some map replacing

sources/awesome-widget/package/contents/ui/main.qml

@@ -93,6 +93,7 @@ Item {
 
         onNewData: {
             if (debug) console.log("[main::onNewData] : Update source " + sourceName)
+            systemmonitorDE.interval = plasmoid.configuration.interval
 
             awKeys.setDataBySource(sourceName, data, settings)
         }
@@ -112,6 +113,7 @@ Item {
 
         onNewData: {
             if (debug) console.log("[main::onNewData] : Update source " + sourceName)
+            extsysmonDE.interval = plasmoid.configuration.interval
 
             awKeys.setDataBySource(sourceName, data, settings)
         }

sources/awesome-widget/plugin/awactions.h

@@ -19,7 +19,6 @@
 #ifndef AWACTIONS_H
 #define AWACTIONS_H
 
-#include <QMap>
 #include <QObject>
 #include <QVariant>
 

sources/awesome-widget/plugin/awkeys.cpp

@@ -346,7 +346,6 @@ void AWKeys::setDataBySource(const QString sourceName, const QVariantMap data,
     if (sourceName == QString("update")) return emit(needToBeUpdated());
 
     // checking
-//     if (!checkKeys(data)) return;
     if (keys.isEmpty()) return;
 
     // regular expressions
@@ -866,15 +865,6 @@ void AWKeys::addKeyToCache(const QString type, const QString key)
 }
 
 
-bool AWKeys::checkKeys(const QVariantMap data) const
-{
-    if (debug) qDebug() << PDEBUG;
-    if (debug) qDebug() << PDEBUG << ":" << "Data" << data;
-
-    return (data.count() != 0);
-}
-
-
 QString AWKeys::htmlValue(QString key) const
 {
     if (debug) qDebug() << PDEBUG;

sources/awesome-widget/plugin/awkeys.h

@@ -19,7 +19,7 @@
 #ifndef AWKEYS_H
 #define AWKEYS_H
 
-#include <QMap>
+#include <QHash>
 #include <QObject>
 #include <QStringList>
 #include <QVariant>
@@ -75,7 +75,6 @@ private slots:
 private:
     // methods
     void addKeyToCache(const QString type, const QString key = QString(""));
-    bool checkKeys(const QVariantMap data) const;
     QString htmlValue(QString key) const;
     int numberCpus() const;
     float temperature(const float temp, const QString units) const;
@@ -96,7 +95,7 @@ private:
     ExtItemAggregator<ExtWeather> *extWeather;
     QString pattern;
     QStringList foundBars, foundKeys, keys;
-    QMap<QString, QString> values;
+    QHash<QString, QString> values;
     QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices;
 };
 

sources/awesome-widget/plugin/awtooltip.cpp

@@ -67,8 +67,8 @@ AWToolTip::AWToolTip(QObject *parent, QVariantMap settings)
     if (configuration[QString("upTooltip")].toBool()) requiredKeys.append(QString("upTooltip"));
     if (configuration[QString("batTooltip")].toBool()) requiredKeys.append(QString("batTooltip"));
 
-    connect(this, SIGNAL(updateData(QMap<QString, QString>)),
-            this, SLOT(dataUpdate(QMap<QString, QString>)));
+    connect(this, SIGNAL(updateData(QHash<QString, QString>)),
+            this, SLOT(dataUpdate(QHash<QString, QString>)));
 }
 
 
@@ -80,7 +80,7 @@ AWToolTip::~AWToolTip()
 }
 
 
-void AWToolTip::dataUpdate(QMap<QString, QString> values)
+void AWToolTip::dataUpdate(QHash<QString, QString> values)
 {
     if (debug) qDebug() << PDEBUG;
 

sources/awesome-widget/plugin/awtooltip.h

@@ -21,7 +21,7 @@
 
 #include <QGraphicsScene>
 #include <QGraphicsView>
-#include <QMap>
+#include <QHash>
 #include <QObject>
 #include <QPixmap>
 #include <QVariant>
@@ -39,11 +39,11 @@ public:
     QPixmap image();
 
 signals:
-    void updateData(QMap<QString, QString> values);
+    void updateData(QHash<QString, QString> values);
     void toolTipPainted(QString image);
 
 private slots:
-    void dataUpdate(QMap<QString, QString> values);
+    void dataUpdate(QHash<QString, QString> values);
 
 private:
     // ui
@@ -55,8 +55,8 @@ private:
     bool debug = false;
     int counts = 0;
     QVariantMap configuration;
-    QMap<QString, float> boundaries;
-    QMap<QString, QList<float>> data;
+    QHash<QString, float> boundaries;
+    QHash<QString, QList<float>> data;
     QStringList requiredKeys;
     QSize size;
 };

sources/desktop-panel/plugin/CMakeLists.txt

@@ -11,7 +11,8 @@ include_directories(
     ${Kf5_INCLUDE}
 )
 
-file(GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp)
+file(GLOB_RECURSE SUBPROJECT_SOURCE *.cpp ${PROJECT_TRDPARTY_DIR}/fontdialog/*.cpp
+                                          ${PROJECT_TRDPARTY_DIR}/pdebug/*.cpp)
 file(GLOB SUBPROJECT_NOTIFY *.notifyrc)
 
 add_library(${PLUGIN_NAME} SHARED ${SUBPROJECT_SOURCE})

sources/desktop-panel/plugin/dpadds.cpp

@@ -35,6 +35,7 @@
 
 #include <fontdialog/fontdialog.h>
 #include <pdebug/pdebug.h>
+#include <pdebug/pdebug-time.h>
 
 #include "version.h"
 
@@ -42,6 +43,8 @@
 DPAdds::DPAdds(QObject *parent)
     : QObject(parent)
 {
+    qInstallMessageHandler(debugString);
+
     // debug
     QProcessEnvironment environment = QProcessEnvironment::systemEnvironment();
     QString debugEnv = environment.value(QString("DEBUG"), QString("no"));