Merge lp:~thomas-voss/unity-mir/qt-no-keywords into lp:unity-mir

[Thomas Voß]

Switch to QT_NO_KEYWORDS and with that account for changes in process-cpp.

Are there any related MPs required for this MP to build/function as expected? Please list: Yes, https://code.launchpad.net/~thomas-voss/process-cpp/add_death_observer_for_child_processes/+merge/204629

Did you perform an exploratory manual test run of your code change and any related functionality? Yes, on the N4. No changes in behavior.

If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP? n/a

[Gerry Boland (gerboland)]

Looks good, thanks

• Did you perform an exploratory manual test run of the code change and any related functionality?
Yes
• Did CI run pass? If not, please explain why.
Was fine

review: Approve

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:185
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/278/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-amd64-ci/141
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/142
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-armhf-ci/142/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-trusty-i386-ci/141

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-mir-ci/278/rebuild

review: Approve (continuous-integration)

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-02-14 15:42:49 +0000
+++ CMakeLists.txt	2014-03-06 13:37:13 +0000
@@ -32,6 +32,9 @@
     add_definitions(-DQT_NO_DEBUG)
 endif()
 
+# Disable Qt keywords
+add_definitions(-DQT_NO_KEYWORDS)
+
 #####################################################################
 # Enable code coverage calculation with gcov/gcovr/lcov
 # Usage:

=== modified file 'src/modules/Unity/Application/application_manager.cpp'
--- src/modules/Unity/Application/application_manager.cpp	2014-02-11 09:47:56 +0000
+++ src/modules/Unity/Application/application_manager.cpp	2014-03-06 13:37:13 +0000
@@ -761,7 +761,7 @@
     beginInsertRows(QModelIndex(), m_applications.size(), m_applications.size());
     m_applications.append(application);
     endInsertRows();
-    emit countChanged();
+    Q_EMIT countChanged();
 }
 
 void ApplicationManager::remove(Application *application)
@@ -774,7 +774,7 @@
         beginRemoveRows(QModelIndex(), i, i);
         m_applications.removeAt(i);
         endRemoveRows();
-        emit countChanged();
+        Q_EMIT countChanged();
     }
 }
 

=== modified file 'src/modules/Unity/Application/dbuswindowstack.cpp'
--- src/modules/Unity/Application/dbuswindowstack.cpp	2013-10-09 09:02:23 +0000
+++ src/modules/Unity/Application/dbuswindowstack.cpp	2014-03-06 13:37:13 +0000
@@ -57,7 +57,7 @@
     QList<WindowInfo> res;
     ApplicationManager *appMgr = static_cast<ApplicationManager*>(parent());
     const QList<Application*> &applications = appMgr->list();
-    foreach(Application* app, applications) {
+    for(Application* app : applications) {
         WindowInfo wi;
         wi.window_id = 0;
         wi.app_id = app->appId();

=== modified file 'src/modules/Unity/Application/dbuswindowstack.h'
--- src/modules/Unity/Application/dbuswindowstack.h	2014-01-09 08:40:51 +0000
+++ src/modules/Unity/Application/dbuswindowstack.h	2014-03-06 13:37:13 +0000
@@ -56,7 +56,7 @@
     Q_INVOKABLE Q_SCRIPTABLE QList<WindowInfo> GetWindowStack();
     Q_INVOKABLE Q_SCRIPTABLE QStringList GetWindowProperties(unsigned int window_id, const QString &app_id, const QStringList &names);
 
-signals:
+Q_SIGNALS:
     void FocusedWindowChanged(unsigned int window_id, const QString &app_id, unsigned int stage);
     void WindowCreated(unsigned int window_id, const QString &app_id);
     void WindowDestroyed(unsigned int window_id, const QString &app_id);

=== modified file 'tests/auto/modules/Unity/Application/main.cpp'
--- tests/auto/modules/Unity/Application/main.cpp	2014-01-27 11:29:44 +0000
+++ tests/auto/modules/Unity/Application/main.cpp	2014-03-06 13:37:13 +0000
@@ -38,7 +38,7 @@
 class ApplicationManagerTests: public QObject
 {
     Q_OBJECT
-private slots:
+private Q_SLOTS:
     void testStartStop();
 };