Code Review
/
staging
/
HomeScreen.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
v0.1.0
[staging/HomeScreen.git]
/
HomeScreen
/
src
/
controlbarwidget.h
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
(file)
--- a/
src/controlbarwidget.h
+++ b/
HomeScreen/src/controlbarwidget.h
@@
-18,8
+18,7
@@
#define CONTROLBARWIDGET_H
#include <QWidget>
#define CONTROLBARWIDGET_H
#include <QWidget>
-#include "include/daynightmode.h"
-#include "daynightmode_adapter.h"
+#include "../interfaces/daynightmode.h"
#include "daynightmode_proxy.h"
#include "settingswidget.h"
#include "daynightmode_proxy.h"
#include "settingswidget.h"
@@
-35,13
+34,9
@@
public:
explicit ControlBarWidget(QWidget *parent = 0);
~ControlBarWidget();
explicit ControlBarWidget(QWidget *parent = 0);
~ControlBarWidget();
-//
from daynightmode_adapter.h
+//
day/night mode
public Q_SLOTS:
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();
private slots:
void on_pushButton_Settings_clicked();
@@
-53,8
+48,9
@@
private:
SettingsWidget *mp_settingsWidget;
org::agl::daynightmode *mp_dBusDayNightMode_SettingsWidget;
SettingsWidget *mp_settingsWidget;
org::agl::daynightmode *mp_dBusDayNightMode_SettingsWidget;
+ // D-Bus day/night
SystemDayNight::eDayNightMode m_dayNightMode;
SystemDayNight::eDayNightMode m_dayNightMode;
-
DaynightmodeAdaptor *mp_daynightmodeAdaptor
;
+
org::agl::daynightmode *mp_dayNightModeProxy
;
};
#endif // CONTROLBARWIDGET_H
};
#endif // CONTROLBARWIDGET_H