Get Gentoo!
gentoo.org sites
gentoo.org Wiki Bugs Forums Packages
Planet Archives Sources
Infra Status

Gentoo Archives: gentoo-commits

From: "Johannes Huber (johu)" <johu@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in kde-misc/smooth-tasks/files: smooth-tasks-0_p20120130-kde48.patch
Date: Mon, 30 Jan 2012 16:47:50
Message-Id: 20120130164739.C39C12004C@flycatcher.gentoo.org
1 johu 12/01/30 16:47:39
2
3 Added: smooth-tasks-0_p20120130-kde48.patch
4 Log:
5 Add new snapshot from a more active fork. Snapshot is patched to build with kde 4.8. Remove old snapshot violates naming scheme. Fixes bug #400863.
6
7 (Portage version: 2.2.0_alpha84/cvs/Linux x86_64)
8
9 Revision Changes Path
10 1.1 kde-misc/smooth-tasks/files/smooth-tasks-0_p20120130-kde48.patch
11
12 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/smooth-tasks/files/smooth-tasks-0_p20120130-kde48.patch?rev=1.1&view=markup
13 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/kde-misc/smooth-tasks/files/smooth-tasks-0_p20120130-kde48.patch?rev=1.1&content-type=text/plain
14
15 Index: smooth-tasks-0_p20120130-kde48.patch
16 ===================================================================
17 diff -u src/smooth-tasks-fork/applet/SmoothTasks/PlasmaToolTip.cpp src/smooth-tasks-fork/applet/SmoothTasksX/PlasmaToolTip.cpp
18 --- src/smooth-tasks-fork/applet/SmoothTasks/PlasmaToolTip.cpp 2011-12-24 03:13:55.604361299 +0100
19 +++ src/smooth-tasks-fork/applet/SmoothTasksX/PlasmaToolTip.cpp 2011-12-24 03:11:00.000000000 +0100
20 @@ -91,7 +91,7 @@
21 }
22
23 Plasma::ToolTipContent data;
24 - TaskManager::TaskPtr taskPtr(task->task());
25 + TaskManager::Task* taskPtr(task->task());
26 QList<WId> windows;
27 int desktop = -1;
28
29 diff -u src/smooth-tasks-fork/applet/SmoothTasks/SmoothToolTip.cpp src/smooth-tasks-fork/applet/SmoothTasksX/SmoothToolTip.cpp
30 --- src/smooth-tasks-fork/applet/SmoothTasks/SmoothToolTip.cpp 2011-12-24 03:13:55.605361287 +0100
31 +++ src/smooth-tasks-fork/applet/SmoothTasksX/SmoothToolTip.cpp 2011-12-24 03:10:24.000000000 +0100
32 @@ -474,7 +474,7 @@
33 foreach (WindowPreview *preview, m_previews) {
34 preview->show();
35
36 - TaskManager::TaskPtr task = preview->task()->task();
37 + TaskManager::Task* task = preview->task()->task();
38
39 if (task && preview->task()->type() != Task::StartupItem && preview->task()->type() != Task::LauncherItem) {
40 winIds.append(task->window());
41 diff -u src/smooth-tasks-fork/applet/SmoothTasks/Task.cpp src/smooth-tasks-fork/applet/SmoothTasksX/Task.cpp
42 --- src/smooth-tasks-fork/applet/SmoothTasks/Task.cpp 2011-12-24 03:13:55.606361275 +0100
43 +++ src/smooth-tasks-fork/applet/SmoothTasksX/Task.cpp 2011-12-24 03:07:21.000000000 +0100
44 @@ -118,8 +118,8 @@
45 }
46
47 QString Task::text() const {
48 - TaskManager::TaskPtr task;
49 - TaskManager::StartupPtr startup;
50 + TaskManager::Task *task;
51 + TaskManager::Startup *startup;
52
53 switch (type()) {
54 case StartupItem:
55 @@ -186,12 +186,23 @@
56 return m_task ? m_task->task()->desktop() : -1;
57 }
58
59 -TaskManager::TaskPtr Task::task() const {
60 - return m_task ? m_task->task() : TaskManager::TaskPtr();
61 -}
62 -
63 -TaskManager::StartupPtr Task::startup() const {
64 - return m_task ? m_task->startup() : TaskManager::StartupPtr();
65 +TaskManager::Task* Task::task() const {
66 + if (m_task) {
67 + return m_task->task();
68 + } else {
69 + TaskManager::Task *task;
70 + return task;
71 + }
72 + //return m_task ? m_task->task() : ::TaskManager::Task task;
73 +}
74 +
75 +TaskManager::Startup* Task::startup() const {
76 + if (m_task) {
77 + return m_task->startup();
78 + } else {
79 + TaskManager::Startup* startup;
80 + return startup;
81 + }
82 }
83
84 int Task::taskCount() const {
85 @@ -309,7 +320,7 @@
86 void Task::setWindowTask(TaskManager::TaskItem* taskItem) {
87 m_type = TaskItem;
88 if (m_task && m_task->task()) {
89 - disconnect(m_task->task().constData(), 0, this, 0);
90 + disconnect(m_task->task(), 0, this, 0);
91 }
92
93 m_task = taskItem;
94 diff -u src/smooth-tasks-fork/applet/SmoothTasks/Task.h src/smooth-tasks-fork/applet/SmoothTasksX/Task.h
95 --- src/smooth-tasks-fork/applet/SmoothTasks/Task.h 2011-12-24 03:13:55.607361262 +0100
96 +++ src/smooth-tasks-fork/applet/SmoothTasksX/Task.h 2011-12-24 02:34:23.000000000 +0100
97 @@ -78,12 +78,12 @@
98 QString text() const;
99 QString description() const;
100 int desktop() const;
101 - TaskManager::TaskPtr task() const;
102 + TaskManager::Task *task() const;
103 TaskManager::AbstractGroupableItem *abstractItem() { return m_abstractItem; }
104 TaskManager::GroupPtr group() const { return m_group; }
105 - TaskManager::TaskItem *taskItem() const { return m_task; }
106 + TaskManager::TaskItem *taskItem() const { return m_task; }
107 TaskManager::LauncherItem *launcherItem() const { return m_launcher; }
108 - TaskManager::StartupPtr startup() const;
109 + TaskManager::Startup *startup() const;
110 TaskFlags flags() const { return m_flags; }
111 ItemType type() const { return m_type; }
112 void addMimeData(QMimeData* mimeData);
113 Only in src/smooth-tasks-fork/applet/SmoothTasksX: .Task.h.kate-swp
114 diff -u src/smooth-tasks-fork/applet/SmoothTasks/TaskItem.cpp src/smooth-tasks-fork/applet/SmoothTasksX/TaskItem.cpp
115 --- src/smooth-tasks-fork/applet/SmoothTasks/TaskItem.cpp 2011-12-24 03:13:55.610361223 +0100
116 +++ src/smooth-tasks-fork/applet/SmoothTasksX/TaskItem.cpp 2011-12-24 03:09:11.000000000 +0100
117 @@ -375,7 +375,7 @@
118
119 void TaskItem::publishIconGeometry() {
120 QRect iconRect(iconGeometry());
121 - TaskManager::TaskPtr task;
122 + TaskManager::Task *task;
123 TaskManager::GroupPtr group;
124
125 switch (m_task->type()) {
126 @@ -465,7 +465,7 @@
127 }
128
129 void TaskItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
130 - TaskManager::TaskPtr task;
131 + TaskManager::Task* task;
132
133 switch (event->button()) {
134 case Qt::LeftButton:
135 @@ -626,7 +626,7 @@
136 }
137
138 void TaskItem::activate() {
139 - TaskManager::TaskPtr task;
140 + TaskManager::Task* task;
141
142 switch (m_task->type()) {
143 case Task::TaskItem:
144 Common subdirectories: src/smooth-tasks-fork/applet/SmoothTasks/Ui and src/smooth-tasks-fork/applet/SmoothTasksX/Ui
145 diff -u src/smooth-tasks-fork/applet/SmoothTasks/WindowPreview.cpp src/smooth-tasks-fork/applet/SmoothTasksX/WindowPreview.cpp
146 --- src/smooth-tasks-fork/applet/SmoothTasks/WindowPreview.cpp 2011-12-24 03:13:55.619361111 +0100
147 +++ src/smooth-tasks-fork/applet/SmoothTasksX/WindowPreview.cpp 2011-12-24 03:12:49.000000000 +0100
148 @@ -117,7 +117,7 @@
149 if (m_toolTip->previewsAvailable()) {
150 // determine preview size:
151 WId wid = 0;
152 - TaskManager::TaskPtr task = m_task->task();
153 + TaskManager::Task* task = m_task->task();
154
155 if (task) {
156 wid = task->window();
157 @@ -297,7 +297,7 @@
158 }
159
160 void WindowPreview::highlightTask() {
161 - TaskManager::TaskPtr task = m_task->task();
162 + TaskManager::Task* task = m_task->task();
163
164 if (task) {
165 m_toolTip->highlightTask(task->window());
166 @@ -325,7 +325,7 @@
167 m_toolTip->hide();
168
169 if(m_task->type() != Task::LauncherItem) {
170 - TaskManager::TaskPtr task = m_task->task();
171 + TaskManager::Task* task = m_task->task();
172 if (task) {
173 task->activate();
174 }
175 @@ -336,7 +336,7 @@
176 }
177
178 void WindowPreview::activateForDrop() {
179 - TaskManager::TaskPtr task = m_task->task();
180 + TaskManager::Task* task = m_task->task();
181 if (task) {
182 if (task->isMinimized()) {
183 task->restore();
184 @@ -347,7 +347,7 @@
185 }
186
187 void WindowPreview::closeTask() {
188 - TaskManager::TaskPtr task = m_task->task();
189 + TaskManager::Task* task = m_task->task();
190 if (task) {
191 task->close();
192 }
Report Message
Find on MARC Find on Google Groups