Merge lp:~dandrader/unity-mir/mergeModules into lp:unity-mir

[Daniel d'Andrada]

Merge ApplicationManager and SurfaceManager modules into a single one, named simply "Application"

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:68
http://jenkins.qa.ubuntu.com/job/unity-mir-ci/49/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/49
        deb: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-armhf-ci/49/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-mir-saucy-i386-ci/49

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

review: Approve (continuous-integration)

[Gerry Boland (gerboland)]

review: Approve

=== renamed directory 'src/modules/Unity/ApplicationManager' => 'src/modules/Unity/Application'
=== renamed file 'src/modules/Unity/ApplicationManager/ApplicationManager.pro' => 'src/modules/Unity/Application/Application.pro'
--- src/modules/Unity/ApplicationManager/ApplicationManager.pro	2013-08-26 23:45:40 +0000
+++ src/modules/Unity/Application/Application.pro	2013-08-29 18:29:13 +0000
@@ -1,4 +1,4 @@
-TARGET = unityapplicationmanagerplugin
+TARGET = unityapplicationplugin
 TEMPLATE = lib
 
 QT       += core quick dbus
@@ -9,13 +9,14 @@
 QMAKE_CXXFLAGS_RELEASE += -Werror     # so no stop on warning in debug builds
 QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
 
-PKGCONFIG += mircommon mirserver
+PKGCONFIG += mircommon mirserver ubuntu-platform-api
 
 INCLUDEPATH += ../../../unity-mir
-LIBS += -L../../../unity-mir -lunity-mir
+LIBS += -L../../../unity-mir -lunity-mir \
+    -lubuntu_application_api_mirserver #FIXME platform-api pkgconfig should set this
 
 TARGET = $$qtLibraryTarget($$TARGET)
-uri = Unity.ApplicationManager
+uri = Unity.Application
 
 SOURCES += application_manager.cpp \
     application.cpp \
@@ -24,7 +25,12 @@
     plugin.cpp \
     applicationscreenshotprovider.cpp \
     dbuswindowstack.cpp \
-    taskcontroller.cpp
+    taskcontroller.cpp \
+    mirsurface.cpp \
+    mirsurfacemanager.cpp \
+    inputarea.cpp \
+    inputfilterarea.cpp \
+    shellinputarea.cpp
 
 HEADERS += application_manager.h \
     application.h \
@@ -32,7 +38,12 @@
     desktopfilereader.h \
     applicationscreenshotprovider.h \
     dbuswindowstack.h \
-    taskcontroller.h
+    taskcontroller.h \
+    mirsurface.h \
+    mirsurfacemanager.h \
+    shellinputarea.h \
+    inputarea.h \
+    inputfilterarea.h
 
 installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)
 

=== renamed file 'src/modules/Unity/SurfaceManager/inputarea.cpp' => 'src/modules/Unity/Application/inputarea.cpp'
=== renamed file 'src/modules/Unity/SurfaceManager/inputarea.h' => 'src/modules/Unity/Application/inputarea.h'
=== renamed file 'src/modules/Unity/SurfaceManager/inputfilterarea.cpp' => 'src/modules/Unity/Application/inputfilterarea.cpp'
=== renamed file 'src/modules/Unity/SurfaceManager/inputfilterarea.h' => 'src/modules/Unity/Application/inputfilterarea.h'
=== renamed file 'src/modules/Unity/SurfaceManager/mirsurface.cpp' => 'src/modules/Unity/Application/mirsurface.cpp'
=== renamed file 'src/modules/Unity/SurfaceManager/mirsurface.h' => 'src/modules/Unity/Application/mirsurface.h'
=== renamed file 'src/modules/Unity/SurfaceManager/mirsurfacemanager.cpp' => 'src/modules/Unity/Application/mirsurfacemanager.cpp'
=== renamed file 'src/modules/Unity/SurfaceManager/mirsurfacemanager.h' => 'src/modules/Unity/Application/mirsurfacemanager.h'
=== modified file 'src/modules/Unity/Application/plugin.cpp'
--- src/modules/Unity/ApplicationManager/plugin.cpp	2013-08-09 13:16:13 +0000
+++ src/modules/Unity/Application/plugin.cpp	2013-08-29 18:29:13 +0000
@@ -22,6 +22,11 @@
 #include "application_manager.h"
 #include "application_list_model.h"
 #include "applicationscreenshotprovider.h"
+#include "mirsurfacemanager.h"
+#include "mirsurface.h"
+#include "inputarea.h"
+#include "inputfilterarea.h"
+#include "shellinputarea.h"
 
 // unity-mir
 #include "logging.h"
@@ -35,14 +40,21 @@
     return instance;
 }
 
-class UbuntuApplicationManagerPlugin : public QQmlExtensionPlugin {
+static QObject* surfaceManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
+    Q_UNUSED(engine);
+    Q_UNUSED(scriptEngine);
+    DLOG("surfaceManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);
+    return MirSurfaceManager::singleton();
+}
+
+class UnityApplicationPlugin : public QQmlExtensionPlugin {
     Q_OBJECT
     Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
 
     virtual void registerTypes(const char* uri)
     {
-        DLOG("UbuntuApplicationManagerPlugin::registerTypes (this=%p, uri='%s')", this, uri);
-        ASSERT(QLatin1String(uri) == QLatin1String("Unity.ApplicationManager"));
+        DLOG("UnityApplicationPlugin::registerTypes (this=%p, uri='%s')", this, uri);
+        ASSERT(QLatin1String(uri) == QLatin1String("Unity.Application"));
 
         qRegisterMetaType<ApplicationManager*>("ApplicationManager*"); //need for queueing signals
 
@@ -52,6 +64,13 @@
                     uri, 0, 1, "ApplicationInfo", "ApplicationInfo can't be instantiated");
         qmlRegisterUncreatableType<ApplicationListModel>(
                     uri, 0, 1, "ApplicationListModel", "ApplicationListModel can't be instantiated");
+        qmlRegisterSingletonType<MirSurfaceManager>(
+                    uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
+        qmlRegisterUncreatableType<MirSurface>(
+                    uri, 0, 1, "MirSurface", "MirSurface can't be instantiated");
+        qmlRegisterType<InputArea>(uri, 0, 1, "InputArea");
+        qmlRegisterType<ShellInputArea>(uri, 0, 1, "ShellInputArea");
+        qmlRegisterType<InputFilterArea>(uri, 0, 1, "InputFilterArea");
     }
 
     virtual void initializeEngine(QQmlEngine *engine, const char *uri)

=== modified file 'src/modules/Unity/Application/qmldir'
--- src/modules/Unity/ApplicationManager/qmldir	2013-07-19 17:29:44 +0000
+++ src/modules/Unity/Application/qmldir	2013-08-29 18:29:13 +0000
@@ -1,2 +1,2 @@
-module Unity.ApplicationManager
-plugin unityapplicationmanagerplugin
+module Unity.Application
+plugin unityapplicationplugin

=== renamed file 'src/modules/Unity/SurfaceManager/shellinputarea.cpp' => 'src/modules/Unity/Application/shellinputarea.cpp'
=== renamed file 'src/modules/Unity/SurfaceManager/shellinputarea.h' => 'src/modules/Unity/Application/shellinputarea.h'
=== removed directory 'src/modules/Unity/SurfaceManager'
=== removed file 'src/modules/Unity/SurfaceManager/SurfaceManager.pro'
--- src/modules/Unity/SurfaceManager/SurfaceManager.pro	2013-08-28 20:25:10 +0000
+++ src/modules/Unity/SurfaceManager/SurfaceManager.pro	1970-01-01 00:00:00 +0000
@@ -1,42 +0,0 @@
-TARGET = unitysurfacemanagerplugin
-TEMPLATE = lib
-
-QT       += core quick
-CONFIG   += link_pkgconfig
-
-# CONFIG += c++11 # only enables C++0x
-QMAKE_CXXFLAGS = -std=c++11 -fvisibility=hidden -fvisibility-inlines-hidden
-QMAKE_CXXFLAGS_RELEASE += -Werror     # so no stop on warning in debug builds
-QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
-
-PKGCONFIG += mircommon mirserver ubuntu-platform-api
-
-INCLUDEPATH += ../../../unity-mir
-LIBS += -L../../../unity-mir -lunity-mir \
-    -lubuntu_application_api_mirserver #FIXME platform-api pkgconfig should set this
-
-TARGET = $$qtLibraryTarget($$TARGET)
-uri = Unity.SurfaceManager
-
-SOURCES += mirsurface.cpp \
-    mirsurfacemanager.cpp \
-    inputarea.cpp \
-    inputfilterarea.cpp \
-    shellinputarea.cpp \
-    plugin.cpp
-
-HEADERS += mirsurface.h \
-    mirsurfacemanager.h \
-    shellinputarea.h \
-    inputarea.h \
-    inputfilterarea.h
-
-installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)
-
-QMLDIR_FILE = qmldir
-qmldir_file.path = $$installPath 
-qmldir_file.files = $$QMLDIR_FILE
-
-target.path = $$installPath
-
-INSTALLS += target qmldir_file

=== removed file 'src/modules/Unity/SurfaceManager/plugin.cpp'
--- src/modules/Unity/SurfaceManager/plugin.cpp	2013-08-28 20:25:10 +0000
+++ src/modules/Unity/SurfaceManager/plugin.cpp	1970-01-01 00:00:00 +0000
@@ -1,55 +0,0 @@
-/*
- * Copyright (C) 2013 Canonical, Ltd.
- *
- * This program is free software: you can redistribute it and/or modify it under
- * the terms of the GNU Lesser General Public License version 3, as published by
- * the Free Software Foundation.
- *
- * This program is distributed in the hope that it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
- * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * Lesser General Public License for more details.
- *
- * You should have received a copy of the GNU Lesser General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-// Qt
-#include <QtQml/QtQml>
-
-// local
-#include "mirsurfacemanager.h"
-#include "mirsurface.h"
-#include "inputarea.h"
-#include "inputfilterarea.h"
-#include "shellinputarea.h"
-
-// unity-mir
-#include "logging.h"
-
-static QObject* surfaceManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
-    Q_UNUSED(engine);
-    Q_UNUSED(scriptEngine);
-    DLOG("surfaceManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);
-    return MirSurfaceManager::singleton();
-}
-
-class UbuntuApplicationPlugin : public QQmlExtensionPlugin {
-    Q_OBJECT
-    Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
-
-    virtual void registerTypes(const char* uri) {
-        DLOG("UbuntuSurfacePlugin::registerTypes (this=%p, uri='%s')", this, uri);
-
-        ASSERT(QLatin1String(uri) == QLatin1String("Unity.SurfaceManager"));
-        qmlRegisterSingletonType<MirSurfaceManager>(
-                    uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
-        qmlRegisterUncreatableType<MirSurface>(
-                    uri, 0, 1, "MirSurface", "MirSurface can't be instantiated");
-        qmlRegisterType<InputArea>(uri, 0, 1, "InputArea");
-        qmlRegisterType<ShellInputArea>(uri, 0, 1, "ShellInputArea");
-        qmlRegisterType<InputFilterArea>(uri, 0, 1, "InputFilterArea");
-    }
-};
-
-#include "plugin.moc"

=== removed file 'src/modules/Unity/SurfaceManager/qmldir'
--- src/modules/Unity/SurfaceManager/qmldir	2013-07-19 17:29:44 +0000
+++ src/modules/Unity/SurfaceManager/qmldir	1970-01-01 00:00:00 +0000
@@ -1,2 +0,0 @@
-module Unity.SurfaceManager
-plugin unitysurfacemanagerplugin

=== modified file 'src/modules/modules.pro'
--- src/modules/modules.pro	2013-07-19 17:29:44 +0000
+++ src/modules/modules.pro	2013-08-29 18:29:13 +0000
@@ -1,4 +1,3 @@
 TEMPLATE = subdirs
 
-SUBDIRS += Unity/ApplicationManager \
-           Unity/SurfaceManager \
+SUBDIRS += Unity/Application