API tools faq
paste
Guest User

file:///home/chimarrao/Download/fix_kde4.8_comp.patch

a guest
Apr 14th, 2013
88
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 5.65 KB | None | 0 0
raw download clone embed print report
  1. --- flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/PlasmaToolTip.cpp 2011-10-07 03:21:52.000000000 +0800
  2. +++ flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/PlasmaToolTipX.cpp 2012-02-21 00:35:40.996293493 +0800
  3. @@ -91,7 +91,7 @@
  4. }
  5.  
  6. Plasma::ToolTipContent data;
  7. - TaskManager::TaskPtr taskPtr(task->task());
  8. + TaskManager::Task* taskPtr(task->task());
  9. QList<WId> windows;
  10. int desktop = -1;
  11.  
  12. --- flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/SmoothToolTip.cpp 2011-10-07 03:21:52.000000000 +0800
  13. +++ flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/SmoothToolTipX.cpp 2012-02-21 00:38:52.331901468 +0800
  14. @@ -474,7 +474,7 @@
  15. foreach (WindowPreview *preview, m_previews) {
  16. preview->show();
  17.  
  18. - TaskManager::TaskPtr task = preview->task()->task();
  19. + TaskManager::Task* task = preview->task()->task();
  20.  
  21. if (task && preview->task()->type() != Task::StartupItem && preview->task()->type() != Task::LauncherItem) {
  22. winIds.append(task->window());
  23. --- flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/Task.cpp 2011-10-07 03:21:52.000000000 +0800
  24. +++ flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/TaskX.cpp 2012-02-21 00:43:37.927331034 +0800
  25. @@ -118,8 +118,8 @@
  26. }
  27.  
  28. QString Task::text() const {
  29. - TaskManager::TaskPtr task;
  30. - TaskManager::StartupPtr startup;
  31. + TaskManager::Task *task;
  32. + TaskManager::Startup *startup;
  33.  
  34. switch (type()) {
  35. case StartupItem:
  36. @@ -186,12 +186,23 @@
  37. return m_task ? m_task->task()->desktop() : -1;
  38. }
  39.  
  40. -TaskManager::TaskPtr Task::task() const {
  41. - return m_task ? m_task->task() : TaskManager::TaskPtr();
  42. -}
  43. -
  44. -TaskManager::StartupPtr Task::startup() const {
  45. - return m_task ? m_task->startup() : TaskManager::StartupPtr();
  46. +TaskManager::Task* Task::task() const {
  47. + if (m_task) {
  48. + return m_task->task();
  49. + } else {
  50. + TaskManager::Task *task;
  51. + return task;
  52. + }
  53. + //return m_task ? m_task->task() : ::TaskManager::Task task;
  54. +}
  55. +
  56. +TaskManager::Startup* Task::startup() const {
  57. + if (m_task) {
  58. + return m_task->startup();
  59. + } else {
  60. + TaskManager::Startup* startup;
  61. + return startup;
  62. + }
  63. }
  64.  
  65. int Task::taskCount() const {
  66. @@ -309,7 +320,7 @@
  67. void Task::setWindowTask(TaskManager::TaskItem* taskItem) {
  68. m_type = TaskItem;
  69. if (m_task && m_task->task()) {
  70. - disconnect(m_task->task().constData(), 0, this, 0);
  71. + disconnect(m_task->task(), 0, this, 0);
  72. }
  73.  
  74. m_task = taskItem;
  75. --- flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/TaskItem.cpp 2011-10-07 03:21:52.000000000 +0800
  76. +++ flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/TaskItemX.cpp 2012-02-21 00:49:35.177864788 +0800
  77. @@ -375,7 +375,7 @@
  78.  
  79. void TaskItem::publishIconGeometry() {
  80. QRect iconRect(iconGeometry());
  81. - TaskManager::TaskPtr task;
  82. + TaskManager::Task *task;
  83. TaskManager::GroupPtr group;
  84.  
  85. switch (m_task->type()) {
  86. @@ -465,7 +465,7 @@
  87. }
  88.  
  89. void TaskItem::mouseReleaseEvent(QGraphicsSceneMouseEvent *event) {
  90. - TaskManager::TaskPtr task;
  91. + TaskManager::Task* task;
  92.  
  93. switch (event->button()) {
  94. case Qt::LeftButton:
  95. @@ -626,7 +626,7 @@
  96. }
  97.  
  98. void TaskItem::activate() {
  99. - TaskManager::TaskPtr task;
  100. + TaskManager::Task* task;
  101.  
  102. switch (m_task->type()) {
  103. case Task::TaskItem:
  104. --- flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/WindowPreview.cpp 2011-10-07 03:21:52.000000000 +0800
  105. +++ flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/WindowPreviewX.cpp 2012-02-21 00:53:41.563784539 +0800
  106. @@ -117,7 +117,7 @@
  107. if (m_toolTip->previewsAvailable()) {
  108. // determine preview size:
  109. WId wid = 0;
  110. - TaskManager::TaskPtr task = m_task->task();
  111. + TaskManager::Task* task = m_task->task();
  112.  
  113. if (task) {
  114. wid = task->window();
  115. @@ -297,7 +297,7 @@
  116. }
  117.  
  118. void WindowPreview::highlightTask() {
  119. - TaskManager::TaskPtr task = m_task->task();
  120. + TaskManager::Task* task = m_task->task();
  121.  
  122. if (task) {
  123. m_toolTip->highlightTask(task->window());
  124. @@ -325,7 +325,7 @@
  125. m_toolTip->hide();
  126.  
  127. if(m_task->type() != Task::LauncherItem) {
  128. - TaskManager::TaskPtr task = m_task->task();
  129. + TaskManager::Task* task = m_task->task();
  130. if (task) {
  131. task->activate();
  132. }
  133. @@ -336,7 +336,7 @@
  134. }
  135.  
  136. void WindowPreview::activateForDrop() {
  137. - TaskManager::TaskPtr task = m_task->task();
  138. + TaskManager::Task* task = m_task->task();
  139. if (task) {
  140. if (task->isMinimized()) {
  141. task->restore();
  142. @@ -347,7 +347,7 @@
  143. }
  144.  
  145. void WindowPreview::closeTask() {
  146. - TaskManager::TaskPtr task = m_task->task();
  147. + TaskManager::Task* task = m_task->task();
  148. if (task) {
  149. task->close();
  150. }
  151. --- flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/Task.h 2011-10-07 03:21:52.000000000 +0800
  152. +++ flupp-smooth-tasks-wip-2010-11-06/applet/SmoothTasks/TaskX.h 2012-02-21 00:46:57.920830772 +0800
  153. @@ -78,12 +78,12 @@
  154. QString text() const;
  155. QString description() const;
  156. int desktop() const;
  157. - TaskManager::TaskPtr task() const;
  158. + TaskManager::Task *task() const;
  159. TaskManager::AbstractGroupableItem *abstractItem() { return m_abstractItem; }
  160. TaskManager::GroupPtr group() const { return m_group; }
  161. - TaskManager::TaskItem *taskItem() const { return m_task; }
  162. + TaskManager::TaskItem *taskItem() const { return m_task; }
  163. TaskManager::LauncherItem *launcherItem() const { return m_launcher; }
  164. - TaskManager::StartupPtr startup() const;
  165. + TaskManager::Startup *startup() const;
  166. TaskFlags flags() const { return m_flags; }
  167. ItemType type() const { return m_type; }
  168. void addMimeData(QMimeData* mimeData);
Add Comment
Please, Sign In to add comment
Public Pastes
We use cookies for various purposes including analytics. By continuing to use Pastebin, you agree to our use of cookies as described in the Cookies Policy.  OK, I Understand
Not a member of Pastebin yet?
Sign Up, it unlocks many cool features!