From d2e6f2fe386ec9844481210b361ab5acb26fb0a4 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Fri, 14 Jul 2017 03:34:05 +0300 Subject: [PATCH] some refactoring * massive changes inside includes, drop unused definitions * rewrite some initialization methods to avoid additional freeing/allocation * drop some explicit destructors calls --- .../plugin/awabstractpairconfig.cpp | 1 - sources/awesome-widget/plugin/awactions.cpp | 3 - .../awesome-widget/plugin/awbugreporter.cpp | 2 - .../awesome-widget/plugin/awconfighelper.cpp | 5 ++ .../awesome-widget/plugin/awconfighelper.h | 13 +--- .../plugin/awcustomkeyshelper.h | 1 - .../plugin/awdataaggregator.cpp | 9 --- .../awesome-widget/plugin/awdataaggregator.h | 1 - .../plugin/awdataengineaggregator.cpp | 71 +++++++++---------- .../plugin/awdataengineaggregator.h | 5 +- sources/awesome-widget/plugin/awdbusadaptor.h | 5 +- .../awesome-widget/plugin/awesomewidget.cpp | 5 +- sources/awesome-widget/plugin/awkeycache.cpp | 1 - .../awesome-widget/plugin/awkeyoperations.cpp | 9 --- .../awesome-widget/plugin/awkeyoperations.h | 7 -- sources/awesome-widget/plugin/awkeys.cpp | 25 +------ sources/awesome-widget/plugin/awkeys.h | 3 - .../plugin/awkeysaggregator.cpp | 2 - ...figfactory.cpp => awpairconfigfactory.cpp} | 10 +-- ...rconfigfactory.h => awpairconfigfactory.h} | 12 ++-- .../plugin/awtelemetryhandler.cpp | 2 - .../plugin/awtelemetryhandler.h | 2 - .../awesome-widget/plugin/awupdatehelper.cpp | 2 - sources/awesomewidgets/abstractextitem.cpp | 3 +- .../abstractextitemaggregator.cpp | 1 - .../awesomewidgets/awdatetimeformatter.cpp | 1 - sources/awesomewidgets/awdatetimeformatter.h | 3 +- sources/awesomewidgets/awfloatformatter.cpp | 1 - sources/awesomewidgets/awscriptformatter.cpp | 1 - sources/awesomewidgets/awstringformatter.cpp | 1 - sources/awesomewidgets/extnetworkrequest.cpp | 2 - sources/awesomewidgets/extquotes.cpp | 3 - sources/awesomewidgets/extscript.cpp | 1 - sources/awesomewidgets/extupgrade.cpp | 1 - sources/awesomewidgets/extweather.cpp | 4 -- sources/awesomewidgets/graphicalitem.cpp | 32 ++++----- .../awesomewidgets/graphicalitemhelper.cpp | 1 - sources/awesomewidgets/qcronscheduler.cpp | 1 - sources/desktop-panel/plugin/dpadds.cpp | 2 - sources/extsysmon/extsysmon.cpp | 3 - sources/extsysmonsources/customsource.cpp | 2 - sources/extsysmonsources/quotessource.cpp | 2 - sources/extsysmonsources/requestsource.cpp | 2 - sources/extsysmonsources/upgradesource.cpp | 2 - sources/extsysmonsources/weathersource.cpp | 2 - sources/qml/AWExtensions.qml | 8 +-- sources/test/testawkeys.cpp | 3 - 47 files changed, 79 insertions(+), 199 deletions(-) rename sources/awesome-widget/plugin/{awformatterconfigfactory.cpp => awpairconfigfactory.cpp} (85%) rename sources/awesome-widget/plugin/{awformatterconfigfactory.h => awpairconfigfactory.h} (84%) diff --git a/sources/awesome-widget/plugin/awabstractpairconfig.cpp b/sources/awesome-widget/plugin/awabstractpairconfig.cpp index 16c1ba9..aaab069 100644 --- a/sources/awesome-widget/plugin/awabstractpairconfig.cpp +++ b/sources/awesome-widget/plugin/awabstractpairconfig.cpp @@ -56,7 +56,6 @@ AWAbstractPairConfig::~AWAbstractPairConfig() clearSelectors(); - delete m_helper; delete ui; } diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp index 639a8e9..2366109 100644 --- a/sources/awesome-widget/plugin/awactions.cpp +++ b/sources/awesome-widget/plugin/awactions.cpp @@ -23,7 +23,6 @@ #include #include #include -#include #include @@ -43,8 +42,6 @@ AWActions::AWActions(QObject *_parent) AWActions::~AWActions() { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; - - delete m_updateHelper; } diff --git a/sources/awesome-widget/plugin/awbugreporter.cpp b/sources/awesome-widget/plugin/awbugreporter.cpp index ae4fc7b..edc78ed 100644 --- a/sources/awesome-widget/plugin/awbugreporter.cpp +++ b/sources/awesome-widget/plugin/awbugreporter.cpp @@ -21,11 +21,9 @@ #include #include -#include #include #include #include -#include #include "awdebug.h" diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp index 30658c4..c2ccb57 100644 --- a/sources/awesome-widget/plugin/awconfighelper.cpp +++ b/sources/awesome-widget/plugin/awconfighelper.cpp @@ -22,6 +22,7 @@ #include #include #include +#include #include #include "awdebug.h" @@ -31,6 +32,10 @@ AWConfigHelper::AWConfigHelper(QObject *_parent) : QObject(_parent) { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; + + m_baseDir = QString("%1/awesomewidgets") + .arg(QStandardPaths::writableLocation( + QStandardPaths::GenericDataLocation)); } diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h index f613495..1997129 100644 --- a/sources/awesome-widget/plugin/awconfighelper.h +++ b/sources/awesome-widget/plugin/awconfighelper.h @@ -20,7 +20,6 @@ #define AWCONFIGHELPER_H #include -#include #include @@ -57,15 +56,9 @@ private: void writeFile(QSettings &_settings, const QString &_key, const QString &_fileName) const; // properties - QString m_baseDir = QString("%1/awesomewidgets") - .arg(QStandardPaths::writableLocation( - QStandardPaths::GenericDataLocation)); - QStringList m_dirs = QStringList() << "desktops" - << "quotes" - << "scripts" - << "upgrade" - << "weather" - << "formatters"; + QString m_baseDir; + QStringList m_dirs + = {"desktops", "quotes", "scripts", "upgrade", "weather", "formatters"}; }; diff --git a/sources/awesome-widget/plugin/awcustomkeyshelper.h b/sources/awesome-widget/plugin/awcustomkeyshelper.h index 1d8f814..42b8af7 100644 --- a/sources/awesome-widget/plugin/awcustomkeyshelper.h +++ b/sources/awesome-widget/plugin/awcustomkeyshelper.h @@ -19,7 +19,6 @@ #ifndef AWCUSTOMKEYSHELPER_H #define AWCUSTOMKEYSHELPER_H -#include #include #include "awabstractpairhelper.h" diff --git a/sources/awesome-widget/plugin/awdataaggregator.cpp b/sources/awesome-widget/plugin/awdataaggregator.cpp index 0a8e9b5..b7f239b 100644 --- a/sources/awesome-widget/plugin/awdataaggregator.cpp +++ b/sources/awesome-widget/plugin/awdataaggregator.cpp @@ -22,7 +22,6 @@ #include #include #include -#include #include @@ -55,14 +54,6 @@ AWDataAggregator::~AWDataAggregator() } -QList AWDataAggregator::getData(const QString &_key) const -{ - qCDebug(LOG_AW) << "Key" << _key; - - return m_values[QString("%1Tooltip").arg(_key)]; -} - - QString AWDataAggregator::htmlImage(const QPixmap &_source) const { QByteArray byteArray; diff --git a/sources/awesome-widget/plugin/awdataaggregator.h b/sources/awesome-widget/plugin/awdataaggregator.h index fc4be79..b554477 100644 --- a/sources/awesome-widget/plugin/awdataaggregator.h +++ b/sources/awesome-widget/plugin/awdataaggregator.h @@ -35,7 +35,6 @@ class AWDataAggregator : public QObject public: explicit AWDataAggregator(QObject *_parent = nullptr); virtual ~AWDataAggregator(); - QList getData(const QString &_key) const; QString htmlImage(const QPixmap &_source) const; void setParameters(const QVariantMap &_settings); QPixmap tooltipImage(); diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.cpp b/sources/awesome-widget/plugin/awdataengineaggregator.cpp index b2c69ff..6ca46ef 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.cpp +++ b/sources/awesome-widget/plugin/awdataengineaggregator.cpp @@ -28,6 +28,20 @@ AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent) { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; + m_consumer = new Plasma::DataEngineConsumer(); + m_dataEngines["systemmonitor"] = m_consumer->dataEngine("systemmonitor"); + m_dataEngines["extsysmon"] = m_consumer->dataEngine("extsysmon"); + m_dataEngines["time"] = m_consumer->dataEngine("time"); + + // additional method required by systemmonitor structure + m_newSourceConnection = connect( + m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded, + [this](const QString source) { + emit(deviceAdded(source)); + m_dataEngines["systemmonitor"]->connectSource(source, parent(), + 1000); + }); + // required to define Qt::QueuedConnection for signal-slot connection qRegisterMetaType("Plasma::DataEngine::Data"); } @@ -37,16 +51,7 @@ AWDataEngineAggregator::~AWDataEngineAggregator() { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; - clear(); -} - - -void AWDataEngineAggregator::clear() -{ - // disconnect sources first disconnectSources(); - m_dataEngines.clear(); - delete m_consumer; } @@ -55,27 +60,31 @@ void AWDataEngineAggregator::disconnectSources() for (auto dataengine : m_dataEngines.values()) for (auto &source : dataengine->sources()) dataengine->disconnectSource(source, parent()); + disconnect(m_newSourceConnection); } -void AWDataEngineAggregator::initDataEngines(const int _interval) +void AWDataEngineAggregator::reconnectSources(const int _interval) { - qCDebug(LOG_AW) << "Init dataengines with interval" << _interval; + qCDebug(LOG_AW) << "Reconnect sources with interval" << _interval; - m_consumer = new Plasma::DataEngineConsumer(); - m_dataEngines["systemmonitor"] = m_consumer->dataEngine("systemmonitor"); - m_dataEngines["extsysmon"] = m_consumer->dataEngine("extsysmon"); - m_dataEngines["time"] = m_consumer->dataEngine("time"); + disconnectSources(); - // additional method required by systemmonitor structure - connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded, - [this, _interval](const QString source) { - emit(deviceAdded(source)); - m_dataEngines["systemmonitor"]->connectSource(source, parent(), - _interval); - }); + m_dataEngines["systemmonitor"]->connectAllSources(parent(), _interval); + m_dataEngines["extsysmon"]->connectAllSources(parent(), _interval); + m_dataEngines["time"]->connectSource("Local", parent(), 1000); - return reconnectSources(_interval); + m_newSourceConnection = connect( + m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded, + [this, _interval](const QString source) { + emit(deviceAdded(source)); + m_dataEngines["systemmonitor"]->connectSource(source, parent(), + _interval); + }); + +#ifdef BUILD_FUTURE + createQueuedConnection(); +#endif /* BUILD_FUTURE */ } @@ -84,26 +93,12 @@ void AWDataEngineAggregator::dropSource(const QString &_source) qCDebug(LOG_AW) << "Source" << _source; // HACK there is no possibility to check to which dataengine source - // connected we will try to disconnect it from systemmonitor and extsysmon + // connected we will try to disconnect it from all engines for (auto dataengine : m_dataEngines.values()) dataengine->disconnectSource(_source, parent()); } -void AWDataEngineAggregator::reconnectSources(const int _interval) -{ - qCDebug(LOG_AW) << "Reconnect sources with interval" << _interval; - - m_dataEngines["systemmonitor"]->connectAllSources(parent(), _interval); - m_dataEngines["extsysmon"]->connectAllSources(parent(), _interval); - m_dataEngines["time"]->connectSource("Local", parent(), 1000); - -#ifdef BUILD_FUTURE - createQueuedConnection(); -#endif /* BUILD_FUTURE */ -} - - void AWDataEngineAggregator::createQueuedConnection() { // HACK additional method which forces QueuedConnection instead of Auto one diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.h b/sources/awesome-widget/plugin/awdataengineaggregator.h index 558d3d0..a2def21 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.h +++ b/sources/awesome-widget/plugin/awdataengineaggregator.h @@ -32,21 +32,20 @@ class AWDataEngineAggregator : public QObject public: explicit AWDataEngineAggregator(QObject *_parent = nullptr); virtual ~AWDataEngineAggregator(); - void clear(); void disconnectSources(); - void initDataEngines(const int _interval); + void reconnectSources(const int _interval); signals: void deviceAdded(const QString &_source); public slots: void dropSource(const QString &_source); - void reconnectSources(const int _interval); private: void createQueuedConnection(); Plasma::DataEngineConsumer *m_consumer = nullptr; QHash m_dataEngines; + QMetaObject::Connection m_newSourceConnection; }; diff --git a/sources/awesome-widget/plugin/awdbusadaptor.h b/sources/awesome-widget/plugin/awdbusadaptor.h index 1cad635..5ff888e 100644 --- a/sources/awesome-widget/plugin/awdbusadaptor.h +++ b/sources/awesome-widget/plugin/awdbusadaptor.h @@ -48,10 +48,7 @@ public slots: private: AWKeys *m_plugin = nullptr; - QStringList m_logLevels = QStringList() << "debug" - << "info" - << "warning" - << "critical"; + QStringList m_logLevels = {"debug", "info", "warning", "critical"}; }; diff --git a/sources/awesome-widget/plugin/awesomewidget.cpp b/sources/awesome-widget/plugin/awesomewidget.cpp index a4828b3..fdb526b 100644 --- a/sources/awesome-widget/plugin/awesomewidget.cpp +++ b/sources/awesome-widget/plugin/awesomewidget.cpp @@ -22,8 +22,8 @@ #include "awactions.h" #include "awbugreporter.h" #include "awconfighelper.h" -#include "awformatterconfigfactory.h" #include "awkeys.h" +#include "awpairconfigfactory.h" #include "awtelemetryhandler.h" @@ -34,8 +34,7 @@ void AWPlugin::registerTypes(const char *uri) qmlRegisterType(uri, 1, 0, "AWActions"); qmlRegisterType(uri, 1, 0, "AWBugReporter"); qmlRegisterType(uri, 1, 0, "AWConfigHelper"); - qmlRegisterType(uri, 1, 0, - "AWFormatterConfigFactory"); + qmlRegisterType(uri, 1, 0, "AWPairConfigFactory"); qmlRegisterType(uri, 1, 0, "AWKeys"); qmlRegisterType(uri, 1, 0, "AWTelemetryHandler"); } diff --git a/sources/awesome-widget/plugin/awkeycache.cpp b/sources/awesome-widget/plugin/awkeycache.cpp index dbfd93f..ce3ff84 100644 --- a/sources/awesome-widget/plugin/awkeycache.cpp +++ b/sources/awesome-widget/plugin/awkeycache.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include diff --git a/sources/awesome-widget/plugin/awkeyoperations.cpp b/sources/awesome-widget/plugin/awkeyoperations.cpp index 5dbc60f..c4b4ed2 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.cpp +++ b/sources/awesome-widget/plugin/awkeyoperations.cpp @@ -55,15 +55,6 @@ AWKeyOperations::AWKeyOperations(QObject *_parent) AWKeyOperations::~AWKeyOperations() { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; - - // extensions - delete m_customKeys; - delete m_graphicalItems; - delete m_extNetRequest; - delete m_extQuotes; - delete m_extScripts; - delete m_extUpgrade; - delete m_extWeather; } diff --git a/sources/awesome-widget/plugin/awkeyoperations.h b/sources/awesome-widget/plugin/awkeyoperations.h index cd74099..a58d99f 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.h +++ b/sources/awesome-widget/plugin/awkeyoperations.h @@ -19,25 +19,18 @@ #ifndef AWKEYOPERATIONS_H #define AWKEYOPERATIONS_H -#include - -#include #include #include "extitemaggregator.h" class AWCustomKeysHelper; -class AWDataAggregator; -class AWDataEngineAggregator; -class AWKeysAggregator; class ExtNetworkRequest; class ExtQuotes; class ExtScript; class ExtUpgrade; class ExtWeather; class GraphicalItem; -class QThreadPool; class AWKeyOperations : public QObject { diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index 72ba33e..e8d4745 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -19,7 +19,6 @@ #include #include -#include #include #include #include @@ -76,24 +75,9 @@ AWKeys::~AWKeys() qCDebug(LOG_AW) << __PRETTY_FUNCTION__; m_timer->stop(); - delete m_timer; - // delete dbus session qlonglong id = reinterpret_cast(this); QDBusConnection::sessionBus().unregisterObject(QString("/%1").arg(id)); - - // core - delete m_dataEngineAggregator; - delete m_threadPool; - delete m_aggregator; - delete m_dataAggregator; - delete m_keyOperator; -} - - -bool AWKeys::isDBusActive() const -{ - return m_dbusActive; } @@ -122,8 +106,7 @@ void AWKeys::initKeys(const QString &_currentPattern, const int _interval, m_aggregator->initFormatters(); m_keyOperator->setPattern(_currentPattern); m_keyOperator->updateCache(); - m_dataEngineAggregator->clear(); - m_dataEngineAggregator->initDataEngines(_interval); + m_dataEngineAggregator->reconnectSources(_interval); // timer m_timer->setInterval(_interval); @@ -348,13 +331,9 @@ void AWKeys::createDBusInterface() qCWarning(LOG_AW) << "Could not register DBus service, last error" << bus.lastError().message(); if (!bus.registerObject(QString("/%1").arg(id), new AWDBusAdaptor(this), - QDBusConnection::ExportAllContents)) { + QDBusConnection::ExportAllContents)) qCWarning(LOG_AW) << "Could not register DBus object, last error" << bus.lastError().message(); - m_dbusActive = false; - } else { - m_dbusActive = true; - } } diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h index f0011bd..0c49b8c 100644 --- a/sources/awesome-widget/plugin/awkeys.h +++ b/sources/awesome-widget/plugin/awkeys.h @@ -25,7 +25,6 @@ #include -class AWCustomKeysHelper; class AWDataAggregator; class AWDataEngineAggregator; class AWKeyOperations; @@ -40,7 +39,6 @@ class AWKeys : public QObject public: explicit AWKeys(QObject *_parent = nullptr); virtual ~AWKeys(); - bool isDBusActive() const; Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams); Q_INVOKABLE void initKeys(const QString &_currentPattern, const int _interval, const int _limit, @@ -89,7 +87,6 @@ private: AWKeyOperations *m_keyOperator = nullptr; QTimer *m_timer = nullptr; // variables - bool m_dbusActive = false; QVariantMap m_tooltipParams; QStringList m_foundBars, m_foundKeys, m_foundLambdas, m_requiredKeys; QVariantHash m_values; diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp index c8137d5..c50f331 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.cpp +++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp @@ -60,8 +60,6 @@ AWKeysAggregator::AWKeysAggregator(QObject *_parent) AWKeysAggregator::~AWKeysAggregator() { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; - - delete m_customFormatters; } diff --git a/sources/awesome-widget/plugin/awformatterconfigfactory.cpp b/sources/awesome-widget/plugin/awpairconfigfactory.cpp similarity index 85% rename from sources/awesome-widget/plugin/awformatterconfigfactory.cpp rename to sources/awesome-widget/plugin/awpairconfigfactory.cpp index ebb282c..7de5dc3 100644 --- a/sources/awesome-widget/plugin/awformatterconfigfactory.cpp +++ b/sources/awesome-widget/plugin/awpairconfigfactory.cpp @@ -15,27 +15,27 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#include "awformatterconfigfactory.h" +#include "awpairconfigfactory.h" #include "awcustomkeysconfig.h" #include "awdebug.h" #include "awformatterconfig.h" -AWFormatterConfigFactory::AWFormatterConfigFactory(QObject *_parent) +AWPairConfigFactory::AWPairConfigFactory(QObject *_parent) : QObject(_parent) { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; } -AWFormatterConfigFactory::~AWFormatterConfigFactory() +AWPairConfigFactory::~AWPairConfigFactory() { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; } -void AWFormatterConfigFactory::showFormatterDialog(const QStringList &_keys) +void AWPairConfigFactory::showFormatterDialog(const QStringList &_keys) { AWFormatterConfig *config = new AWFormatterConfig(nullptr, _keys); config->showDialog(); @@ -43,7 +43,7 @@ void AWFormatterConfigFactory::showFormatterDialog(const QStringList &_keys) } -void AWFormatterConfigFactory::showKeysDialog(const QStringList &_keys) +void AWPairConfigFactory::showKeysDialog(const QStringList &_keys) { AWCustomKeysConfig *config = new AWCustomKeysConfig(nullptr, _keys); config->showDialog(); diff --git a/sources/awesome-widget/plugin/awformatterconfigfactory.h b/sources/awesome-widget/plugin/awpairconfigfactory.h similarity index 84% rename from sources/awesome-widget/plugin/awformatterconfigfactory.h rename to sources/awesome-widget/plugin/awpairconfigfactory.h index b8fc7fe..40d0d08 100644 --- a/sources/awesome-widget/plugin/awformatterconfigfactory.h +++ b/sources/awesome-widget/plugin/awpairconfigfactory.h @@ -16,19 +16,19 @@ ***************************************************************************/ -#ifndef AWFORMATTERCONFIGFACTORY_H -#define AWFORMATTERCONFIGFACTORY_H +#ifndef AWPAIRCONFIGFACTORY_H +#define AWPAIRCONFIGFACTORY_H #include -class AWFormatterConfigFactory : public QObject +class AWPairConfigFactory : public QObject { Q_OBJECT public: - explicit AWFormatterConfigFactory(QObject *_parent = nullptr); - virtual ~AWFormatterConfigFactory(); + explicit AWPairConfigFactory(QObject *_parent = nullptr); + virtual ~AWPairConfigFactory(); Q_INVOKABLE void showFormatterDialog(const QStringList &_keys); Q_INVOKABLE void showKeysDialog(const QStringList &_keys); @@ -36,4 +36,4 @@ private: }; -#endif /* AWFORMATTERCONFIGFACTORY_H */ +#endif /* AWPAIRCONFIGFACTORY_H */ diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.cpp b/sources/awesome-widget/plugin/awtelemetryhandler.cpp index c0e3a51..8eb0091 100644 --- a/sources/awesome-widget/plugin/awtelemetryhandler.cpp +++ b/sources/awesome-widget/plugin/awtelemetryhandler.cpp @@ -18,10 +18,8 @@ #include "awtelemetryhandler.h" #include -#include #include #include -#include #include #include #include diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.h b/sources/awesome-widget/plugin/awtelemetryhandler.h index 3fdab9c..9586db0 100644 --- a/sources/awesome-widget/plugin/awtelemetryhandler.h +++ b/sources/awesome-widget/plugin/awtelemetryhandler.h @@ -20,10 +20,8 @@ #define AWTELEMETRYHANDLER_H #include -#include -class QAbstractButton; class QNetworkReply; class AWTelemetryHandler : public QObject diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp index f6b5338..f4839e2 100644 --- a/sources/awesome-widget/plugin/awupdatehelper.cpp +++ b/sources/awesome-widget/plugin/awupdatehelper.cpp @@ -21,10 +21,8 @@ #include #include -#include #include #include -#include #include #include "awdebug.h" diff --git a/sources/awesomewidgets/abstractextitem.cpp b/sources/awesomewidgets/abstractextitem.cpp index 6595d73..317578e 100644 --- a/sources/awesomewidgets/abstractextitem.cpp +++ b/sources/awesomewidgets/abstractextitem.cpp @@ -24,7 +24,6 @@ #include #include "abstractextitemaggregator.h" -#include "awdebug.h" #include "qcronscheduler.h" @@ -47,7 +46,7 @@ AbstractExtItem::~AbstractExtItem() if (m_socket) { m_socket->close(); m_socket->removeServer(socket()); - delete m_socket; + m_socket->deleteLater(); } } diff --git a/sources/awesomewidgets/abstractextitemaggregator.cpp b/sources/awesomewidgets/abstractextitemaggregator.cpp index 9c9a0e7..a2d8663 100644 --- a/sources/awesomewidgets/abstractextitemaggregator.cpp +++ b/sources/awesomewidgets/abstractextitemaggregator.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/sources/awesomewidgets/awdatetimeformatter.cpp b/sources/awesomewidgets/awdatetimeformatter.cpp index 0575d95..44bdcca 100644 --- a/sources/awesomewidgets/awdatetimeformatter.cpp +++ b/sources/awesomewidgets/awdatetimeformatter.cpp @@ -22,7 +22,6 @@ #include #include -#include #include #include "awdebug.h" diff --git a/sources/awesomewidgets/awdatetimeformatter.h b/sources/awesomewidgets/awdatetimeformatter.h index 0e023a5..c83bc6c 100644 --- a/sources/awesomewidgets/awdatetimeformatter.h +++ b/sources/awesomewidgets/awdatetimeformatter.h @@ -18,9 +18,10 @@ #ifndef AWDATETIMEFORMATTER_H #define AWDATETIMEFORMATTER_H -#include "awabstractformatter.h" #include +#include "awabstractformatter.h" + namespace Ui { diff --git a/sources/awesomewidgets/awfloatformatter.cpp b/sources/awesomewidgets/awfloatformatter.cpp index 7fab070..f587ae1 100644 --- a/sources/awesomewidgets/awfloatformatter.cpp +++ b/sources/awesomewidgets/awfloatformatter.cpp @@ -21,7 +21,6 @@ #include -#include #include #include "awdebug.h" diff --git a/sources/awesomewidgets/awscriptformatter.cpp b/sources/awesomewidgets/awscriptformatter.cpp index 965088a..f6943a4 100644 --- a/sources/awesomewidgets/awscriptformatter.cpp +++ b/sources/awesomewidgets/awscriptformatter.cpp @@ -21,7 +21,6 @@ #include -#include #include #include diff --git a/sources/awesomewidgets/awstringformatter.cpp b/sources/awesomewidgets/awstringformatter.cpp index 92e08e0..56c4e7f 100644 --- a/sources/awesomewidgets/awstringformatter.cpp +++ b/sources/awesomewidgets/awstringformatter.cpp @@ -21,7 +21,6 @@ #include -#include #include #include "awdebug.h" diff --git a/sources/awesomewidgets/extnetworkrequest.cpp b/sources/awesomewidgets/extnetworkrequest.cpp index 14fa1de..b8a85b9 100644 --- a/sources/awesomewidgets/extnetworkrequest.cpp +++ b/sources/awesomewidgets/extnetworkrequest.cpp @@ -21,8 +21,6 @@ #include #include -#include -#include #include #include diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp index 5841f5f..2a265d8 100644 --- a/sources/awesomewidgets/extquotes.cpp +++ b/sources/awesomewidgets/extquotes.cpp @@ -22,9 +22,6 @@ #include #include -#include -#include -#include #include #include diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp index 928f5b7..ef9c35d 100644 --- a/sources/awesomewidgets/extscript.cpp +++ b/sources/awesomewidgets/extscript.cpp @@ -22,7 +22,6 @@ #include #include -#include #include #include #include diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp index 302fb02..06bdbb9 100644 --- a/sources/awesomewidgets/extupgrade.cpp +++ b/sources/awesomewidgets/extupgrade.cpp @@ -21,7 +21,6 @@ #include #include -#include #include #include diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp index 625e501..70a00a0 100644 --- a/sources/awesomewidgets/extweather.cpp +++ b/sources/awesomewidgets/extweather.cpp @@ -22,9 +22,6 @@ #include #include -#include -#include -#include #include #include @@ -72,7 +69,6 @@ ExtWeather::~ExtWeather() disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest())); m_manager->deleteLater(); - delete m_providerObject; delete ui; } diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp index 759a603..42e8442 100644 --- a/sources/awesomewidgets/graphicalitem.cpp +++ b/sources/awesomewidgets/graphicalitem.cpp @@ -38,6 +38,19 @@ GraphicalItem::GraphicalItem(QWidget *_parent, const QString &_filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; + // init scene + m_scene = new QGraphicsScene(); + m_scene->setBackgroundBrush(QBrush(Qt::NoBrush)); + // init view + m_view = new QGraphicsView(m_scene); + m_view->setStyleSheet("background: transparent"); + m_view->setContentsMargins(0, 0, 0, 0); + m_view->setFrameShape(QFrame::NoFrame); + m_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + m_view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); + // init helper + m_helper = new GraphicalItemHelper(this, m_scene); + if (!_filePath.isEmpty()) readConfiguration(); ui->setupUi(this); @@ -58,9 +71,7 @@ GraphicalItem::~GraphicalItem() { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; - delete m_scene; delete ui; - delete m_helper; } @@ -141,24 +152,7 @@ QString GraphicalItem::image(const QVariant &value) void GraphicalItem::initScene() { - // cleanup - delete m_helper; - delete m_scene; - - // init scene - m_scene = new QGraphicsScene(); - m_scene->setBackgroundBrush(QBrush(Qt::NoBrush)); - // init view - m_view = new QGraphicsView(m_scene); - m_view->setStyleSheet("background: transparent"); - m_view->setContentsMargins(0, 0, 0, 0); - m_view->setFrameShape(QFrame::NoFrame); - m_view->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); - m_view->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); m_view->resize(m_width + 5, m_height + 5); - - // init helper - m_helper = new GraphicalItemHelper(this, m_scene); m_helper->setParameters(activeColor(), inactiveColor(), itemWidth(), itemHeight(), count()); } diff --git a/sources/awesomewidgets/graphicalitemhelper.cpp b/sources/awesomewidgets/graphicalitemhelper.cpp index 1a3a474..1fcc703 100644 --- a/sources/awesomewidgets/graphicalitemhelper.cpp +++ b/sources/awesomewidgets/graphicalitemhelper.cpp @@ -17,7 +17,6 @@ #include "graphicalitemhelper.h" -#include #include #include #include diff --git a/sources/awesomewidgets/qcronscheduler.cpp b/sources/awesomewidgets/qcronscheduler.cpp index c27224b..90d5adc 100644 --- a/sources/awesomewidgets/qcronscheduler.cpp +++ b/sources/awesomewidgets/qcronscheduler.cpp @@ -44,7 +44,6 @@ QCronScheduler::~QCronScheduler() qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; m_timer->stop(); - delete m_timer; } diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index 08149fb..098f737 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -27,8 +27,6 @@ #include #include #include -#include -#include #include #include diff --git a/sources/extsysmon/extsysmon.cpp b/sources/extsysmon/extsysmon.cpp index 2e074c6..fab99fd 100644 --- a/sources/extsysmon/extsysmon.cpp +++ b/sources/extsysmon/extsysmon.cpp @@ -18,7 +18,6 @@ #include "extsysmon.h" #include -#include #include #include @@ -50,8 +49,6 @@ ExtendedSysMon::ExtendedSysMon(QObject *_parent, const QVariantList &_args) ExtendedSysMon::~ExtendedSysMon() { qCDebug(LOG_ESM) << __PRETTY_FUNCTION__; - - delete m_aggregator; } diff --git a/sources/extsysmonsources/customsource.cpp b/sources/extsysmonsources/customsource.cpp index 07eb9a6..e4d9664 100644 --- a/sources/extsysmonsources/customsource.cpp +++ b/sources/extsysmonsources/customsource.cpp @@ -37,8 +37,6 @@ CustomSource::CustomSource(QObject *_parent, const QStringList &_args) CustomSource::~CustomSource() { qCDebug(LOG_ESS) << __PRETTY_FUNCTION__; - - delete m_extScripts; } diff --git a/sources/extsysmonsources/quotessource.cpp b/sources/extsysmonsources/quotessource.cpp index f759c36..2a29cad 100644 --- a/sources/extsysmonsources/quotessource.cpp +++ b/sources/extsysmonsources/quotessource.cpp @@ -37,8 +37,6 @@ QuotesSource::QuotesSource(QObject *_parent, const QStringList &_args) QuotesSource::~QuotesSource() { qCDebug(LOG_ESS) << __PRETTY_FUNCTION__; - - delete m_extQuotes; } diff --git a/sources/extsysmonsources/requestsource.cpp b/sources/extsysmonsources/requestsource.cpp index e72cfaf..6ac889b 100644 --- a/sources/extsysmonsources/requestsource.cpp +++ b/sources/extsysmonsources/requestsource.cpp @@ -38,8 +38,6 @@ RequestSource::RequestSource(QObject *_parent, const QStringList &_args) RequestSource::~RequestSource() { qCDebug(LOG_ESS) << __PRETTY_FUNCTION__; - - delete m_extNetRequest; } diff --git a/sources/extsysmonsources/upgradesource.cpp b/sources/extsysmonsources/upgradesource.cpp index 62dd975..1968e24 100644 --- a/sources/extsysmonsources/upgradesource.cpp +++ b/sources/extsysmonsources/upgradesource.cpp @@ -37,8 +37,6 @@ UpgradeSource::UpgradeSource(QObject *_parent, const QStringList &_args) UpgradeSource::~UpgradeSource() { qCDebug(LOG_ESS) << __PRETTY_FUNCTION__; - - delete m_extUpgrade; } diff --git a/sources/extsysmonsources/weathersource.cpp b/sources/extsysmonsources/weathersource.cpp index 89ac0aa..576a285 100644 --- a/sources/extsysmonsources/weathersource.cpp +++ b/sources/extsysmonsources/weathersource.cpp @@ -37,8 +37,6 @@ WeatherSource::WeatherSource(QObject *_parent, const QStringList &_args) WeatherSource::~WeatherSource() { qCDebug(LOG_ESS) << __PRETTY_FUNCTION__; - - delete m_extWeather; } diff --git a/sources/qml/AWExtensions.qml b/sources/qml/AWExtensions.qml index eed6e0d..d048ac8 100644 --- a/sources/qml/AWExtensions.qml +++ b/sources/qml/AWExtensions.qml @@ -28,8 +28,8 @@ Row { // backend property var backend - AWFormatterConfigFactory { - id: awFormatter + AWPairConfigFactory { + id: awPairConfig } AWTelemetryHandler { id: awTelemetryHandler @@ -49,13 +49,13 @@ Row { QtControls.Button { width: parent.width * 3 / 15 text: i18n("Formatters") - onClicked: awFormatter.showFormatterDialog(backend.dictKeys(true)) + onClicked: awPairConfig.showFormatterDialog(backend.dictKeys(true)) } QtControls.Button { width: parent.width * 3 / 15 text: i18n("User keys") - onClicked: awFormatter.showKeysDialog(backend.dictKeys(true)) + onClicked: awPairConfig.showKeysDialog(backend.dictKeys(true)) } QtControls.Button { diff --git a/sources/test/testawkeys.cpp b/sources/test/testawkeys.cpp index f51de28..c55d2d7 100644 --- a/sources/test/testawkeys.cpp +++ b/sources/test/testawkeys.cpp @@ -168,9 +168,6 @@ void TestAWKeys::test_valueByKey() void TestAWKeys::test_dbus() { - if (!plugin->isDBusActive()) - QSKIP("No DBus session created, skip DBus test"); - // get id qlonglong id = reinterpret_cast(plugin);