unity-mir

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

  1. mergeModules
  2. Merge into trunk
Proposed by Daniel d'Andrada
Status: Merged
Approved by: Gerry Boland
Approved revision: 68
Merged at revision: 69
Proposed branch: lp:~dandrader/unity-mir/mergeModules
Merge into: lp:unity-mir
Diff against target: 255 lines (+42/-112)
7 files modified
src/modules/Unity/Application/Application.pro (+17/-6)
src/modules/Unity/Application/plugin.cpp (+22/-3)
src/modules/Unity/Application/qmldir (+2/-2)
src/modules/Unity/SurfaceManager/SurfaceManager.pro (+0/-42)
src/modules/Unity/SurfaceManager/plugin.cpp (+0/-55)
src/modules/Unity/SurfaceManager/qmldir (+0/-2)
src/modules/modules.pro (+1/-2)
To merge this branch: bzr merge lp:~dandrader/unity-mir/mergeModules
Reviewer Review Type Date Requested Status
Gerry Boland (community) Approve
PS Jenkins bot (community) continuous-integration Approve
Review via email: mp+182981@code.launchpad.net

Commit message

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

To post a comment you must log in.
Revision history for this message
PS Jenkins bot (ps-jenkins) wrote :

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)
Revision history for this message
Gerry Boland (gerboland) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== 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 @@
1TARGET = unityapplicationmanagerplugin1TARGET = unityapplicationplugin
2TEMPLATE = lib2TEMPLATE = lib
33
4QT += core quick dbus4QT += core quick dbus
@@ -9,13 +9,14 @@
9QMAKE_CXXFLAGS_RELEASE += -Werror # so no stop on warning in debug builds9QMAKE_CXXFLAGS_RELEASE += -Werror # so no stop on warning in debug builds
10QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined10QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
1111
12PKGCONFIG += mircommon mirserver12PKGCONFIG += mircommon mirserver ubuntu-platform-api
1313
14INCLUDEPATH += ../../../unity-mir14INCLUDEPATH += ../../../unity-mir
15LIBS += -L../../../unity-mir -lunity-mir15LIBS += -L../../../unity-mir -lunity-mir \
16 -lubuntu_application_api_mirserver #FIXME platform-api pkgconfig should set this
1617
17TARGET = $$qtLibraryTarget($$TARGET)18TARGET = $$qtLibraryTarget($$TARGET)
18uri = Unity.ApplicationManager19uri = Unity.Application
1920
20SOURCES += application_manager.cpp \21SOURCES += application_manager.cpp \
21 application.cpp \22 application.cpp \
@@ -24,7 +25,12 @@
24 plugin.cpp \25 plugin.cpp \
25 applicationscreenshotprovider.cpp \26 applicationscreenshotprovider.cpp \
26 dbuswindowstack.cpp \27 dbuswindowstack.cpp \
27 taskcontroller.cpp28 taskcontroller.cpp \
29 mirsurface.cpp \
30 mirsurfacemanager.cpp \
31 inputarea.cpp \
32 inputfilterarea.cpp \
33 shellinputarea.cpp
2834
29HEADERS += application_manager.h \35HEADERS += application_manager.h \
30 application.h \36 application.h \
@@ -32,7 +38,12 @@
32 desktopfilereader.h \38 desktopfilereader.h \
33 applicationscreenshotprovider.h \39 applicationscreenshotprovider.h \
34 dbuswindowstack.h \40 dbuswindowstack.h \
35 taskcontroller.h41 taskcontroller.h \
42 mirsurface.h \
43 mirsurfacemanager.h \
44 shellinputarea.h \
45 inputarea.h \
46 inputfilterarea.h
3647
37installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)48installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)
3849
3950
=== 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 @@
22#include "application_manager.h"22#include "application_manager.h"
23#include "application_list_model.h"23#include "application_list_model.h"
24#include "applicationscreenshotprovider.h"24#include "applicationscreenshotprovider.h"
25#include "mirsurfacemanager.h"
26#include "mirsurface.h"
27#include "inputarea.h"
28#include "inputfilterarea.h"
29#include "shellinputarea.h"
2530
26// unity-mir31// unity-mir
27#include "logging.h"32#include "logging.h"
@@ -35,14 +40,21 @@
35 return instance;40 return instance;
36}41}
3742
38class UbuntuApplicationManagerPlugin : public QQmlExtensionPlugin {43static QObject* surfaceManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
44 Q_UNUSED(engine);
45 Q_UNUSED(scriptEngine);
46 DLOG("surfaceManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);
47 return MirSurfaceManager::singleton();
48}
49
50class UnityApplicationPlugin : public QQmlExtensionPlugin {
39 Q_OBJECT51 Q_OBJECT
40 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")52 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
4153
42 virtual void registerTypes(const char* uri)54 virtual void registerTypes(const char* uri)
43 {55 {
44 DLOG("UbuntuApplicationManagerPlugin::registerTypes (this=%p, uri='%s')", this, uri);56 DLOG("UnityApplicationPlugin::registerTypes (this=%p, uri='%s')", this, uri);
45 ASSERT(QLatin1String(uri) == QLatin1String("Unity.ApplicationManager"));57 ASSERT(QLatin1String(uri) == QLatin1String("Unity.Application"));
4658
47 qRegisterMetaType<ApplicationManager*>("ApplicationManager*"); //need for queueing signals59 qRegisterMetaType<ApplicationManager*>("ApplicationManager*"); //need for queueing signals
4860
@@ -52,6 +64,13 @@
52 uri, 0, 1, "ApplicationInfo", "ApplicationInfo can't be instantiated");64 uri, 0, 1, "ApplicationInfo", "ApplicationInfo can't be instantiated");
53 qmlRegisterUncreatableType<ApplicationListModel>(65 qmlRegisterUncreatableType<ApplicationListModel>(
54 uri, 0, 1, "ApplicationListModel", "ApplicationListModel can't be instantiated");66 uri, 0, 1, "ApplicationListModel", "ApplicationListModel can't be instantiated");
67 qmlRegisterSingletonType<MirSurfaceManager>(
68 uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
69 qmlRegisterUncreatableType<MirSurface>(
70 uri, 0, 1, "MirSurface", "MirSurface can't be instantiated");
71 qmlRegisterType<InputArea>(uri, 0, 1, "InputArea");
72 qmlRegisterType<ShellInputArea>(uri, 0, 1, "ShellInputArea");
73 qmlRegisterType<InputFilterArea>(uri, 0, 1, "InputFilterArea");
55 }74 }
5675
57 virtual void initializeEngine(QQmlEngine *engine, const char *uri)76 virtual void initializeEngine(QQmlEngine *engine, const char *uri)
5877
=== 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 @@
1module Unity.ApplicationManager1module Unity.Application
2plugin unityapplicationmanagerplugin2plugin unityapplicationplugin
33
=== 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 @@
1TARGET = unitysurfacemanagerplugin
2TEMPLATE = lib
3
4QT += core quick
5CONFIG += link_pkgconfig
6
7# CONFIG += c++11 # only enables C++0x
8QMAKE_CXXFLAGS = -std=c++11 -fvisibility=hidden -fvisibility-inlines-hidden
9QMAKE_CXXFLAGS_RELEASE += -Werror # so no stop on warning in debug builds
10QMAKE_LFLAGS = -std=c++11 -Wl,-no-undefined
11
12PKGCONFIG += mircommon mirserver ubuntu-platform-api
13
14INCLUDEPATH += ../../../unity-mir
15LIBS += -L../../../unity-mir -lunity-mir \
16 -lubuntu_application_api_mirserver #FIXME platform-api pkgconfig should set this
17
18TARGET = $$qtLibraryTarget($$TARGET)
19uri = Unity.SurfaceManager
20
21SOURCES += mirsurface.cpp \
22 mirsurfacemanager.cpp \
23 inputarea.cpp \
24 inputfilterarea.cpp \
25 shellinputarea.cpp \
26 plugin.cpp
27
28HEADERS += mirsurface.h \
29 mirsurfacemanager.h \
30 shellinputarea.h \
31 inputarea.h \
32 inputfilterarea.h
33
34installPath = $$[QT_INSTALL_IMPORTS]/$$replace(uri, \\., /)
35
36QMLDIR_FILE = qmldir
37qmldir_file.path = $$installPath
38qmldir_file.files = $$QMLDIR_FILE
39
40target.path = $$installPath
41
42INSTALLS += target qmldir_file
430
=== 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 @@
1/*
2 * Copyright (C) 2013 Canonical, Ltd.
3 *
4 * This program is free software: you can redistribute it and/or modify it under
5 * the terms of the GNU Lesser General Public License version 3, as published by
6 * the Free Software Foundation.
7 *
8 * This program is distributed in the hope that it will be useful, but WITHOUT
9 * ANY WARRANTY; without even the implied warranties of MERCHANTABILITY,
10 * SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
11 * Lesser General Public License for more details.
12 *
13 * You should have received a copy of the GNU Lesser General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17// Qt
18#include <QtQml/QtQml>
19
20// local
21#include "mirsurfacemanager.h"
22#include "mirsurface.h"
23#include "inputarea.h"
24#include "inputfilterarea.h"
25#include "shellinputarea.h"
26
27// unity-mir
28#include "logging.h"
29
30static QObject* surfaceManagerSingleton(QQmlEngine* engine, QJSEngine* scriptEngine) {
31 Q_UNUSED(engine);
32 Q_UNUSED(scriptEngine);
33 DLOG("surfaceManagerSingleton (engine=%p, scriptEngine=%p)", engine, scriptEngine);
34 return MirSurfaceManager::singleton();
35}
36
37class UbuntuApplicationPlugin : public QQmlExtensionPlugin {
38 Q_OBJECT
39 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface/1.0")
40
41 virtual void registerTypes(const char* uri) {
42 DLOG("UbuntuSurfacePlugin::registerTypes (this=%p, uri='%s')", this, uri);
43
44 ASSERT(QLatin1String(uri) == QLatin1String("Unity.SurfaceManager"));
45 qmlRegisterSingletonType<MirSurfaceManager>(
46 uri, 0, 1, "SurfaceManager", surfaceManagerSingleton);
47 qmlRegisterUncreatableType<MirSurface>(
48 uri, 0, 1, "MirSurface", "MirSurface can't be instantiated");
49 qmlRegisterType<InputArea>(uri, 0, 1, "InputArea");
50 qmlRegisterType<ShellInputArea>(uri, 0, 1, "ShellInputArea");
51 qmlRegisterType<InputFilterArea>(uri, 0, 1, "InputFilterArea");
52 }
53};
54
55#include "plugin.moc"
560
=== 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 @@
1module Unity.SurfaceManager
2plugin unitysurfacemanagerplugin
30
=== 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 @@
1TEMPLATE = subdirs1TEMPLATE = subdirs
22
3SUBDIRS += Unity/ApplicationManager \3SUBDIRS += Unity/Application
4 Unity/SurfaceManager \

Subscribers

People subscribed via source and target branches