From 178bbd0bc0f56c8d3c6244f411b0620bf38a0bde Mon Sep 17 00:00:00 2001
From: arcan1s <esalexeev@gmail.com>
Date: Tue, 10 Jun 2014 09:42:21 +0400
Subject: [PATCH] fix first initialization

---
 sources/ext-sysmon/extsysmon.cpp | 63 +++++---------------------------
 sources/ext-sysmon/extsysmon.h   |  2 +-
 2 files changed, 10 insertions(+), 55 deletions(-)

diff --git a/sources/ext-sysmon/extsysmon.cpp b/sources/ext-sysmon/extsysmon.cpp
index d71e6e2..1d47353 100644
--- a/sources/ext-sysmon/extsysmon.cpp
+++ b/sources/ext-sysmon/extsysmon.cpp
@@ -44,7 +44,7 @@ ExtendedSysMon::ExtendedSysMon(QObject* parent, const QVariantList& args)
     setMinimumPollingInterval(333);
     readConfiguration();
     setProcesses();
-    setKeys();
+    initValues();
 }
 
 
@@ -104,6 +104,14 @@ QStringList ExtendedSysMon::sources() const
 }
 
 
+void ExtendedSysMon::initValues()
+{
+    QStringList sourceList = sources();
+    for (int i=0; i<sourceList.count(); i++)
+        updateSourceEvent(sourceList[i]);
+}
+
+
 void ExtendedSysMon::readConfiguration()
 {
     if (debug) qDebug() << "[DE]" << "[readConfiguration]";
@@ -147,59 +155,6 @@ void ExtendedSysMon::readConfiguration()
 }
 
 
-void ExtendedSysMon::setKeys()
-{
-    if (debug) qDebug() << "[DE]" << "[setKeys]";
-    QString key, source;
-    // custom
-    source = QString("custom");
-    for (int i=0; i<configuration[QString("CUSTOM")].split(QString("@@"), QString::SkipEmptyParts).count(); i++) {
-        key = QString("custom") + QString::number(i);
-        setData(source, key, QString(""));
-    }
-    // gpu
-    source = QString("gpu");
-    key = QString("GPU");
-    setData(source, key, float(0.0));
-    // gputemp
-    source = QString("gputemp");
-    key = QString("GPUTemp");
-    setData(source, key, float(0.0));
-    // hddtemp
-    source = QString("hddtemp");
-    for (int i=0; i<configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts).count(); i++) {
-        key = configuration[QString("HDDDEV")].split(QChar(','), QString::SkipEmptyParts)[i];
-        setData(source, key, float(0.0));
-    }
-    // pkg
-    source = QString("pkg");
-    for (int i=0; i<configuration[QString("PKGCMD")].split(QString(","), QString::SkipEmptyParts).count(); i++) {
-        key = QString("pkgCount") + QString::number(i);
-        setData(source, key, 0);
-    }
-    // player
-    source = QString("player");
-    key = QString("album");
-    setData(source, key, QString("unknown"));
-    key = QString("artist");
-    setData(source, key, QString("unknown"));
-    key = QString("duration");
-    setData(source, key, QString("0"));
-    key = QString("progress");
-    setData(source, key, QString("0"));
-    key = QString("title");
-    setData(source, key, QString("unknown"));
-    // ps
-    source = QString("ps");
-    key = QString("psCount");
-    setData(source, key, QString("0"));
-    key = QString("ps");
-    setData(source, key, QString(""));
-    key = QString("psTotal");
-    setData(source, key, QString("0"));
-}
-
-
 void ExtendedSysMon::setProcesses()
 {
     if (debug) qDebug() << "[DE]" << "[setProcesses]";
diff --git a/sources/ext-sysmon/extsysmon.h b/sources/ext-sysmon/extsysmon.h
index b321f28..0f497b5 100644
--- a/sources/ext-sysmon/extsysmon.h
+++ b/sources/ext-sysmon/extsysmon.h
@@ -64,8 +64,8 @@ private:
     // reread configuration
     QString getAllHdd();
     QString getAutoGpu();
+    void initValues();
     void readConfiguration();
-    void setKeys();
     void setProcesses();
     QMap<QString, QString> updateConfiguration(const QMap<QString, QString> rawConfig);
 };