summaryrefslogtreecommitdiff
path: root/kde-base/kdeplasma-addons/files
diff options
context:
space:
mode:
authorJonathan Callen <abcd@gentoo.org>2011-12-11 21:04:48 -0500
committerJonathan Callen <abcd@gentoo.org>2011-12-11 21:06:08 -0500
commit8c5c3ead1aaaed5339986a9edb31885a99cf35b0 (patch)
tree6d1a937abe0ba99380bd9b386218b87e4fbf0d94 /kde-base/kdeplasma-addons/files
parentbfc067ee9475458f59cc176a70b8495f3000c2b4 (diff)
downloadkde-8c5c3ead1aaaed5339986a9edb31885a99cf35b0.tar.gz
kde-8c5c3ead1aaaed5339986a9edb31885a99cf35b0.tar.bz2
kde-8c5c3ead1aaaed5339986a9edb31885a99cf35b0.zip
Cleanup unused files
Diffstat (limited to 'kde-base/kdeplasma-addons/files')
-rw-r--r--kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch69
-rw-r--r--kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch122
-rw-r--r--kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch19
-rw-r--r--kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch40
4 files changed, 0 insertions, 250 deletions
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch
deleted file mode 100644
index 587295afc89..00000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.0-groupingdesktop-crash.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-commit 67b5c56e564f5052238bab38342a85e5f4af570b
-Author: Christoph Feck <christoph@maxiom.de>
-Date: Sat Jul 30 19:15:28 2011 +0200
-
- Fix assignment operator and add copy constructor
-
- This fixes the crash in Grid Desktop and Grouping Desktop.
- Thanks to Aaron Seigo for investigation and patch review.
-
- BUG: 278222
- FIXED-IN: 4.7.1
-
-diff --git a/containments/groupingdesktop/lib/groupinfo.cpp b/containments/groupingdesktop/lib/groupinfo.cpp
-index 2106cca..c945551 100644
---- a/containments/groupingdesktop/lib/groupinfo.cpp
-+++ b/containments/groupingdesktop/lib/groupinfo.cpp
-@@ -43,6 +43,12 @@ GroupInfo::GroupInfo(const QString &name, const QString &prettyName)
- d->prettyName = prettyName;
- }
-
-+GroupInfo::GroupInfo(const GroupInfo &other)
-+ : d(new GroupInfoPrivate())
-+{
-+ *d = *other.d;
-+}
-+
- GroupInfo::~GroupInfo()
- {
- delete d;
-@@ -78,13 +84,12 @@ QString GroupInfo::icon() const
- return d->icon;
- }
-
--GroupInfo GroupInfo::operator=(const GroupInfo &gi)
-+GroupInfo &GroupInfo::operator=(const GroupInfo &gi)
- {
-- GroupInfo g(gi.name(), gi.prettyName());
-- g.setFormFactors(gi.formFactors());
-- g.setIcon(gi.icon());
--
-- return g;
-+ if (this != &gi) {
-+ *d = *gi.d;
-+ }
-+ return *this;
- }
-
- bool GroupInfo::operator==(const GroupInfo &gi) const
-diff --git a/containments/groupingdesktop/lib/groupinfo.h b/containments/groupingdesktop/lib/groupinfo.h
-index f8cc66f..320c800 100644
---- a/containments/groupingdesktop/lib/groupinfo.h
-+++ b/containments/groupingdesktop/lib/groupinfo.h
-@@ -31,6 +31,7 @@ class GroupInfo
- {
- public:
- explicit GroupInfo(const QString &name, const QString &prettyName = QString());
-+ GroupInfo(const GroupInfo &other);
- ~GroupInfo();
- void setFormFactors(QSet<Plasma::FormFactor> formFactors);
- void setIcon(const QString &icon);
-@@ -40,7 +41,7 @@ class GroupInfo
- QSet<Plasma::FormFactor> formFactors() const;
- QString icon() const;
-
-- GroupInfo operator=(const GroupInfo &gi);
-+ GroupInfo &operator=(const GroupInfo &gi);
- bool operator==(const GroupInfo &gi) const;
- bool operator<(const GroupInfo &gi) const;
-
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch
deleted file mode 100644
index 96a00c5ebd0..00000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-lancelot.patch
+++ /dev/null
@@ -1,122 +0,0 @@
-commit 6967ee53518136651b4fd5d691293a3c866d7a47
-Author: Aaron Seigo <aseigo@kde.org>
-Date: Tue Nov 22 21:10:45 2011 +0100
-
- fix build
-
-diff --git a/libs/lancelot-datamodels/OpenDocuments.cpp b/libs/lancelot-datamodels/OpenDocuments.cpp
-index 4b2bec5..b9f24ec 100644
---- a/libs/lancelot-datamodels/OpenDocuments.cpp
-+++ b/libs/lancelot-datamodels/OpenDocuments.cpp
-@@ -66,41 +66,41 @@ OpenDocuments::~OpenDocuments()
- delete d;
- }
-
--void OpenDocuments::Private::connectTask(TaskPtr task)
-+void OpenDocuments::Private::connectTask(::TaskManager::Task *task)
- {
- Q_ASSERT(task);
- connect(
-- task.constData(), SIGNAL(changed(::TaskManager::TaskChanges)),
-+ task, SIGNAL(changed(::TaskManager::TaskChanges)),
- this, SLOT(taskChanged())
- );
- }
-
- void OpenDocuments::load()
- {
-- foreach (TaskPtr task, TaskManager::TaskManager::self()->tasks()) {
-+ foreach (TaskManager::Task *task, TaskManager::TaskManager::self()->tasks()) {
- if (d->setDataForTask(task)) {
- d->connectTask(task);
- }
- }
-
- connect(
-- TaskManager::TaskManager::self(), SIGNAL(taskAdded(TaskPtr)),
-- d, SLOT(taskAdded(TaskPtr))
-+ TaskManager::TaskManager::self(), SIGNAL(taskAdded(::TaskManager::Task*)),
-+ d, SLOT(taskAdded(::TaskManager::Task*))
- );
-
- connect(
-- TaskManager::TaskManager::self(), SIGNAL(taskRemoved(TaskPtr)),
-- d, SLOT(taskRemoved(TaskPtr))
-+ TaskManager::TaskManager::self(), SIGNAL(taskRemoved(::TaskManager::Task*)),
-+ d, SLOT(taskRemoved(::TaskManager::Task*))
- );
- }
-
--void OpenDocuments::Private::taskAdded(TaskPtr task)
-+void OpenDocuments::Private::taskAdded(::TaskManager::Task *task)
- {
- connectTask(task);
- setDataForTask(task);
- }
-
--void OpenDocuments::Private::taskRemoved(TaskPtr task)
-+void OpenDocuments::Private::taskRemoved(::TaskManager::Task *task)
- {
- Q_ASSERT(task);
- int index = indexOf(task->window());
-@@ -115,10 +115,10 @@ void OpenDocuments::Private::taskChanged()
- TaskManager::Task* task = qobject_cast<TaskManager::Task*>(sender());
- Q_ASSERT(task);
-
-- setDataForTask(TaskPtr(task));
-+ setDataForTask(task);
- }
-
--bool OpenDocuments::Private::setDataForTask(TaskPtr task)
-+bool OpenDocuments::Private::setDataForTask(::TaskManager::Task *task)
- {
- Q_ASSERT(task);
-
-diff --git a/libs/lancelot-datamodels/OpenDocuments.h b/libs/lancelot-datamodels/OpenDocuments.h
-index 00b0910..f9c5461 100644
---- a/libs/lancelot-datamodels/OpenDocuments.h
-+++ b/libs/lancelot-datamodels/OpenDocuments.h
-@@ -26,8 +26,6 @@
- #include <taskmanager/taskmanager.h>
- #include <QSet>
-
--using TaskManager::TaskPtr;
--
- namespace Lancelot {
- namespace Models {
-
-diff --git a/libs/lancelot-datamodels/OpenDocuments_p.h b/libs/lancelot-datamodels/OpenDocuments_p.h
-index 5fdfe70..d2dc374 100644
---- a/libs/lancelot-datamodels/OpenDocuments_p.h
-+++ b/libs/lancelot-datamodels/OpenDocuments_p.h
-@@ -24,8 +24,6 @@
- #include <taskmanager/taskmanager.h>
- #include <QSet>
-
--using TaskManager::TaskPtr;
--
- namespace Lancelot {
- namespace Models {
-
-@@ -44,16 +42,16 @@ public:
-
- public Q_SLOTS:
- void taskChanged();
-- void taskAdded(TaskPtr task);
-- void taskRemoved(TaskPtr task);
-+ void taskAdded(::TaskManager::Task *task);
-+ void taskRemoved(::TaskManager::Task *task);
-
-- void connectTask(TaskPtr task);
-- bool setDataForTask(TaskPtr task);
-+ void connectTask(::TaskManager::Task *task);
-+ bool setDataForTask(::TaskManager::Task *task);
-
- int indexOf(WId wid);
-
- public:
-- QMap <WId, TaskPtr > tasks;
-+ QMap <WId, TaskManager::Task *> tasks;
- QList <SupportedTask> supportedTasks;
-
- private:
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch
deleted file mode 100644
index c01f13122b1..00000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-fix-build-marble-wallpaper.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-commit e089568a73ec0fa9f8e9ec61c9853b1905d3a1d7
-Author: Ben Cooksley <bcooksley@kde.org>
-Date: Mon Nov 28 08:14:54 2011 +1300
-
- Fix build of Marble wallpaper
- REVIEW: 103243
-
-diff --git a/wallpapers/marble/marble.cpp b/wallpapers/marble/marble.cpp
-index 3cecaae..988a8b6 100644
---- a/wallpapers/marble/marble.cpp
-+++ b/wallpapers/marble/marble.cpp
-@@ -137,7 +137,6 @@ QWidget *MarbleWallpaper::createConfigurationInterface(QWidget *parent)
- m_ui.showPlacemarks->setChecked(m_showPlacemarks);
-
- MapThemeManager themeManager;
-- themeManager.updateMapThemeModel();
- // FIXME: Going manually through the model is ugly as hell, but plugging the
- // model into the view didn't work for me
- for (int i = 0; i < themeManager.mapThemeModel()->rowCount(); i++) {
diff --git a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch b/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch
deleted file mode 100644
index cc6958d3162..00000000000
--- a/kde-base/kdeplasma-addons/files/kdeplasma-addons-4.7.80-remove-outdated-statements.patch
+++ /dev/null
@@ -1,40 +0,0 @@
-commit b0c70d7fd866efb628036f43978bc791e0485f90
-Author: Aaron Seigo <aseigo@kde.org>
-Date: Tue Nov 22 14:07:59 2011 +0100
-
- remove outdated using statements
-
-diff --git a/applets/icontasks/taskitemlayout.h b/applets/icontasks/taskitemlayout.h
-index 9ebf82f..64142e1 100644
---- a/applets/icontasks/taskitemlayout.h
-+++ b/applets/icontasks/taskitemlayout.h
-@@ -32,9 +32,6 @@ class TaskGroupItem;
- class AbstractTaskItem;
- class LauncherSeparator;
-
--using TaskManager::StartupPtr;
--using TaskManager::TaskPtr;
--
- /**
- * A Layout for the expanded group
- */
-diff --git a/applets/icontasks/tasks.h b/applets/icontasks/tasks.h
-index e7bab6b..bf8a665 100644
---- a/applets/icontasks/tasks.h
-+++ b/applets/icontasks/tasks.h
-@@ -54,15 +54,6 @@ namespace TaskManager
- class GroupManager;
- } // namespace TaskManager
-
--using TaskManager::StartupPtr;
--using TaskManager::TaskPtr;
--using TaskManager::StartupPtr;
--using TaskManager::GroupPtr;
--using TaskManager::AbstractGroupableItem;
--using TaskManager::TaskItem;
--using TaskManager::TaskGroup;
--using TaskManager::LauncherItem;
--
- class TaskGroupItem;
- class GroupManager;
-