From 1cddf6f14d19ce97537aeb941ce34e1d354d3cc4 Mon Sep 17 00:00:00 2001 From: arcan1s Date: Tue, 4 Aug 2015 00:15:19 +0300 Subject: [PATCH] some map replacing --- sources/awesome-widget/package/contents/ui/main.qml | 2 ++ sources/awesome-widget/plugin/awactions.h | 1 - sources/awesome-widget/plugin/awkeys.cpp | 10 ---------- sources/awesome-widget/plugin/awkeys.h | 5 ++--- sources/awesome-widget/plugin/awtooltip.cpp | 6 +++--- sources/awesome-widget/plugin/awtooltip.h | 10 +++++----- sources/desktop-panel/plugin/CMakeLists.txt | 3 ++- sources/desktop-panel/plugin/dpadds.cpp | 3 +++ 8 files changed, 17 insertions(+), 23 deletions(-) diff --git a/sources/awesome-widget/package/contents/ui/main.qml b/sources/awesome-widget/package/contents/ui/main.qml index d459f25..2c116ae 100644 --- a/sources/awesome-widget/package/contents/ui/main.qml +++ b/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) } diff --git a/sources/awesome-widget/plugin/awactions.h b/sources/awesome-widget/plugin/awactions.h index d338950..a50845c 100644 --- a/sources/awesome-widget/plugin/awactions.h +++ b/sources/awesome-widget/plugin/awactions.h @@ -19,7 +19,6 @@ #ifndef AWACTIONS_H #define AWACTIONS_H -#include #include #include diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index b7e57d6..541f371 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/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; diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h index 005eedf..5f982ff 100644 --- a/sources/awesome-widget/plugin/awkeys.h +++ b/sources/awesome-widget/plugin/awkeys.h @@ -19,7 +19,7 @@ #ifndef AWKEYS_H #define AWKEYS_H -#include +#include #include #include #include @@ -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; QString pattern; QStringList foundBars, foundKeys, keys; - QMap values; + QHash values; QStringList diskDevices, hddDevices, mountDevices, networkDevices, tempDevices; }; diff --git a/sources/awesome-widget/plugin/awtooltip.cpp b/sources/awesome-widget/plugin/awtooltip.cpp index 40aca45..a102867 100644 --- a/sources/awesome-widget/plugin/awtooltip.cpp +++ b/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)), - this, SLOT(dataUpdate(QMap))); + connect(this, SIGNAL(updateData(QHash)), + this, SLOT(dataUpdate(QHash))); } @@ -80,7 +80,7 @@ AWToolTip::~AWToolTip() } -void AWToolTip::dataUpdate(QMap values) +void AWToolTip::dataUpdate(QHash values) { if (debug) qDebug() << PDEBUG; diff --git a/sources/awesome-widget/plugin/awtooltip.h b/sources/awesome-widget/plugin/awtooltip.h index 326c20a..696200e 100644 --- a/sources/awesome-widget/plugin/awtooltip.h +++ b/sources/awesome-widget/plugin/awtooltip.h @@ -21,7 +21,7 @@ #include #include -#include +#include #include #include #include @@ -39,11 +39,11 @@ public: QPixmap image(); signals: - void updateData(QMap values); + void updateData(QHash values); void toolTipPainted(QString image); private slots: - void dataUpdate(QMap values); + void dataUpdate(QHash values); private: // ui @@ -55,8 +55,8 @@ private: bool debug = false; int counts = 0; QVariantMap configuration; - QMap boundaries; - QMap> data; + QHash boundaries; + QHash> data; QStringList requiredKeys; QSize size; }; diff --git a/sources/desktop-panel/plugin/CMakeLists.txt b/sources/desktop-panel/plugin/CMakeLists.txt index 09819c1..05012f3 100644 --- a/sources/desktop-panel/plugin/CMakeLists.txt +++ b/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}) diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index c106592..fcf3d8e 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -35,6 +35,7 @@ #include #include +#include #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"));