git.iko.soy/unity8
on xenial help sign in
Keep hook to powerd auto-brightness

Update mock powerd.h to reflect changes in real powerd.h

commit459fa41a3e2518041370776300aa9438c3bbd4d3 authorAlberto Aguirre <alberto.aguirre@canonical.com> dateTue 20 May 2014, 22:04 (12 years ago) parent8282365
3 files changed+22−18
compare with xenial
unifiedsplit
plugins/Powerd/Powerd.cpp+14−9 plugins/Powerd/Powerd.h+1 tests/mocks/Powerd/Powerd.h+7−9
plugins/Powerd/Powerd.cpp+14−9
@@ -29,17 +29,22 @@ Powerd::Powerd(QObject* parent)
2929 : QObject(parent),
3030 powerd(NULL)
3131{
32− powerd = new QDBusInterface("com.canonical.Unity.Screen",
33− "/com/canonical/Unity/Screen",
34− "com.canonical.Unity.Screen",
32+ powerd = new QDBusInterface("com.canonical.powerd",
33+ "/com/canonical/powerd",
34+ "com.canonical.powerd",
3535 QDBusConnection::SM_BUSNAME(), this);
3636
37− powerd->connection().connect("com.canonical.Unity.Screen",
38− "/com/canonical/Unity/Screen",
39− "com.canonical.Unity.Screen",
40− "DisplayPowerStateChange",
41− this,
42− SIGNAL(displayPowerStateChange(int, int)));
37+ unityScreen = new QDBusInterface("com.canonical.Unity.Screen",
38+ "/com/canonical/Unity/Screen",
39+ "com.canonical.Unity.Screen",
40+ QDBusConnection::SM_BUSNAME(), this);
41+
42+ unityScreen->connection().connect("com.canonical.Unity.Screen",
43+ "/com/canonical/Unity/Screen",
44+ "com.canonical.Unity.Screen",
45+ "DisplayPowerStateChange",
46+ this,
47+ SIGNAL(displayPowerStateChange(int, int)));
4348
4449 systemSettings = g_settings_new("com.ubuntu.touch.system");
4550 g_signal_connect(systemSettings, "changed::auto-brightness", G_CALLBACK(autoBrightnessChanged), powerd);
plugins/Powerd/Powerd.h+1
@@ -51,6 +51,7 @@ Q_SIGNALS:
5151
5252private:
5353 QDBusInterface *powerd;
54+ QDBusInterface *unityScreen;
5455 GSettings *systemSettings;
5556};
5657
tests/mocks/Powerd/Powerd.h+7−9
@@ -25,15 +25,15 @@ class Powerd: public QObject
2525{
2626 Q_OBJECT
2727 Q_ENUMS(Status)
28− Q_FLAGS(DisplayFlag DisplayFlags)
28+ Q_ENUMS(DisplayStateChangeReason)
2929
3030public:
31− enum DisplayFlag {
32− UseProximity = 1, // Use proximity sensor to override screen state
33− DisableAutoBrightness = 2, // Force autobrightness to be disabled
34− Bright = 4, // Request the screen to stay bright
31+ enum DisplayStateChangeReason {
32+ Normal = 0,
33+ Inactivity = 1, // Display changed state due to inactivity
34+ PowerKey = 2, // Display changed state due to user pressing power key
35+ Proximity = 3, // Display changed state due to proximity events
3536 };
36− Q_DECLARE_FLAGS(DisplayFlags, DisplayFlag)
3737
3838 enum Status {
3939 Off,
@@ -43,7 +43,5 @@ public:
4343 explicit Powerd(QObject *parent = 0);
4444
4545Q_SIGNALS:
46− void displayPowerStateChange(int status, unsigned int flags);
46+ void displayPowerStateChange(int status, int reason);
4747};
48−
49−#endif