API tools faq
paste
Advertisement
Guest User

unity2d_qt5.patch

a guest
Jan 4th, 2012
125
0
Never
Add comment
Not a member of Pastebin yet? Sign Up, it unlocks many cool features!
text 123.58 KB | None | 0 0
raw download clone embed print report
  1. === modified file 'CMakeLists.txt'
  2. --- CMakeLists.txt 2011-11-23 12:43:09 +0000
  3. +++ CMakeLists.txt 2012-01-03 20:38:04 +0000
  4. @@ -34,7 +34,18 @@
  5.  
  6. # Dependencies
  7. include(FindPkgConfig)
  8. -find_package(Qt4 REQUIRED)
  9. +find_package(Qt5Core REQUIRED)
  10. +find_package(Qt5Widgets REQUIRED)
  11. +find_package(Qt5Gui REQUIRED)
  12. +find_package(Qt5OpenGL REQUIRED)
  13. +find_package(Qt5Declarative REQUIRED)
  14. +find_package(Qt5Test REQUIRED)
  15. +find_package(Qt5Quick1 REQUIRED)
  16. +find_package(Qt5DBus REQUIRED)
  17. +find_package(Qt5DBusTools REQUIRED)
  18. +find_package(Qt5Network REQUIRED)
  19. +find_package(Qt5Xml REQUIRED)
  20. +find_package(Qt5XmlPatterns REQUIRED)
  21. find_package(X11 REQUIRED)
  22. find_package(Gettext REQUIRED)
  23. pkg_check_modules(GLIB REQUIRED glib-2.0)
  24. @@ -74,14 +85,15 @@
  25.  
  26. include_directories(
  27. ${CMAKE_BINARY_DIR}
  28. - ${QT_INCLUDE_DIR}
  29. - ${QT_QTCORE_INCLUDE_DIR}
  30. - ${QT_QTDBUS_INCLUDE_DIR}
  31. - ${QT_QTDECLARATIVE_INCLUDE_DIR}
  32. - ${QT_QTXML_INCLUDE_DIR}
  33. - ${QT_QTGUI_INCLUDE_DIR}
  34. - ${QT_QTOPENGL_INCLUDE_DIR}
  35. - ${X11_INCLUDE_DIR}
  36. + ${QT_INCLUDE_DIRS}
  37. + ${Qt5Core_INCLUDE_DIRS}
  38. + ${Qt5Widgets_INCLUDE_DIRS}
  39. + ${Qt5Gui_INCLUDE_DIRS}
  40. + ${Qt5OpenGL_INCLUDE_DIRS}
  41. + ${Qt5Declarative_INCLUDE_DIRS}
  42. + ${Qt5Quick1_INCLUDE_DIRS}
  43. + ${Qt5DBus_INCLUDE_DIRS}
  44. + ${X11_INCLUDE_DIRS}
  45. ${DCONFQT_INCLUDE_DIRS}
  46. )
  47.  
  48. @@ -92,7 +104,7 @@
  49. # Source
  50. add_subdirectory(libunity-2d-private)
  51. add_subdirectory(launcher)
  52. -add_subdirectory(panel)
  53. +#add_subdirectory(panel)
  54. add_subdirectory(places)
  55. add_subdirectory(spread)
  56. add_subdirectory(po)
  57.  
  58. === modified file 'config.h.in'
  59. --- config.h.in 2011-11-18 10:15:49 +0000
  60. +++ config.h.in 2012-01-03 21:35:30 +0000
  61. @@ -60,7 +60,7 @@
  62.  
  63. inline QString unity2dImportPath() {
  64. if (isRunningInstalled()) {
  65. - return QString(INSTALL_PREFIX "/" INSTALL_LIBDIR "/qt4/imports");
  66. + return QString(INSTALL_PREFIX "/" INSTALL_LIBDIR "/qt5/imports");
  67. } else {
  68. return QString("@CMAKE_BINARY_DIR@/libunity-2d-private/");
  69. }
  70.  
  71. === modified file 'debian/libunity-2d-private0.install.in'
  72. --- debian/libunity-2d-private0.install.in 2011-11-09 22:26:57 +0000
  73. +++ debian/libunity-2d-private0.install.in 2012-01-03 21:33:01 +0000
  74. @@ -1,3 +1,3 @@
  75. @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/libunity-2d-private.so.*
  76. -@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/qt4/imports/Unity2d
  77. +@DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_LIBDIR@/qt5/imports/Unity2d
  78. @DEBIAN_INSTALL_PREFIX@/@CMAKE_INSTALL_DATADIR@/unity-2d/warty-final-ubuntu.jpg
  79.  
  80. === modified file 'launcher/Launcher.qml'
  81. --- launcher/Launcher.qml 2011-11-30 16:15:21 +0000
  82. +++ launcher/Launcher.qml 2012-01-03 21:50:34 +0000
  83. @@ -22,7 +22,7 @@
  84. LauncherDropItem {
  85. id: launcher
  86.  
  87. - Accessible.name: "root"
  88. + //Accessible.name: "root"
  89.  
  90. function clamp(x, min, max) {
  91. return Math.max(Math.min(x, max), min)
  92. @@ -47,7 +47,7 @@
  93. }
  94.  
  95. GnomeBackground {
  96. - Accessible.name: "background"
  97. + //Accessible.name: "background"
  98. anchors.fill: parent
  99. overlay_color: "black"
  100. overlay_alpha: 0.66
  101. @@ -55,7 +55,7 @@
  102. }
  103.  
  104. Rectangle {
  105. - Accessible.name: "background"
  106. + //Accessible.name: "background"
  107. anchors.fill: parent
  108. color: "black"
  109. opacity: 0.66
  110. @@ -63,7 +63,7 @@
  111. }
  112.  
  113. Image {
  114. - Accessible.name: "border"
  115. + //Accessible.name: "border"
  116. id: border
  117.  
  118. width: 1
  119. @@ -77,7 +77,7 @@
  120. onWebpageUrlDropped: applications.insertWebFavorite(url)
  121.  
  122. FocusScope {
  123. - Accessible.name: "content"
  124. + //Accessible.name: "content"
  125.  
  126. focus: true
  127. anchors.fill: parent
  128. @@ -85,7 +85,7 @@
  129.  
  130. LauncherList {
  131. id: main
  132. - Accessible.name: "main"
  133. + //Accessible.name: "main"
  134.  
  135. /* function to position highlighted tile so that the shadow does not cover it */
  136. function positionMainViewForIndex(index) {
  137. @@ -147,7 +147,7 @@
  138.  
  139. LauncherList {
  140. id: shelf
  141. - Accessible.name: "shelf"
  142. + //Accessible.name: "shelf"
  143.  
  144. anchors.bottom: parent.bottom
  145. anchors.bottomMargin: main.anchors.bottomMargin
  146.  
  147. === modified file 'launcher/LauncherItem.qml'
  148. --- launcher/LauncherItem.qml 2011-11-28 19:40:53 +0000
  149. +++ launcher/LauncherItem.qml 2012-01-03 21:49:30 +0000
  150. @@ -48,7 +48,7 @@
  151. DropItem {
  152. id: item
  153.  
  154. - Accessible.role: Accessible.PushButton
  155. +// Accessible.role: Accessible.PushButton
  156.  
  157. anchors.horizontalCenter: parent.horizontalCenter
  158.  
  159.  
  160. === modified file 'launcher/LauncherList.qml'
  161. --- launcher/LauncherList.qml 2011-11-28 19:40:53 +0000
  162. +++ launcher/LauncherList.qml 2012-01-03 21:49:54 +0000
  163. @@ -88,7 +88,7 @@
  164. }
  165. }
  166.  
  167. - Accessible.name: accessibleDescription()
  168. + //Accessible.name: accessibleDescription()
  169.  
  170. width: list.width
  171. tileSize: list.tileSize
  172.  
  173. === modified file 'launcher/app/CMakeLists.txt'
  174. --- launcher/app/CMakeLists.txt 2011-11-18 10:15:49 +0000
  175. +++ launcher/app/CMakeLists.txt 2012-01-03 20:37:08 +0000
  176. @@ -17,11 +17,11 @@
  177. gesturehandler.h
  178. )
  179.  
  180. -qt4_wrap_cpp(launcher_MOC_SRCS ${launcher_MOC_HDRS})
  181. +qt5_wrap_cpp(launcher_MOC_SRCS ${launcher_MOC_HDRS})
  182.  
  183. configure_file(unity-2d-launcher.service.in unity-2d-launcher.service)
  184.  
  185. -qt4_add_dbus_adaptor(launcher_SRCS launcher.xml
  186. +qt5_add_dbus_adaptor(launcher_SRCS launcher.xml
  187. launcherdbus.h LauncherDBus
  188. )
  189.  
  190. @@ -40,10 +40,10 @@
  191. )
  192.  
  193. target_link_libraries(uqlauncher
  194. - ${QT_QTCORE_LIBRARIES}
  195. - ${QT_QTGUI_LIBRARIES}
  196. - ${QT_QTDBUS_LIBRARIES}
  197. - ${QT_QTDECLARATIVE_LIBRARIES}
  198. + ${Qt5Core_LIBRARIES}
  199. + ${Qt5Gui_LIBRARIES}
  200. + ${Qt5DBus_LIBRARIES}
  201. + ${Qt5Declarative_LIBRARIES}
  202. ${GTK_LDFLAGS}
  203. ${X11_LDFLAGS}
  204. ${GEIS_LDFLAGS}
  205.  
  206. === modified file 'launcher/app/gesturehandler.cpp'
  207. --- launcher/app/gesturehandler.cpp 2011-11-08 13:33:33 +0000
  208. +++ launcher/app/gesturehandler.cpp 2012-01-03 20:37:08 +0000
  209. @@ -19,9 +19,9 @@
  210.  
  211. #include "gesturehandler.h"
  212.  
  213. -#include <QX11Info>
  214. +#include <QX11Info.h>
  215. #include <QSocketNotifier>
  216. -#include <QDBusInterface>
  217. +#include <QtDBus/QDBusInterface>
  218.  
  219. #include <debug_p.h>
  220.  
  221.  
  222. === modified file 'launcher/app/gesturehandler.h'
  223. --- launcher/app/gesturehandler.h 2011-02-21 00:25:44 +0000
  224. +++ launcher/app/gesturehandler.h 2012-01-03 20:37:08 +0000
  225. @@ -20,7 +20,7 @@
  226. #ifndef GESTUREHANDLER_H
  227. #define GESTUREHANDLER_H
  228.  
  229. -#include <QObject>
  230. +#include <QtCore/QObject>
  231. #include <QHash>
  232.  
  233. extern "C" {
  234.  
  235. === modified file 'launcher/app/launcher.cpp'
  236. --- launcher/app/launcher.cpp 2011-12-01 09:55:45 +0000
  237. +++ launcher/app/launcher.cpp 2012-01-03 20:37:08 +0000
  238. @@ -23,12 +23,12 @@
  239. #include <unity2dapplication.h>
  240.  
  241. // Qt
  242. -#include <QApplication>
  243. -#include <QDesktopWidget>
  244. -#include <QDeclarativeEngine>
  245. -#include <QDeclarativeContext>
  246. +#include <QtWidgets/QApplication>
  247. +#include <QtWidgets/QDesktopWidget>
  248. +#include <QtDeclarative/QDeclarativeEngine>
  249. +#include <QtDeclarative/QDeclarativeContext>
  250. #include <QDir>
  251. -#include <QGraphicsObject>
  252. +#include <QtWidgets/QGraphicsObject>
  253.  
  254. #include "config.h"
  255. #include "launcherview.h"
  256.  
  257. === modified file 'launcher/app/launcherview.cpp'
  258. --- launcher/app/launcherview.cpp 2011-11-25 11:13:44 +0000
  259. +++ launcher/app/launcherview.cpp 2012-01-03 20:37:08 +0000
  260. @@ -19,16 +19,16 @@
  261.  
  262. #include "launcherview.h"
  263.  
  264. -#include <QApplication>
  265. -#include <QDesktopWidget>
  266. -#include <QX11Info>
  267. -#include <QDebug>
  268. -#include <QGraphicsObject>
  269. +#include <QtWidgets/QApplication>
  270. +#include <QtWidgets/QDesktopWidget>
  271. +#include <QX11Info.h>
  272. +#include <QtCore/QDebug>
  273. +#include <QtWidgets/QGraphicsObject>
  274.  
  275. #include <QtDeclarative/qdeclarative.h>
  276. -#include <QDeclarativeEngine>
  277. -#include <QDeclarativeContext>
  278. -#include <QDeclarativeImageProvider>
  279. +#include <QtDeclarative/QDeclarativeEngine>
  280. +#include <QtDeclarative/QDeclarativeContext>
  281. +#include <QtDeclarative/QDeclarativeImageProvider>
  282. #include <QtDBus/QDBusInterface>
  283. #include <QtDBus/QDBusPendingCall>
  284. #include <QtDBus/QDBusReply>
  285.  
  286. === modified file 'launcher/app/launcherview.h'
  287. --- launcher/app/launcherview.h 2011-11-25 12:32:03 +0000
  288. +++ launcher/app/launcherview.h 2012-01-03 20:37:08 +0000
  289. @@ -20,11 +20,11 @@
  290. #ifndef LAUNCHERVIEW
  291. #define LAUNCHERVIEW
  292.  
  293. -#include <QDeclarativeView>
  294. +#include <QtQuick1/QDeclarativeView>
  295. #include <QList>
  296. #include <QUrl>
  297. -#include <QTimer>
  298. -#include <QVariant>
  299. +#include <QtCore/QTimer>
  300. +#include <QtCore/QVariant>
  301.  
  302. #include <unity2ddeclarativeview.h>
  303.  
  304.  
  305. === modified file 'launcher/app/visibilitycontroller.cpp'
  306. --- launcher/app/visibilitycontroller.cpp 2011-12-01 09:55:45 +0000
  307. +++ launcher/app/visibilitycontroller.cpp 2012-01-03 20:37:09 +0000
  308. @@ -32,8 +32,8 @@
  309. #include <config.h>
  310.  
  311. // Qt
  312. -#include <QDBusConnection>
  313. -#include <QDBusServiceWatcher>
  314. +#include <QtDBus/QDBusConnection>
  315. +#include <QtDBus/QDBusServiceWatcher>
  316.  
  317. VisibilityController::VisibilityController(Unity2dPanel* panel)
  318. : QObject(panel)
  319.  
  320. === modified file 'launcher/app/visibilitycontroller.h'
  321. --- launcher/app/visibilitycontroller.h 2011-11-24 15:12:00 +0000
  322. +++ launcher/app/visibilitycontroller.h 2012-01-03 20:37:08 +0000
  323. @@ -25,7 +25,7 @@
  324.  
  325. // Qt
  326. #include <QHash>
  327. -#include <QObject>
  328. +#include <QtCore/QObject>
  329. #include <QScopedPointer>
  330.  
  331. class AbstractVisibilityBehavior;
  332.  
  333. === modified file 'launcher/tests/CMakeLists.txt'
  334. --- launcher/tests/CMakeLists.txt 2011-11-25 15:38:51 +0000
  335. +++ launcher/tests/CMakeLists.txt 2012-01-03 20:37:08 +0000
  336. @@ -5,7 +5,7 @@
  337. COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/tests/run-with-xvfb.sh ./${_test}
  338. )
  339. add_executable(${_test} ${_test}.cpp ${_test}.moc)
  340. - qt4_generate_moc(${_test}.cpp ${_test}.moc)
  341. + qt5_generate_moc(${_test}.cpp ${_test}.moc)
  342. target_link_libraries(${_test}
  343. ${QT_QTTEST_LIBRARIES}
  344. uqlauncher
  345. @@ -18,7 +18,7 @@
  346. ${CMAKE_SOURCE_DIR}/tests
  347. ${CMAKE_CURRENT_SOURCE_DIR}/../app
  348. ${CMAKE_CURRENT_BINARY_DIR}
  349. - ${QT_QTTEST_INCLUDE_DIR}
  350. + ${QT_QTTEST_INCLUDE_DIRS}
  351. ${QTGCONF_INCLUDE_DIRS}
  352. )
  353.  
  354.  
  355. === modified file 'libunity-2d-private/Unity2d/CMakeLists.txt'
  356. --- libunity-2d-private/Unity2d/CMakeLists.txt 2011-11-18 10:15:49 +0000
  357. +++ libunity-2d-private/Unity2d/CMakeLists.txt 2012-01-03 20:37:13 +0000
  358. @@ -9,8 +9,8 @@
  359.  
  360. file(GLOB unity-2d-private-qml_QML *.qml)
  361.  
  362. -qt4_add_resources(unity-2d-private-qml_RC_SRCS launchermenu/launchermenu.qrc)
  363. -qt4_wrap_cpp(unity-2d-private-qml_MOC_SRCS ${unity-2d-private-qml_MOC_HDRS})
  364. +qt5_add_resources(unity-2d-private-qml_RC_SRCS launchermenu/launchermenu.qrc)
  365. +qt5_wrap_cpp(unity-2d-private-qml_MOC_SRCS ${unity-2d-private-qml_MOC_HDRS})
  366.  
  367. # Build
  368. add_library(unity-2d-private-qml SHARED ${unity-2d-private-qml_SRCS} ${unity-2d-private-qml_MOC_SRCS} ${unity-2d-private-qml_RC_SRCS})
  369. @@ -28,7 +28,7 @@
  370. ${GIO_INCLUDE_DIRS}
  371. ${STARTUPNOTIFICATION_INCLUDE_DIRS}
  372. ${INDICATOR_INCLUDE_DIRS}
  373. - ${X11_INCLUDE_DIR}
  374. + ${X11_INCLUDE_DIRS}
  375. ${UNITYCORE_INCLUDE_DIRS}
  376. ${NUXCORE_INCLUDE_DIRS}
  377. ${DEE_INCLUDE_DIRS}
  378. @@ -42,7 +42,7 @@
  379. )
  380.  
  381. # Install
  382. -set(IMPORT_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt4/imports/Unity2d)
  383. +set(IMPORT_INSTALL_DIR ${CMAKE_INSTALL_LIBDIR}/qt5/imports/Unity2d)
  384.  
  385. install(TARGETS unity-2d-private-qml
  386. LIBRARY DESTINATION ${IMPORT_INSTALL_DIR}
  387.  
  388. === modified file 'libunity-2d-private/Unity2d/plugin.cpp'
  389. --- libunity-2d-private/Unity2d/plugin.cpp 2011-12-18 17:02:18 +0000
  390. +++ libunity-2d-private/Unity2d/plugin.cpp 2012-01-03 21:29:32 +0000
  391. @@ -74,10 +74,10 @@
  392. #include "focuspath.h"
  393.  
  394. #include <QtDeclarative/qdeclarative.h>
  395. -#include <QDeclarativeEngine>
  396. -#include <QDeclarativeContext>
  397. -#include <QGraphicsEffect>
  398. -#include <QAbstractListModel>
  399. +#include <QtDeclarative/QDeclarativeEngine>
  400. +#include <QtDeclarative/QDeclarativeContext>
  401. +#include <QtWidgets/QGraphicsEffect>
  402. +#include <QtCore/QAbstractListModel>
  403. #include <QTextCodec>
  404.  
  405. // QtDee
  406. @@ -102,65 +102,65 @@
  407.  
  408. void Unity2dPlugin::registerTypes(const char *uri)
  409. {
  410. - qmlRegisterType<QSortFilterProxyModelQML>(uri, 0, 1, "SortFilterProxyModel");
  411. -
  412. - qmlRegisterType<DashSettings>(uri, 0, 1, "DashSettings");
  413. -
  414. - qmlRegisterType<WindowInfo>(uri, 0, 1, "WindowInfo");
  415. - qmlRegisterType<WindowsList>(uri, 0, 1, "WindowsList");
  416. + qmlRegisterType<QSortFilterProxyModelQML>(uri, 1, 0, "SortFilterProxyModel");
  417. +
  418. + qmlRegisterType<DashSettings>(uri, 1, 0, "DashSettings");
  419. +
  420. + qmlRegisterType<WindowInfo>(uri, 1, 0, "WindowInfo");
  421. + qmlRegisterType<WindowsList>(uri, 1, 0, "WindowsList");
  422. qmlRegisterType<ScreenInfo>(); // Register the type as non creatable
  423. qmlRegisterType<WorkspacesInfo>(); // Register the type as non creatable
  424. qmlRegisterType<RootWindowInfo>(); // Register the type as non creatable
  425.  
  426. - qmlRegisterType<CacheEffect>(uri, 0, 1, "CacheEffect");
  427. + qmlRegisterType<CacheEffect>(uri, 1, 0, "CacheEffect");
  428. qmlRegisterType<QGraphicsBlurEffect>("Effects", 1, 0, "Blur");
  429. qmlRegisterType<QGraphicsColorizeEffect>("Effects", 1, 0, "Colorize");
  430. qmlRegisterType<QGraphicsDropShadowEffect>("Effects", 1, 0, "DropShadow");
  431.  
  432. /* Custom drag’n’drop implementation in QML */
  433. - qmlRegisterType<DeclarativeDragItemWithUrl>(uri, 0, 1, "DragItemWithUrl");
  434. - qmlRegisterType<DeclarativeDropItem>(uri, 0, 1, "DropItem");
  435. + qmlRegisterType<DeclarativeDragItemWithUrl>(uri, 1, 0, "DragItemWithUrl");
  436. + qmlRegisterType<DeclarativeDropItem>(uri, 1, 0, "DropItem");
  437. qmlRegisterType<DeclarativeMimeData>();
  438. qmlRegisterType<DeclarativeDragDropEvent>();
  439. - qmlRegisterType<LauncherDropItem>(uri, 0, 1, "LauncherDropItem");
  440. -
  441. - qmlRegisterType<ListAggregatorModel>(uri, 0, 1, "ListAggregatorModel");
  442. -
  443. - qmlRegisterType<BfbModel>(uri, 0, 1, "BfbModel");
  444. - qmlRegisterType<BfbItem>(uri, 0, 1, "BfbItem");
  445. -
  446. - qmlRegisterType<LauncherApplicationsList>(uri, 0, 1, "LauncherApplicationsList");
  447. - qmlRegisterType<LauncherApplication>(uri, 0, 1, "LauncherApplication");
  448. -
  449. - qmlRegisterType<LauncherPlacesList>(uri, 0, 1, "LauncherPlacesList");
  450. - qmlRegisterType<Place>(uri, 0, 1, "Place");
  451. - qmlRegisterType<PlaceEntry>(uri, 0, 1, "PlaceEntry");
  452. + qmlRegisterType<LauncherDropItem>(uri, 1, 0, "LauncherDropItem");
  453. +
  454. + qmlRegisterType<ListAggregatorModel>(uri, 1, 0, "ListAggregatorModel");
  455. +
  456. + qmlRegisterType<BfbModel>(uri, 1, 0, "BfbModel");
  457. + qmlRegisterType<BfbItem>(uri, 1, 0, "BfbItem");
  458. +
  459. + qmlRegisterType<LauncherApplicationsList>(uri, 1, 0, "LauncherApplicationsList");
  460. + qmlRegisterType<LauncherApplication>(uri, 1, 0, "LauncherApplication");
  461. +
  462. + qmlRegisterType<LauncherPlacesList>(uri, 1, 0, "LauncherPlacesList");
  463. + qmlRegisterType<Place>(uri, 1, 0, "Place");
  464. + qmlRegisterType<PlaceEntry>(uri, 1, 0, "PlaceEntry");
  465. /* DeeListModel is exposed to QML by PlaceEntry */
  466. - qmlRegisterType<DeeListModel>(uri, 0, 1, "DeeListModel");
  467. -
  468. - qmlRegisterType<LauncherDevicesList>(uri, 0, 1, "LauncherDevicesList");
  469. - qmlRegisterType<LauncherDevice>(uri, 0, 1, "LauncherDevice");
  470. -
  471. - qmlRegisterType<Trashes>(uri, 0, 1, "Trashes");
  472. - qmlRegisterType<Trash>(uri, 0, 1, "Trash");
  473. -
  474. - qmlRegisterType<WorkspacesList>(uri, 0, 1, "WorkspacesList");
  475. - qmlRegisterType<Workspaces>(uri, 0, 1, "Workspaces");
  476. -
  477. - qmlRegisterType<IntelliHideBehavior>(uri, 0, 1, "IntelliHideBehavior");
  478. - qmlRegisterType<AutoHideBehavior>(uri, 0, 1, "AutoHideBehavior");
  479. - qmlRegisterType<ForceVisibleBehavior>(uri, 0, 1, "ForceVisibleBehavior");
  480. + qmlRegisterType<DeeListModel>(uri, 1, 0, "DeeListModel");
  481. +
  482. + qmlRegisterType<LauncherDevicesList>(uri, 1, 0, "LauncherDevicesList");
  483. + qmlRegisterType<LauncherDevice>(uri, 1, 0, "LauncherDevice");
  484. +
  485. + qmlRegisterType<Trashes>(uri, 1, 0, "Trashes");
  486. + qmlRegisterType<Trash>(uri, 1, 0, "Trash");
  487. +
  488. + qmlRegisterType<WorkspacesList>(uri, 1, 0, "WorkspacesList");
  489. + qmlRegisterType<Workspaces>(uri, 1, 0, "Workspaces");
  490. +
  491. + qmlRegisterType<IntelliHideBehavior>(uri, 1, 0, "IntelliHideBehavior");
  492. + qmlRegisterType<AutoHideBehavior>(uri, 1, 0, "AutoHideBehavior");
  493. + qmlRegisterType<ForceVisibleBehavior>(uri, 1, 0, "ForceVisibleBehavior");
  494.  
  495. qmlRegisterType<IconUtilities>(); // Register the type as non creatable
  496.  
  497. - qmlRegisterType<GioDefaultApplication>(uri, 0, 1, "GioDefaultApplication");
  498. + qmlRegisterType<GioDefaultApplication>(uri, 1, 0, "GioDefaultApplication");
  499.  
  500. qmlRegisterType<Lenses>(uri, 1, 0, "Lenses");
  501. qmlRegisterType<Lens>(uri, 1, 0, "Lens");
  502.  
  503. - qmlRegisterType<PercentCoder>(uri, 0, 1, "PercentCoder");
  504. + qmlRegisterType<PercentCoder>(uri, 1, 0, "PercentCoder");
  505.  
  506. - qmlRegisterType<FocusPath>(uri, 0, 1, "FocusPath");
  507. + qmlRegisterType<FocusPath>(uri, 1, 0, "FocusPath");
  508.  
  509. qmlRegisterType<Filter>();
  510. qmlRegisterType<Filters>();
  511.  
  512. === modified file 'libunity-2d-private/src/CMakeLists.txt'
  513. --- libunity-2d-private/src/CMakeLists.txt 2011-12-18 17:02:18 +0000
  514. +++ libunity-2d-private/src/CMakeLists.txt 2012-01-03 20:37:16 +0000
  515. @@ -77,11 +77,89 @@
  516. panelstyle.cpp
  517. percentcoder.cpp
  518. focuspath.cpp
  519. - )
  520. + QX11Info.cpp
  521. + )
  522. +
  523. +set(lib${LIB_NAME}_MOC_HEADERS
  524. + bfb.h
  525. + dashclient.h
  526. + dashsettings.h
  527. + gconnector.h
  528. + gimageutils.h
  529. + gnomesessionclient.h
  530. + keyboardmodifiersmonitor.h
  531. + hotkeymonitor.h
  532. + hotkey.h
  533. + keymonitor.h
  534. + launcherclient.h
  535. + mousearea.h
  536. + unity2dapplication.h
  537. + unity2ddebug.h
  538. + unity2dpanel.h
  539. + unity2dtr.h
  540. + unity2ddeclarativeview.h
  541. + mimedata.h
  542. + dragdropevent.h
  543. + propertybinder.h
  544. + abstractvisibilitybehavior.h
  545. + autohidebehavior.h
  546. + edgehitdetector.h
  547. + forcevisiblebehavior.h
  548. + intellihidebehavior.h
  549. + giodefaultapplication.h
  550. + qsortfilterproxymodelqml.h
  551. + blendedimageprovider.h
  552. + windowimageprovider.h
  553. + windowinfo.h
  554. + windowslist.h
  555. + screeninfo.h
  556. + rootwindowinfo.h
  557. + cacheeffect.h
  558. + workspacesinfo.h
  559. + signalwaiter.h
  560. + dragitem.h
  561. + dragitemwithurl.h
  562. + dropitem.h
  563. + iconimageprovider.h
  564. + listaggregatormodel.h
  565. + launcheritem.h
  566. + launcherapplication.h
  567. + launcherapplicationslist.h
  568. + launcherapplicationslistdbus.h
  569. + launcherdevice.h
  570. + launcherdeviceslist.h
  571. + launcherutility.h
  572. + placeentry.h
  573. + place.h
  574. + launcherplaceslist.h
  575. + trash.h
  576. + launchermenu.h
  577. + webfavorite.h
  578. + workspaces.h
  579. + launcherdropitem.h
  580. + iconutilities.h
  581. + lenses.h
  582. + lens.h
  583. + filter.h
  584. + filteroption.h
  585. + ratingsfilter.h
  586. + radiooptionfilter.h
  587. + checkoptionfilter.h
  588. + multirangefilter.h
  589. + filters.h
  590. + cairoutils.h
  591. + indicatorentrywidget.h
  592. + indicatorsmanager.h
  593. + indicatorswidget.h
  594. + panelapplet.h
  595. + panelstyle.h
  596. + percentcoder.h
  597. + focuspath.h
  598. + )
  599. +
  600. +qt5_wrap_cpp(lib${LIB_NAME}_MOC_SOURCES ${lib${LIB_NAME}_MOC_HEADERS})
  601.  
  602. # Build
  603. -qt4_automoc(${libunity-2d-private_SRCS})
  604. -
  605. add_definitions(-DWNCK_I_KNOW_THIS_IS_UNSTABLE -DSN_API_NOT_YET_FROZEN)
  606.  
  607. include_directories(
  608. @@ -99,27 +177,28 @@
  609. ${GIO_INCLUDE_DIRS}
  610. ${STARTUPNOTIFICATION_INCLUDE_DIRS}
  611. ${INDICATOR_INCLUDE_DIRS}
  612. - ${X11_INCLUDE_DIR}
  613. + ${X11_INCLUDE_DIRS}
  614. ${UNITYCORE_INCLUDE_DIRS}
  615. ${NUXCORE_INCLUDE_DIRS}
  616. ${DEE_INCLUDE_DIRS}
  617. ${XINPUT_INCLUDE_DIRS}
  618. + ${Qt5Quick1_INCLUDE_DIRS}
  619. )
  620.  
  621. -add_library(${LIB_NAME} SHARED ${libunity-2d-private_SRCS} listmodelwrapper.h)
  622. +add_library(${LIB_NAME} SHARED ${libunity-2d-private_SRCS} listmodelwrapper.h ${lib${LIB_NAME}_MOC_SOURCES})
  623. set_target_properties(${LIB_NAME} PROPERTIES
  624. VERSION ${libunity-2d-private_VERSION}
  625. SOVERSION ${libunity-2d-private_SOVERSION}
  626. )
  627.  
  628. target_link_libraries(${LIB_NAME}
  629. - ${QT_QTGUI_LIBRARIES}
  630. - ${QT_QTCORE_LIBRARIES}
  631. - ${QT_QTDBUS_LIBRARIES}
  632. - ${QT_QTDECLARATIVE_LIBRARIES}
  633. - ${QT_QTOPENGL_LIBRARIES}
  634. - ${QT_QTGUI_LIBRARIES}
  635. - ${QT_QTNETWORK_LIBRARIES}
  636. + ${Qt5Gui_LIBRARIES}
  637. + ${Qt5Core_LIBRARIES}
  638. + ${Qt5DBus_LIBRARIES}
  639. + ${Qt5Declarative_LIBRARIES}
  640. + ${Qt5Quick1_LIBRARIES}
  641. + ${Qt5OpenGL_LIBRARIES}
  642. + ${Qt5Widgets_LIBRARIES}
  643. ${X11_LIBRARIES}
  644. ${GLIB_LDFLAGS}
  645. ${GTK_LDFLAGS}
  646.  
  647. === added file 'libunity-2d-private/src/QX11Info.cpp'
  648. --- libunity-2d-private/src/QX11Info.cpp 1970-01-01 00:00:00 +0000
  649. +++ libunity-2d-private/src/QX11Info.cpp 2012-01-03 20:37:17 +0000
  650. @@ -0,0 +1,40 @@
  651. +#include "QX11Info.h"
  652. +#include <X11/Xlib.h>
  653. +
  654. +namespace QX11Info {
  655. +
  656. +Display* display()
  657. +{
  658. + return XOpenDisplay(0);
  659. +}
  660. +
  661. +unsigned long appRootWindow(int screen)
  662. +{
  663. + Display* display = XOpenDisplay(0);
  664. + return RootWindow(display, screen == -1 ? DefaultScreen(display) : screen);
  665. +}
  666. +
  667. +bool isCompositingManagerRunning()
  668. +{
  669. + return false;
  670. +}
  671. +
  672. +int appScreen()
  673. +{
  674. + // FIXME
  675. + Display* display = XOpenDisplay(0);
  676. + return DefaultScreen(display);
  677. +}
  678. +
  679. +int screen()
  680. +{
  681. + // FIXME
  682. + Display* display = XOpenDisplay(0);
  683. + return DefaultScreen(display);
  684. +}
  685. +
  686. +unsigned long appTime()
  687. +{
  688. + return 0;
  689. +}
  690. +}
  691.  
  692. === added file 'libunity-2d-private/src/QX11Info.h'
  693. --- libunity-2d-private/src/QX11Info.h 1970-01-01 00:00:00 +0000
  694. +++ libunity-2d-private/src/QX11Info.h 2012-01-03 20:37:13 +0000
  695. @@ -0,0 +1,18 @@
  696. +#ifndef QX11INFO_H
  697. +#define QX11INFO_H
  698. +
  699. +typedef struct _XDisplay Display;
  700. +typedef unsigned long int XID;
  701. +typedef XID Window;
  702. +
  703. +namespace QX11Info {
  704. +
  705. +Display* display();
  706. +unsigned long appRootWindow(int screen = -1);
  707. +bool isCompositingManagerRunning();
  708. +int appScreen();
  709. +int screen();
  710. +unsigned long appTime();
  711. +}
  712. +
  713. +#endif
  714.  
  715. === modified file 'libunity-2d-private/src/abstractvisibilitybehavior.cpp'
  716. --- libunity-2d-private/src/abstractvisibilitybehavior.cpp 2011-06-11 11:33:52 +0000
  717. +++ libunity-2d-private/src/abstractvisibilitybehavior.cpp 2012-01-03 20:37:13 +0000
  718. @@ -27,7 +27,7 @@
  719. // libunity-2d
  720.  
  721. // Qt
  722. -#include <QWidget>
  723. +#include <QtWidgets/QWidget>
  724.  
  725. AbstractVisibilityBehavior::AbstractVisibilityBehavior(QWidget* panel)
  726. : QObject(panel)
  727. @@ -56,4 +56,4 @@
  728. Q_EMIT panelChanged(m_panel);
  729. }
  730.  
  731. -#include "abstractvisibilitybehavior.moc"
  732. +
  733.  
  734. === modified file 'libunity-2d-private/src/abstractvisibilitybehavior.h'
  735. --- libunity-2d-private/src/abstractvisibilitybehavior.h 2011-06-11 11:33:52 +0000
  736. +++ libunity-2d-private/src/abstractvisibilitybehavior.h 2012-01-03 20:37:16 +0000
  737. @@ -25,7 +25,7 @@
  738. // Local
  739.  
  740. // Qt
  741. -#include <QObject>
  742. +#include <QtCore/QObject>
  743.  
  744. class QWidget;
  745.  
  746.  
  747. === modified file 'libunity-2d-private/src/autohidebehavior.cpp'
  748. --- libunity-2d-private/src/autohidebehavior.cpp 2011-06-11 11:33:52 +0000
  749. +++ libunity-2d-private/src/autohidebehavior.cpp 2012-01-03 20:37:16 +0000
  750. @@ -30,8 +30,8 @@
  751.  
  752. // Qt
  753. #include <QCursor>
  754. -#include <QTimer>
  755. -#include <QWidget>
  756. +#include <QtCore/QTimer>
  757. +#include <QtWidgets/QWidget>
  758.  
  759. static const int AUTOHIDE_TIMEOUT = 1000;
  760.  
  761. @@ -107,4 +107,4 @@
  762. }
  763. }
  764.  
  765. -#include "autohidebehavior.moc"
  766. +
  767.  
  768. === modified file 'libunity-2d-private/src/autohidebehavior.h'
  769. --- libunity-2d-private/src/autohidebehavior.h 2011-06-11 11:33:52 +0000
  770. +++ libunity-2d-private/src/autohidebehavior.h 2012-01-03 20:37:16 +0000
  771. @@ -26,7 +26,7 @@
  772. #include <abstractvisibilitybehavior.h>
  773.  
  774. // Qt
  775. -#include <QObject>
  776. +#include <QtCore/QObject>
  777.  
  778. class EdgeHitDetector;
  779. class QTimer;
  780.  
  781. === modified file 'libunity-2d-private/src/bfb.cpp'
  782. --- libunity-2d-private/src/bfb.cpp 2011-09-01 14:46:25 +0000
  783. +++ libunity-2d-private/src/bfb.cpp 2012-01-03 20:37:17 +0000
  784. @@ -115,5 +115,3 @@
  785.  
  786. return QVariant::fromValue(m_bfbItem);
  787. }
  788. -
  789. -#include <bfb.moc>
  790.  
  791. === modified file 'libunity-2d-private/src/bfb.h'
  792. --- libunity-2d-private/src/bfb.h 2011-08-11 09:25:35 +0000
  793. +++ libunity-2d-private/src/bfb.h 2012-01-03 20:37:17 +0000
  794. @@ -23,8 +23,8 @@
  795. #include "launcheritem.h"
  796.  
  797. // Qt
  798. -#include <QAbstractListModel>
  799. -#include <QMetaType>
  800. +#include <QtCore/QAbstractListModel>
  801. +#include <QtCore/QMetaType>
  802.  
  803. class BfbItem : public LauncherItem
  804. {
  805.  
  806. === modified file 'libunity-2d-private/src/blendedimageprovider.cpp'
  807. --- libunity-2d-private/src/blendedimageprovider.cpp 2011-10-21 07:01:16 +0000
  808. +++ libunity-2d-private/src/blendedimageprovider.cpp 2012-01-03 20:37:17 +0000
  809. @@ -15,7 +15,7 @@
  810. */
  811.  
  812. #include "blendedimageprovider.h"
  813. -#include <QPainter>
  814. +#include <QtGui/QPainter>
  815. #include <debug_p.h>
  816.  
  817. BlendedImageProvider::BlendedImageProvider(QUrl baseUrl) : QDeclarativeImageProvider(QDeclarativeImageProvider::Image),
  818.  
  819. === modified file 'libunity-2d-private/src/blendedimageprovider.h'
  820. --- libunity-2d-private/src/blendedimageprovider.h 2011-07-29 13:49:34 +0000
  821. +++ libunity-2d-private/src/blendedimageprovider.h 2012-01-03 20:37:17 +0000
  822. @@ -17,7 +17,7 @@
  823. #ifndef BLENDEDIMAGEPROVIDER_H
  824. #define BLENDEDIMAGEPROVIDER_H
  825.  
  826. -#include <QDeclarativeImageProvider>
  827. +#include <QtDeclarative/QDeclarativeImageProvider>
  828. #include <QUrl>
  829.  
  830. class BlendedImageProvider : public QDeclarativeImageProvider
  831.  
  832. === modified file 'libunity-2d-private/src/cacheeffect.h'
  833. --- libunity-2d-private/src/cacheeffect.h 2011-07-29 13:49:34 +0000
  834. +++ libunity-2d-private/src/cacheeffect.h 2012-01-03 20:37:13 +0000
  835. @@ -17,8 +17,8 @@
  836. #ifndef CACHEEFFECT_H
  837. #define CACHEEFFECT_H
  838.  
  839. -#include <QGraphicsEffect>
  840. -#include <QPainter>
  841. +#include <QtWidgets/QGraphicsEffect>
  842. +#include <QtGui/QPainter>
  843.  
  844. class CacheEffect : public QGraphicsEffect
  845. {
  846.  
  847. === modified file 'libunity-2d-private/src/cairoutils.cpp'
  848. --- libunity-2d-private/src/cairoutils.cpp 2011-08-22 09:17:03 +0000
  849. +++ libunity-2d-private/src/cairoutils.cpp 2012-01-03 20:37:17 +0000
  850. @@ -24,7 +24,7 @@
  851. // Local
  852.  
  853. // Qt
  854. -#include <QImage>
  855. +#include <QtGui/QImage>
  856.  
  857. namespace CairoUtils {
  858.  
  859.  
  860. === modified file 'libunity-2d-private/src/checkoptionfilter.cpp'
  861. --- libunity-2d-private/src/checkoptionfilter.cpp 2011-08-19 17:12:24 +0000
  862. +++ libunity-2d-private/src/checkoptionfilter.cpp 2012-01-03 20:37:17 +0000
  863. @@ -54,4 +54,4 @@
  864. Q_EMIT optionsChanged();
  865. }
  866.  
  867. -#include "checkoptionfilter.moc"
  868. +
  869.  
  870. === modified file 'libunity-2d-private/src/checkoptionfilter.h'
  871. --- libunity-2d-private/src/checkoptionfilter.h 2011-08-24 12:36:27 +0000
  872. +++ libunity-2d-private/src/checkoptionfilter.h 2012-01-03 20:37:16 +0000
  873. @@ -21,8 +21,8 @@
  874. #define CHECKOPTIONFILTER_H
  875.  
  876. // Qt
  877. -#include <QObject>
  878. -#include <QMetaType>
  879. +#include <QtCore/QObject>
  880. +#include <QtCore/QMetaType>
  881.  
  882. // libunity-core
  883. #include <UnityCore/CheckOptionFilter.h>
  884.  
  885. === modified file 'libunity-2d-private/src/dashclient.cpp'
  886. --- libunity-2d-private/src/dashclient.cpp 2011-08-11 15:36:04 +0000
  887. +++ libunity-2d-private/src/dashclient.cpp 2012-01-03 20:37:16 +0000
  888. @@ -27,11 +27,11 @@
  889. #include <debug_p.h>
  890.  
  891. // Qt
  892. -#include <QApplication>
  893. -#include <QDBusConnection>
  894. -#include <QDBusConnectionInterface>
  895. -#include <QDBusInterface>
  896. -#include <QDBusServiceWatcher>
  897. +#include <QtWidgets/QApplication>
  898. +#include <QtDBus/QDBusConnection>
  899. +#include <QtDBus/QDBusConnectionInterface>
  900. +#include <QtDBus/QDBusInterface>
  901. +#include <QtDBus/QDBusServiceWatcher>
  902.  
  903. static const char* DASH_DBUS_SERVICE = "com.canonical.Unity2d.Dash";
  904. static const char* DASH_DBUS_PATH = "/Dash";
  905. @@ -152,4 +152,4 @@
  906. }
  907. }
  908.  
  909. -#include "dashclient.moc"
  910. +
  911.  
  912. === modified file 'libunity-2d-private/src/dashclient.h'
  913. --- libunity-2d-private/src/dashclient.h 2011-08-11 15:36:04 +0000
  914. +++ libunity-2d-private/src/dashclient.h 2012-01-03 20:37:16 +0000
  915. @@ -24,7 +24,7 @@
  916. // Local
  917.  
  918. // Qt
  919. -#include <QObject>
  920. +#include <QtCore/QObject>
  921.  
  922. class QDBusInterface;
  923.  
  924.  
  925. === modified file 'libunity-2d-private/src/dashsettings.cpp'
  926. --- libunity-2d-private/src/dashsettings.cpp 2011-10-17 12:12:10 +0000
  927. +++ libunity-2d-private/src/dashsettings.cpp 2012-01-03 20:37:17 +0000
  928. @@ -27,9 +27,9 @@
  929. #include "qconf.h"
  930.  
  931. // Qt
  932. -#include <QMetaEnum>
  933. -#include <QSize>
  934. -#include <QVariant>
  935. +#include <QtCore/QMetaEnum>
  936. +#include <QtCore/QSize>
  937. +#include <QtCore/QVariant>
  938.  
  939. static const int DASH_MIN_SCREEN_WIDTH = 1280;
  940. static const int DASH_MIN_SCREEN_HEIGHT = 1084;
  941. @@ -114,4 +114,4 @@
  942.  
  943. }; // namespace Unity2d
  944.  
  945. -#include "dashsettings.moc"
  946. +
  947.  
  948. === modified file 'libunity-2d-private/src/dashsettings.h'
  949. --- libunity-2d-private/src/dashsettings.h 2011-10-17 12:12:10 +0000
  950. +++ libunity-2d-private/src/dashsettings.h 2012-01-03 20:37:17 +0000
  951. @@ -22,8 +22,8 @@
  952. #define DASHSETTINGS_H
  953.  
  954. // Qt
  955. -#include <QObject>
  956. -#include <QMetaType>
  957. +#include <QtCore/QObject>
  958. +#include <QtCore/QMetaType>
  959.  
  960. namespace Unity2d {
  961.  
  962.  
  963. === modified file 'libunity-2d-private/src/debug_p.h'
  964. --- libunity-2d-private/src/debug_p.h 2011-07-05 09:32:29 +0000
  965. +++ libunity-2d-private/src/debug_p.h 2012-01-03 20:37:16 +0000
  966. @@ -18,7 +18,7 @@
  967. #define DEBUG_P_H
  968.  
  969. // Qt
  970. -#include <QDebug>
  971. +#include <QtCore/QDebug>
  972.  
  973. // STL
  974. #include <string>
  975.  
  976. === modified file 'libunity-2d-private/src/dragdropevent.cpp'
  977. --- libunity-2d-private/src/dragdropevent.cpp 2011-03-02 15:52:05 +0000
  978. +++ libunity-2d-private/src/dragdropevent.cpp 2012-01-03 20:37:17 +0000
  979. @@ -19,7 +19,7 @@
  980.  
  981. #include "dragdropevent.h"
  982.  
  983. -#include <QGraphicsSceneDragDropEvent>
  984. +#include <QtWidgets/QGraphicsSceneDragDropEvent>
  985.  
  986. DeclarativeDragDropEvent::DeclarativeDragDropEvent(QGraphicsSceneDragDropEvent* event, QObject* parent)
  987. : QObject(parent)
  988. @@ -54,5 +54,5 @@
  989. m_event->setDropAction(action);
  990. }
  991.  
  992. -#include "dragdropevent.moc"
  993. +
  994.  
  995.  
  996. === modified file 'libunity-2d-private/src/dragitem.cpp'
  997. --- libunity-2d-private/src/dragitem.cpp 2011-07-29 13:49:34 +0000
  998. +++ libunity-2d-private/src/dragitem.cpp 2012-01-03 20:37:17 +0000
  999. @@ -19,15 +19,15 @@
  1000.  
  1001. #include "dragitem.h"
  1002.  
  1003. -#include <QDeclarativeEngine>
  1004. +#include <QtDeclarative/QDeclarativeEngine>
  1005. #include <QDeclarativeComponent>
  1006. -#include <QGraphicsSceneMouseEvent>
  1007. -#include <QApplication>
  1008. +#include <QtWidgets/QGraphicsSceneMouseEvent>
  1009. +#include <QtWidgets/QApplication>
  1010. #include <QDrag>
  1011. -#include <QGraphicsScene>
  1012. -#include <QPainter>
  1013. +#include <QtWidgets/QGraphicsScene>
  1014. +#include <QtGui/QPainter>
  1015. #include <QMimeData>
  1016. -#include <QX11Info>
  1017. +#include <QX11Info.h>
  1018.  
  1019. DeclarativeDragItem::DeclarativeDragItem(QDeclarativeItem* parent)
  1020. : QDeclarativeItem(parent)
  1021. @@ -157,4 +157,4 @@
  1022. Q_EMIT released();
  1023. }
  1024.  
  1025. -#include "dragitem.moc"
  1026. +
  1027.  
  1028. === modified file 'libunity-2d-private/src/dragitem.h'
  1029. --- libunity-2d-private/src/dragitem.h 2011-07-29 13:49:34 +0000
  1030. +++ libunity-2d-private/src/dragitem.h 2012-01-03 20:37:17 +0000
  1031. @@ -20,7 +20,7 @@
  1032. #ifndef DeclarativeDragItem_H
  1033. #define DeclarativeDragItem_H
  1034.  
  1035. -#include <QDeclarativeItem>
  1036. +#include <QtQuick1/QDeclarativeItem>
  1037.  
  1038. class QMimeData;
  1039. class QDeclarativeComponent;
  1040.  
  1041. === modified file 'libunity-2d-private/src/dragitemwithurl.cpp'
  1042. --- libunity-2d-private/src/dragitemwithurl.cpp 2011-07-29 13:49:34 +0000
  1043. +++ libunity-2d-private/src/dragitemwithurl.cpp 2012-01-03 20:37:17 +0000
  1044. @@ -79,4 +79,4 @@
  1045. }
  1046. }
  1047.  
  1048. -#include "dragitemwithurl.moc"
  1049. +
  1050.  
  1051. === modified file 'libunity-2d-private/src/dropitem.cpp'
  1052. --- libunity-2d-private/src/dropitem.cpp 2011-07-29 13:49:34 +0000
  1053. +++ libunity-2d-private/src/dropitem.cpp 2012-01-03 20:37:17 +0000
  1054. @@ -19,7 +19,7 @@
  1055.  
  1056. #include "dropitem.h"
  1057.  
  1058. -#include <QGraphicsSceneDragDropEvent>
  1059. +#include <QtWidgets/QGraphicsSceneDragDropEvent>
  1060.  
  1061. #include "dragdropevent.h"
  1062.  
  1063. @@ -46,4 +46,4 @@
  1064. Q_EMIT drop(&dragDropEvent);
  1065. }
  1066.  
  1067. -#include "dropitem.moc"
  1068. +
  1069.  
  1070. === modified file 'libunity-2d-private/src/dropitem.h'
  1071. --- libunity-2d-private/src/dropitem.h 2011-07-29 13:49:34 +0000
  1072. +++ libunity-2d-private/src/dropitem.h 2012-01-03 20:37:17 +0000
  1073. @@ -20,7 +20,7 @@
  1074. #ifndef DROPITEM_H
  1075. #define DROPITEM_H
  1076.  
  1077. -#include <QDeclarativeItem>
  1078. +#include <QtQuick1/QDeclarativeItem>
  1079.  
  1080. class QGraphicsSceneDragDropEvent;
  1081. class DeclarativeDragDropEvent;
  1082.  
  1083. === modified file 'libunity-2d-private/src/edgehitdetector.cpp'
  1084. --- libunity-2d-private/src/edgehitdetector.cpp 2011-11-29 11:46:34 +0000
  1085. +++ libunity-2d-private/src/edgehitdetector.cpp 2012-01-03 20:37:13 +0000
  1086. @@ -17,8 +17,8 @@
  1087. #include <debug_p.h>
  1088.  
  1089. // Qt
  1090. -#include <QDesktopWidget>
  1091. -#include <QTimer>
  1092. +#include <QtWidgets/QDesktopWidget>
  1093. +#include <QtCore/QTimer>
  1094.  
  1095. static const int EDGE_HIT_DELAY = 500;
  1096.  
  1097. @@ -62,4 +62,4 @@
  1098. }
  1099. }
  1100.  
  1101. -#include "edgehitdetector.moc"
  1102. +
  1103.  
  1104. === modified file 'libunity-2d-private/src/filter.cpp'
  1105. --- libunity-2d-private/src/filter.cpp 2011-09-03 00:19:55 +0000
  1106. +++ libunity-2d-private/src/filter.cpp 2012-01-03 20:37:17 +0000
  1107. @@ -34,7 +34,7 @@
  1108. #include <UnityCore/MultiRangeFilter.h>
  1109.  
  1110. // Qt
  1111. -#include <QDebug>
  1112. +#include <QtCore/QDebug>
  1113.  
  1114. Filter::Filter(QObject *parent) :
  1115. QObject(parent)
  1116. @@ -130,4 +130,4 @@
  1117. return m_unityFilter == unityFilter;
  1118. }
  1119.  
  1120. -#include "filter.moc"
  1121. +
  1122.  
  1123. === modified file 'libunity-2d-private/src/filter.h'
  1124. --- libunity-2d-private/src/filter.h 2011-08-24 12:36:27 +0000
  1125. +++ libunity-2d-private/src/filter.h 2012-01-03 20:37:13 +0000
  1126. @@ -21,8 +21,8 @@
  1127. #define FILTER_H
  1128.  
  1129. // Qt
  1130. -#include <QObject>
  1131. -#include <QMetaType>
  1132. +#include <QtCore/QObject>
  1133. +#include <QtCore/QMetaType>
  1134.  
  1135. // libunity-core
  1136. #include <UnityCore/Filter.h>
  1137.  
  1138. === modified file 'libunity-2d-private/src/filteroption.cpp'
  1139. --- libunity-2d-private/src/filteroption.cpp 2011-09-03 00:19:55 +0000
  1140. +++ libunity-2d-private/src/filteroption.cpp 2012-01-03 20:37:17 +0000
  1141. @@ -69,4 +69,4 @@
  1142. m_unityFilterOption->active.changed.connect(sigc::mem_fun(this, &FilterOption::activeChanged));
  1143. }
  1144.  
  1145. -#include "filteroption.moc"
  1146. +
  1147.  
  1148. === modified file 'libunity-2d-private/src/filteroption.h'
  1149. --- libunity-2d-private/src/filteroption.h 2011-08-19 17:12:24 +0000
  1150. +++ libunity-2d-private/src/filteroption.h 2012-01-03 20:37:17 +0000
  1151. @@ -24,8 +24,8 @@
  1152. #include "listmodelwrapper.h"
  1153.  
  1154. // Qt
  1155. -#include <QObject>
  1156. -#include <QMetaType>
  1157. +#include <QtCore/QObject>
  1158. +#include <QtCore/QMetaType>
  1159.  
  1160. // libunity-core
  1161. #include <UnityCore/Filter.h>
  1162.  
  1163. === modified file 'libunity-2d-private/src/filters.cpp'
  1164. --- libunity-2d-private/src/filters.cpp 2011-08-31 10:57:31 +0000
  1165. +++ libunity-2d-private/src/filters.cpp 2012-01-03 20:37:13 +0000
  1166. @@ -24,7 +24,7 @@
  1167. #include "filter.h"
  1168.  
  1169. // Qt
  1170. -#include <QDebug>
  1171. +#include <QtCore/QDebug>
  1172.  
  1173. // libunity-core
  1174. #include <UnityCore/Filters.h>
  1175. @@ -141,4 +141,4 @@
  1176. }
  1177.  
  1178.  
  1179. -#include "filters.moc"
  1180. +
  1181.  
  1182. === modified file 'libunity-2d-private/src/filters.h'
  1183. --- libunity-2d-private/src/filters.h 2011-08-31 10:57:31 +0000
  1184. +++ libunity-2d-private/src/filters.h 2012-01-03 20:37:13 +0000
  1185. @@ -21,7 +21,7 @@
  1186. #define FILTERS_H
  1187.  
  1188. // Qt
  1189. -#include <QAbstractListModel>
  1190. +#include <QtCore/QAbstractListModel>
  1191. #include <QList>
  1192.  
  1193. // libunity-core
  1194.  
  1195. === modified file 'libunity-2d-private/src/focuspath.cpp'
  1196. --- libunity-2d-private/src/focuspath.cpp 2011-11-21 18:57:43 +0000
  1197. +++ libunity-2d-private/src/focuspath.cpp 2012-01-03 20:37:16 +0000
  1198. @@ -20,8 +20,9 @@
  1199. #include "focuspath.h"
  1200.  
  1201. #include <QtCore/qmath.h>
  1202. -#include <QEvent>
  1203. +#include <QtCore/QEvent>
  1204. #include <QKeyEvent>
  1205. +#include <QtWidgets/QGraphicsItem>
  1206.  
  1207. /*!
  1208. \qmlclass FocusPath
  1209. @@ -467,4 +468,4 @@
  1210. }
  1211. }
  1212.  
  1213. -#include "focuspath.moc"
  1214. +
  1215.  
  1216. === modified file 'libunity-2d-private/src/focuspath.h'
  1217. --- libunity-2d-private/src/focuspath.h 2011-11-21 14:31:31 +0000
  1218. +++ libunity-2d-private/src/focuspath.h 2012-01-03 20:37:17 +0000
  1219. @@ -20,8 +20,8 @@
  1220. #ifndef FOCUSPATH_H
  1221. #define FOCUSPATH_H
  1222.  
  1223. -#include <QObject>
  1224. -#include <QDeclarativeItem>
  1225. +#include <QtCore/QObject>
  1226. +#include <QtQuick1/QDeclarativeItem>
  1227.  
  1228. typedef QPair<int, QDeclarativeItem *> PathItem;
  1229.  
  1230.  
  1231. === modified file 'libunity-2d-private/src/forcevisiblebehavior.cpp'
  1232. --- libunity-2d-private/src/forcevisiblebehavior.cpp 2011-06-11 11:33:52 +0000
  1233. +++ libunity-2d-private/src/forcevisiblebehavior.cpp 2012-01-03 20:37:13 +0000
  1234. @@ -26,11 +26,11 @@
  1235. // libunity-2d
  1236.  
  1237. // Qt
  1238. -#include <QWidget>
  1239. +#include <QtWidgets/QWidget>
  1240.  
  1241. ForceVisibleBehavior::ForceVisibleBehavior(QWidget* panel)
  1242. : AbstractVisibilityBehavior(panel)
  1243. {
  1244. }
  1245.  
  1246. -#include "forcevisiblebehavior.moc"
  1247. +
  1248.  
  1249. === modified file 'libunity-2d-private/src/forcevisiblebehavior.h'
  1250. --- libunity-2d-private/src/forcevisiblebehavior.h 2011-06-11 11:33:52 +0000
  1251. +++ libunity-2d-private/src/forcevisiblebehavior.h 2012-01-03 20:37:17 +0000
  1252. @@ -25,7 +25,7 @@
  1253. #include <abstractvisibilitybehavior.h>
  1254.  
  1255. // Qt
  1256. -#include <QObject>
  1257. +#include <QtCore/QObject>
  1258.  
  1259. /**
  1260. * Behavior used when someone requested the launcher to be visible even if it
  1261.  
  1262. === modified file 'libunity-2d-private/src/gimageutils.cpp'
  1263. --- libunity-2d-private/src/gimageutils.cpp 2011-08-01 10:08:29 +0000
  1264. +++ libunity-2d-private/src/gimageutils.cpp 2012-01-03 20:37:17 +0000
  1265. @@ -27,7 +27,7 @@
  1266.  
  1267. // Qt
  1268. #include <QByteArray>
  1269. -#include <QImage>
  1270. +#include <QtGui/QImage>
  1271.  
  1272. // GTK
  1273. #include <gtk/gtk.h>
  1274.  
  1275. === modified file 'libunity-2d-private/src/giodefaultapplication.cpp'
  1276. --- libunity-2d-private/src/giodefaultapplication.cpp 2011-09-01 12:28:40 +0000
  1277. +++ libunity-2d-private/src/giodefaultapplication.cpp 2012-01-03 20:37:13 +0000
  1278. @@ -25,7 +25,7 @@
  1279. // Qt
  1280. #include <QFileSystemWatcher>
  1281. #include <QDir>
  1282. -#include <QTimer>
  1283. +#include <QtCore/QTimer>
  1284.  
  1285. // gio
  1286. #include <gio/gio.h>
  1287. @@ -131,4 +131,4 @@
  1288. Q_EMIT desktopFileChanged();
  1289. }
  1290.  
  1291. -#include "giodefaultapplication.moc"
  1292. +
  1293.  
  1294. === modified file 'libunity-2d-private/src/giodefaultapplication.h'
  1295. --- libunity-2d-private/src/giodefaultapplication.h 2011-09-01 12:28:40 +0000
  1296. +++ libunity-2d-private/src/giodefaultapplication.h 2012-01-03 20:37:17 +0000
  1297. @@ -20,7 +20,7 @@
  1298. #ifndef GIODEFAULTAPPLICATION_H
  1299. #define GIODEFAULTAPPLICATION_H
  1300.  
  1301. -#include <QObject>
  1302. +#include <QtCore/QObject>
  1303. #include <QString>
  1304.  
  1305. class QFileSystemWatcher;
  1306.  
  1307. === modified file 'libunity-2d-private/src/gnomesessionclient.cpp'
  1308. --- libunity-2d-private/src/gnomesessionclient.cpp 2011-03-23 14:43:45 +0000
  1309. +++ libunity-2d-private/src/gnomesessionclient.cpp 2012-01-03 20:37:16 +0000
  1310. @@ -27,10 +27,10 @@
  1311.  
  1312. // Qt
  1313. #include <QCoreApplication>
  1314. -#include <QDBusConnection>
  1315. -#include <QDBusInterface>
  1316. -#include <QDBusReply>
  1317. -#include <QDBusPendingCallWatcher>
  1318. +#include <QtDBus/QDBusConnection>
  1319. +#include <QtDBus/QDBusInterface>
  1320. +#include <QtDBus/QDBusReply>
  1321. +#include <QtDBus/QDBusPendingCallWatcher>
  1322. #include <QTime>
  1323.  
  1324. static const char* SM_DBUS_SERVICE = "org.gnome.SessionManager";
  1325. @@ -159,4 +159,4 @@
  1326. }
  1327. }
  1328.  
  1329. -#include "gnomesessionclient.moc"
  1330. +
  1331.  
  1332. === modified file 'libunity-2d-private/src/gnomesessionclient.h'
  1333. --- libunity-2d-private/src/gnomesessionclient.h 2011-03-22 09:58:45 +0000
  1334. +++ libunity-2d-private/src/gnomesessionclient.h 2012-01-03 20:37:17 +0000
  1335. @@ -25,7 +25,7 @@
  1336. // Local
  1337.  
  1338. // Qt
  1339. -#include <QObject>
  1340. +#include <QtCore/QObject>
  1341.  
  1342. class QDBusPendingCallWatcher;
  1343.  
  1344.  
  1345. === modified file 'libunity-2d-private/src/hotkey.cpp'
  1346. --- libunity-2d-private/src/hotkey.cpp 2011-05-03 15:28:49 +0000
  1347. +++ libunity-2d-private/src/hotkey.cpp 2012-01-03 20:37:17 +0000
  1348. @@ -19,9 +19,9 @@
  1349.  
  1350. #include "hotkey.h"
  1351.  
  1352. -#include <QX11Info>
  1353. -#include <QDebug>
  1354. -#include <QKeySequence>
  1355. +#include <QX11Info.h>
  1356. +#include <QtCore/QDebug>
  1357. +#include <QtGui/QKeySequence>
  1358.  
  1359. #include <X11/Xlib.h>
  1360. #include <X11/XKBlib.h>
  1361. @@ -93,7 +93,7 @@
  1362. UQ_DEBUG << "Grabbing hotkey" << QKeySequence(m_key | m_modifiers).toString();
  1363. _x_old_errhandler = XSetErrorHandler(_x_grabkey_errhandler);
  1364. XGrabKey(QX11Info::display(), m_x11key, m_x11modifiers,
  1365. - QX11Info::appRootWindow(), True, GrabModeAsync, GrabModeAsync);
  1366. + (unsigned long int)QX11Info::appRootWindow(), True, GrabModeAsync, GrabModeAsync);
  1367. XSync(QX11Info::display(), False);
  1368. XSetErrorHandler(_x_old_errhandler);
  1369. }
  1370. @@ -107,7 +107,7 @@
  1371. if (m_connections == 1) {
  1372. UQ_DEBUG << "Ungrabbing hotkey" << QKeySequence(m_key | m_modifiers).toString();
  1373. XUngrabKey(QX11Info::display(), m_x11key, m_x11modifiers,
  1374. - QX11Info::appRootWindow());
  1375. + (long unsigned int)QX11Info::appRootWindow());
  1376. }
  1377. m_connections--;
  1378. }
  1379. @@ -122,4 +122,4 @@
  1380. return false;
  1381. }
  1382.  
  1383. -#include "hotkey.moc"
  1384. +
  1385.  
  1386. === modified file 'libunity-2d-private/src/hotkey.h'
  1387. --- libunity-2d-private/src/hotkey.h 2011-02-23 17:03:50 +0000
  1388. +++ libunity-2d-private/src/hotkey.h 2012-01-03 20:37:17 +0000
  1389. @@ -20,7 +20,7 @@
  1390. #ifndef Hotkey_H
  1391. #define Hotkey_H
  1392.  
  1393. -#include <QObject>
  1394. +#include <QtCore/QObject>
  1395.  
  1396. class Hotkey : public QObject
  1397. {
  1398.  
  1399. === modified file 'libunity-2d-private/src/hotkeymonitor.cpp'
  1400. --- libunity-2d-private/src/hotkeymonitor.cpp 2011-10-14 07:07:09 +0000
  1401. +++ libunity-2d-private/src/hotkeymonitor.cpp 2012-01-03 20:37:17 +0000
  1402. @@ -20,15 +20,15 @@
  1403. #include "hotkeymonitor.h"
  1404. #include "hotkey.h"
  1405.  
  1406. -#include <QDebug>
  1407. +#include <QtCore/QDebug>
  1408. +#include <QX11Info.h>
  1409.  
  1410. #include <X11/X.h>
  1411. #include <X11/Xlib.h>
  1412. #include <X11/XKBlib.h>
  1413. #include <X11/extensions/XKB.h>
  1414.  
  1415. -#include <QX11Info>
  1416. -#include <QAbstractEventDispatcher>
  1417. +#include <QtCore/QAbstractEventDispatcher>
  1418.  
  1419. #include <debug_p.h>
  1420.  
  1421. @@ -118,4 +118,4 @@
  1422. }
  1423. }
  1424.  
  1425. -#include "hotkeymonitor.moc"
  1426. +
  1427.  
  1428. === modified file 'libunity-2d-private/src/hotkeymonitor.h'
  1429. --- libunity-2d-private/src/hotkeymonitor.h 2011-10-14 07:07:09 +0000
  1430. +++ libunity-2d-private/src/hotkeymonitor.h 2012-01-03 20:37:17 +0000
  1431. @@ -20,7 +20,7 @@
  1432. #ifndef HotkeyMonitor_H
  1433. #define HotkeyMonitor_H
  1434.  
  1435. -#include <QObject>
  1436. +#include <QtCore/QObject>
  1437. #include <QList>
  1438.  
  1439. class Hotkey;
  1440.  
  1441. === modified file 'libunity-2d-private/src/iconimageprovider.h'
  1442. --- libunity-2d-private/src/iconimageprovider.h 2011-07-29 13:49:34 +0000
  1443. +++ libunity-2d-private/src/iconimageprovider.h 2012-01-03 20:37:17 +0000
  1444. @@ -17,7 +17,7 @@
  1445. #ifndef ICONIMAGEPROVIDER_H
  1446. #define ICONIMAGEPROVIDER_H
  1447.  
  1448. -#include <QDeclarativeImageProvider>
  1449. +#include <QtDeclarative/QDeclarativeImageProvider>
  1450. #include <QHash>
  1451.  
  1452. class IconImageProvider : public QDeclarativeImageProvider
  1453.  
  1454. === modified file 'libunity-2d-private/src/iconutilities.cpp'
  1455. --- libunity-2d-private/src/iconutilities.cpp 2011-07-29 13:49:34 +0000
  1456. +++ libunity-2d-private/src/iconutilities.cpp 2012-01-03 20:37:13 +0000
  1457. @@ -23,10 +23,10 @@
  1458. #include <debug_p.h>
  1459.  
  1460. // Qt
  1461. -#include <QImage>
  1462. -#include <QDeclarativeEngine>
  1463. -#include <QDeclarativeContext>
  1464. -#include <QDeclarativeImageProvider>
  1465. +#include <QtGui/QImage>
  1466. +#include <QtDeclarative/QDeclarativeEngine>
  1467. +#include <QtDeclarative/QDeclarativeContext>
  1468. +#include <QtDeclarative/QDeclarativeImageProvider>
  1469.  
  1470. IconUtilities::IconUtilities(QDeclarativeEngine *engine) : QObject(engine), m_engine(engine)
  1471. {
  1472. @@ -83,4 +83,4 @@
  1473. return colors;
  1474. }
  1475.  
  1476. -#include "iconutilities.moc"
  1477. +
  1478.  
  1479. === modified file 'libunity-2d-private/src/iconutilities.h'
  1480. --- libunity-2d-private/src/iconutilities.h 2011-07-29 13:49:34 +0000
  1481. +++ libunity-2d-private/src/iconutilities.h 2012-01-03 20:37:17 +0000
  1482. @@ -17,11 +17,11 @@
  1483. #ifndef ICONUTILITIES_H
  1484. #define ICONUTILITIES_H
  1485.  
  1486. -#include <QObject>
  1487. +#include <QtCore/QObject>
  1488. #include <QUrl>
  1489. -#include <QSize>
  1490. -#include <QVariant>
  1491. -#include <QDeclarativeEngine>
  1492. +#include <QtCore/QSize>
  1493. +#include <QtCore/QVariant>
  1494. +#include <QtDeclarative/QDeclarativeEngine>
  1495.  
  1496. class IconUtilities : public QObject
  1497. {
  1498.  
  1499. === modified file 'libunity-2d-private/src/indicatorentrywidget.cpp'
  1500. --- libunity-2d-private/src/indicatorentrywidget.cpp 2011-11-05 21:37:54 +0000
  1501. +++ libunity-2d-private/src/indicatorentrywidget.cpp 2012-01-03 20:37:17 +0000
  1502. @@ -29,8 +29,8 @@
  1503. #include <panelstyle.h>
  1504.  
  1505. // Qt
  1506. -#include <QIcon>
  1507. -#include <QPainter>
  1508. +#include <QtWidgets/QIcon>
  1509. +#include <QtGui/QPainter>
  1510. #include <QWheelEvent>
  1511.  
  1512. // GTK
  1513. @@ -375,4 +375,4 @@
  1514. return m_entry;
  1515. }
  1516.  
  1517. -#include "indicatorentrywidget.moc"
  1518. +
  1519.  
  1520. === modified file 'libunity-2d-private/src/indicatorentrywidget.h'
  1521. --- libunity-2d-private/src/indicatorentrywidget.h 2011-08-22 09:17:03 +0000
  1522. +++ libunity-2d-private/src/indicatorentrywidget.h 2012-01-03 20:37:17 +0000
  1523. @@ -27,7 +27,7 @@
  1524. #include <UnityCore/IndicatorEntry.h>
  1525.  
  1526. // Qt
  1527. -#include <QWidget>
  1528. +#include <QtWidgets/QWidget>
  1529.  
  1530. struct _GtkWidgetPath;
  1531. struct _PangoLayout;
  1532.  
  1533. === modified file 'libunity-2d-private/src/indicatorsmanager.cpp'
  1534. --- libunity-2d-private/src/indicatorsmanager.cpp 2011-10-14 21:01:28 +0000
  1535. +++ libunity-2d-private/src/indicatorsmanager.cpp 2012-01-03 20:37:17 +0000
  1536. @@ -26,9 +26,9 @@
  1537. #include <indicatorentrywidget.h>
  1538.  
  1539. // Qt
  1540. -#include <QApplication>
  1541. -#include <QTimer>
  1542. -#include <QX11Info>
  1543. +#include <QtWidgets/QApplication>
  1544. +#include <QtCore/QTimer>
  1545. +#include <QX11Info.h>
  1546.  
  1547. // X11
  1548. #include <X11/Xlib.h>
  1549. @@ -124,7 +124,8 @@
  1550. Button1,
  1551. True
  1552. };
  1553. - qApp->x11ProcessEvent(reinterpret_cast<XEvent*>(&event));
  1554. + // FIXME
  1555. + //qApp->x11ProcessEvent(reinterpret_cast<XEvent*>(&event));
  1556. }
  1557.  
  1558. void IndicatorsManager::checkMousePosition()
  1559. @@ -152,7 +153,8 @@
  1560. False,
  1561. display,
  1562. widget != 0 ? widget->effectiveWinId() : 0,
  1563. - widget != 0 ? RootWindow(display, widget->x11Info().screen()) : 0,
  1564. + // FIXME
  1565. + widget != 0 ? RootWindow(display, 0) : 0,
  1566. 0,
  1567. CurrentTime,
  1568. pos.x(), pos.y(),
  1569. @@ -161,7 +163,8 @@
  1570. False,
  1571. True
  1572. };
  1573. - qApp->x11ProcessEvent(reinterpret_cast<XEvent*>(&event));
  1574. + // FIXME
  1575. + //qApp->x11ProcessEvent(reinterpret_cast<XEvent*>(&event));
  1576.  
  1577. IndicatorEntryWidget* entryWidget = qobject_cast<IndicatorEntryWidget*>(widget);
  1578. if (!entryWidget) {
  1579. @@ -253,4 +256,4 @@
  1580. return m_widgetList;
  1581. }
  1582.  
  1583. -#include "indicatorsmanager.moc"
  1584. +
  1585.  
  1586. === modified file 'libunity-2d-private/src/indicatorsmanager.h'
  1587. --- libunity-2d-private/src/indicatorsmanager.h 2011-10-14 21:01:28 +0000
  1588. +++ libunity-2d-private/src/indicatorsmanager.h 2012-01-03 20:37:13 +0000
  1589. @@ -25,9 +25,9 @@
  1590. #include "unity2dpanel.h"
  1591.  
  1592. // Qt
  1593. -#include <QMap>
  1594. -#include <QObject>
  1595. -#include <QPoint>
  1596. +#include <QtCore/QMap>
  1597. +#include <QtCore/QObject>
  1598. +#include <QtCore/QPoint>
  1599.  
  1600. // libunity-core
  1601. #include <UnityCore/DBusIndicators.h>
  1602.  
  1603. === modified file 'libunity-2d-private/src/indicatorswidget.cpp'
  1604. --- libunity-2d-private/src/indicatorswidget.cpp 2011-11-24 08:45:18 +0000
  1605. +++ libunity-2d-private/src/indicatorswidget.cpp 2012-01-03 20:37:16 +0000
  1606. @@ -28,7 +28,7 @@
  1607. #include <indicatorsmanager.h>
  1608.  
  1609. // Qt
  1610. -#include <QHBoxLayout>
  1611. +#include <QtWidgets/QHBoxLayout>
  1612.  
  1613. using namespace unity::indicator;
  1614.  
  1615. @@ -119,4 +119,4 @@
  1616. return m_entries;
  1617. }
  1618.  
  1619. -#include "indicatorswidget.moc"
  1620. +
  1621.  
  1622. === modified file 'libunity-2d-private/src/indicatorswidget.h'
  1623. --- libunity-2d-private/src/indicatorswidget.h 2011-09-28 07:05:56 +0000
  1624. +++ libunity-2d-private/src/indicatorswidget.h 2012-01-03 20:37:17 +0000
  1625. @@ -29,8 +29,8 @@
  1626. #include <UnityCore/IndicatorEntry.h>
  1627.  
  1628. // Qt
  1629. -#include <QMap>
  1630. -#include <QWidget>
  1631. +#include <QtCore/QMap>
  1632. +#include <QtWidgets/QWidget>
  1633.  
  1634. // sigc++
  1635. #include <sigc++/connection.h>
  1636.  
  1637. === modified file 'libunity-2d-private/src/intellihidebehavior.cpp'
  1638. --- libunity-2d-private/src/intellihidebehavior.cpp 2011-11-25 15:27:29 +0000
  1639. +++ libunity-2d-private/src/intellihidebehavior.cpp 2012-01-03 20:37:13 +0000
  1640. @@ -21,10 +21,10 @@
  1641.  
  1642. // Qt
  1643. #include <QCursor>
  1644. -#include <QEvent>
  1645. -#include <QTimer>
  1646. -#include <QWidget>
  1647. -#include <QDesktopWidget>
  1648. +#include <QtCore/QEvent>
  1649. +#include <QtCore/QTimer>
  1650. +#include <QtWidgets/QWidget>
  1651. +#include <QtWidgets/QDesktopWidget>
  1652.  
  1653. // libwnck
  1654. extern "C" {
  1655. @@ -248,4 +248,4 @@
  1656. }
  1657. }
  1658.  
  1659. -#include "intellihidebehavior.moc"
  1660. +
  1661.  
  1662. === modified file 'libunity-2d-private/src/intellihidebehavior.h'
  1663. --- libunity-2d-private/src/intellihidebehavior.h 2011-06-11 11:33:52 +0000
  1664. +++ libunity-2d-private/src/intellihidebehavior.h 2012-01-03 20:37:17 +0000
  1665. @@ -16,7 +16,7 @@
  1666. #include <abstractvisibilitybehavior.h>
  1667.  
  1668. // Qt
  1669. -#include <QObject>
  1670. +#include <QtCore/QObject>
  1671.  
  1672. struct _WnckWindow;
  1673.  
  1674.  
  1675. === modified file 'libunity-2d-private/src/keyboardmodifiersmonitor.cpp'
  1676. --- libunity-2d-private/src/keyboardmodifiersmonitor.cpp 2011-06-08 10:15:49 +0000
  1677. +++ libunity-2d-private/src/keyboardmodifiersmonitor.cpp 2012-01-03 20:37:13 +0000
  1678. @@ -26,7 +26,7 @@
  1679. #include <debug_p.h>
  1680.  
  1681. // Qt
  1682. -#include <QX11Info>
  1683. +#include <QX11Info.h>
  1684.  
  1685. // X11
  1686. #include <X11/Xlib.h>
  1687. @@ -38,8 +38,8 @@
  1688. static void setupXkb()
  1689. {
  1690. int opcode, error;
  1691. - XkbQueryExtension(QX11Info::display(), &opcode, &sXkbBaseEventType, &error, NULL, NULL);
  1692. - XkbSelectEvents(QX11Info::display(), XkbUseCoreKbd, XkbStateNotifyMask, XkbStateNotifyMask);
  1693. +// XkbQueryExtension(QX11Info::display(), &opcode, &sXkbBaseEventType, &error, NULL, NULL);
  1694. +// XkbSelectEvents(QX11Info::display(), XkbUseCoreKbd, XkbStateNotifyMask, XkbStateNotifyMask);
  1695. }
  1696.  
  1697. struct KeyboardModifiersMonitorPrivate
  1698. @@ -110,4 +110,4 @@
  1699. return value;
  1700. }
  1701.  
  1702. -#include "keyboardmodifiersmonitor.moc"
  1703. +
  1704.  
  1705. === modified file 'libunity-2d-private/src/keymonitor.cpp'
  1706. --- libunity-2d-private/src/keymonitor.cpp 2011-10-28 22:18:46 +0000
  1707. +++ libunity-2d-private/src/keymonitor.cpp 2012-01-03 20:37:16 +0000
  1708. @@ -22,7 +22,7 @@
  1709.  
  1710. // Qt
  1711. #include <QSocketNotifier>
  1712. -#include <QDebug>
  1713. +#include <QtCore/QDebug>
  1714.  
  1715. // X11
  1716. #include <X11/Xlib.h>
  1717. @@ -160,4 +160,4 @@
  1718. }
  1719. }
  1720.  
  1721. -#include "keymonitor.moc"
  1722. +
  1723.  
  1724. === modified file 'libunity-2d-private/src/keymonitor.h'
  1725. --- libunity-2d-private/src/keymonitor.h 2011-10-28 22:14:18 +0000
  1726. +++ libunity-2d-private/src/keymonitor.h 2012-01-03 20:37:16 +0000
  1727. @@ -21,7 +21,7 @@
  1728. #define KEYMONITOR_H
  1729.  
  1730. // Qt
  1731. -#include <QObject>
  1732. +#include <QtCore/QObject>
  1733. #include <QFuture>
  1734. #include <QVector>
  1735.  
  1736.  
  1737. === modified file 'libunity-2d-private/src/launcherapplication.cpp'
  1738. --- libunity-2d-private/src/launcherapplication.cpp 2011-11-24 08:45:18 +0000
  1739. +++ libunity-2d-private/src/launcherapplication.cpp 2012-01-03 20:37:17 +0000
  1740. @@ -44,15 +44,15 @@
  1741.  
  1742. // Qt
  1743. #include <Qt>
  1744. -#include <QDebug>
  1745. -#include <QAction>
  1746. -#include <QDBusInterface>
  1747. -#include <QDBusReply>
  1748. -#include <QDBusServiceWatcher>
  1749. +#include <QtCore/QDebug>
  1750. +#include <QtWidgets/QAction>
  1751. +#include <QtDBus/QDBusInterface>
  1752. +#include <QtDBus/QDBusReply>
  1753. +#include <QtDBus/QDBusServiceWatcher>
  1754. #include <QFile>
  1755. #include <QFileSystemWatcher>
  1756. #include <QScopedPointer>
  1757. -#include <QX11Info>
  1758. +#include <QX11Info.h>
  1759.  
  1760. extern "C" {
  1761. #include <gdk/gdk.h>
  1762. @@ -762,7 +762,7 @@
  1763. "org.freedesktop.compiz");
  1764.  
  1765. if (compiz.isValid()) {
  1766. - Qt::HANDLE root = QX11Info::appRootWindow();
  1767. + Qt::HANDLE root = (Qt::HANDLE)QX11Info::appRootWindow();
  1768. BamfUintList* xids = m_application->xids();
  1769. QStringList fragments;
  1770. for (int i = 0; i < xids->size(); i++) {
  1771. @@ -770,7 +770,7 @@
  1772. fragments.append("xid=" + QString::number(xid));
  1773. }
  1774.  
  1775. - compiz.asyncCall("activate", "root", static_cast<int>(root), "match", fragments.join(" | "));
  1776. + compiz.asyncCall("activate", "root", (quintptr)(root), "match", fragments.join(" | "));
  1777. } else {
  1778. QDBusInterface spread("com.canonical.Unity2d.Spread", "/Spread",
  1779. "com.canonical.Unity2d.Spread");
  1780. @@ -1052,4 +1052,4 @@
  1781. setDynamicQuicklistImporter(newOwner);
  1782. }
  1783.  
  1784. -#include "launcherapplication.moc"
  1785. +
  1786.  
  1787. === modified file 'libunity-2d-private/src/launcherapplication.h'
  1788. --- libunity-2d-private/src/launcherapplication.h 2011-08-09 11:28:45 +0000
  1789. +++ libunity-2d-private/src/launcherapplication.h 2012-01-03 20:37:16 +0000
  1790. @@ -29,11 +29,11 @@
  1791. #include <gscopedpointer.h>
  1792.  
  1793. // Qt
  1794. -#include <QObject>
  1795. +#include <QtCore/QObject>
  1796. #include <QUrl>
  1797. -#include <QMetaType>
  1798. +#include <QtCore/QMetaType>
  1799. #include <QString>
  1800. -#include <QTimer>
  1801. +#include <QtCore/QTimer>
  1802. #include <QHash>
  1803. #include <QPointer>
  1804. #include <QScopedPointer>
  1805.  
  1806. === modified file 'libunity-2d-private/src/launcherapplicationslist.cpp'
  1807. --- libunity-2d-private/src/launcherapplicationslist.cpp 2011-11-24 08:45:18 +0000
  1808. +++ libunity-2d-private/src/launcherapplicationslist.cpp 2012-01-03 20:37:13 +0000
  1809. @@ -29,11 +29,11 @@
  1810.  
  1811. #include <QStringList>
  1812. #include <QDir>
  1813. -#include <QDBusConnection>
  1814. -#include <QDBusMessage>
  1815. +#include <QtDBus/QDBusConnection>
  1816. +#include <QtDBus/QDBusMessage>
  1817. #include <QFileInfo>
  1818. #include <QProcess>
  1819. -#include <QX11Info>
  1820. +#include <QX11Info.h>
  1821.  
  1822. #include <debug_p.h>
  1823.  
  1824. @@ -518,4 +518,4 @@
  1825. }
  1826. }
  1827.  
  1828. -#include "launcherapplicationslist.moc"
  1829. +
  1830.  
  1831. === modified file 'libunity-2d-private/src/launcherapplicationslist.h'
  1832. --- libunity-2d-private/src/launcherapplicationslist.h 2011-11-18 10:15:49 +0000
  1833. +++ libunity-2d-private/src/launcherapplicationslist.h 2012-01-03 20:37:13 +0000
  1834. @@ -17,15 +17,16 @@
  1835. #ifndef LAUNCHERAPPLICATIONSLIST_H
  1836. #define LAUNCHERAPPLICATIONSLIST_H
  1837.  
  1838. -#include <QAbstractListModel>
  1839. +#include <QtCore/QAbstractListModel>
  1840. #include <QList>
  1841. -#include <QVariant>
  1842. +#include <QtCore/QVariant>
  1843. #include <QString>
  1844. +#include <QStringList>
  1845. #include <QUrl>
  1846. -#include <QObject>
  1847. +#include <QtCore/QObject>
  1848. #include <QtDeclarative/qdeclarative.h>
  1849. -#include <QMap>
  1850. -#include <QDBusContext>
  1851. +#include <QtCore/QMap>
  1852. +#include <QtDBus/QDBusContext>
  1853.  
  1854. #include <unity2dapplication.h>
  1855.  
  1856.  
  1857. === modified file 'libunity-2d-private/src/launcherapplicationslistdbus.cpp'
  1858. --- libunity-2d-private/src/launcherapplicationslistdbus.cpp 2011-07-29 13:49:34 +0000
  1859. +++ libunity-2d-private/src/launcherapplicationslistdbus.cpp 2012-01-03 20:37:16 +0000
  1860. @@ -29,4 +29,4 @@
  1861. }
  1862. }
  1863.  
  1864. -#include "launcherapplicationslistdbus.moc"
  1865. +
  1866.  
  1867. === modified file 'libunity-2d-private/src/launcherapplicationslistdbus.h'
  1868. --- libunity-2d-private/src/launcherapplicationslistdbus.h 2011-07-29 13:49:34 +0000
  1869. +++ libunity-2d-private/src/launcherapplicationslistdbus.h 2012-01-03 20:37:13 +0000
  1870. @@ -1,7 +1,7 @@
  1871. #ifndef LAUNCHERAPPLICATIONSLISTDBUS_H
  1872. #define LAUNCHERAPPLICATIONSLISTDBUS_H
  1873.  
  1874. -#include <QObject>
  1875. +#include <QtCore/QObject>
  1876. #include <QtDBus/QDBusAbstractAdaptor>
  1877.  
  1878. class LauncherApplicationsListDBUS : public QDBusAbstractAdaptor
  1879.  
  1880. === modified file 'libunity-2d-private/src/launcherclient.cpp'
  1881. --- libunity-2d-private/src/launcherclient.cpp 2011-03-22 16:30:31 +0000
  1882. +++ libunity-2d-private/src/launcherclient.cpp 2012-01-03 20:37:13 +0000
  1883. @@ -22,9 +22,9 @@
  1884. #include "launcherclient.h"
  1885.  
  1886. // Qt
  1887. -#include <QDBusConnection>
  1888. -#include <QDBusMessage>
  1889. -#include <QDBusPendingCall>
  1890. +#include <QtDBus/QDBusConnection>
  1891. +#include <QtDBus/QDBusMessage>
  1892. +#include <QtDBus/QDBusPendingCall>
  1893.  
  1894. static const char* LAUNCHER_DBUS_SERVICE = "com.canonical.Unity2d.Launcher";
  1895. static const char* LAUNCHER_DBUS_OBJECT_PATH = "/Launcher";
  1896. @@ -71,4 +71,4 @@
  1897. d->asyncDBusCall("EndForceVisible");
  1898. }
  1899.  
  1900. -#include "launcherclient.moc"
  1901. +
  1902.  
  1903. === modified file 'libunity-2d-private/src/launcherclient.h'
  1904. --- libunity-2d-private/src/launcherclient.h 2011-03-22 11:30:53 +0000
  1905. +++ libunity-2d-private/src/launcherclient.h 2012-01-03 20:37:17 +0000
  1906. @@ -24,7 +24,7 @@
  1907. // Local
  1908.  
  1909. // Qt
  1910. -#include <QObject>
  1911. +#include <QtCore/QObject>
  1912.  
  1913. struct LauncherClientPrivate;
  1914. /**
  1915.  
  1916. === modified file 'libunity-2d-private/src/launcherdevice.cpp'
  1917. --- libunity-2d-private/src/launcherdevice.cpp 2011-08-03 11:57:25 +0000
  1918. +++ libunity-2d-private/src/launcherdevice.cpp 2012-01-03 20:37:13 +0000
  1919. @@ -23,8 +23,8 @@
  1920. #include <gscopedpointer.h>
  1921. #include "config.h"
  1922.  
  1923. -#include <QDebug>
  1924. -#include <QAction>
  1925. +#include <QtCore/QDebug>
  1926. +#include <QtWidgets/QAction>
  1927.  
  1928. extern "C" {
  1929. #include <gtk/gtk.h>
  1930. @@ -298,4 +298,4 @@
  1931. stop();
  1932. }
  1933.  
  1934. -#include "launcherdevice.moc"
  1935. +
  1936.  
  1937. === modified file 'libunity-2d-private/src/launcherdevice.h'
  1938. --- libunity-2d-private/src/launcherdevice.h 2011-08-02 19:01:35 +0000
  1939. +++ libunity-2d-private/src/launcherdevice.h 2012-01-03 20:37:17 +0000
  1940. @@ -24,9 +24,9 @@
  1941.  
  1942. #include "launcheritem.h"
  1943.  
  1944. -#include <QObject>
  1945. +#include <QtCore/QObject>
  1946. #include <QString>
  1947. -#include <QMetaType>
  1948. +#include <QtCore/QMetaType>
  1949.  
  1950. class LauncherDevice : public LauncherItem
  1951. {
  1952.  
  1953. === modified file 'libunity-2d-private/src/launcherdeviceslist.cpp'
  1954. --- libunity-2d-private/src/launcherdeviceslist.cpp 2011-07-29 13:49:34 +0000
  1955. +++ libunity-2d-private/src/launcherdeviceslist.cpp 2012-01-03 20:37:17 +0000
  1956. @@ -196,4 +196,4 @@
  1957. }
  1958. }
  1959.  
  1960. -#include "launcherdeviceslist.moc"
  1961. +
  1962.  
  1963. === modified file 'libunity-2d-private/src/launcherdeviceslist.h'
  1964. --- libunity-2d-private/src/launcherdeviceslist.h 2011-07-29 13:49:34 +0000
  1965. +++ libunity-2d-private/src/launcherdeviceslist.h 2012-01-03 20:37:16 +0000
  1966. @@ -22,8 +22,8 @@
  1967.  
  1968. #include "launcherdevice.h"
  1969.  
  1970. -#include <QObject>
  1971. -#include <QAbstractListModel>
  1972. +#include <QtCore/QObject>
  1973. +#include <QtCore/QAbstractListModel>
  1974.  
  1975. #include <gio/gio.h>
  1976.  
  1977.  
  1978. === modified file 'libunity-2d-private/src/launcherdropitem.cpp'
  1979. --- libunity-2d-private/src/launcherdropitem.cpp 2011-11-29 18:47:04 +0000
  1980. +++ libunity-2d-private/src/launcherdropitem.cpp 2012-01-03 20:37:13 +0000
  1981. @@ -19,7 +19,7 @@
  1982.  
  1983. #include "launcherdropitem.h"
  1984.  
  1985. -#include <QGraphicsSceneDragDropEvent>
  1986. +#include <QtWidgets/QGraphicsSceneDragDropEvent>
  1987. #include <QMimeData>
  1988.  
  1989. LauncherDropItem::LauncherDropItem(QDeclarativeItem *parent) : DeclarativeDropItem(parent)
  1990. @@ -80,4 +80,4 @@
  1991. return QList<QUrl>();
  1992. }
  1993.  
  1994. -#include "launcherdropitem.moc"
  1995. +
  1996.  
  1997. === modified file 'libunity-2d-private/src/launcheritem.cpp'
  1998. --- libunity-2d-private/src/launcheritem.cpp 2011-07-29 13:49:34 +0000
  1999. +++ libunity-2d-private/src/launcheritem.cpp 2012-01-03 20:37:13 +0000
  2000. @@ -122,4 +122,4 @@
  2001. return QString();
  2002. }
  2003.  
  2004. -#include "launcheritem.moc"
  2005. +
  2006.  
  2007. === modified file 'libunity-2d-private/src/launcheritem.h'
  2008. --- libunity-2d-private/src/launcheritem.h 2011-07-29 13:49:34 +0000
  2009. +++ libunity-2d-private/src/launcheritem.h 2012-01-03 20:37:16 +0000
  2010. @@ -20,9 +20,8 @@
  2011. #ifndef LAUNCHERITEM_H
  2012. #define LAUNCHERITEM_H
  2013.  
  2014. -#include <QObject>
  2015. -#include <QString>
  2016. -#include <Qt>
  2017. +#include <QtCore/QObject>
  2018. +#include <QtCore/QString>
  2019.  
  2020. #include "dragdropevent.h"
  2021.  
  2022.  
  2023. === modified file 'libunity-2d-private/src/launchermenu.cpp'
  2024. --- libunity-2d-private/src/launchermenu.cpp 2011-11-05 21:14:08 +0000
  2025. +++ libunity-2d-private/src/launchermenu.cpp 2012-01-03 20:37:17 +0000
  2026. @@ -20,14 +20,14 @@
  2027. #include "launchermenu.h"
  2028. #include "launcheritem.h"
  2029.  
  2030. -#include <QAction>
  2031. +#include <QtWidgets/QAction>
  2032. #include <QFile>
  2033. -#include <QApplication>
  2034. +#include <QtWidgets/QApplication>
  2035. #include <QResizeEvent>
  2036. -#include <QBitmap>
  2037. -#include <QX11Info>
  2038. -#include <QDesktopWidget>
  2039. -#include <QPainter>
  2040. +#include <QtGui/QBitmap>
  2041. +#include <QX11Info.h>
  2042. +#include <QtWidgets/QDesktopWidget>
  2043. +#include <QtGui/QPainter>
  2044.  
  2045. LauncherContextualMenu::LauncherContextualMenu():
  2046. QMenu(0), m_folded(true), m_launcherItem(NULL), m_titleAction(NULL)
  2047. @@ -356,4 +356,4 @@
  2048. return insertSeparator(m_titleAction);
  2049. }
  2050.  
  2051. -#include "launchermenu.moc"
  2052. +
  2053.  
  2054. === modified file 'libunity-2d-private/src/launchermenu.h'
  2055. --- libunity-2d-private/src/launchermenu.h 2011-10-21 16:12:21 +0000
  2056. +++ libunity-2d-private/src/launchermenu.h 2012-01-03 20:37:16 +0000
  2057. @@ -20,9 +20,9 @@
  2058. #ifndef LAUNCHERMENU_H
  2059. #define LAUNCHERMENU_H
  2060.  
  2061. -#include <QMenu>
  2062. -#include <QTimer>
  2063. -#include <QPixmap>
  2064. +#include <QtWidgets/QMenu>
  2065. +#include <QtCore/QTimer>
  2066. +#include <QtGui/QPixmap>
  2067.  
  2068. class LauncherItem;
  2069.  
  2070.  
  2071. === modified file 'libunity-2d-private/src/launcherplaceslist.cpp'
  2072. --- libunity-2d-private/src/launcherplaceslist.cpp 2011-07-29 13:49:34 +0000
  2073. +++ libunity-2d-private/src/launcherplaceslist.cpp 2012-01-03 20:37:13 +0000
  2074. @@ -136,4 +136,4 @@
  2075. }
  2076. }
  2077.  
  2078. -#include "launcherplaceslist.moc"
  2079. +
  2080.  
  2081. === modified file 'libunity-2d-private/src/lens.cpp'
  2082. --- libunity-2d-private/src/lens.cpp 2011-09-12 13:29:41 +0000
  2083. +++ libunity-2d-private/src/lens.cpp 2012-01-03 20:37:13 +0000
  2084. @@ -305,4 +305,4 @@
  2085. m_categories->setName(QString::fromStdString(m_unityLens->categories()->swarm_name));
  2086. }
  2087.  
  2088. -#include "lens.moc"
  2089. +
  2090.  
  2091. === modified file 'libunity-2d-private/src/lens.h'
  2092. --- libunity-2d-private/src/lens.h 2011-09-12 13:29:41 +0000
  2093. +++ libunity-2d-private/src/lens.h 2012-01-03 20:37:17 +0000
  2094. @@ -23,9 +23,9 @@
  2095. // Local
  2096.  
  2097. // Qt
  2098. -#include <QObject>
  2099. +#include <QtCore/QObject>
  2100. #include <QString>
  2101. -#include <QMetaType>
  2102. +#include <QtCore/QMetaType>
  2103.  
  2104. // libunity-core
  2105. #include <UnityCore/Lens.h>
  2106.  
  2107. === modified file 'libunity-2d-private/src/lenses.cpp'
  2108. --- libunity-2d-private/src/lenses.cpp 2011-09-09 10:15:14 +0000
  2109. +++ libunity-2d-private/src/lenses.cpp 2012-01-03 20:37:13 +0000
  2110. @@ -120,4 +120,4 @@
  2111. delete lens;
  2112. }
  2113.  
  2114. -#include "lenses.moc"
  2115. +
  2116.  
  2117. === modified file 'libunity-2d-private/src/lenses.h'
  2118. --- libunity-2d-private/src/lenses.h 2011-08-11 14:38:51 +0000
  2119. +++ libunity-2d-private/src/lenses.h 2012-01-03 20:37:17 +0000
  2120. @@ -21,7 +21,7 @@
  2121. #define LENSES_H
  2122.  
  2123. // Qt
  2124. -#include <QAbstractListModel>
  2125. +#include <QtCore/QAbstractListModel>
  2126. #include <QList>
  2127.  
  2128. // libunity-core
  2129.  
  2130. === modified file 'libunity-2d-private/src/listaggregatormodel.cpp'
  2131. --- libunity-2d-private/src/listaggregatormodel.cpp 2011-07-29 13:49:34 +0000
  2132. +++ libunity-2d-private/src/listaggregatormodel.cpp 2012-01-03 20:37:17 +0000
  2133. @@ -268,4 +268,4 @@
  2134. return true;
  2135. }
  2136.  
  2137. -#include "listaggregatormodel.moc"
  2138. +
  2139.  
  2140. === modified file 'libunity-2d-private/src/listaggregatormodel.h'
  2141. --- libunity-2d-private/src/listaggregatormodel.h 2011-07-29 13:49:34 +0000
  2142. +++ libunity-2d-private/src/listaggregatormodel.h 2012-01-03 20:37:13 +0000
  2143. @@ -20,7 +20,7 @@
  2144. #ifndef LISTAGGREGATORMODEL_H
  2145. #define LISTAGGREGATORMODEL_H
  2146.  
  2147. -#include <QAbstractListModel>
  2148. +#include <QtCore/QAbstractListModel>
  2149.  
  2150. /* Aggregates the data of several models and present them to the client
  2151. as if they were one single model.
  2152.  
  2153. === modified file 'libunity-2d-private/src/listmodelwrapper.h'
  2154. --- libunity-2d-private/src/listmodelwrapper.h 2011-08-31 10:57:31 +0000
  2155. +++ libunity-2d-private/src/listmodelwrapper.h 2012-01-03 20:37:13 +0000
  2156. @@ -21,7 +21,7 @@
  2157. #define LISTMODELWRAPPER_H
  2158.  
  2159. // Qt
  2160. -#include <QAbstractListModel>
  2161. +#include <QtCore/QAbstractListModel>
  2162. #include <QList>
  2163.  
  2164. #include <sigc++/signal.h>
  2165.  
  2166. === modified file 'libunity-2d-private/src/mimedata.cpp'
  2167. --- libunity-2d-private/src/mimedata.cpp 2011-11-24 08:45:18 +0000
  2168. +++ libunity-2d-private/src/mimedata.cpp 2012-01-03 20:37:17 +0000
  2169. @@ -27,5 +27,5 @@
  2170. }
  2171. }
  2172.  
  2173. -#include "mimedata.moc"
  2174. +
  2175.  
  2176.  
  2177. === modified file 'libunity-2d-private/src/mousearea.cpp'
  2178. --- libunity-2d-private/src/mousearea.cpp 2011-06-11 10:50:03 +0000
  2179. +++ libunity-2d-private/src/mousearea.cpp 2012-01-03 20:37:17 +0000
  2180. @@ -25,7 +25,7 @@
  2181. #include <debug_p.h>
  2182.  
  2183. // Qt
  2184. -#include <QX11Info>
  2185. +#include <QX11Info.h>
  2186.  
  2187. // X11
  2188. #include <X11/Xlib.h>
  2189. @@ -59,7 +59,7 @@
  2190.  
  2191. d->m_geometry = QRect(0, 0, 1, 1);
  2192.  
  2193. - d->m_window = XCreateWindow(QX11Info::display(), QX11Info::appRootWindow(),
  2194. + d->m_window = XCreateWindow(QX11Info::display(), (unsigned long int)QX11Info::appRootWindow(),
  2195. 0, 0, 1, 1, // geometry
  2196. 0, // border_width
  2197. 0, // depth
  2198. @@ -114,4 +114,4 @@
  2199. return d->m_containsMouse;
  2200. }
  2201.  
  2202. -#include "mousearea.moc"
  2203. +
  2204.  
  2205. === modified file 'libunity-2d-private/src/mousearea.h'
  2206. --- libunity-2d-private/src/mousearea.h 2011-02-15 18:18:13 +0000
  2207. +++ libunity-2d-private/src/mousearea.h 2012-01-03 20:37:13 +0000
  2208. @@ -25,7 +25,7 @@
  2209. #include <unity2dapplication.h>
  2210.  
  2211. // Qt
  2212. -#include <QObject>
  2213. +#include <QtCore/QObject>
  2214. #include <QRect>
  2215.  
  2216. struct MouseAreaPrivate;
  2217.  
  2218. === modified file 'libunity-2d-private/src/multirangefilter.cpp'
  2219. --- libunity-2d-private/src/multirangefilter.cpp 2011-08-19 17:12:24 +0000
  2220. +++ libunity-2d-private/src/multirangefilter.cpp 2012-01-03 20:37:17 +0000
  2221. @@ -54,4 +54,4 @@
  2222. Q_EMIT optionsChanged();
  2223. }
  2224.  
  2225. -#include "multirangefilter.moc"
  2226. +
  2227.  
  2228. === modified file 'libunity-2d-private/src/multirangefilter.h'
  2229. --- libunity-2d-private/src/multirangefilter.h 2011-08-24 12:36:27 +0000
  2230. +++ libunity-2d-private/src/multirangefilter.h 2012-01-03 20:37:17 +0000
  2231. @@ -21,8 +21,8 @@
  2232. #define MULTIRANGEFILTER_H
  2233.  
  2234. // Qt
  2235. -#include <QObject>
  2236. -#include <QMetaType>
  2237. +#include <QtCore/QObject>
  2238. +#include <QtCore/QMetaType>
  2239.  
  2240. // libunity-core
  2241. #include <UnityCore/MultiRangeFilter.h>
  2242.  
  2243. === modified file 'libunity-2d-private/src/panelapplet.cpp'
  2244. --- libunity-2d-private/src/panelapplet.cpp 2011-08-22 10:38:32 +0000
  2245. +++ libunity-2d-private/src/panelapplet.cpp 2012-01-03 20:37:16 +0000
  2246. @@ -29,4 +29,4 @@
  2247.  
  2248. } // namespace Unity2d
  2249.  
  2250. -#include "panelapplet.moc"
  2251. +
  2252.  
  2253. === modified file 'libunity-2d-private/src/panelapplet.h'
  2254. --- libunity-2d-private/src/panelapplet.h 2011-08-22 10:38:32 +0000
  2255. +++ libunity-2d-private/src/panelapplet.h 2012-01-03 20:37:16 +0000
  2256. @@ -27,7 +27,7 @@
  2257. class Unity2dPanel;
  2258.  
  2259. // Qt
  2260. -#include <QWidget>
  2261. +#include <QtWidgets/QWidget>
  2262.  
  2263. namespace Unity2d
  2264. {
  2265.  
  2266. === modified file 'libunity-2d-private/src/panelstyle.cpp'
  2267. --- libunity-2d-private/src/panelstyle.cpp 2011-10-05 08:27:09 +0000
  2268. +++ libunity-2d-private/src/panelstyle.cpp 2012-01-03 20:37:13 +0000
  2269. @@ -28,9 +28,9 @@
  2270. #include <gscopedpointer.h>
  2271.  
  2272. // Qt
  2273. -#include <QApplication>
  2274. +#include <QtWidgets/QApplication>
  2275. #include <QPalette>
  2276. -#include <QStyle>
  2277. +#include <QtWidgets/QStyle>
  2278.  
  2279. // GTK
  2280. #include <gtk/gtk.h>
  2281. @@ -205,4 +205,4 @@
  2282. }
  2283. }
  2284.  
  2285. -#include "panelstyle.moc"
  2286. +
  2287.  
  2288. === modified file 'libunity-2d-private/src/panelstyle.h'
  2289. --- libunity-2d-private/src/panelstyle.h 2011-10-05 08:27:09 +0000
  2290. +++ libunity-2d-private/src/panelstyle.h 2012-01-03 20:37:17 +0000
  2291. @@ -24,7 +24,7 @@
  2292. // Local
  2293.  
  2294. // Qt
  2295. -#include <QObject>
  2296. +#include <QtCore/QObject>
  2297.  
  2298. class QPixmap;
  2299.  
  2300.  
  2301. === modified file 'libunity-2d-private/src/percentcoder.cpp'
  2302. --- libunity-2d-private/src/percentcoder.cpp 2011-09-23 10:35:54 +0000
  2303. +++ libunity-2d-private/src/percentcoder.cpp 2012-01-03 20:37:13 +0000
  2304. @@ -54,4 +54,4 @@
  2305. }
  2306. }
  2307.  
  2308. -#include "percentcoder.moc"
  2309. +
  2310.  
  2311. === modified file 'libunity-2d-private/src/percentcoder.h'
  2312. --- libunity-2d-private/src/percentcoder.h 2011-09-23 10:35:54 +0000
  2313. +++ libunity-2d-private/src/percentcoder.h 2012-01-03 20:37:17 +0000
  2314. @@ -20,7 +20,7 @@
  2315. #ifndef PERCENTCODER_H
  2316. #define PERCENTCODER_H
  2317.  
  2318. -#include <QObject>
  2319. +#include <QtCore/QObject>
  2320.  
  2321. /* This element type can be used to covert URL Encoded strings to Unicode
  2322. QStrings and vice versa */
  2323.  
  2324. === modified file 'libunity-2d-private/src/place.cpp'
  2325. --- libunity-2d-private/src/place.cpp 2011-07-29 13:49:34 +0000
  2326. +++ libunity-2d-private/src/place.cpp 2012-01-03 20:37:13 +0000
  2327. @@ -27,13 +27,13 @@
  2328. #include <QHash>
  2329. #include <QByteArray>
  2330. #include <QStringList>
  2331. -#include <QDBusPendingReply>
  2332. -#include <QDBusServiceWatcher>
  2333. -#include <QDBusConnectionInterface>
  2334. -#include <QTimer>
  2335. +#include <QtDBus/QDBusPendingReply>
  2336. +#include <QtDBus/QDBusServiceWatcher>
  2337. +#include <QtDBus/QDBusConnectionInterface>
  2338. +#include <QtCore/QTimer>
  2339. #include <QUrl>
  2340. #include <QDesktopServices>
  2341. -#include <QDBusReply>
  2342. +#include <QtDBus/QDBusReply>
  2343.  
  2344. static const char* UNITY_PLACE_INTERFACE = "com.canonical.Unity.Place";
  2345. static const char* UNITY_ACTIVATION_INTERFACE = "com.canonical.Unity.Activation";
  2346. @@ -453,4 +453,4 @@
  2347. QDesktopServices::openUrl(url);
  2348. }
  2349.  
  2350. -#include "place.moc"
  2351. +
  2352.  
  2353. === modified file 'libunity-2d-private/src/place.h'
  2354. --- libunity-2d-private/src/place.h 2011-07-29 13:49:34 +0000
  2355. +++ libunity-2d-private/src/place.h 2012-01-03 20:37:17 +0000
  2356. @@ -20,15 +20,15 @@
  2357. #ifndef PLACE_H
  2358. #define PLACE_H
  2359.  
  2360. -#include <QAbstractListModel>
  2361. +#include <QtCore/QAbstractListModel>
  2362. #include <QString>
  2363. #include <QSettings>
  2364. #include <QList>
  2365. #include <QHash>
  2366. -#include <QMetaType>
  2367. -#include <QDBusInterface>
  2368. -#include <QDBusPendingCallWatcher>
  2369. -#include <QDBusServiceWatcher>
  2370. +#include <QtCore/QMetaType>
  2371. +#include <QtDBus/QDBusInterface>
  2372. +#include <QtDBus/QDBusPendingCallWatcher>
  2373. +#include <QtDBus/QDBusServiceWatcher>
  2374.  
  2375. #include "placeentry.h"
  2376.  
  2377.  
  2378. === modified file 'libunity-2d-private/src/placeentry.cpp'
  2379. --- libunity-2d-private/src/placeentry.cpp 2011-08-23 17:46:06 +0000
  2380. +++ libunity-2d-private/src/placeentry.cpp 2012-01-03 20:37:16 +0000
  2381. @@ -28,9 +28,9 @@
  2382. // QtDee
  2383. #include "deelistmodel.h"
  2384.  
  2385. -#include <QDBusMetaType>
  2386. -#include <QAction>
  2387. -#include <QDebug>
  2388. +#include <QtDBus/QDBusMetaType>
  2389. +#include <QtWidgets/QAction>
  2390. +#include <QtCore/QDebug>
  2391.  
  2392. // Marshall the RendererInfoStruct data into a D-Bus argument
  2393. QDBusArgument &operator<<(QDBusArgument &argument, const RendererInfoStruct &r)
  2394. @@ -934,4 +934,4 @@
  2395. Q_EMIT rendererInfoChanged();
  2396. }
  2397.  
  2398. -#include "placeentry.moc"
  2399. +
  2400.  
  2401. === modified file 'libunity-2d-private/src/placeentry.h'
  2402. --- libunity-2d-private/src/placeentry.h 2011-08-23 17:46:06 +0000
  2403. +++ libunity-2d-private/src/placeentry.h 2012-01-03 20:37:17 +0000
  2404. @@ -25,9 +25,9 @@
  2405. // QtDee
  2406. class DeeListModel;
  2407.  
  2408. -#include <QMetaType>
  2409. -#include <QDBusInterface>
  2410. -#include <QDBusArgument>
  2411. +#include <QtCore/QMetaType>
  2412. +#include <QtDBus/QDBusInterface>
  2413. +#include <QtDBus/QDBusArgument>
  2414.  
  2415. // https://wiki.ubuntu.com/Unity/Places#RendererInfo
  2416. struct RendererInfoStruct
  2417.  
  2418. === modified file 'libunity-2d-private/src/propertybinder.cpp'
  2419. --- libunity-2d-private/src/propertybinder.cpp 2011-03-28 13:59:15 +0000
  2420. +++ libunity-2d-private/src/propertybinder.cpp 2012-01-03 20:37:17 +0000
  2421. @@ -93,4 +93,4 @@
  2422. m_metaPropertyA.write(m_objectA, valueB);
  2423. }
  2424.  
  2425. -#include "propertybinder.moc"
  2426. +
  2427.  
  2428. === modified file 'libunity-2d-private/src/propertybinder.h'
  2429. --- libunity-2d-private/src/propertybinder.h 2011-02-21 00:10:10 +0000
  2430. +++ libunity-2d-private/src/propertybinder.h 2012-01-03 20:37:17 +0000
  2431. @@ -20,7 +20,7 @@
  2432. #ifndef PROPERTYBINDER_H
  2433. #define PROPERTYBINDER_H
  2434.  
  2435. -#include <QObject>
  2436. +#include <QtCore/QObject>
  2437. #include <QMetaProperty>
  2438.  
  2439. /**
  2440.  
  2441. === modified file 'libunity-2d-private/src/qsortfilterproxymodelqml.cpp'
  2442. --- libunity-2d-private/src/qsortfilterproxymodelqml.cpp 2011-09-08 14:00:55 +0000
  2443. +++ libunity-2d-private/src/qsortfilterproxymodelqml.cpp 2012-01-03 20:37:17 +0000
  2444. @@ -162,4 +162,4 @@
  2445. return (m_invertMatch) ? !result : result;
  2446. }
  2447.  
  2448. -#include "qsortfilterproxymodelqml.moc"
  2449. +
  2450.  
  2451. === modified file 'libunity-2d-private/src/radiooptionfilter.cpp'
  2452. --- libunity-2d-private/src/radiooptionfilter.cpp 2011-08-31 10:57:31 +0000
  2453. +++ libunity-2d-private/src/radiooptionfilter.cpp 2012-01-03 20:37:16 +0000
  2454. @@ -64,4 +64,4 @@
  2455. Q_EMIT optionsChanged();
  2456. }
  2457.  
  2458. -#include "radiooptionfilter.moc"
  2459. +
  2460.  
  2461. === modified file 'libunity-2d-private/src/radiooptionfilter.h'
  2462. --- libunity-2d-private/src/radiooptionfilter.h 2011-08-31 10:57:31 +0000
  2463. +++ libunity-2d-private/src/radiooptionfilter.h 2012-01-03 20:37:17 +0000
  2464. @@ -21,8 +21,8 @@
  2465. #define RADIOOPTIONFILTER_H
  2466.  
  2467. // Qt
  2468. -#include <QObject>
  2469. -#include <QMetaType>
  2470. +#include <QtCore/QObject>
  2471. +#include <QtCore/QMetaType>
  2472.  
  2473. // libunity-core
  2474. #include <UnityCore/RadioOptionFilter.h>
  2475.  
  2476. === modified file 'libunity-2d-private/src/ratingsfilter.cpp'
  2477. --- libunity-2d-private/src/ratingsfilter.cpp 2011-08-19 17:00:01 +0000
  2478. +++ libunity-2d-private/src/ratingsfilter.cpp 2012-01-03 20:37:16 +0000
  2479. @@ -48,4 +48,4 @@
  2480. m_unityRatingsFilter->rating.changed.connect(sigc::mem_fun(this, &RatingsFilter::ratingChanged));
  2481. }
  2482.  
  2483. -#include "ratingsfilter.moc"
  2484. +
  2485.  
  2486. === modified file 'libunity-2d-private/src/ratingsfilter.h'
  2487. --- libunity-2d-private/src/ratingsfilter.h 2011-08-24 12:36:27 +0000
  2488. +++ libunity-2d-private/src/ratingsfilter.h 2012-01-03 20:37:17 +0000
  2489. @@ -21,8 +21,8 @@
  2490. #define RATINGSFILTER_H
  2491.  
  2492. // Qt
  2493. -#include <QObject>
  2494. -#include <QMetaType>
  2495. +#include <QtCore/QObject>
  2496. +#include <QtCore/QMetaType>
  2497.  
  2498. // libunity-core
  2499. #include <UnityCore/RatingsFilter.h>
  2500.  
  2501. === modified file 'libunity-2d-private/src/rootwindowinfo.cpp'
  2502. --- libunity-2d-private/src/rootwindowinfo.cpp 2011-12-18 17:02:18 +0000
  2503. +++ libunity-2d-private/src/rootwindowinfo.cpp 2012-01-03 20:37:16 +0000
  2504. @@ -19,8 +19,8 @@
  2505.  
  2506. #include "rootwindowinfo.h"
  2507.  
  2508. -#include <QX11Info>
  2509. -#include <QAbstractEventDispatcher>
  2510. +#include <QX11Info.h>
  2511. +#include <QtCore/QAbstractEventDispatcher>
  2512.  
  2513. #include <X11/Xlib.h>
  2514. #include <X11/Xatom.h>
  2515. @@ -118,4 +118,4 @@
  2516. }
  2517.  
  2518.  
  2519. -#include "rootwindowinfo.moc"
  2520. +
  2521.  
  2522. === modified file 'libunity-2d-private/src/rootwindowinfo.h'
  2523. --- libunity-2d-private/src/rootwindowinfo.h 2011-12-18 17:02:18 +0000
  2524. +++ libunity-2d-private/src/rootwindowinfo.h 2012-01-03 20:37:13 +0000
  2525. @@ -20,8 +20,8 @@
  2526. #ifndef ROOTWINDOWINFO_H
  2527. #define ROOTWINDOWINFO_H
  2528.  
  2529. -#include <QObject>
  2530. -#include <QAbstractEventDispatcher>
  2531. +#include <QtCore/QObject>
  2532. +#include <QtCore/QAbstractEventDispatcher>
  2533.  
  2534. typedef unsigned long Atom;
  2535.  
  2536.  
  2537. === modified file 'libunity-2d-private/src/screeninfo.cpp'
  2538. --- libunity-2d-private/src/screeninfo.cpp 2011-11-29 17:36:45 +0000
  2539. +++ libunity-2d-private/src/screeninfo.cpp 2012-01-03 20:37:17 +0000
  2540. @@ -11,9 +11,9 @@
  2541. #include "screeninfo.h"
  2542. #include "workspacesinfo.h"
  2543.  
  2544. -#include <QX11Info>
  2545. -#include <QApplication>
  2546. -#include <QDesktopWidget>
  2547. +#include <QX11Info.h>
  2548. +#include <QtWidgets/QApplication>
  2549. +#include <QtWidgets/QDesktopWidget>
  2550.  
  2551. ScreenInfo::ScreenInfo(QObject *parent) :
  2552. QObject(parent),
  2553. @@ -121,4 +121,4 @@
  2554. return QX11Info::isCompositingManagerRunning();
  2555. }
  2556.  
  2557. -#include "screeninfo.moc"
  2558. +
  2559.  
  2560. === modified file 'libunity-2d-private/src/screeninfo.h'
  2561. --- libunity-2d-private/src/screeninfo.h 2011-11-29 17:36:45 +0000
  2562. +++ libunity-2d-private/src/screeninfo.h 2012-01-03 20:37:13 +0000
  2563. @@ -1,7 +1,7 @@
  2564. #ifndef SCREENINFO_H
  2565. #define SCREENINFO_H
  2566.  
  2567. -#include <QObject>
  2568. +#include <QtCore/QObject>
  2569. #include <QRect>
  2570.  
  2571. #include "workspacesinfo.h"
  2572.  
  2573. === modified file 'libunity-2d-private/src/signalwaiter.cpp'
  2574. --- libunity-2d-private/src/signalwaiter.cpp 2011-07-29 13:49:34 +0000
  2575. +++ libunity-2d-private/src/signalwaiter.cpp 2012-01-03 20:37:13 +0000
  2576. @@ -1,6 +1,6 @@
  2577. #include "signalwaiter.h"
  2578.  
  2579. -#include <QTimer>
  2580. +#include <QtCore/QTimer>
  2581. #include <debug_p.h>
  2582.  
  2583. SignalWaiter::SignalWaiter(QObject *parent) : QObject(parent)
  2584. @@ -46,4 +46,4 @@
  2585. m_loop.exit(1);
  2586. }
  2587.  
  2588. -#include "signalwaiter.moc"
  2589. +
  2590.  
  2591. === modified file 'libunity-2d-private/src/signalwaiter.h'
  2592. --- libunity-2d-private/src/signalwaiter.h 2011-07-29 13:49:34 +0000
  2593. +++ libunity-2d-private/src/signalwaiter.h 2012-01-03 20:37:17 +0000
  2594. @@ -2,7 +2,7 @@
  2595. #define SIGNALWAITER_H
  2596.  
  2597. #include <QEventLoop>
  2598. -#include <QObject>
  2599. +#include <QtCore/QObject>
  2600.  
  2601. class SignalWaiter : public QObject
  2602. {
  2603.  
  2604. === modified file 'libunity-2d-private/src/trash.cpp'
  2605. --- libunity-2d-private/src/trash.cpp 2011-11-24 08:45:18 +0000
  2606. +++ libunity-2d-private/src/trash.cpp 2012-01-03 20:37:13 +0000
  2607. @@ -31,7 +31,7 @@
  2608. #include <unity2dtr.h>
  2609. #include <debug_p.h>
  2610.  
  2611. -#include <QAction>
  2612. +#include <QtWidgets/QAction>
  2613.  
  2614. #define TRASH_URI "trash://"
  2615.  
  2616. @@ -322,4 +322,4 @@
  2617. m_iconName = "user-trash-full"; }
  2618. }
  2619.  
  2620. -#include "trash.moc"
  2621. +
  2622.  
  2623. === modified file 'libunity-2d-private/src/trash.h'
  2624. --- libunity-2d-private/src/trash.h 2011-09-03 20:10:01 +0000
  2625. +++ libunity-2d-private/src/trash.h 2012-01-03 20:37:13 +0000
  2626. @@ -30,8 +30,8 @@
  2627. #include "launcherutility.h"
  2628.  
  2629.  
  2630. -#include <QAbstractListModel>
  2631. -#include <QMetaType>
  2632. +#include <QtCore/QAbstractListModel>
  2633. +#include <QtCore/QMetaType>
  2634. #include <QtDBus/QtDBus>
  2635.  
  2636. class Trash : public LauncherItem
  2637.  
  2638. === modified file 'libunity-2d-private/src/unity2dapplication.cpp'
  2639. --- libunity-2d-private/src/unity2dapplication.cpp 2011-10-12 19:36:54 +0000
  2640. +++ libunity-2d-private/src/unity2dapplication.cpp 2012-01-03 20:37:13 +0000
  2641. @@ -32,10 +32,10 @@
  2642.  
  2643. // Qt
  2644. #include <QFont>
  2645. -#include <QWindowsStyle>
  2646. +#include <QtWidgets/QWindowsStyle>
  2647. #include <QAccessible>
  2648. -#include <QAccessibleWidget>
  2649. -#include <QWidget>
  2650. +#include <QtWidgets/QAccessibleWidget>
  2651. +#include <QtWidgets/QWidget>
  2652.  
  2653. // GTK
  2654. #include <gtk/gtk.h>
  2655. @@ -205,7 +205,7 @@
  2656. return true;
  2657. }
  2658. }
  2659. - return QApplication::x11EventFilter(event);
  2660. + // FIXME
  2661. + return false;
  2662. + //return QApplication::x11EventFilter(event);
  2663. }
  2664. -
  2665. -#include <unity2dapplication.moc>
  2666.  
  2667. === modified file 'libunity-2d-private/src/unity2dapplication.h'
  2668. --- libunity-2d-private/src/unity2dapplication.h 2011-07-27 14:07:00 +0000
  2669. +++ libunity-2d-private/src/unity2dapplication.h 2012-01-03 20:37:17 +0000
  2670. @@ -23,11 +23,12 @@
  2671. #define UNITY2DAPPLICATION_H
  2672.  
  2673. // Qt
  2674. -#include <QApplication>
  2675. +#include <QtWidgets/QApplication>
  2676.  
  2677. class Unity2dApplication;
  2678.  
  2679. class PlatformFontTracker;
  2680. +typedef union _XEvent XEvent;
  2681.  
  2682. class AbstractX11EventFilter
  2683. {
  2684.  
  2685. === modified file 'libunity-2d-private/src/unity2ddebug.h'
  2686. --- libunity-2d-private/src/unity2ddebug.h 2011-03-07 14:52:11 +0000
  2687. +++ libunity-2d-private/src/unity2ddebug.h 2012-01-03 20:37:16 +0000
  2688. @@ -24,7 +24,7 @@
  2689. // Local
  2690.  
  2691. // Qt
  2692. -#include <QObject>
  2693. +#include <QtCore/QObject>
  2694.  
  2695. /**
  2696. *
  2697.  
  2698. === modified file 'libunity-2d-private/src/unity2ddeclarativeview.cpp'
  2699. --- libunity-2d-private/src/unity2ddeclarativeview.cpp 2011-12-18 00:37:20 +0000
  2700. +++ libunity-2d-private/src/unity2ddeclarativeview.cpp 2012-01-03 20:37:13 +0000
  2701. @@ -16,10 +16,10 @@
  2702.  
  2703. #include "unity2ddeclarativeview.h"
  2704.  
  2705. -#include <QDebug>
  2706. -#include <QGLWidget>
  2707. -#include <QVariant>
  2708. -#include <QX11Info>
  2709. +#include <QtCore/QDebug>
  2710. +#include <QtOpenGL/QGLWidget>
  2711. +#include <QtCore/QVariant>
  2712. +#include <QX11Info.h>
  2713.  
  2714. #include <X11/Xlib.h>
  2715. #include <X11/Xatom.h>
  2716. @@ -228,7 +228,7 @@
  2717. xev.xclient.data.l[3] = 0;
  2718. xev.xclient.data.l[4] = 0;
  2719.  
  2720. - XSendEvent(display, QX11Info::appRootWindow(), False,
  2721. + XSendEvent(display, (unsigned long int)QX11Info::appRootWindow(), False,
  2722. SubstructureRedirectMask | SubstructureNotifyMask, &xev);
  2723.  
  2724. /* Ensure focus is actually switched to active window */
  2725. @@ -248,5 +248,3 @@
  2726. m_last_focused_window = active_window;
  2727. }
  2728. }
  2729. -
  2730. -#include <unity2ddeclarativeview.moc>
  2731.  
  2732. === modified file 'libunity-2d-private/src/unity2ddeclarativeview.h'
  2733. --- libunity-2d-private/src/unity2ddeclarativeview.h 2011-12-18 00:37:20 +0000
  2734. +++ libunity-2d-private/src/unity2ddeclarativeview.h 2012-01-03 20:37:17 +0000
  2735. @@ -17,7 +17,7 @@
  2736. #ifndef UNITY2DDECLARATIVEVIEW_H
  2737. #define UNITY2DDECLARATIVEVIEW_H
  2738.  
  2739. -#include <QDeclarativeView>
  2740. +#include <QtQuick1/QDeclarativeView>
  2741.  
  2742. class Unity2DDeclarativeView : public QDeclarativeView
  2743. {
  2744.  
  2745. === modified file 'libunity-2d-private/src/unity2dpanel.cpp'
  2746. --- libunity-2d-private/src/unity2dpanel.cpp 2011-11-05 21:14:08 +0000
  2747. +++ libunity-2d-private/src/unity2dpanel.cpp 2012-01-03 20:37:17 +0000
  2748. @@ -25,12 +25,12 @@
  2749. #include <indicatorsmanager.h>
  2750.  
  2751. // Qt
  2752. -#include <QApplication>
  2753. -#include <QDesktopWidget>
  2754. -#include <QPainter>
  2755. +#include <QtWidgets/QApplication>
  2756. +#include <QtWidgets/QDesktopWidget>
  2757. +#include <QtGui/QPainter>
  2758. #include <QPropertyAnimation>
  2759. -#include <QHBoxLayout>
  2760. -#include <QX11Info>
  2761. +#include <QtWidgets/QHBoxLayout>
  2762. +#include <QX11Info.h>
  2763.  
  2764. // X
  2765. #include <X11/Xlib.h>
  2766. @@ -228,9 +228,10 @@
  2767.  
  2768. void Unity2dPanel::slotWorkAreaResized(int screen)
  2769. {
  2770. - if (x11Info().screen() == screen) {
  2771. + // FIXME
  2772. + //if (x11Info().screen() == screen) {
  2773. d->updateEdge();
  2774. - }
  2775. + //}
  2776. }
  2777.  
  2778. void Unity2dPanel::paintEvent(QPaintEvent* event)
  2779. @@ -330,4 +331,4 @@
  2780. return "Unity2DPanel" + QString::number(screen);
  2781. }
  2782.  
  2783. -#include "unity2dpanel.moc"
  2784. +
  2785.  
  2786. === modified file 'libunity-2d-private/src/unity2dpanel.h'
  2787. --- libunity-2d-private/src/unity2dpanel.h 2011-10-12 16:54:18 +0000
  2788. +++ libunity-2d-private/src/unity2dpanel.h 2012-01-03 20:37:17 +0000
  2789. @@ -26,8 +26,8 @@
  2790. class IndicatorsManager;
  2791.  
  2792. // Qt
  2793. -#include <QWidget>
  2794. -#include <QEvent>
  2795. +#include <QtWidgets/QWidget>
  2796. +#include <QtCore/QEvent>
  2797.  
  2798. struct Unity2dPanelPrivate;
  2799. class Unity2dPanel : public QWidget
  2800.  
  2801. === modified file 'libunity-2d-private/src/unity2dtr.cpp'
  2802. --- libunity-2d-private/src/unity2dtr.cpp 2011-04-01 12:06:57 +0000
  2803. +++ libunity-2d-private/src/unity2dtr.cpp 2012-01-03 20:37:16 +0000
  2804. @@ -25,7 +25,7 @@
  2805. #include <config.h>
  2806.  
  2807. // Qt
  2808. -#include <QDeclarativeContext>
  2809. +#include <QtDeclarative/QDeclarativeContext>
  2810.  
  2811. // libc
  2812. #include <libintl.h>
  2813. @@ -79,5 +79,3 @@
  2814. text.replace("%n", QString::number(n));
  2815. return text;
  2816. }
  2817. -
  2818. -#include <unity2dtr.moc>
  2819.  
  2820. === modified file 'libunity-2d-private/src/unity2dtr.h'
  2821. --- libunity-2d-private/src/unity2dtr.h 2011-04-01 12:06:57 +0000
  2822. +++ libunity-2d-private/src/unity2dtr.h 2012-01-03 20:37:16 +0000
  2823. @@ -22,7 +22,7 @@
  2824. #define UNITY2DTR_H
  2825.  
  2826. // Qt
  2827. -#include <QObject>
  2828. +#include <QtCore/QObject>
  2829.  
  2830. class QString;
  2831. class QDeclarativeContext;
  2832.  
  2833. === modified file 'libunity-2d-private/src/webfavorite.cpp'
  2834. --- libunity-2d-private/src/webfavorite.cpp 2011-07-29 13:49:34 +0000
  2835. +++ libunity-2d-private/src/webfavorite.cpp 2012-01-03 20:37:17 +0000
  2836. @@ -30,7 +30,7 @@
  2837. #include <QtNetwork/QNetworkRequest>
  2838. #include <QtNetwork/QNetworkReply>
  2839. #include <QRegExp>
  2840. -#include <QPixmap>
  2841. +#include <QtGui/QPixmap>
  2842. #include <QCryptographicHash>
  2843. #include <QTextDocumentFragment>
  2844.  
  2845. @@ -241,4 +241,4 @@
  2846. return QCryptographicHash::hash(url.toEncoded(), QCryptographicHash::Md5).toHex().constData();
  2847. }
  2848.  
  2849. -#include "webfavorite.moc"
  2850. +
  2851.  
  2852. === modified file 'libunity-2d-private/src/webfavorite.h'
  2853. --- libunity-2d-private/src/webfavorite.h 2011-07-29 13:49:34 +0000
  2854. +++ libunity-2d-private/src/webfavorite.h 2012-01-03 20:37:16 +0000
  2855. @@ -20,7 +20,7 @@
  2856. #ifndef WebFavorite_H
  2857. #define WebFavorite_H
  2858.  
  2859. -#include <QObject>
  2860. +#include <QtCore/QObject>
  2861. #include <QUrl>
  2862. #include <QString>
  2863. #include <QStringList>
  2864.  
  2865. === modified file 'libunity-2d-private/src/windowimageprovider.cpp'
  2866. --- libunity-2d-private/src/windowimageprovider.cpp 2011-12-18 00:45:12 +0000
  2867. +++ libunity-2d-private/src/windowimageprovider.cpp 2012-01-03 20:37:13 +0000
  2868. @@ -14,10 +14,10 @@
  2869. * along with this program. If not, see <http://www.gnu.org/licenses/>.
  2870. */
  2871.  
  2872. -#include <QX11Info>
  2873. -#include <QPixmap>
  2874. -#include <QPainter>
  2875. -#include <QImage>
  2876. +#include <QX11Info.h>
  2877. +#include <QtGui/QPixmap>
  2878. +#include <QtGui/QPainter>
  2879. +#include <QtGui/QImage>
  2880.  
  2881. #include "windowimageprovider.h"
  2882. #include <debug_p.h>
  2883. @@ -150,7 +150,9 @@
  2884.  
  2885. XGetWindowAttributes(QX11Info::display(), frameWindowId, &attr);
  2886. if (attr.map_state == IsViewable) {
  2887. - return QPixmap::fromX11Pixmap(frameWindowId);
  2888. + // FIXME
  2889. + return QPixmap();
  2890. + //return QPixmap::fromX11Pixmap(frameWindowId);
  2891. } else {
  2892. /* If the window is not viewable, grabbing the pixmap directly will fail.
  2893. Therefore we try to retrieve the captured pixmap from the special metacity
  2894. @@ -162,7 +164,9 @@
  2895. if (!tryGetWindowCapture(contentWindowId, &pixmap)) {
  2896. return QPixmap();
  2897. } else {
  2898. - return QPixmap::fromX11Pixmap(pixmap);
  2899. + // FIXME
  2900. + return QPixmap();
  2901. + //return QPixmap::fromX11Pixmap(pixmap);
  2902. }
  2903. }
  2904. }
  2905.  
  2906. === modified file 'libunity-2d-private/src/windowimageprovider.h'
  2907. --- libunity-2d-private/src/windowimageprovider.h 2011-07-29 13:49:34 +0000
  2908. +++ libunity-2d-private/src/windowimageprovider.h 2012-01-03 20:37:17 +0000
  2909. @@ -17,9 +17,9 @@
  2910. #ifndef X11WINDOWIMAGEPROVIDER_H
  2911. #define X11WINDOWIMAGEPROVIDER_H
  2912.  
  2913. -#include <QDeclarativeImageProvider>
  2914. -#include <QImage>
  2915. -#include <QSize>
  2916. +#include <QtDeclarative/QDeclarativeImageProvider>
  2917. +#include <QtGui/QImage>
  2918. +#include <QtCore/QSize>
  2919.  
  2920. typedef unsigned long Window;
  2921.  
  2922.  
  2923. === modified file 'libunity-2d-private/src/windowinfo.cpp'
  2924. --- libunity-2d-private/src/windowinfo.cpp 2011-08-01 13:04:32 +0000
  2925. +++ libunity-2d-private/src/windowinfo.cpp 2012-01-03 20:37:17 +0000
  2926. @@ -22,9 +22,10 @@
  2927. #include "bamf-application.h"
  2928. #include "bamf-window.h"
  2929.  
  2930. +#include <QX11Info.h>
  2931. +
  2932. #include "windowinfo.h"
  2933. #include <X11/Xlib.h>
  2934. -#include <QX11Info>
  2935.  
  2936. WindowInfo::WindowInfo(unsigned int contentXid, QObject *parent) :
  2937. QObject(parent), m_bamfApplication(NULL), m_bamfWindow(NULL), m_wnckWindow(NULL),
  2938. @@ -284,4 +285,4 @@
  2939. Q_EMIT workspaceChanged(workspace());
  2940. }
  2941.  
  2942. -#include "windowinfo.moc"
  2943. +
  2944.  
  2945. === modified file 'libunity-2d-private/src/windowinfo.h'
  2946. --- libunity-2d-private/src/windowinfo.h 2011-07-29 13:49:34 +0000
  2947. +++ libunity-2d-private/src/windowinfo.h 2012-01-03 20:37:16 +0000
  2948. @@ -17,9 +17,9 @@
  2949. #ifndef WINDOWINFO_H
  2950. #define WINDOWINFO_H
  2951.  
  2952. -#include <QObject>
  2953. -#include <QPoint>
  2954. -#include <QSize>
  2955. +#include <QtCore/QObject>
  2956. +#include <QtCore/QPoint>
  2957. +#include <QtCore/QSize>
  2958. #include <QtDeclarative/qdeclarative.h>
  2959.  
  2960. class BamfWindow;
  2961.  
  2962. === modified file 'libunity-2d-private/src/windowslist.cpp'
  2963. --- libunity-2d-private/src/windowslist.cpp 2011-07-29 13:49:34 +0000
  2964. +++ libunity-2d-private/src/windowslist.cpp 2012-01-03 20:37:13 +0000
  2965. @@ -15,8 +15,8 @@
  2966. */
  2967.  
  2968. #include <QRegExp>
  2969. -#include <QApplication>
  2970. -#include <QWidget>
  2971. +#include <QtWidgets/QApplication>
  2972. +#include <QtWidgets/QWidget>
  2973. #include <QList>
  2974.  
  2975. #include <debug_p.h>
  2976. @@ -229,4 +229,4 @@
  2977. return true;
  2978. }
  2979.  
  2980. -#include "windowslist.moc"
  2981. +
  2982.  
  2983. === modified file 'libunity-2d-private/src/windowslist.h'
  2984. --- libunity-2d-private/src/windowslist.h 2011-07-29 13:49:34 +0000
  2985. +++ libunity-2d-private/src/windowslist.h 2012-01-03 20:37:13 +0000
  2986. @@ -17,9 +17,9 @@
  2987. #ifndef WINDOWSLIST_H
  2988. #define WINDOWSLIST_H
  2989.  
  2990. -#include <QAbstractListModel>
  2991. -#include <QVariant>
  2992. -#include <QObject>
  2993. +#include <QtCore/QAbstractListModel>
  2994. +#include <QtCore/QVariant>
  2995. +#include <QtCore/QObject>
  2996. #include <QtDeclarative/qdeclarative.h>
  2997.  
  2998. class WindowInfo;
  2999.  
  3000. === modified file 'libunity-2d-private/src/workspaces.cpp'
  3001. --- libunity-2d-private/src/workspaces.cpp 2011-07-29 13:49:34 +0000
  3002. +++ libunity-2d-private/src/workspaces.cpp 2012-01-03 20:37:16 +0000
  3003. @@ -21,10 +21,10 @@
  3004.  
  3005. #include "config.h"
  3006.  
  3007. -#include <QDBusInterface>
  3008. -#include <QDBusReply>
  3009. +#include <QtDBus/QDBusInterface>
  3010. +#include <QtDBus/QDBusReply>
  3011. #include <Qt>
  3012. -#include <QX11Info>
  3013. +#include <QX11Info.h>
  3014.  
  3015. // libunity-2d
  3016. #include <unity2dtr.h>
  3017. @@ -93,8 +93,8 @@
  3018. "org.freedesktop.compiz");
  3019.  
  3020. if (compiz.isValid()) {
  3021. - Qt::HANDLE root = QX11Info::appRootWindow();
  3022. - compiz.asyncCall("activate", "root", static_cast<int>(root));
  3023. + Qt::HANDLE root = (Qt::HANDLE)QX11Info::appRootWindow();
  3024. + compiz.asyncCall("activate", "root", (quintptr)(root));
  3025. } else {
  3026. QDBusInterface spread("com.canonical.Unity2d.Spread", "/Spread",
  3027. "com.canonical.Unity2d.Spread");
  3028. @@ -147,4 +147,4 @@
  3029. return QVariant::fromValue(m_workspaces);
  3030. }
  3031.  
  3032. -#include "workspaces.moc"
  3033. +
  3034.  
  3035. === modified file 'libunity-2d-private/src/workspaces.h'
  3036. --- libunity-2d-private/src/workspaces.h 2011-07-29 13:49:34 +0000
  3037. +++ libunity-2d-private/src/workspaces.h 2012-01-03 20:37:13 +0000
  3038. @@ -24,8 +24,8 @@
  3039.  
  3040. #include "launcheritem.h"
  3041.  
  3042. -#include <QAbstractListModel>
  3043. -#include <QMetaType>
  3044. +#include <QtCore/QAbstractListModel>
  3045. +#include <QtCore/QMetaType>
  3046.  
  3047. class Workspaces : public LauncherItem
  3048. {
  3049.  
  3050. === modified file 'libunity-2d-private/src/workspacesinfo.cpp'
  3051. --- libunity-2d-private/src/workspacesinfo.cpp 2011-11-10 17:53:54 +0000
  3052. +++ libunity-2d-private/src/workspacesinfo.cpp 2012-01-03 20:37:17 +0000
  3053. @@ -7,8 +7,8 @@
  3054. #include <libwnck/libwnck.h>
  3055. }
  3056.  
  3057. -#include <QAbstractEventDispatcher>
  3058. -#include <QX11Info>
  3059. +#include <QtCore/QAbstractEventDispatcher>
  3060. +#include <QX11Info.h>
  3061.  
  3062. #include <X11/Xlib.h>
  3063. #include <X11/Xatom.h>
  3064. @@ -282,4 +282,4 @@
  3065. data, length);
  3066. }
  3067.  
  3068. -#include "workspacesinfo.moc"
  3069. +
  3070.  
  3071. === modified file 'libunity-2d-private/src/workspacesinfo.h'
  3072. --- libunity-2d-private/src/workspacesinfo.h 2011-11-10 17:53:54 +0000
  3073. +++ libunity-2d-private/src/workspacesinfo.h 2012-01-03 20:37:13 +0000
  3074. @@ -1,7 +1,7 @@
  3075. #ifndef WORKSPACESINFO_H
  3076. #define WORKSPACESINFO_H
  3077.  
  3078. -#include <QObject>
  3079. +#include <QtCore/QObject>
  3080.  
  3081. typedef unsigned long Atom;
  3082.  
  3083.  
  3084. === modified file 'libunity-2d-private/tests/CMakeLists.txt'
  3085. --- libunity-2d-private/tests/CMakeLists.txt 2011-11-28 13:44:43 +0000
  3086. +++ libunity-2d-private/tests/CMakeLists.txt 2012-01-03 20:37:12 +0000
  3087. @@ -7,7 +7,8 @@
  3088. ${CMAKE_SOURCE_DIR}/tests
  3089. ${CMAKE_CURRENT_BINARY_DIR}
  3090. ${GLIB_INCLUDE_DIRS}
  3091. - ${QT_QTTEST_INCLUDE_DIR}
  3092. + ${QT_QTTEST_INCLUDE_DIRS}
  3093. + ${Qt5Widgets_INCLUDE_DIRS}
  3094. )
  3095.  
  3096. set(LIBUNITY_2D_TEST_DIR ${libunity-2d-private_BINARY_DIR}/tests)
  3097. @@ -20,7 +21,7 @@
  3098. COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/tests/run-with-xvfb.sh ./${_test}
  3099. )
  3100. add_executable(${_test} ${_test}.cpp ${_test}.moc)
  3101. - qt4_generate_moc(${_test}.cpp ${_test}.moc)
  3102. + qt5_generate_moc(${_test}.cpp ${_test}.moc)
  3103. target_link_libraries(${_test}
  3104. ${QT_QTTEST_LIBRARIES}
  3105. unity-2d-private
  3106. @@ -46,7 +47,7 @@
  3107. add_executable(unity2dtrtest
  3108. unity2dtrtest.cpp unity2dtrtest.moc
  3109. )
  3110. -qt4_generate_moc(unity2dtrtest.cpp
  3111. +qt5_generate_moc(unity2dtrtest.cpp
  3112. unity2dtrtest.moc
  3113. )
  3114. target_link_libraries(unity2dtrtest
  3115.  
  3116. === modified file 'libunity-2d-private/tests/focuspathtest.cpp'
  3117. --- libunity-2d-private/tests/focuspathtest.cpp 2011-11-21 18:58:02 +0000
  3118. +++ libunity-2d-private/tests/focuspathtest.cpp 2012-01-03 20:37:12 +0000
  3119. @@ -23,11 +23,11 @@
  3120. #include <config.h>
  3121. #include <focuspath.h>
  3122.  
  3123. -#include <QGraphicsObject>
  3124. -#include <QDeclarativeEngine>
  3125. -#include <QObject>
  3126. -#include <QDeclarativeView>
  3127. -#include <QtTestGui>
  3128. +#include <QtWidgets/QGraphicsObject>
  3129. +#include <QtDeclarative/QDeclarativeEngine>
  3130. +#include <QtCore/QObject>
  3131. +#include <QtQuick1/QDeclarativeView>
  3132. +#include <QtTest/QtTestGui>
  3133.  
  3134. class FocusPathTest : public QObject
  3135. {
  3136. @@ -259,4 +259,4 @@
  3137.  
  3138. UAPP_TEST_MAIN(FocusPathTest)
  3139.  
  3140. -#include "focuspathtest.moc"
  3141. +
  3142.  
  3143. === modified file 'libunity-2d-private/tests/gconnectortest.cpp'
  3144. --- libunity-2d-private/tests/gconnectortest.cpp 2011-07-13 12:47:02 +0000
  3145. +++ libunity-2d-private/tests/gconnectortest.cpp 2012-01-03 20:37:12 +0000
  3146. @@ -93,4 +93,4 @@
  3147.  
  3148. QTEST_MAIN(GConnectorTest)
  3149.  
  3150. -#include "gconnectortest.moc"
  3151. +
  3152.  
  3153. === modified file 'libunity-2d-private/tests/gnomesessionclienttesthelper.cpp'
  3154. --- libunity-2d-private/tests/gnomesessionclienttesthelper.cpp 2011-11-17 20:10:19 +0000
  3155. +++ libunity-2d-private/tests/gnomesessionclienttesthelper.cpp 2012-01-03 20:37:12 +0000
  3156. @@ -13,9 +13,9 @@
  3157. #include <gnomesessionclient.h>
  3158.  
  3159. // Qt
  3160. -#include <QApplication>
  3161. +#include <QtWidgets/QApplication>
  3162. #include <QPushButton>
  3163. -#include <QWindowsStyle>
  3164. +#include <QtWidgets/QWindowsStyle>
  3165.  
  3166. int main(int argc, char** argv)
  3167. {
  3168.  
  3169. === modified file 'libunity-2d-private/tests/keyboardmodifiersmonitortest.cpp'
  3170. --- libunity-2d-private/tests/keyboardmodifiersmonitortest.cpp 2011-11-17 20:10:19 +0000
  3171. +++ libunity-2d-private/tests/keyboardmodifiersmonitortest.cpp 2012-01-03 20:37:12 +0000
  3172. @@ -26,8 +26,8 @@
  3173.  
  3174. // Qt
  3175. #include <QSignalSpy>
  3176. -#include <QtTestGui>
  3177. -#include <QX11Info>
  3178. +#include <QtTest/QtTestGui>
  3179. +#include <QX11Info.h>
  3180.  
  3181. // X11
  3182. #include <X11/Xlib.h>
  3183. @@ -89,4 +89,4 @@
  3184.  
  3185. UAPP_TEST_MAIN(KeyboardModifiersMonitorTest)
  3186.  
  3187. -#include "keyboardmodifiersmonitortest.moc"
  3188. +
  3189.  
  3190. === modified file 'libunity-2d-private/tests/launchermenutest.cpp'
  3191. --- libunity-2d-private/tests/launchermenutest.cpp 2011-11-17 20:10:19 +0000
  3192. +++ libunity-2d-private/tests/launchermenutest.cpp 2012-01-03 20:37:12 +0000
  3193. @@ -24,7 +24,7 @@
  3194. #include <launchermenu.h>
  3195.  
  3196. // Qt
  3197. -#include <QtTestGui>
  3198. +#include <QtTest/QtTestGui>
  3199.  
  3200. class LauncherMenuTest : public QObject
  3201. {
  3202. @@ -54,5 +54,5 @@
  3203.  
  3204. QAPP_TEST_MAIN(LauncherMenuTest)
  3205.  
  3206. -#include "launchermenutest.moc"
  3207. +
  3208.  
  3209.  
  3210. === modified file 'libunity-2d-private/tests/listaggregatormodeltest.cpp'
  3211. --- libunity-2d-private/tests/listaggregatormodeltest.cpp 2011-06-13 16:21:18 +0000
  3212. +++ libunity-2d-private/tests/listaggregatormodeltest.cpp 2012-01-03 20:37:12 +0000
  3213. @@ -26,7 +26,7 @@
  3214. #include <QSignalSpy>
  3215. #include <QModelIndex>
  3216. #include <QSortFilterProxyModel>
  3217. -#include <QAbstractListModel>
  3218. +#include <QtCore/QAbstractListModel>
  3219.  
  3220. class QMovableStringListModel : public QAbstractListModel
  3221. {
  3222. @@ -377,5 +377,5 @@
  3223.  
  3224. QTEST_MAIN(ListAggregatorModelTest)
  3225.  
  3226. -#include "listaggregatormodeltest.moc"
  3227. +
  3228.  
  3229.  
  3230. === modified file 'libunity-2d-private/tests/mouseareademo.cpp'
  3231. --- libunity-2d-private/tests/mouseareademo.cpp 2011-07-18 14:36:34 +0000
  3232. +++ libunity-2d-private/tests/mouseareademo.cpp 2012-01-03 20:37:12 +0000
  3233. @@ -24,7 +24,7 @@
  3234. #include <unity2dapplication.h>
  3235.  
  3236. // Qt
  3237. -#include <QLabel>
  3238. +#include <QtWidgets/QLabel>
  3239. #include <QVBoxLayout>
  3240.  
  3241. int main(int argc, char** argv)
  3242.  
  3243. === modified file 'libunity-2d-private/tests/qsortfilterproxymodeltest.cpp'
  3244. --- libunity-2d-private/tests/qsortfilterproxymodeltest.cpp 2011-09-08 14:00:55 +0000
  3245. +++ libunity-2d-private/tests/qsortfilterproxymodeltest.cpp 2012-01-03 20:37:12 +0000
  3246. @@ -24,8 +24,8 @@
  3247. #include <QTest>
  3248. #include <QSignalSpy>
  3249. #include <QModelIndex>
  3250. -#include <QAbstractListModel>
  3251. -#include <QDebug>
  3252. +#include <QtCore/QAbstractListModel>
  3253. +#include <QtCore/QDebug>
  3254.  
  3255.  
  3256. class MockListModel : public QAbstractListModel
  3257. @@ -432,5 +432,5 @@
  3258.  
  3259. QTEST_MAIN(QSortFilterProxyModelTest)
  3260.  
  3261. -#include "qsortfilterproxymodeltest.moc"
  3262. +
  3263.  
  3264.  
  3265. === modified file 'libunity-2d-private/tests/unity2dtrtest.cpp'
  3266. --- libunity-2d-private/tests/unity2dtrtest.cpp 2011-03-16 17:37:58 +0000
  3267. +++ libunity-2d-private/tests/unity2dtrtest.cpp 2012-01-03 20:37:12 +0000
  3268. @@ -52,4 +52,4 @@
  3269.  
  3270. QTEST_MAIN(Unity2dTrTest)
  3271.  
  3272. -#include "unity2dtrtest.moc"
  3273. +
  3274.  
  3275. === modified file 'panel/app/main.cpp'
  3276. --- panel/app/main.cpp 2011-09-20 08:40:43 +0000
  3277. +++ panel/app/main.cpp 2012-01-03 20:05:59 +0000
  3278. @@ -31,7 +31,7 @@
  3279.  
  3280. // Qt
  3281. #include <QAbstractFileEngineHandler>
  3282. -#include <QApplication>
  3283. +#include <QtWidgets/QApplication>
  3284. #include <QFSFileEngine>
  3285.  
  3286. class ThemeEngineHandler : public QAbstractFileEngineHandler
  3287.  
  3288. === modified file 'panel/app/panelmanager.cpp'
  3289. --- panel/app/panelmanager.cpp 2011-11-24 08:45:18 +0000
  3290. +++ panel/app/panelmanager.cpp 2012-01-03 20:05:59 +0000
  3291. @@ -34,15 +34,15 @@
  3292. #include <panelappletproviderinterface.h>
  3293.  
  3294. // Qt
  3295. -#include <QApplication>
  3296. -#include <QDebug>
  3297. -#include <QDesktopWidget>
  3298. +#include <QtWidgets/QApplication>
  3299. +#include <QtCore/QDebug>
  3300. +#include <QtWidgets/QDesktopWidget>
  3301. #include <QDir>
  3302. #include <QFileInfo>
  3303. #include <QHash>
  3304. #include <QPluginLoader>
  3305. #include <QProcessEnvironment>
  3306. -#include <QVariant>
  3307. +#include <QtCore/QVariant>
  3308.  
  3309. using namespace Unity2d;
  3310.  
  3311. @@ -239,5 +239,5 @@
  3312. }
  3313. }
  3314.  
  3315. -#include "panelmanager.moc"
  3316. +
  3317.  
  3318.  
  3319. === modified file 'panel/app/panelmanager.h'
  3320. --- panel/app/panelmanager.h 2011-11-18 10:15:49 +0000
  3321. +++ panel/app/panelmanager.h 2012-01-03 20:05:59 +0000
  3322. @@ -23,7 +23,7 @@
  3323. #define PanelManager_H
  3324.  
  3325. // Qt
  3326. -#include <QObject>
  3327. +#include <QtCore/QObject>
  3328. #include <QList>
  3329.  
  3330. class Unity2dPanel;
  3331.  
  3332. === modified file 'panel/applets/appindicator/appindicatorapplet.cpp'
  3333. --- panel/applets/appindicator/appindicatorapplet.cpp 2011-11-24 08:45:18 +0000
  3334. +++ panel/applets/appindicator/appindicatorapplet.cpp 2012-01-03 20:05:59 +0000
  3335. @@ -27,8 +27,8 @@
  3336. #include "sniitem.h"
  3337.  
  3338. // Qt
  3339. -#include <QDBusConnection>
  3340. -#include <QHBoxLayout>
  3341. +#include <QtDBus/QDBusConnection>
  3342. +#include <QtWidgets/QHBoxLayout>
  3343.  
  3344. // System
  3345. #include <unistd.h>
  3346. @@ -85,4 +85,4 @@
  3347. new SNIItem(service, path, m_menuBar);
  3348. }
  3349.  
  3350. -#include "appindicatorapplet.moc"
  3351. +
  3352.  
  3353. === modified file 'panel/applets/appindicator/appindicatorapplet.h'
  3354. --- panel/applets/appindicator/appindicatorapplet.h 2011-08-22 09:17:03 +0000
  3355. +++ panel/applets/appindicator/appindicatorapplet.h 2012-01-03 20:05:59 +0000
  3356. @@ -23,8 +23,8 @@
  3357. #define APPINDICATORAPPLET_H
  3358.  
  3359. // Qt
  3360. -#include <QDBusInterface>
  3361. -#include <QMenuBar>
  3362. +#include <QtDBus/QDBusInterface>
  3363. +#include <QtWidgets/QMenuBar>
  3364.  
  3365. // Unity-2d
  3366. #include <panelapplet.h>
  3367.  
  3368. === modified file 'panel/applets/appindicator/plugin.cpp'
  3369. --- panel/applets/appindicator/plugin.cpp 2011-08-22 09:17:03 +0000
  3370. +++ panel/applets/appindicator/plugin.cpp 2012-01-03 20:05:59 +0000
  3371. @@ -36,4 +36,4 @@
  3372.  
  3373. Q_EXPORT_PLUGIN2(panelplugin-appindicator, AppIndicatorPlugin)
  3374.  
  3375. -#include "plugin.moc"
  3376. +
  3377.  
  3378. === modified file 'panel/applets/appindicator/sniitem.cpp'
  3379. --- panel/applets/appindicator/sniitem.cpp 2011-01-15 01:41:03 +0000
  3380. +++ panel/applets/appindicator/sniitem.cpp 2012-01-03 20:05:59 +0000
  3381. @@ -28,11 +28,11 @@
  3382. #include <dbusmenuimporter.h>
  3383.  
  3384. // Qt
  3385. -#include <QAction>
  3386. -#include <QDBusPendingCallWatcher>
  3387. -#include <QDBusPendingReply>
  3388. -#include <QMenuBar>
  3389. -#include <QVariant>
  3390. +#include <QtWidgets/QAction>
  3391. +#include <QtDBus/QDBusPendingCallWatcher>
  3392. +#include <QtDBus/QDBusPendingReply>
  3393. +#include <QtWidgets/QMenuBar>
  3394. +#include <QtCore/QVariant>
  3395.  
  3396. static const char* SNI_IFACE = "org.kde.StatusNotifierItem";
  3397. static const char* FDO_PROPERTIES_IFACE = "org.freedesktop.DBus.Properties";
  3398. @@ -85,4 +85,4 @@
  3399. }
  3400. }
  3401.  
  3402. -#include "sniitem.moc"
  3403. +
  3404.  
  3405. === modified file 'panel/applets/appindicator/sniitem.h'
  3406. --- panel/applets/appindicator/sniitem.h 2011-01-15 01:41:03 +0000
  3407. +++ panel/applets/appindicator/sniitem.h 2012-01-03 20:05:59 +0000
  3408. @@ -23,8 +23,8 @@
  3409. #define SNIITEM_H
  3410.  
  3411. // Qt
  3412. -#include <QDBusInterface>
  3413. -#include <QObject>
  3414. +#include <QtDBus/QDBusInterface>
  3415. +#include <QtCore/QObject>
  3416.  
  3417. class DBusMenuImporter;
  3418.  
  3419.  
  3420. === modified file 'panel/applets/appname/appnameapplet.cpp'
  3421. --- panel/applets/appname/appnameapplet.cpp 2011-11-29 12:13:27 +0000
  3422. +++ panel/applets/appname/appnameapplet.cpp 2012-01-03 20:05:59 +0000
  3423. @@ -43,16 +43,16 @@
  3424. #include <bamf-matcher.h>
  3425.  
  3426. // Qt
  3427. -#include <QAbstractButton>
  3428. -#include <QHBoxLayout>
  3429. -#include <QLabel>
  3430. -#include <QLinearGradient>
  3431. -#include <QMenuBar>
  3432. -#include <QPainter>
  3433. -#include <QApplication>
  3434. -#include <QDesktopWidget>
  3435. -#include <QMouseEvent>
  3436. -#include <QPoint>
  3437. +#include <QtWidgets/QAbstractButton>
  3438. +#include <QtWidgets/QHBoxLayout>
  3439. +#include <QtWidgets/QLabel>
  3440. +#include <QtGui/QLinearGradient>
  3441. +#include <QtWidgets/QMenuBar>
  3442. +#include <QtGui/QPainter>
  3443. +#include <QtWidgets/QApplication>
  3444. +#include <QtWidgets/QDesktopWidget>
  3445. +#include <QtGui/QMouseEvent>
  3446. +#include <QtCore/QPoint>
  3447.  
  3448. static const int APPNAME_LABEL_LEFT_MARGIN = 6;
  3449.  
  3450. @@ -376,4 +376,4 @@
  3451. }
  3452. }
  3453.  
  3454. -#include "appnameapplet.moc"
  3455. +
  3456.  
  3457. === modified file 'panel/applets/appname/croppedlabel.cpp'
  3458. --- panel/applets/appname/croppedlabel.cpp 2011-09-24 06:59:06 +0000
  3459. +++ panel/applets/appname/croppedlabel.cpp 2012-01-03 20:05:59 +0000
  3460. @@ -32,9 +32,9 @@
  3461. #include <gconfitem-qml-wrapper.h>
  3462.  
  3463. // Qt
  3464. -#include <QApplication>
  3465. -#include <QImage>
  3466. -#include <QPainter>
  3467. +#include <QtWidgets/QApplication>
  3468. +#include <QtGui/QImage>
  3469. +#include <QtGui/QPainter>
  3470.  
  3471. // GTK
  3472. #include <gtk/gtk.h>
  3473. @@ -146,4 +146,4 @@
  3474. update();
  3475. }
  3476.  
  3477. -#include "croppedlabel.moc"
  3478. +
  3479.  
  3480. === modified file 'panel/applets/appname/croppedlabel.h'
  3481. --- panel/applets/appname/croppedlabel.h 2011-09-15 08:33:23 +0000
  3482. +++ panel/applets/appname/croppedlabel.h 2012-01-03 20:05:59 +0000
  3483. @@ -24,7 +24,7 @@
  3484. // Local
  3485.  
  3486. // Qt
  3487. -#include <QLabel>
  3488. +#include <QtWidgets/QLabel>
  3489.  
  3490. class GConfItemQmlWrapper;
  3491.  
  3492.  
  3493. === modified file 'panel/applets/appname/menubarwidget.cpp'
  3494. --- panel/applets/appname/menubarwidget.cpp 2011-11-24 08:45:18 +0000
  3495. +++ panel/applets/appname/menubarwidget.cpp 2012-01-03 20:05:59 +0000
  3496. @@ -28,7 +28,7 @@
  3497. #include <indicatorsmanager.h>
  3498.  
  3499. // Qt
  3500. -#include <QHBoxLayout>
  3501. +#include <QtWidgets/QHBoxLayout>
  3502.  
  3503. static const int MENU_ITEM_PADDING = 6;
  3504.  
  3505. @@ -175,4 +175,4 @@
  3506. setOpened(isOpened);
  3507. }
  3508.  
  3509. -#include "menubarwidget.moc"
  3510. +
  3511.  
  3512. === modified file 'panel/applets/appname/menubarwidget.h'
  3513. --- panel/applets/appname/menubarwidget.h 2011-09-28 07:05:56 +0000
  3514. +++ panel/applets/appname/menubarwidget.h 2012-01-03 20:05:59 +0000
  3515. @@ -23,7 +23,7 @@
  3516. #define MENUBARWIDGET_H
  3517.  
  3518. // Qt
  3519. -#include <QWidget>
  3520. +#include <QtWidgets/QWidget>
  3521.  
  3522. // libunity-core
  3523. #include <UnityCore/Indicator.h>
  3524.  
  3525. === modified file 'panel/applets/appname/plugin.cpp'
  3526. --- panel/applets/appname/plugin.cpp 2011-08-22 09:17:03 +0000
  3527. +++ panel/applets/appname/plugin.cpp 2012-01-03 20:05:59 +0000
  3528. @@ -36,4 +36,4 @@
  3529.  
  3530. Q_EXPORT_PLUGIN2(panelplugin-appname, AppNamePlugin)
  3531.  
  3532. -#include "plugin.moc"
  3533. +
  3534.  
  3535. === modified file 'panel/applets/appname/windowhelper.cpp'
  3536. --- panel/applets/appname/windowhelper.cpp 2011-10-17 12:46:55 +0000
  3537. +++ panel/applets/appname/windowhelper.cpp 2012-01-03 20:05:59 +0000
  3538. @@ -41,15 +41,15 @@
  3539. }
  3540.  
  3541. // Qt
  3542. -#include <QDateTime>
  3543. -#include <QApplication>
  3544. -#include <QDesktopWidget>
  3545. -#include <QPoint>
  3546. +#include <QtCore/QDateTime>
  3547. +#include <QtWidgets/QApplication>
  3548. +#include <QtWidgets/QDesktopWidget>
  3549. +#include <QtCore/QPoint>
  3550. +#include <QX11Info.h>
  3551.  
  3552. // X11
  3553. #include <X11/Xlib.h>
  3554. #include <X11/Xatom.h>
  3555. -#include <QX11Info>
  3556.  
  3557. using namespace Unity2d;
  3558.  
  3559. @@ -258,7 +258,6 @@
  3560. // this code IMO should ultimately belong to wnck
  3561. if (wnck_window_is_maximized(d->m_window)) {
  3562. XEvent xev;
  3563. - QX11Info info;
  3564. Atom netMoveResize = XInternAtom(QX11Info::display(), "_NET_WM_MOVERESIZE", false);
  3565. xev.xclient.type = ClientMessage;
  3566. xev.xclient.message_type = netMoveResize;
  3567. @@ -271,9 +270,9 @@
  3568. xev.xclient.data.l[3] = Button1;
  3569. xev.xclient.data.l[4] = 0;
  3570. XUngrabPointer(QX11Info::display(), QX11Info::appTime());
  3571. - XSendEvent(QX11Info::display(), QX11Info::appRootWindow(info.screen()), false,
  3572. + XSendEvent(QX11Info::display(), QX11Info::appRootWindow(QX11Info::screen()), false,
  3573. SubstructureRedirectMask | SubstructureNotifyMask, &xev);
  3574. }
  3575. }
  3576.  
  3577. -#include "windowhelper.moc"
  3578. +
  3579.  
  3580. === modified file 'panel/applets/appname/windowhelper.h'
  3581. --- panel/applets/appname/windowhelper.h 2011-10-17 12:46:55 +0000
  3582. +++ panel/applets/appname/windowhelper.h 2012-01-03 20:05:59 +0000
  3583. @@ -25,7 +25,7 @@
  3584. // Local
  3585.  
  3586. // Qt
  3587. -#include <QObject>
  3588. +#include <QtCore/QObject>
  3589.  
  3590. class QPoint;
  3591.  
  3592.  
  3593. === modified file 'panel/applets/homebutton/homebutton.cpp'
  3594. --- panel/applets/homebutton/homebutton.cpp 2011-08-22 10:47:51 +0000
  3595. +++ panel/applets/homebutton/homebutton.cpp 2012-01-03 20:05:59 +0000
  3596. @@ -26,7 +26,7 @@
  3597. #include <debug_p.h>
  3598.  
  3599. // Qt
  3600. -#include <QApplication>
  3601. +#include <QtWidgets/QApplication>
  3602.  
  3603. HomeButton::HomeButton(QWidget *parent)
  3604. : QToolButton(parent)
  3605. @@ -60,4 +60,4 @@
  3606. lastClickTime.restart();
  3607. }
  3608.  
  3609. -#include "homebutton.moc"
  3610. +
  3611.  
  3612. === modified file 'panel/applets/homebutton/homebutton.h'
  3613. --- panel/applets/homebutton/homebutton.h 2011-08-22 09:17:03 +0000
  3614. +++ panel/applets/homebutton/homebutton.h 2012-01-03 20:05:59 +0000
  3615. @@ -24,7 +24,7 @@
  3616.  
  3617. // Qt
  3618. #include <QTime>
  3619. -#include <QToolButton>
  3620. +#include <QtWidgets/QToolButton>
  3621.  
  3622. class HomeButton : public QToolButton
  3623. {
  3624.  
  3625. === modified file 'panel/applets/homebutton/homebuttonapplet.cpp'
  3626. --- panel/applets/homebutton/homebuttonapplet.cpp 2011-08-22 09:17:03 +0000
  3627. +++ panel/applets/homebutton/homebuttonapplet.cpp 2012-01-03 20:05:59 +0000
  3628. @@ -29,10 +29,10 @@
  3629. #include <launcherclient.h>
  3630.  
  3631. // Qt
  3632. -#include <QHBoxLayout>
  3633. -#include <QDBusInterface>
  3634. -#include <QDBusServiceWatcher>
  3635. -#include <QDBusConnectionInterface>
  3636. +#include <QtWidgets/QHBoxLayout>
  3637. +#include <QtDBus/QDBusInterface>
  3638. +#include <QtDBus/QDBusServiceWatcher>
  3639. +#include <QtDBus/QDBusConnectionInterface>
  3640.  
  3641. static const char* DBUS_SERVICE = "com.canonical.Unity2d.Dash";
  3642. static const char* DBUS_PATH = "/Dash";
  3643. @@ -109,4 +109,4 @@
  3644. m_launcherClient->endForceVisible();
  3645. }
  3646.  
  3647. -#include "homebuttonapplet.moc"
  3648. +
  3649.  
  3650. === modified file 'panel/applets/homebutton/plugin.cpp'
  3651. --- panel/applets/homebutton/plugin.cpp 2011-08-22 09:17:03 +0000
  3652. +++ panel/applets/homebutton/plugin.cpp 2012-01-03 20:05:59 +0000
  3653. @@ -36,4 +36,4 @@
  3654.  
  3655. Q_EXPORT_PLUGIN2(panelplugin-homebutton, HomeButtonPlugin)
  3656.  
  3657. -#include "plugin.moc"
  3658. +
  3659.  
  3660. === modified file 'panel/applets/indicator/indicatorapplet.cpp'
  3661. --- panel/applets/indicator/indicatorapplet.cpp 2011-09-28 07:05:56 +0000
  3662. +++ panel/applets/indicator/indicatorapplet.cpp 2012-01-03 20:05:59 +0000
  3663. @@ -34,7 +34,7 @@
  3664. #include <bamf-matcher.h>
  3665.  
  3666. // Qt
  3667. -#include <QHBoxLayout>
  3668. +#include <QtWidgets/QHBoxLayout>
  3669.  
  3670. using namespace unity::indicator;
  3671.  
  3672. @@ -106,4 +106,4 @@
  3673. }
  3674. }
  3675.  
  3676. -#include "indicatorapplet.moc"
  3677. +
  3678.  
  3679. === modified file 'panel/applets/indicator/plugin.cpp'
  3680. --- panel/applets/indicator/plugin.cpp 2011-08-22 09:39:50 +0000
  3681. +++ panel/applets/indicator/plugin.cpp 2012-01-03 20:05:59 +0000
  3682. @@ -36,4 +36,4 @@
  3683.  
  3684. Q_EXPORT_PLUGIN2(panelplugin-indicator, IndicatorPlugin)
  3685.  
  3686. -#include "plugin.moc"
  3687. +
  3688.  
  3689. === modified file 'panel/applets/legacytray/CMakeLists.txt'
  3690. --- panel/applets/legacytray/CMakeLists.txt 2011-11-18 10:15:49 +0000
  3691. +++ panel/applets/legacytray/CMakeLists.txt 2012-01-05 00:46:21 +0000
  3692. @@ -15,7 +15,7 @@
  3693. include_directories(
  3694. ${CMAKE_CURRENT_SOURCE_DIR}
  3695. ${CMAKE_CURRENT_BINARY_DIR}
  3696. - ${X11_INCLUDE_DIR}
  3697. + ${X11_INCLUDE_DIRS}
  3698. ${libunity-2d-private_SOURCE_DIR}/src
  3699. )
  3700.  
  3701.  
  3702. === modified file 'panel/applets/legacytray/fdoselectionmanager.cpp'
  3703. --- panel/applets/legacytray/fdoselectionmanager.cpp 2011-06-22 14:49:34 +0000
  3704. +++ panel/applets/legacytray/fdoselectionmanager.cpp 2012-01-03 20:05:59 +0000
  3705. @@ -32,7 +32,7 @@
  3706. #include <QtCore/QTimer>
  3707.  
  3708. #include <QtGui/QTextDocument>
  3709. -#include <QtGui/QX11Info>
  3710. +#include <QX11Info.h>
  3711. /* UQ
  3712. #include <KIconLoader>
  3713.  
  3714. @@ -416,4 +416,4 @@
  3715.  
  3716. }
  3717.  
  3718. -#include "fdoselectionmanager.moc"
  3719. +
  3720.  
  3721. === modified file 'panel/applets/legacytray/fdoselectionmanager.h'
  3722. --- panel/applets/legacytray/fdoselectionmanager.h 2011-06-22 14:49:34 +0000
  3723. +++ panel/applets/legacytray/fdoselectionmanager.h 2012-01-03 20:05:59 +0000
  3724. @@ -22,7 +22,9 @@
  3725. #ifndef FDOSELECTIONMANAGER_H
  3726. #define FDOSELECTIONMANAGER_H
  3727.  
  3728. -#include <QtGui/QWidget>
  3729. +#include <QtWidgets/QWidget>
  3730. +
  3731. +typedef union _XEvent XEvent;
  3732.  
  3733. namespace SystemTray
  3734. {
  3735.  
  3736. === modified file 'panel/applets/legacytray/fdotask.cpp'
  3737. --- panel/applets/legacytray/fdotask.cpp 2011-09-26 08:52:11 +0000
  3738. +++ panel/applets/legacytray/fdotask.cpp 2012-01-03 20:05:59 +0000
  3739. @@ -30,8 +30,8 @@
  3740. #include <debug_p.h>
  3741.  
  3742. // Qt
  3743. -#include <QEvent>
  3744. -#include <QX11Info>
  3745. +#include <QtCore/QEvent>
  3746. +#include <QX11Info.h>
  3747.  
  3748. // Others
  3749. #include <X11/Xutil.h>
  3750. @@ -117,4 +117,4 @@
  3751.  
  3752. } // namespace
  3753.  
  3754. -#include "fdotask.moc"
  3755. +
  3756.  
  3757. === modified file 'panel/applets/legacytray/fdotask.h'
  3758. --- panel/applets/legacytray/fdotask.h 2011-08-31 15:45:56 +0000
  3759. +++ panel/applets/legacytray/fdotask.h 2012-01-03 20:05:59 +0000
  3760. @@ -25,8 +25,8 @@
  3761. // Local
  3762.  
  3763. // Qt
  3764. -#include <QObject>
  3765. -#include <QWidget>
  3766. +#include <QtCore/QObject>
  3767. +#include <QtWidgets/QWidget>
  3768.  
  3769. namespace SystemTray
  3770. {
  3771.  
  3772. === modified file 'panel/applets/legacytray/legacytrayapplet.cpp'
  3773. --- panel/applets/legacytray/legacytrayapplet.cpp 2011-11-18 10:15:49 +0000
  3774. +++ panel/applets/legacytray/legacytrayapplet.cpp 2012-01-03 20:05:59 +0000
  3775. @@ -31,9 +31,9 @@
  3776. #include <config.h>
  3777.  
  3778. // Qt
  3779. -#include <QApplication>
  3780. -#include <QHBoxLayout>
  3781. -#include <QVariant>
  3782. +#include <QtWidgets/QApplication>
  3783. +#include <QtWidgets/QHBoxLayout>
  3784. +#include <QtCore/QVariant>
  3785.  
  3786. LegacyTrayApplet::LegacyTrayApplet(Unity2dPanel* panel)
  3787. : Unity2d::PanelApplet(panel)
  3788. @@ -77,4 +77,4 @@
  3789. layout()->addWidget(widget);
  3790. }
  3791.  
  3792. -#include "legacytrayapplet.moc"
  3793. +
  3794.  
  3795. === modified file 'panel/applets/legacytray/plugin.cpp'
  3796. --- panel/applets/legacytray/plugin.cpp 2011-08-22 09:17:03 +0000
  3797. +++ panel/applets/legacytray/plugin.cpp 2012-01-03 20:05:59 +0000
  3798. @@ -36,4 +36,4 @@
  3799.  
  3800. Q_EXPORT_PLUGIN2(panelplugin-legacytray, LegacyTrayPlugin)
  3801.  
  3802. -#include "plugin.moc"
  3803. +
  3804.  
  3805. === modified file 'panel/applets/legacytray/x11embedcontainer.cpp'
  3806. --- panel/applets/legacytray/x11embedcontainer.cpp 2011-06-22 14:49:34 +0000
  3807. +++ panel/applets/legacytray/x11embedcontainer.cpp 2012-01-03 20:05:59 +0000
  3808. @@ -30,7 +30,7 @@
  3809. // Qt
  3810. #include <QtGui/QPainter>
  3811. #include <QtGui/QPaintEngine>
  3812. -#include <QtGui/QX11Info>
  3813. +#include <QX11Info.h>
  3814.  
  3815. // Xlib
  3816. // UQ #include <config-X11.h>
  3817. @@ -205,7 +205,7 @@
  3818. if (pixmap.paintEngine()->type() != QPaintEngine::X11) {
  3819. // If we're using the raster or OpenGL graphics systems, a QPixmap isn't an X pixmap,
  3820. // so we have to get the window contents into a QImage and then draw that.
  3821. - Display *dpy = x11Info().display();
  3822. + Display *dpy = QX11Info::display();
  3823.  
  3824. // XXX We really should keep a cached copy of the image client side, and only
  3825. // update it in response to a damage event.
  3826. @@ -245,7 +245,7 @@
  3827. } else {
  3828. pixmap.fill(Qt::transparent);
  3829.  
  3830. - XRenderComposite(x11Info().display(), PictOpSrc, d->picture, None, pixmap.x11PictureHandle(),
  3831. + XRenderComposite(QX11Info::display(), PictOpSrc, d->picture, None, pixmap.x11PictureHandle(),
  3832. 0, 0, 0, 0, 0, 0, width(), height());
  3833.  
  3834. p.drawPixmap(0, 0, pixmap);
  3835. @@ -402,4 +402,4 @@
  3836.  
  3837. }
  3838.  
  3839. -#include "x11embedcontainer.moc"
  3840. +
  3841.  
  3842. === modified file 'panel/applets/legacytray/x11embeddelegate.cpp'
  3843. --- panel/applets/legacytray/x11embeddelegate.cpp 2010-11-18 17:11:44 +0000
  3844. +++ panel/applets/legacytray/x11embeddelegate.cpp 2012-01-03 20:05:59 +0000
  3845. @@ -91,4 +91,4 @@
  3846.  
  3847. }
  3848.  
  3849. -#include "x11embeddelegate.moc"
  3850. +
  3851.  
  3852. === modified file 'panel/applets/legacytray/x11embeddelegate.h'
  3853. --- panel/applets/legacytray/x11embeddelegate.h 2010-11-18 14:11:59 +0000
  3854. +++ panel/applets/legacytray/x11embeddelegate.h 2012-01-03 20:05:59 +0000
  3855. @@ -22,7 +22,7 @@
  3856. #ifndef X11EMBEDDELEGATE_H
  3857. #define X11EMBEDDELEGATE_H
  3858.  
  3859. -#include <QWidget>
  3860. +#include <QtWidgets/QWidget>
  3861.  
  3862. namespace SystemTray
  3863. {
  3864.  
  3865. === modified file 'panel/applets/legacytray/x11embedpainter.cpp'
  3866. --- panel/applets/legacytray/x11embedpainter.cpp 2011-06-22 14:49:34 +0000
  3867. +++ panel/applets/legacytray/x11embedpainter.cpp 2012-01-03 20:05:59 +0000
  3868. @@ -149,4 +149,4 @@
  3869.  
  3870. }
  3871.  
  3872. -#include "x11embedpainter.moc"
  3873. +
  3874.  
  3875. === modified file 'panel/applets/separator/plugin.cpp'
  3876. --- panel/applets/separator/plugin.cpp 2011-08-22 09:17:03 +0000
  3877. +++ panel/applets/separator/plugin.cpp 2012-01-03 20:05:59 +0000
  3878. @@ -36,4 +36,4 @@
  3879.  
  3880. Q_EXPORT_PLUGIN2(panelplugin-separator, SeparatorPlugin)
  3881.  
  3882. -#include "plugin.moc"
  3883. +
  3884.  
  3885. === modified file 'panel/applets/separator/separatorapplet.cpp'
  3886. --- panel/applets/separator/separatorapplet.cpp 2011-08-22 09:17:03 +0000
  3887. +++ panel/applets/separator/separatorapplet.cpp 2012-01-03 20:05:59 +0000
  3888. @@ -26,8 +26,8 @@
  3889. #include <config.h>
  3890.  
  3891. // QT
  3892. -#include <QPixmap>
  3893. -#include <QHBoxLayout>
  3894. +#include <QtGui/QPixmap>
  3895. +#include <QtWidgets/QHBoxLayout>
  3896.  
  3897. SeparatorApplet::SeparatorApplet(Unity2dPanel* panel) :
  3898. Unity2d::PanelApplet(panel),
  3899. @@ -42,4 +42,4 @@
  3900. layout->addWidget(m_separator);
  3901. }
  3902.  
  3903. -#include "separatorapplet.moc"
  3904. +
  3905.  
  3906. === modified file 'panel/applets/separator/separatorapplet.h'
  3907. --- panel/applets/separator/separatorapplet.h 2011-08-22 09:17:03 +0000
  3908. +++ panel/applets/separator/separatorapplet.h 2012-01-03 20:05:59 +0000
  3909. @@ -23,7 +23,7 @@
  3910. #define SEPARATORAPPLET_H
  3911.  
  3912. // Qt
  3913. -#include <QLabel>
  3914. +#include <QtWidgets/QLabel>
  3915.  
  3916. // Unity-2d
  3917. #include <panelapplet.h>
  3918.  
  3919. === modified file 'panel/tests/CMakeLists.txt'
  3920. --- panel/tests/CMakeLists.txt 2011-11-23 19:57:05 +0000
  3921. +++ panel/tests/CMakeLists.txt 2012-01-05 00:46:30 +0000
  3922. @@ -5,7 +5,7 @@
  3923. COMMAND /bin/bash ${CMAKE_SOURCE_DIR}/tests/run-with-xvfb.sh ${_test}
  3924. )
  3925. add_executable(${_test} ${_test}.cpp ${_test}.moc)
  3926. - qt4_generate_moc(${_test}.cpp ${_test}.moc)
  3927. + qt5_generate_moc(${_test}.cpp ${_test}.moc)
  3928. target_link_libraries(${_test}
  3929. ${QT_QTTEST_LIBRARIES}
  3930. panelplugin-homebutton
  3931. @@ -21,7 +21,7 @@
  3932. include_directories(
  3933. ${panelplugin-homebutton_SOURCE_DIR}
  3934. ${CMAKE_CURRENT_BINARY_DIR}
  3935. - ${QT_QTTEST_INCLUDE_DIR}
  3936. + ${QT_QTTEST_INCLUDE_DIRS}
  3937. )
  3938.  
  3939. #panel_tests(
  3940.  
  3941. === modified file 'places/AbstractButton.qml'
  3942. --- places/AbstractButton.qml 2011-11-14 20:15:47 +0000
  3943. +++ places/AbstractButton.qml 2012-01-03 21:52:40 +0000
  3944. @@ -30,7 +30,7 @@
  3945.  
  3946. signal clicked
  3947.  
  3948. - Accessible.role: Accessible.PushButton
  3949. + //Accessible.role: Accessible.PushButton
  3950.  
  3951. MouseArea {
  3952. id: mouse_area
  3953.  
  3954. === modified file 'places/CategoryHeader.qml'
  3955. --- places/CategoryHeader.qml 2011-11-21 17:07:09 +0000
  3956. +++ places/CategoryHeader.qml 2012-01-03 21:52:40 +0000
  3957. @@ -33,7 +33,7 @@
  3958. */
  3959. property bool moving: false
  3960.  
  3961. - Accessible.name: "%1 %2 %3".arg(title.text).arg(label.text).arg(folded ? u2d.tr("not expanded") : u2d.tr("expanded"))
  3962. + //Accessible.name: "%1 %2 %3".arg(title.text).arg(label.text).arg(folded ? u2d.tr("not expanded") : u2d.tr("expanded"))
  3963.  
  3964. effect: DropShadow {
  3965. blurRadius: 6
  3966.  
  3967. === modified file 'places/FilterLoader.qml'
  3968. --- places/FilterLoader.qml 2011-09-29 11:44:58 +0000
  3969. +++ places/FilterLoader.qml 2012-01-03 21:52:40 +0000
  3970. @@ -39,7 +39,7 @@
  3971. }
  3972. }
  3973.  
  3974. - Accessible.name: accessibleDescription()
  3975. + //Accessible.name: accessibleDescription()
  3976.  
  3977. KeyNavigation.down: filterView
  3978.  
  3979.  
  3980. === modified file 'places/FilterPane.qml'
  3981. --- places/FilterPane.qml 2011-08-25 13:10:22 +0000
  3982. +++ places/FilterPane.qml 2012-01-03 21:52:40 +0000
  3983. @@ -32,7 +32,7 @@
  3984. AbstractButton {
  3985. id: header
  3986.  
  3987. - Accessible.name: title.text
  3988. + //Accessible.name: title.text
  3989.  
  3990. effect: DropShadow {
  3991. blurRadius: {
  3992.  
  3993. === modified file 'places/Home.qml'
  3994. --- places/Home.qml 2011-11-21 18:57:05 +0000
  3995. +++ places/Home.qml 2012-01-03 21:52:40 +0000
  3996. @@ -59,7 +59,7 @@
  3997. AbstractButton {
  3998. id: openShortcutsButton
  3999.  
  4000. - Accessible.name: "Open Shortcuts"
  4001. + //Accessible.name: "Open Shortcuts"
  4002.  
  4003. anchors.bottom: parent.top
  4004. anchors.right: parent.right
  4005.  
  4006. === modified file 'places/HomeButton.qml'
  4007. --- places/HomeButton.qml 2011-08-25 13:08:52 +0000
  4008. +++ places/HomeButton.qml 2012-01-03 21:52:40 +0000
  4009. @@ -25,7 +25,7 @@
  4010. property alias label: label.text
  4011. property alias iconSourceSize: icon.sourceSize
  4012.  
  4013. - Accessible.name: label.text
  4014. + //Accessible.name: label.text
  4015.  
  4016. width: 160
  4017. height: 172
  4018.  
  4019. === modified file 'places/LensBar.qml'
  4020. --- places/LensBar.qml 2011-11-14 10:45:33 +0000
  4021. +++ places/LensBar.qml 2012-01-03 21:52:40 +0000
  4022. @@ -97,7 +97,7 @@
  4023. LensButton {
  4024. id: homeLens
  4025.  
  4026. - Accessible.name: u2d.tr("home")
  4027. + //Accessible.name: u2d.tr("home")
  4028.  
  4029. focus: true
  4030. icon: "artwork/lens-nav-home.svg"
  4031. @@ -115,7 +115,7 @@
  4032.  
  4033. model: visibleLenses
  4034. delegate: LensButton {
  4035. - Accessible.name: u2d.tr(item.name)
  4036. + //Accessible.name: u2d.tr(item.name)
  4037.  
  4038. /* Heuristic: if iconHint does not contain a '/' then it is an icon name */
  4039. icon: item.iconHint.indexOf("/") == -1 ? "image://icons/" + item.iconHint : item.iconHint
  4040.  
  4041. === modified file 'places/MultiRangeButton.qml'
  4042. --- places/MultiRangeButton.qml 2011-08-25 13:14:19 +0000
  4043. +++ places/MultiRangeButton.qml 2012-01-03 21:52:41 +0000
  4044. @@ -26,7 +26,7 @@
  4045. property bool checked: false
  4046. property bool isLast: false
  4047.  
  4048. - Accessible.name: text
  4049. + //Accessible.name: text
  4050.  
  4051. TextCustom {
  4052. id: label
  4053.  
  4054. === modified file 'places/SearchEntry.qml'
  4055. --- places/SearchEntry.qml 2011-12-01 15:27:35 +0000
  4056. +++ places/SearchEntry.qml 2012-01-03 21:52:40 +0000
  4057. @@ -23,7 +23,7 @@
  4058. AbstractButton {
  4059. property string searchQuery
  4060.  
  4061. - Accessible.name: "Search Entry"
  4062. + //Accessible.name: "Search Entry"
  4063.  
  4064. /* Cancels current search when the dash becomes invisible */
  4065. Connections {
  4066. @@ -73,8 +73,8 @@
  4067. MouseArea {
  4068. id: clear_button
  4069.  
  4070. - Accessible.name: "Clear"
  4071. - Accessible.role: Accessible.PushButton
  4072. + //Accessible.name: "Clear"
  4073. + //Accessible.role: Accessible.PushButton
  4074.  
  4075. anchors.fill: search_icon
  4076.  
  4077. @@ -87,8 +87,8 @@
  4078. TextInput {
  4079. id: search_input
  4080.  
  4081. - Accessible.name: search_instructions.text
  4082. - Accessible.role: Accessible.EditableText
  4083. + //Accessible.name: search_instructions.text
  4084. + //Accessible.role: Accessible.EditableText
  4085.  
  4086. effect: DropShadow {
  4087. id: glow
  4088.  
  4089. === modified file 'places/TickBox.qml'
  4090. --- places/TickBox.qml 2011-08-25 13:10:22 +0000
  4091. +++ places/TickBox.qml 2012-01-03 21:52:41 +0000
  4092. @@ -26,8 +26,8 @@
  4093. property bool checked: false
  4094. property bool canUncheck: true
  4095.  
  4096. - Accessible.name: text
  4097. - Accessible.role: Accessible.CheckBox
  4098. + //Accessible.name: text
  4099. + //Accessible.role: Accessible.CheckBox
  4100.  
  4101. width: childrenRect.width
  4102. height: childrenRect.height
  4103.  
  4104. === modified file 'places/TileHorizontal.qml'
  4105. --- places/TileHorizontal.qml 2011-12-01 15:27:35 +0000
  4106. +++ places/TileHorizontal.qml 2012-01-03 21:52:40 +0000
  4107. @@ -36,7 +36,7 @@
  4108. property string comment
  4109. property string dndUri
  4110.  
  4111. - Accessible.name: displayName
  4112. + //Accessible.name: displayName
  4113.  
  4114. onClicked: {
  4115. dashView.active = false
  4116.  
  4117. === modified file 'places/TileVertical.qml'
  4118. --- places/TileVertical.qml 2011-11-17 18:18:47 +0000
  4119. +++ places/TileVertical.qml 2012-01-03 21:52:41 +0000
  4120. @@ -36,7 +36,7 @@
  4121. property string comment
  4122. property string dndUri
  4123.  
  4124. - Accessible.name: displayName
  4125. + //Accessible.name: displayName
  4126.  
  4127. onClicked: {
  4128. dashView.active = false
  4129.  
  4130. === modified file 'places/app/CMakeLists.txt'
  4131. --- places/app/CMakeLists.txt 2011-11-09 21:28:49 +0000
  4132. +++ places/app/CMakeLists.txt 2012-01-03 21:52:41 +0000
  4133. @@ -11,12 +11,12 @@
  4134. dashdeclarativeview.h
  4135. )
  4136.  
  4137. -qt4_wrap_cpp(places_MOC_SRCS ${places_MOC_HDRS})
  4138. +qt5_wrap_cpp(places_MOC_SRCS ${places_MOC_HDRS})
  4139.  
  4140. # Build
  4141. configure_file(unity-2d-places.service.in unity-2d-places.service)
  4142.  
  4143. -qt4_add_dbus_adaptor(places_SRCS dash.xml
  4144. +qt5_add_dbus_adaptor(places_SRCS dash.xml
  4145. dashdeclarativeview.h DashDeclarativeView
  4146. )
  4147.  
  4148.  
  4149. === modified file 'places/app/dashdeclarativeview.cpp'
  4150. --- places/app/dashdeclarativeview.cpp 2011-12-18 00:37:20 +0000
  4151. +++ places/app/dashdeclarativeview.cpp 2012-01-03 21:52:40 +0000
  4152. @@ -23,15 +23,15 @@
  4153. #include <screeninfo.h>
  4154.  
  4155. // Qt
  4156. -#include <QDesktopWidget>
  4157. -#include <QApplication>
  4158. -#include <QBitmap>
  4159. -#include <QCloseEvent>
  4160. -#include <QDeclarativeContext>
  4161. -#include <QX11Info>
  4162. -#include <QGraphicsObject>
  4163. +#include <QtWidgets/QDesktopWidget>
  4164. +#include <QtWidgets/QApplication>
  4165. +#include <QtGui/QBitmap>
  4166. +#include <QtGui/QCloseEvent>
  4167. +#include <QtDeclarative/QDeclarativeContext>
  4168. +#include <QX11Info.h>
  4169. +#include <QtWidgets/QGraphicsObject>
  4170. #include <QtDBus/QDBusConnection>
  4171. -#include <QTimer>
  4172. +#include <QtCore/QTimer>
  4173.  
  4174. #include <X11/Xlib.h>
  4175. #include <X11/Xatom.h>
  4176.  
  4177. === modified file 'places/app/dashdeclarativeview.h'
  4178. --- places/app/dashdeclarativeview.h 2011-12-06 19:37:23 +0000
  4179. +++ places/app/dashdeclarativeview.h 2012-01-03 21:52:40 +0000
  4180. @@ -17,7 +17,7 @@
  4181. #ifndef DashDeclarativeView_H
  4182. #define DashDeclarativeView_H
  4183.  
  4184. -#include <QDeclarativeView>
  4185. +#include <QtQuick1/QDeclarativeView>
  4186. #include <unity2ddeclarativeview.h>
  4187.  
  4188. class LauncherClient;
  4189.  
  4190. === modified file 'places/app/places.cpp'
  4191. --- places/app/places.cpp 2011-11-29 12:13:27 +0000
  4192. +++ places/app/places.cpp 2012-01-03 21:54:39 +0000
  4193. @@ -17,16 +17,16 @@
  4194. * along with this program. If not, see <http://www.gnu.org/licenses/>.
  4195. */
  4196.  
  4197. -#include <QApplication>
  4198. -#include <QDebug>
  4199. -#include <QtDeclarative>
  4200. -#include <QDeclarativeEngine>
  4201. -#include <QDeclarativeView>
  4202. -#include <QDesktopWidget>
  4203. -#include <QDBusConnection>
  4204. -#include <QDBusConnectionInterface>
  4205. -#include <QDeclarativeContext>
  4206. -#include <QAbstractEventDispatcher>
  4207. +#include <QtDeclarative/QtDeclarative>
  4208. +#include <QtWidgets/QApplication>
  4209. +#include <QtCore/QDebug>
  4210. +#include <QtDeclarative/QDeclarativeEngine>
  4211. +#include <QtQuick1/QDeclarativeView>
  4212. +#include <QtWidgets/QDesktopWidget>
  4213. +#include <QtDBus/QDBusConnection>
  4214. +#include <QtDBus/QDBusConnectionInterface>
  4215. +#include <QtDeclarative/QDeclarativeContext>
  4216. +#include <QtCore/QAbstractEventDispatcher>
  4217. #include <QDir>
  4218.  
  4219. #include <X11/Xlib.h>
  4220.  
  4221. === modified file 'places/dash.qml'
  4222. --- places/dash.qml 2011-11-29 12:13:27 +0000
  4223. +++ places/dash.qml 2012-01-03 21:52:40 +0000
  4224. @@ -23,7 +23,7 @@
  4225. Item {
  4226. id: dash
  4227.  
  4228. - Accessible.name: "root"
  4229. + //Accessible.name: "root"
  4230. LayoutMirroring.enabled: isRightToLeft()
  4231. LayoutMirroring.childrenInherit: true
  4232.  
  4233. @@ -276,7 +276,7 @@
  4234. Loader {
  4235. id: pageLoader
  4236.  
  4237. - Accessible.name: "loader"
  4238. + //Accessible.name: "loader"
  4239. /* FIXME: check on visible necessary; fixed in Qt Quick 1.1
  4240. ref: http://bugreports.qt.nokia.com/browse/QTBUG-15862
  4241. */
  4242.  
  4243. === modified file 'spread/app/CMakeLists.txt'
  4244. --- spread/app/CMakeLists.txt 2011-11-09 21:28:49 +0000
  4245. +++ spread/app/CMakeLists.txt 2012-01-03 20:37:11 +0000
  4246. @@ -10,11 +10,11 @@
  4247. spreadcontrol.h
  4248. )
  4249.  
  4250. -qt4_wrap_cpp(spread_MOC_SRCS ${spread_MOC_HDRS})
  4251. +qt5_wrap_cpp(spread_MOC_SRCS ${spread_MOC_HDRS})
  4252.  
  4253. configure_file(unity-2d-spread.service.in unity-2d-spread.service)
  4254.  
  4255. -qt4_add_dbus_adaptor(spread_SRCS spread.xml
  4256. +qt5_add_dbus_adaptor(spread_SRCS spread.xml
  4257. spreadcontrol.h SpreadControl
  4258. )
  4259.  
  4260.  
  4261. === modified file 'spread/app/spread.cpp'
  4262. --- spread/app/spread.cpp 2011-11-11 15:52:49 +0000
  4263. +++ spread/app/spread.cpp 2012-01-03 20:37:09 +0000
  4264. @@ -18,10 +18,10 @@
  4265. * along with this program. If not, see <http://www.gnu.org/licenses/>.
  4266. */
  4267.  
  4268. -#include <QApplication>
  4269. -#include <QDesktopWidget>
  4270. -#include <QDeclarativeEngine>
  4271. -#include <QDeclarativeContext>
  4272. +#include <QtWidgets/QApplication>
  4273. +#include <QtWidgets/QDesktopWidget>
  4274. +#include <QtDeclarative/QDeclarativeEngine>
  4275. +#include <QtDeclarative/QDeclarativeContext>
  4276.  
  4277. #include "spreadview.h"
  4278. #include "spreadcontrol.h"
  4279.  
  4280. === modified file 'spread/app/spreadcontrol.cpp'
  4281. --- spread/app/spreadcontrol.cpp 2011-03-17 17:28:31 +0000
  4282. +++ spread/app/spreadcontrol.cpp 2012-01-03 20:37:09 +0000
  4283. @@ -18,7 +18,7 @@
  4284. * along with this program. If not, see <http://www.gnu.org/licenses/>.
  4285. */
  4286.  
  4287. -#include <QDebug>
  4288. +#include <QtCore/QDebug>
  4289.  
  4290. #include "spreadcontrol.h"
  4291. #include "spreadadaptor.h"
  4292.  
  4293. === modified file 'spread/app/spreadcontrol.h'
  4294. --- spread/app/spreadcontrol.h 2011-03-17 16:05:29 +0000
  4295. +++ spread/app/spreadcontrol.h 2012-01-03 20:37:11 +0000
  4296. @@ -21,10 +21,10 @@
  4297. #ifndef SPREADCONTROL_H
  4298. #define SPREADCONTROL_H
  4299.  
  4300. -#include <QObject>
  4301. -#include <QDBusContext>
  4302. +#include <QtCore/QObject>
  4303. +#include <QtDBus/QDBusContext>
  4304. #include <QtDeclarative/qdeclarative.h>
  4305. -#include <QWidget>
  4306. +#include <QtWidgets/QWidget>
  4307.  
  4308. class LauncherClient;
  4309.  
  4310.  
  4311. === modified file 'spread/app/spreadview.cpp'
  4312. --- spread/app/spreadview.cpp 2011-12-18 00:37:20 +0000
  4313. +++ spread/app/spreadview.cpp 2012-01-03 20:37:11 +0000
  4314. @@ -19,9 +19,9 @@
  4315.  
  4316. #include "spreadview.h"
  4317.  
  4318. -#include <QDesktopWidget>
  4319. -#include <QApplication>
  4320. -#include <QMouseEvent>
  4321. +#include <QtWidgets/QDesktopWidget>
  4322. +#include <QtWidgets/QApplication>
  4323. +#include <QtGui/QMouseEvent>
  4324.  
  4325. #include "screeninfo.h"
  4326.  
  4327.  
  4328. === modified file 'spread/app/spreadview.h'
  4329. --- spread/app/spreadview.h 2011-12-18 00:37:20 +0000
  4330. +++ spread/app/spreadview.h 2012-01-03 20:37:11 +0000
  4331. @@ -20,8 +20,8 @@
  4332. #ifndef SPREADVIEW_H
  4333. #define SPREADVIEW_H
  4334.  
  4335. -#include <QDeclarativeView>
  4336. -#include <QEvent>
  4337. +#include <QtQuick1/QDeclarativeView>
  4338. +#include <QtCore/QEvent>
  4339.  
  4340. #include <unity2ddeclarativeview.h>
  4341.  
  4342.  
  4343. === modified file 'tests/unitytestmacro.h'
  4344. --- tests/unitytestmacro.h 2011-11-17 20:39:51 +0000
  4345. +++ tests/unitytestmacro.h 2012-01-03 20:05:59 +0000
  4346. @@ -23,8 +23,8 @@
  4347. #ifndef UNITYTESTMACRO_H
  4348. #define UNITYTESTMACRO_H
  4349.  
  4350. -#include <QtTestGui>
  4351. -#include <QWindowsStyle>
  4352. +#include <QtTest/QtTestGui>
  4353. +#include <QtWidgets/QWindowsStyle>
  4354. #include <unity2dapplication.h>
  4355.  
  4356. /*
Advertisement
Add Comment
Please, Sign In to add comment
Advertisement
Public Pastes
Advertisement
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!