remove unused code

batterylayer.cpp

@@ -23,7 +23,6 @@
 
 #include <QtCore/QDebug>
 #include <QtCore/QFile>
-//#include <QtCore/QFileSystemWatcher>
 #include <QtCore/QTextStream>
 #include <QtCore/QTime>
 
@@ -37,12 +36,7 @@ BatteryLayer::BatteryLayer(MapWidget *map) :
     connect(m_updateTimer, SIGNAL(timeout()), this, SLOT(repaint()));
     m_updateTimer->start();
 
-//    QFileSystemWatcher *w = new QFileSystemWatcher(this);
-//    w->addPath("/sys/class/power_supply/battery/capacity");
-//    w->addPath("/sys/class/power_supply/battery/status");
-//    connect(w, SIGNAL(fileChanged(QString)), this, SLOT(fileChanged(QString)));
-
-    repaint();
+    reload();
 }
 
 void BatteryLayer::keyPressed(QKeyEvent *event)
@@ -50,6 +44,7 @@ void BatteryLayer::keyPressed(QKeyEvent *event)
     if (event->modifiers() == Qt::NoModifier &&
         event->key() == Qt::Key_B) {
         toggleVisibility();
+        reload();
     }
 }
 
@@ -72,6 +67,14 @@ void BatteryLayer::paint(QPainter *painter)
 void BatteryLayer::repaint()
 {
     if (isVisible()) {
+        if (reload()) {
+            map()->update();
+        }
+    }
+}
+
+bool BatteryLayer::reload()
+{
     int percent = m_percent;
     QFile capacity("/sys/class/power_supply/battery/capacity");
     if (capacity.open(QFile::ReadOnly | QFile::Text)) {
@@ -89,16 +92,12 @@ void BatteryLayer::repaint()
     }
 
     if (charging != m_isCharging || percent != m_percent) {
-            m_percent = percent;
         m_isCharging = charging;
-            map()->update();
-        }
+        m_percent = percent;
+
+        return true;
+    } else {
+        return false;
     }
 }
 
-void BatteryLayer::fileChanged(const QString &filename)
-{
-    qDebug() << filename;
-    repaint();
-}
-

batterylayer.h

@@ -38,9 +38,10 @@ protected:
 
 private slots:
     void repaint();
-    void fileChanged(const QString &filename);
 
 private:
+    bool reload();
+
     QTimer *m_updateTimer;
     int m_percent;
     bool m_isCharging;