git.iko.soy/unity8
on xenial help sign in
Rename plugin to Powerd
commit01db1e7c8815125b113502ba1076b55cec16f5c3 authorMichael Terry <michael.terry@canonical.com> dateFri 2 Aug 2013, 12:18 (13 years ago) parent4f6ff69
10 files changed+32−32
compare with xenial
unifiedsplit
Shell.qml+2−2 plugins/CMakeLists.txt+1−1 plugins/Power/CMakeLists.txt−13 plugins/Power/qmldir−3 plugins/Powerd/CMakeLists.txt+13 plugins/Power/Power.cpp → plugins/Powerd/Powerd.cpp+2−2 plugins/Power/Power.h → plugins/Powerd/Powerd.h+4−4 plugins/Power/plugin.cpp → plugins/Powerd/plugin.cpp+6−6 plugins/Power/plugin.h → plugins/Powerd/plugin.h+1−1 plugins/Powerd/qmldir+3
Shell.qml+2−2
@@ -19,7 +19,7 @@ import Ubuntu.Application 0.1
1919import Ubuntu.Components 0.1
2020import Ubuntu.Gestures 0.1
2121import LightDM 0.1 as LightDM
22−import Power 0.1
22+import Powerd 0.1
2323import "Dash"
2424import "Greeter"
2525import "Launcher"
@@ -453,7 +453,7 @@ FocusScope {
453453
454454 Connections {
455455 id: powerConnection
456− target: Power
456+ target: Powerd
457457
458458 property var previousMainApp: null
459459 property var previousSideApp: null
plugins/CMakeLists.txt+1−1
@@ -4,4 +4,4 @@ add_subdirectory(Unity)
44add_subdirectory(HudClient)
55add_subdirectory(LightDM)
66add_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 @@
1616 * Author: Michael Terry <michael.terry@canonical.com>
1717 */
1818
19−#include "Power.h"
19+#include "Powerd.h"
2020
21−Power::Power(QObject* parent)
21+Powerd::Powerd(QObject* parent)
2222 : QObject(parent),
2323 powerd(NULL)
2424{
plugins/Power/Power.h → plugins/Powerd/Powerd.hrenamed+4−4
@@ -17,18 +17,18 @@
1717 * Michael Terry <michael.terry@canonical.com>
1818 */
1919
20−#ifndef UNITY_POWER_H
21−#define UNITY_POWER_H
20+#ifndef UNITY_POWERD_H
21+#define UNITY_POWERD_H
2222
2323#include <QtCore/QObject>
2424#include <QtDBus/QDBusInterface>
2525
26−class Power: public QObject
26+class Powerd: public QObject
2727{
2828 Q_OBJECT
2929
3030public:
31− explicit Power(QObject *parent = 0);
31+ explicit Powerd(QObject *parent = 0);
3232
3333Q_SIGNALS:
3434 void powerStateChange(int state);
plugins/Power/plugin.cpp → plugins/Powerd/plugin.cpprenamed+6−6
@@ -18,19 +18,19 @@
1818 */
1919
2020#include "plugin.h"
21−#include "Power.h"
21+#include "Powerd.h"
2222
2323#include <QtQml/QtQml>
2424
25−static QObject *power_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
25+static QObject *powerd_provider(QQmlEngine *engine, QJSEngine *scriptEngine)
2626{
2727 Q_UNUSED(engine)
2828 Q_UNUSED(scriptEngine)
29− return new Power();
29+ return new Powerd();
3030}
3131
32−void PowerPlugin::registerTypes(const char *uri)
32+void PowerdPlugin::registerTypes(const char *uri)
3333{
34− Q_ASSERT(uri == QLatin1String("Power"));
35− qmlRegisterSingletonType<Power>(uri, 0, 1, "Power", power_provider);
34+ Q_ASSERT(uri == QLatin1String("Powerd"));
35+ qmlRegisterSingletonType<Powerd>(uri, 0, 1, "Powerd", powerd_provider);
3636}
plugins/Power/plugin.h → plugins/Powerd/plugin.hrenamed+1−1
@@ -23,7 +23,7 @@
2323#include <QtQml/QQmlEngine>
2424#include <QtQml/QQmlExtensionPlugin>
2525
26−class PowerPlugin : public QQmlExtensionPlugin
26+class PowerdPlugin : public QQmlExtensionPlugin
2727{
2828 Q_OBJECT
2929 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