01db1e7 · unity8 · git.iko.soy

Shell.qml+2−2

compare with xenial

unifiedsplit

@@ -19,7 +19,7 @@ import Ubuntu.Application 0.1

19import Ubuntu.Components 0.1

20import Ubuntu.Gestures 0.1

21import LightDM 0.1 as LightDM

22−import Power 0.1

22+import Powerd 0.1

23import "Dash"

24import "Greeter"

25import "Launcher"

@@ -453,7 +453,7 @@ FocusScope {

453

454 Connections {

455 id: powerConnection

456− target: Power

456+ target: Powerd

457

458 property var previousMainApp: null

459 property var previousSideApp: null

plugins/CMakeLists.txt+1−1

@@ -4,4 +4,4 @@ add_subdirectory(Unity)

4add_subdirectory(HudClient)

5add_subdirectory(LightDM)

6add_subdirectory(ListViewWithPageHeader)

7−add_subdirectory(Power)

7+add_subdirectory(Powerd)

plugins/Power/CMakeLists.txtdeleted−13

@@ -1,13 +0,0 @@

1−include(Plugins)

2−

3−add_definitions(-DSM_BUSNAME=systemBus)

4−

5−add_library(Power-qml MODULE

6− plugin.cpp

7− Power.cpp

8− )

9−

10−qt5_use_modules(Power-qml DBus Qml)

11−

12−export_qmlfiles(Power Power)

13−export_qmlplugin(Power 0.1 Power TARGETS Power-qml)

plugins/Power/qmldirdeleted−3

@@ -1,3 +0,0 @@

1−module Power

2−plugin Power-qml

3−typeinfo plugin.qmltypes

plugins/Powerd/CMakeLists.txtnew file+13

@@ -0,0 +1,13 @@

1+include(Plugins)

2+

3+add_definitions(-DSM_BUSNAME=systemBus)

4+

5+add_library(Powerd-qml MODULE

6+ plugin.cpp

7+ Powerd.cpp

8+ )

9+

10+qt5_use_modules(Powerd-qml DBus Qml)

11+

12+export_qmlfiles(Powerd Powerd)

13+export_qmlplugin(Powerd 0.1 Powerd TARGETS Powerd-qml)

plugins/Power/Power.cpp → plugins/Powerd/Powerd.cpprenamed+2−2

@@ -16,9 +16,9 @@

16 * Author: Michael Terry <michael.terry@canonical.com>

17 */

18

19−#include "Power.h"

19+#include "Powerd.h"

20

21−Power::Power(QObject* parent)

21+Powerd::Powerd(QObject* parent)

22 : QObject(parent),

23 powerd(NULL)

24{

plugins/Power/Power.h → plugins/Powerd/Powerd.hrenamed+4−4

@@ -17,18 +17,18 @@

17 * Michael Terry <michael.terry@canonical.com>

18 */

19

20−#ifndef UNITY_POWER_H

20+#ifndef UNITY_POWERD_H

21−#define UNITY_POWER_H

21+#define UNITY_POWERD_H

22

23#include <QtCore/QObject>

24#include <QtDBus/QDBusInterface>

25

26−class Power: public QObject

26+class Powerd: public QObject

27{

28 Q_OBJECT

29

30public:

31− explicit Power(QObject *parent = 0);

31+ explicit Powerd(QObject *parent = 0);

32

33Q_SIGNALS:

34 void powerStateChange(int state);

plugins/Power/plugin.cpp → plugins/Powerd/plugin.cpprenamed+6−6

@@ -18,19 +18,19 @@

18 */

19

20#include "plugin.h"

21−#include "Power.h"

21+#include "Powerd.h"

22

23#include <QtQml/QtQml>

24

25−static QObject *power_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

25+static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)

26{

27 Q_UNUSED(engine)

28 Q_UNUSED(scriptEngine)

29− return new Power();

29+ return new Powerd();

30}

31

32−void PowerPlugin::registerTypes(const char *uri)

32+void PowerdPlugin::registerTypes(const char *uri)

33{

34− Q_ASSERT(uri == QLatin1String("Power"));

34+ Q_ASSERT(uri == QLatin1String("Powerd"));

35− qmlRegisterSingletonType<Power>(uri, 0, 1, "Power", power_provider);

35+ qmlRegisterSingletonType<Powerd>(uri, 0, 1, "Powerd", powerd_provider);

36}

plugins/Power/plugin.h → plugins/Powerd/plugin.hrenamed+1−1

@@ -23,7 +23,7 @@

23#include <QtQml/QQmlEngine>

24#include <QtQml/QQmlExtensionPlugin>

25

26−class PowerPlugin : public QQmlExtensionPlugin

26+class PowerdPlugin : public QQmlExtensionPlugin

27{

28 Q_OBJECT

29 Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QQmlExtensionInterface")

plugins/Powerd/qmldirnew file+3

@@ -0,0 +1,3 @@

1+module Powerd

2+plugin Powerd-qml

3+typeinfo plugin.qmltypes