Merge lp:~gerboland/unity8/remove-unused-variable into lp:unity8

[Gerry Boland]

Cleanup: Remove unused member and fix small syntax error in OrientationLock

Cleanup: Remove unused member and fix small syntax error in OrientationLock

 * Are there any related MPs required for this MP to build/function as expected? Please list.
N
 * Did you perform an exploratory manual test run of your code change and any related functionality?
Y
 * Did you make sure that your branch does not contain spurious tags?
Y
 * If you changed the packaging (debian), did you subscribe the ubuntu-unity team to this MP?
N/A
 * If you changed the UI, has there been a design review?
N/A

[Daniel d'Andrada (dandrader)]

review: Approve

[PS Jenkins bot (ps-jenkins)]

FAILED: Continuous integration, rev:1270
http://jenkins.qa.ubuntu.com/job/unity8-ci/4347/
Executed test runs:
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-utopic-touch/4956/console
    UNSTABLE: http://jenkins.qa.ubuntu.com/job/unity-phablet-qmluitests-utopic/1348
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-amd64-ci/1441
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity8-utopic-i386-ci/1441
    FAILURE: http://jenkins.qa.ubuntu.com/job/generic-deb-autopilot-runner-mako/4706/console
    SUCCESS: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6208
        deb: http://jenkins.qa.ubuntu.com/job/generic-mediumtests-builder-utopic-armhf/6208/artifact/work/output/*zip*/output.zip
    SUCCESS: http://s-jenkins.ubuntu-ci:8080/job/touch-flash-device/13393

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity8-ci/4347/rebuild

review: Needs Fixing (continuous-integration)

=== modified file 'plugins/Unity/Session/orientationlock.cpp'
--- plugins/Unity/Session/orientationlock.cpp	2014-08-26 23:33:17 +0000
+++ plugins/Unity/Session/orientationlock.cpp	2014-09-18 14:59:28 +0000
@@ -24,16 +24,16 @@
     , m_enabled(false)
     , m_savedOrientation(Qt::PortraitOrientation)
 {
-    systemSettings = g_settings_new("com.ubuntu.touch.system");
-    g_signal_connect(systemSettings, "changed::rotation-lock",
+    m_systemSettings = g_settings_new("com.ubuntu.touch.system");
+    g_signal_connect(m_systemSettings, "changed::rotation-lock",
                      G_CALLBACK(OrientationLock::onEnabledChangedProxy), this);
-    m_enabled = g_settings_get_boolean(systemSettings, "rotation-lock");
+    m_enabled = g_settings_get_boolean(m_systemSettings, "rotation-lock");
 }
 
 OrientationLock::~OrientationLock()
 {
-    g_signal_handlers_disconnect_by_data(systemSettings, this);
-    g_object_unref(systemSettings);
+    g_signal_handlers_disconnect_by_data(m_systemSettings, this);
+    g_object_unref(m_systemSettings);
 }
 
 bool OrientationLock::enabled() const
@@ -54,7 +54,7 @@
 
 void OrientationLock::onEnabledChanged()
 {
-    const bool enabled = g_settings_get_boolean(systemSettings, "rotation-lock");
+    const bool enabled = g_settings_get_boolean(m_systemSettings, "rotation-lock");
     if (m_enabled != enabled) {
         m_enabled = enabled;
         Q_EMIT enabledChanged();

=== modified file 'plugins/Unity/Session/orientationlock.h'
--- plugins/Unity/Session/orientationlock.h	2014-08-26 23:33:17 +0000
+++ plugins/Unity/Session/orientationlock.h	2014-09-18 14:59:28 +0000
@@ -19,7 +19,6 @@
 
 #include <gio/gio.h>
 #include <QtCore/QObject>
-#include <QtDBus/QDBusInterface>
 
 /**
  * @brief The OrientationLock class exports orientation lock related properties to QML
@@ -52,8 +51,7 @@
     void onEnabledChanged();
 
 private:
-    QDBusInterface *dbusInterface;
-    GSettings *systemSettings;
+    GSettings *m_systemSettings;
 
     bool m_enabled;
     Qt::ScreenOrientation m_savedOrientation;