Move initBattery to private side as it's not used outside

sailfishos · Dec 19, 2017 · c411b12 · c411b12
1 parent 5d2cde6
commit c411b12
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 9 deletions.
diff --git a/src/notifications/batterynotifier.h b/src/notifications/batterynotifier.h
@@ -28,7 +28,8 @@ class ContextProperty;
 /*!
  * Implements the configuration and state for the battery, the power save mode.
  */
-class BatteryNotifier : public QObject {
+class BatteryNotifier : public QObject
+{
     Q_OBJECT
 
 public:
@@ -89,9 +90,6 @@ class BatteryNotifier : public QObject {
     };
 
 public slots:
-    //! Initializes the battery status from the current values given by QBatteryInfo
-    void initBattery();
-
     //! Sends a low battery notification
     void lowBatteryAlert();
 
@@ -103,6 +101,7 @@ public slots:
     void setTouchScreenLockActive(bool active);
 
 private slots:
+    void initBattery();
     void onPowerSaveModeChanged();
     void onPropertyChanged();
     void prepareNotification();

diff --git a/src/notifications/lowbatterynotifier.h b/src/notifications/lowbatterynotifier.h
@@ -33,7 +33,8 @@ class QTimer;
  * The LowBatteryNotifier will emit a lowBatteryAlert() when the user should
  * be alerted about a low battery condition.
  */
-class LowBatteryNotifier : public QObject {
+class LowBatteryNotifier : public QObject
+{
     Q_OBJECT
 
 public:

diff --git a/src/utilities/qobjectlistmodel.cpp b/src/utilities/qobjectlistmodel.cpp
@@ -59,8 +59,7 @@ QVariant QObjectListModel::data(const QModelIndex &index, int role) const
     if (index.row() < 0 || index.row() >= _list->count())
         return QVariant();
 
-    if (role == Qt::UserRole + 1)
-    {
+    if (role == Qt::UserRole + 1) {
         QObject *obj = _list->at(index.row());
         return QVariant::fromValue(obj);
     }
@@ -73,8 +72,7 @@ bool QObjectListModel::setData(const QModelIndex &index, const QVariant &value,
     if (index.row() < 0 || index.row() >= _list->count())
         return false;
 
-    if (role == Qt::UserRole + 1)
-    {
+    if (role == Qt::UserRole + 1) {
         _list->replace(index.row(), reinterpret_cast<QObject*>(value.toInt()));
         return true;
     }