X-Git-Url: https://gerrit.automotivelinux.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=HomeScreen%2Fsrc%2Fcontrolbarwidget.h;fp=src%2Fcontrolbarwidget.h;h=618fa35f7c34f0f460c119037898e2d8aa4bd758;hb=ca3605ea664834acdf712e691be8f0358b1c6b6f;hp=9d4fa7f160e584016bc576c0ac7840ac4163a6a5;hpb=ff25a2a06428ffb0d6d8aeddb5faaa301b4201fe;p=staging%2FHomeScreen.git

diff --git a/src/controlbarwidget.h b/HomeScreen/src/controlbarwidget.h
similarity index 83%
rename from src/controlbarwidget.h
rename to HomeScreen/src/controlbarwidget.h
index 9d4fa7f..618fa35 100644
--- a/src/controlbarwidget.h
+++ b/HomeScreen/src/controlbarwidget.h
@@ -18,8 +18,7 @@
 #define CONTROLBARWIDGET_H
 
 #include <QWidget>
-#include "include/daynightmode.h"
-#include "daynightmode_adapter.h"
+#include "../interfaces/daynightmode.h"
 #include "daynightmode_proxy.h"
 #include "settingswidget.h"
 
@@ -35,13 +34,9 @@ public:
     explicit ControlBarWidget(QWidget *parent = 0);
     ~ControlBarWidget();
 
-// from daynightmode_adapter.h
+// day/night mode
 public Q_SLOTS:
-    void setDayNightMode(int mode);
-    inline int getDayNightMode()
-    {
-        return (int)m_dayNightMode;
-    }
+    void dayNightModeSlot(int mode);
 
 private slots:
     void on_pushButton_Settings_clicked();
@@ -53,8 +48,9 @@ private:
     SettingsWidget *mp_settingsWidget;
     org::agl::daynightmode *mp_dBusDayNightMode_SettingsWidget;
 
+    // D-Bus day/night
     SystemDayNight::eDayNightMode m_dayNightMode;
-    DaynightmodeAdaptor *mp_daynightmodeAdaptor;
+    org::agl::daynightmode *mp_dayNightModeProxy;
 };
 
 #endif // CONTROLBARWIDGET_H