From 6e62ceaac710f426c1fc2239e06b4cce0779eff8 Mon Sep 17 00:00:00 2001 From: Evgeniy Alekseev Date: Thu, 4 May 2017 15:00:50 +0300 Subject: [PATCH] massive changes inside * use pass by ref instead of by value if possible * use reference in interation over collections * fix no tag inserting --- sources/CMakeLists.txt | 3 -- .../plugin/awabstractselector.cpp | 7 +-- .../plugin/awabstractselector.h | 6 +-- sources/awesome-widget/plugin/awactions.cpp | 10 ++-- sources/awesome-widget/plugin/awactions.h | 13 ++--- .../awesome-widget/plugin/awbugreporter.cpp | 16 +++--- sources/awesome-widget/plugin/awbugreporter.h | 14 ++--- .../awesome-widget/plugin/awconfighelper.cpp | 36 ++++++------- .../awesome-widget/plugin/awconfighelper.h | 18 +++---- .../plugin/awdataaggregator.cpp | 18 +++---- .../awesome-widget/plugin/awdataaggregator.h | 16 +++--- .../plugin/awdataengineaggregator.cpp | 10 ++-- .../plugin/awdataengineaggregator.h | 2 +- .../awesome-widget/plugin/awdbusadaptor.cpp | 12 ++--- sources/awesome-widget/plugin/awdbusadaptor.h | 10 ++-- .../plugin/awformatterconfig.cpp | 8 +-- .../awesome-widget/plugin/awformatterconfig.h | 2 +- .../plugin/awformatterconfigfactory.cpp | 2 +- .../plugin/awformatterconfigfactory.h | 2 +- .../plugin/awformatterhelper.cpp | 22 ++++---- .../awesome-widget/plugin/awformatterhelper.h | 8 +-- sources/awesome-widget/plugin/awkeycache.cpp | 22 ++++---- sources/awesome-widget/plugin/awkeycache.h | 2 +- .../awesome-widget/plugin/awkeyoperations.cpp | 53 ++++++++++--------- .../awesome-widget/plugin/awkeyoperations.h | 14 ++--- sources/awesome-widget/plugin/awkeys.cpp | 30 +++++------ sources/awesome-widget/plugin/awkeys.h | 24 ++++----- .../plugin/awkeysaggregator.cpp | 18 +++---- .../awesome-widget/plugin/awkeysaggregator.h | 12 ++--- .../plugin/awpatternfunctions.cpp | 36 +++++++------ .../plugin/awpatternfunctions.h | 15 +++--- .../plugin/awtelemetryhandler.cpp | 20 +++---- .../plugin/awtelemetryhandler.h | 15 +++--- .../awesome-widget/plugin/awupdatehelper.cpp | 6 +-- .../awesome-widget/plugin/awupdatehelper.h | 6 +-- sources/awesomewidgets/abstractextitem.cpp | 12 ++--- sources/awesomewidgets/abstractextitem.h | 16 +++--- .../abstractextitemaggregator.cpp | 10 ++-- .../abstractextitemaggregator.h | 4 +- .../awesomewidgets/abstractweatherprovider.h | 2 +- .../awesomewidgets/awabstractformatter.cpp | 4 +- sources/awesomewidgets/awabstractformatter.h | 4 +- .../awesomewidgets/awdatetimeformatter.cpp | 8 +-- sources/awesomewidgets/awdatetimeformatter.h | 8 +-- sources/awesomewidgets/awfloatformatter.cpp | 8 +-- sources/awesomewidgets/awfloatformatter.h | 8 +-- sources/awesomewidgets/awjsonformatter.cpp | 13 ++--- sources/awesomewidgets/awjsonformatter.h | 8 +-- sources/awesomewidgets/awlistformatter.cpp | 10 ++-- sources/awesomewidgets/awlistformatter.h | 10 ++-- sources/awesomewidgets/awnoformatter.cpp | 6 +-- sources/awesomewidgets/awnoformatter.h | 6 +-- sources/awesomewidgets/awscriptformatter.cpp | 8 +-- sources/awesomewidgets/awscriptformatter.h | 8 +-- sources/awesomewidgets/awstringformatter.cpp | 8 +-- sources/awesomewidgets/awstringformatter.h | 8 +-- sources/awesomewidgets/extitemaggregator.h | 16 +++--- sources/awesomewidgets/extnetworkrequest.cpp | 8 +-- sources/awesomewidgets/extnetworkrequest.h | 8 +-- sources/awesomewidgets/extquotes.cpp | 8 +-- sources/awesomewidgets/extquotes.h | 8 +-- sources/awesomewidgets/extscript.cpp | 20 +++---- sources/awesomewidgets/extscript.h | 16 +++--- sources/awesomewidgets/extupgrade.cpp | 10 ++-- sources/awesomewidgets/extupgrade.h | 10 ++-- sources/awesomewidgets/extweather.cpp | 12 ++--- sources/awesomewidgets/extweather.h | 12 ++--- sources/awesomewidgets/graphicalitem.cpp | 20 +++---- sources/awesomewidgets/graphicalitem.h | 18 +++---- .../awesomewidgets/graphicalitemhelper.cpp | 20 +++---- sources/awesomewidgets/graphicalitemhelper.h | 16 +++--- sources/awesomewidgets/owmweatherprovider.cpp | 2 +- sources/awesomewidgets/owmweatherprovider.h | 2 +- sources/awesomewidgets/qcronscheduler.cpp | 2 +- .../awesomewidgets/yahooweatherprovider.cpp | 2 +- sources/awesomewidgets/yahooweatherprovider.h | 2 +- sources/desktop-panel/plugin/dpadds.cpp | 30 +++++------ sources/desktop-panel/plugin/dpadds.h | 20 +++---- sources/extsysmon/extsysmon.cpp | 6 +-- sources/extsysmon/extsysmonaggregator.cpp | 38 ++++++------- sources/extsysmon/extsysmonaggregator.h | 10 ++-- .../abstractextsysmonsource.h | 8 +-- sources/extsysmonsources/batterysource.cpp | 6 +-- sources/extsysmonsources/batterysource.h | 6 +-- sources/extsysmonsources/customsource.cpp | 8 +-- sources/extsysmonsources/customsource.h | 6 +-- sources/extsysmonsources/desktopsource.cpp | 6 +-- sources/extsysmonsources/desktopsource.h | 6 +-- sources/extsysmonsources/gpuloadsource.cpp | 10 ++-- sources/extsysmonsources/gpuloadsource.h | 6 +-- sources/extsysmonsources/gputempsource.cpp | 10 ++-- sources/extsysmonsources/gputempsource.h | 6 +-- sources/extsysmonsources/hddtempsource.cpp | 20 +++---- sources/extsysmonsources/hddtempsource.h | 6 +-- sources/extsysmonsources/loadsource.cpp | 11 ++-- sources/extsysmonsources/loadsource.h | 6 +-- sources/extsysmonsources/networksource.cpp | 8 +-- sources/extsysmonsources/networksource.h | 6 +-- sources/extsysmonsources/playersource.cpp | 12 ++--- sources/extsysmonsources/playersource.h | 8 +-- sources/extsysmonsources/processessource.cpp | 8 +-- sources/extsysmonsources/processessource.h | 6 +-- sources/extsysmonsources/quotessource.cpp | 17 +++--- sources/extsysmonsources/quotessource.h | 6 +-- sources/extsysmonsources/requestsource.cpp | 17 +++--- sources/extsysmonsources/requestsource.h | 6 +-- sources/extsysmonsources/upgradesource.cpp | 8 +-- sources/extsysmonsources/upgradesource.h | 6 +-- sources/extsysmonsources/weathersource.cpp | 17 +++--- sources/extsysmonsources/weathersource.h | 6 +-- sources/qml/AWTagSelector.qml | 2 +- sources/qml/AWTextEditor.qml | 6 ++- sources/test/testawbugreporter.cpp | 4 +- sources/test/testawconfighelper.cpp | 4 +- sources/test/testawkeys.cpp | 6 +-- sources/test/testawtelemetryhandler.cpp | 2 +- sources/test/testdpplugin.cpp | 2 +- sources/test/testextquotes.cpp | 6 +-- sources/version.h.in | 2 +- 119 files changed, 645 insertions(+), 634 deletions(-) diff --git a/sources/CMakeLists.txt b/sources/CMakeLists.txt index 343d534..e7c5583 100644 --- a/sources/CMakeLists.txt +++ b/sources/CMakeLists.txt @@ -55,9 +55,6 @@ elseif (CMAKE_CXX_COMPILER_ID MATCHES "Clang") set(CMAKE_CXX_FLAGS_RELEASE "-O2 -DNDEBUG") set(CMAKE_CXX_FLAGS_OPTIMIZATION "-Ofast -DNDEBUG") # linker flags -# set(CMAKE_EXE_LINKER_FLAGS "-lc++abi") -# set(CMAKE_MODULE_LINKER_FLAGS "-lc++abi") -# set(CMAKE_SHARED_LINKER_FLAGS "-lc++abi") else () message(FATAL_ERROR "Unknown compiler") endif () diff --git a/sources/awesome-widget/plugin/awabstractselector.cpp b/sources/awesome-widget/plugin/awabstractselector.cpp index 2715974..e34cfc0 100644 --- a/sources/awesome-widget/plugin/awabstractselector.cpp +++ b/sources/awesome-widget/plugin/awabstractselector.cpp @@ -22,7 +22,7 @@ AWAbstractSelector::AWAbstractSelector(QWidget *parent, - const QPair editable) + const QPair &editable) : QWidget(parent) , ui(new Ui::AWAbstractSelector) { @@ -56,8 +56,9 @@ QPair AWAbstractSelector::current() const } -void AWAbstractSelector::init(const QStringList keys, const QStringList values, - const QPair current) +void AWAbstractSelector::init(const QStringList &keys, + const QStringList &values, + const QPair ¤t) { if ((!keys.contains(current.first)) || (!values.contains(current.second))) { qCWarning(LOG_AW) << "Invalid current value" << current diff --git a/sources/awesome-widget/plugin/awabstractselector.h b/sources/awesome-widget/plugin/awabstractselector.h index b421854..4de7aa9 100644 --- a/sources/awesome-widget/plugin/awabstractselector.h +++ b/sources/awesome-widget/plugin/awabstractselector.h @@ -33,12 +33,12 @@ class AWAbstractSelector : public QWidget public: explicit AWAbstractSelector(QWidget *parent = nullptr, - const QPair editable + const QPair &editable = {false, false}); virtual ~AWAbstractSelector(); QPair current() const; - void init(const QStringList keys, const QStringList values, - const QPair current); + void init(const QStringList &keys, const QStringList &values, + const QPair ¤t); signals: void selectionChanged(); diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp index af3b50d..eb50729 100644 --- a/sources/awesome-widget/plugin/awactions.cpp +++ b/sources/awesome-widget/plugin/awactions.cpp @@ -57,7 +57,7 @@ void AWActions::checkUpdates(const bool showAnyway) } -QString AWActions::getFileContent(const QString path) const +QString AWActions::getFileContent(const QString &path) const { qCDebug(LOG_AW) << "Get content from file" << path; @@ -81,7 +81,7 @@ bool AWActions::isDebugEnabled() const } -bool AWActions::runCmd(const QString cmd) const +bool AWActions::runCmd(const QString &cmd) const { qCDebug(LOG_AW) << "Cmd" << cmd; @@ -114,7 +114,7 @@ void AWActions::showLegacyInfo() const // HACK: this method uses variables from version.h -QString AWActions::getAboutText(const QString type) const +QString AWActions::getAboutText(const QString &type) const { qCDebug(LOG_AW) << "Type" << type; @@ -122,7 +122,7 @@ QString AWActions::getAboutText(const QString type) const } -QVariantMap AWActions::getFont(const QVariantMap defaultFont) const +QVariantMap AWActions::getFont(const QVariantMap &defaultFont) const { qCDebug(LOG_AW) << "Default font is" << defaultFont; @@ -144,7 +144,7 @@ QVariantMap AWActions::getFont(const QVariantMap defaultFont) const // to avoid additional object definition this method is static -void AWActions::sendNotification(const QString eventId, const QString message) +void AWActions::sendNotification(const QString &eventId, const QString &message) { qCDebug(LOG_AW) << "Event" << eventId << "with message" << message; diff --git a/sources/awesome-widget/plugin/awactions.h b/sources/awesome-widget/plugin/awactions.h index 1c568cc..fe1efe3 100644 --- a/sources/awesome-widget/plugin/awactions.h +++ b/sources/awesome-widget/plugin/awactions.h @@ -33,19 +33,20 @@ public: explicit AWActions(QObject *parent = nullptr); virtual ~AWActions(); Q_INVOKABLE void checkUpdates(const bool showAnyway = false); - Q_INVOKABLE QString getFileContent(const QString path) const; + Q_INVOKABLE QString getFileContent(const QString &path) const; Q_INVOKABLE bool isDebugEnabled() const; - Q_INVOKABLE bool runCmd(const QString cmd = QString("/usr/bin/true")) const; + Q_INVOKABLE bool runCmd(const QString &cmd + = QString("/usr/bin/true")) const; Q_INVOKABLE void showLegacyInfo() const; Q_INVOKABLE void showReadme() const; // configuration slots - Q_INVOKABLE QString getAboutText(const QString type + Q_INVOKABLE QString getAboutText(const QString &type = QString("header")) const; - Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const; + Q_INVOKABLE QVariantMap getFont(const QVariantMap &defaultFont) const; public slots: - Q_INVOKABLE static void sendNotification(const QString eventId, - const QString message); + Q_INVOKABLE static void sendNotification(const QString &eventId, + const QString &message); private: AWUpdateHelper *m_updateHelper = nullptr; diff --git a/sources/awesome-widget/plugin/awbugreporter.cpp b/sources/awesome-widget/plugin/awbugreporter.cpp index cbc8ed1..4480e78 100644 --- a/sources/awesome-widget/plugin/awbugreporter.cpp +++ b/sources/awesome-widget/plugin/awbugreporter.cpp @@ -46,15 +46,15 @@ AWBugReporter::~AWBugReporter() void AWBugReporter::doConnect() { // additional method for testing needs - connect(this, SIGNAL(replyReceived(const int, const QString)), this, - SLOT(showInformation(const int, const QString))); + connect(this, SIGNAL(replyReceived(const int, const QString &)), this, + SLOT(showInformation(const int, const QString &))); } -QString AWBugReporter::generateText(const QString description, - const QString reproduce, - const QString expected, - const QString logs) const +QString AWBugReporter::generateText(const QString &description, + const QString &reproduce, + const QString &expected, + const QString &logs) const { // do not log logs here, it may have quite large size qCDebug(LOG_AW) << "Generate text with description" << description @@ -74,7 +74,7 @@ QString AWBugReporter::generateText(const QString description, } -void AWBugReporter::sendBugReport(const QString title, const QString body) +void AWBugReporter::sendBugReport(const QString &title, const QString &body) { qCDebug(LOG_AW) << "Send bug report with title" << title << "and body" << body; @@ -126,7 +126,7 @@ void AWBugReporter::issueReplyRecieved(QNetworkReply *reply) } -void AWBugReporter::showInformation(const int number, const QString url) +void AWBugReporter::showInformation(const int number, const QString &url) { qCDebug(LOG_AW) << "Created issue with number" << number << "and url" << url; diff --git a/sources/awesome-widget/plugin/awbugreporter.h b/sources/awesome-widget/plugin/awbugreporter.h index a241a2c..0c24da2 100644 --- a/sources/awesome-widget/plugin/awbugreporter.h +++ b/sources/awesome-widget/plugin/awbugreporter.h @@ -33,18 +33,18 @@ public: explicit AWBugReporter(QObject *parent = nullptr); virtual ~AWBugReporter(); Q_INVOKABLE void doConnect(); - Q_INVOKABLE QString generateText(const QString description, - const QString reproduce, - const QString expected, - const QString logs) const; - Q_INVOKABLE void sendBugReport(const QString title, const QString body); + Q_INVOKABLE QString generateText(const QString &description, + const QString &reproduce, + const QString &expected, + const QString &logs) const; + Q_INVOKABLE void sendBugReport(const QString &title, const QString &body); signals: - void replyReceived(const int number, const QString url); + void replyReceived(const int number, const QString &url); private slots: void issueReplyRecieved(QNetworkReply *reply); - void showInformation(const int number, const QString url); + void showInformation(const int number, const QString &url); void userReplyOnBugReport(QAbstractButton *button); private: diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp index 91b37f7..e2fdf37 100644 --- a/sources/awesome-widget/plugin/awconfighelper.cpp +++ b/sources/awesome-widget/plugin/awconfighelper.cpp @@ -70,7 +70,7 @@ bool AWConfigHelper::dropCache() const bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, - const QString fileName) const + const QString &fileName) const { qCDebug(LOG_AW) << "Selected filename" << fileName; @@ -79,7 +79,7 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, const QQmlPropertyMap *configuration = static_cast(nativeConfig); settings.beginGroup(QString("plasmoid")); - for (auto key : configuration->keys()) { + for (auto &key : configuration->keys()) { QVariant value = configuration->value(key); if (!value.isValid()) continue; @@ -88,13 +88,13 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, settings.endGroup(); // extensions - for (auto item : m_dirs) { + for (auto &item : m_dirs) { QStringList items = QDir(QString("%1/%2").arg(m_baseDir).arg(item)) .entryList(QStringList() << QString("*.desktop"), QDir::Files); settings.beginGroup(item); - for (auto it : items) + for (auto &it : items) copyExtensions(it, item, settings, false); settings.endGroup(); } @@ -121,7 +121,7 @@ bool AWConfigHelper::exportConfiguration(QObject *nativeConfig, } -QVariantMap AWConfigHelper::importConfiguration(const QString fileName, +QVariantMap AWConfigHelper::importConfiguration(const QString &fileName, const bool importPlasmoid, const bool importExtensions, const bool importAdds) const @@ -133,9 +133,9 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName, // extensions if (importExtensions) { - for (auto item : m_dirs) { + for (auto &item : m_dirs) { settings.beginGroup(item); - for (auto it : settings.childGroups()) + for (auto &it : settings.childGroups()) copyExtensions(it, item, settings, true); settings.endGroup(); } @@ -161,7 +161,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString fileName, // plasmoid configuration if (importPlasmoid) { settings.beginGroup(QString("plasmoid")); - for (auto key : settings.childKeys()) + for (auto &key : settings.childKeys()) configuration[key] = settings.value(key); settings.endGroup(); } @@ -207,7 +207,7 @@ QVariantMap AWConfigHelper::readDataEngineConfiguration() const bool AWConfigHelper::writeDataEngineConfiguration( - const QVariantMap configuration) const + const QVariantMap &configuration) const { qCDebug(LOG_AW) << "Configuration" << configuration; @@ -238,18 +238,18 @@ bool AWConfigHelper::writeDataEngineConfiguration( } -void AWConfigHelper::copyConfigs(const QString localDir) const +void AWConfigHelper::copyConfigs(const QString &localDir) const { qCDebug(LOG_AW) << "Local directory" << localDir; QStringList dirs = QStandardPaths::locateAll( QStandardPaths::GenericDataLocation, QString("awesomewidgets/configs"), QStandardPaths::LocateDirectory); - for (auto dir : dirs) { + for (auto &dir : dirs) { if (dir == localDir) continue; QStringList files = QDir(dir).entryList(QDir::Files); - for (auto source : files) { + for (auto &source : files) { QString destination = QString("%1/%2").arg(localDir).arg(source); bool status = QFile::copy(QString("%1/%2").arg(dir).arg(source), destination); @@ -260,7 +260,7 @@ void AWConfigHelper::copyConfigs(const QString localDir) const } -void AWConfigHelper::copyExtensions(const QString item, const QString type, +void AWConfigHelper::copyExtensions(const QString &item, const QString &type, QSettings &settings, const bool inverse) const { @@ -286,13 +286,13 @@ void AWConfigHelper::copyExtensions(const QString item, const QString type, void AWConfigHelper::copySettings(QSettings &from, QSettings &to) const { - for (auto key : from.childKeys()) + for (auto &key : from.childKeys()) to.setValue(key, from.value(key)); } -void AWConfigHelper::readFile(QSettings &settings, const QString key, - const QString fileName) const +void AWConfigHelper::readFile(QSettings &settings, const QString &key, + const QString &fileName) const { qCDebug(LOG_AW) << "Key" << key << "from file" << fileName; @@ -307,8 +307,8 @@ void AWConfigHelper::readFile(QSettings &settings, const QString key, } -void AWConfigHelper::writeFile(QSettings &settings, const QString key, - const QString fileName) const +void AWConfigHelper::writeFile(QSettings &settings, const QString &key, + const QString &fileName) const { qCDebug(LOG_AW) << "Key" << key << "to file" << fileName; diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h index 6747155..62123c9 100644 --- a/sources/awesome-widget/plugin/awconfighelper.h +++ b/sources/awesome-widget/plugin/awconfighelper.h @@ -36,26 +36,26 @@ public: Q_INVOKABLE QString configurationDirectory() const; Q_INVOKABLE bool dropCache() const; Q_INVOKABLE bool exportConfiguration(QObject *nativeConfig, - const QString fileName) const; - Q_INVOKABLE QVariantMap importConfiguration(const QString fileName, + const QString &fileName) const; + Q_INVOKABLE QVariantMap importConfiguration(const QString &fileName, const bool importPlasmoid, const bool importExtensions, const bool importAdds) const; // dataengine Q_INVOKABLE QVariantMap readDataEngineConfiguration() const; Q_INVOKABLE bool - writeDataEngineConfiguration(const QVariantMap configuration) const; + writeDataEngineConfiguration(const QVariantMap &configuration) const; private: // methods - void copyConfigs(const QString localDir) const; - void copyExtensions(const QString item, const QString type, + void copyConfigs(const QString &localDir) const; + void copyExtensions(const QString &item, const QString &type, QSettings &settings, const bool inverse) const; void copySettings(QSettings &from, QSettings &to) const; - void readFile(QSettings &settings, const QString key, - const QString fileName) const; - void writeFile(QSettings &settings, const QString key, - const QString fileName) const; + void readFile(QSettings &settings, const QString &key, + const QString &fileName) const; + void writeFile(QSettings &settings, const QString &key, + const QString &fileName) const; // properties QString m_baseDir = QString("%1/awesomewidgets") .arg(QStandardPaths::writableLocation( diff --git a/sources/awesome-widget/plugin/awdataaggregator.cpp b/sources/awesome-widget/plugin/awdataaggregator.cpp index 2c4abd1..2ef81be 100644 --- a/sources/awesome-widget/plugin/awdataaggregator.cpp +++ b/sources/awesome-widget/plugin/awdataaggregator.cpp @@ -57,7 +57,7 @@ AWDataAggregator::~AWDataAggregator() } -QList AWDataAggregator::getData(const QString key) const +QList AWDataAggregator::getData(const QString &key) const { qCDebug(LOG_AW) << "Key" << key; @@ -78,7 +78,7 @@ QString AWDataAggregator::htmlImage(const QPixmap &source) const } -void AWDataAggregator::setParameters(QVariantMap settings) +void AWDataAggregator::setParameters(const QVariantMap &settings) { qCDebug(LOG_AW) << "Settings" << settings; @@ -128,7 +128,7 @@ QPixmap AWDataAggregator::tooltipImage() m_toolTipScene->clear(); QPen pen; bool down = false; - for (auto key : requiredKeys) { + for (auto &key : requiredKeys) { // create frame float normX = 100.0f / static_cast(m_values[key].count()); float normY = 100.0f / (1.5f * m_boundaries[key]); @@ -174,7 +174,7 @@ void AWDataAggregator::dataUpdate(const QVariantHash &values) } -void AWDataAggregator::checkValue(const QString source, const float value, +void AWDataAggregator::checkValue(const QString &source, const float value, const float extremum) const { qCDebug(LOG_AW) << "Notification source" << source << "with value" << value @@ -194,8 +194,8 @@ void AWDataAggregator::checkValue(const QString source, const float value, } -void AWDataAggregator::checkValue(const QString source, const QString current, - const QString received) const +void AWDataAggregator::checkValue(const QString &source, const QString ¤t, + const QString &received) const { qCDebug(LOG_AW) << "Notification source" << source << "with current value" << current << "and received one" << received; @@ -218,7 +218,7 @@ void AWDataAggregator::initScene() } -QString AWDataAggregator::notificationText(const QString source, +QString AWDataAggregator::notificationText(const QString &source, const float value) const { qCDebug(LOG_AW) << "Notification source" << source << "with value" << value; @@ -239,8 +239,8 @@ QString AWDataAggregator::notificationText(const QString source, } -QString AWDataAggregator::notificationText(const QString source, - const QString value) const +QString AWDataAggregator::notificationText(const QString &source, + const QString &value) const { qCDebug(LOG_AW) << "Notification source" << source << "with value" << value; diff --git a/sources/awesome-widget/plugin/awdataaggregator.h b/sources/awesome-widget/plugin/awdataaggregator.h index 4b59797..373ae04 100644 --- a/sources/awesome-widget/plugin/awdataaggregator.h +++ b/sources/awesome-widget/plugin/awdataaggregator.h @@ -35,14 +35,14 @@ class AWDataAggregator : public QObject public: explicit AWDataAggregator(QObject *parent = nullptr); virtual ~AWDataAggregator(); - QList getData(const QString key) const; + QList getData(const QString &key) const; QString htmlImage(const QPixmap &source) const; - void setParameters(QVariantMap settings); + void setParameters(const QVariantMap &settings); QPixmap tooltipImage(); signals: void updateData(const QVariantHash &values); - void toolTipPainted(const QString image) const; + void toolTipPainted(const QString &image) const; private slots: void dataUpdate(const QVariantHash &values); @@ -51,13 +51,13 @@ private: // ui QGraphicsScene *m_toolTipScene = nullptr; QGraphicsView *m_toolTipView = nullptr; - void checkValue(const QString source, const float value, + void checkValue(const QString &source, const float value, const float extremum) const; - void checkValue(const QString source, const QString current, - const QString received) const; + void checkValue(const QString &source, const QString ¤t, + const QString &received) const; void initScene(); - QString notificationText(const QString source, const float value) const; - QString notificationText(const QString source, const QString value) const; + QString notificationText(const QString &source, const float value) const; + QString notificationText(const QString &source, const QString &value) const; // main method void setData(const QVariantHash &values); void setData(const QString &source, float value, diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.cpp b/sources/awesome-widget/plugin/awdataengineaggregator.cpp index 62bbbda..92fdd41 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.cpp +++ b/sources/awesome-widget/plugin/awdataengineaggregator.cpp @@ -52,8 +52,8 @@ void AWDataEngineAggregator::clear() void AWDataEngineAggregator::disconnectSources() { - for (auto dataengine : m_dataEngines.values()) - for (auto source : dataengine->sources()) + for (auto &dataengine : m_dataEngines.values()) + for (auto &source : dataengine->sources()) dataengine->disconnectSource(source, parent()); } @@ -82,7 +82,7 @@ void AWDataEngineAggregator::initDataEngines(const int interval) } -void AWDataEngineAggregator::dropSource(const QString source) +void AWDataEngineAggregator::dropSource(const QString &source) { qCDebug(LOG_AW) << "Source" << source; @@ -114,7 +114,7 @@ void AWDataEngineAggregator::createQueuedConnection() { // HACK additional method which forces QueuedConnection instead of Auto one // for more details refer to plasma-framework source code - for (auto dataEngine : m_dataEngines.keys()) { + for (auto &dataEngine : m_dataEngines.keys()) { // different source set for different engines QStringList sources; if (dataEngine == QString("time")) @@ -122,7 +122,7 @@ void AWDataEngineAggregator::createQueuedConnection() else sources = m_dataEngines[dataEngine]->sources(); // reconnect sources - for (auto source : sources) { + for (auto &source : sources) { Plasma::DataContainer *container = m_dataEngines[dataEngine]->containerForSource(source); // disconnect old connections first diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.h b/sources/awesome-widget/plugin/awdataengineaggregator.h index fb4bfe8..4defc43 100644 --- a/sources/awesome-widget/plugin/awdataengineaggregator.h +++ b/sources/awesome-widget/plugin/awdataengineaggregator.h @@ -40,7 +40,7 @@ signals: void deviceAdded(const QString &source); public slots: - void dropSource(const QString source); + void dropSource(const QString &source); void reconnectSources(const int interval); private: diff --git a/sources/awesome-widget/plugin/awdbusadaptor.cpp b/sources/awesome-widget/plugin/awdbusadaptor.cpp index 01dfc28..d422c6f 100644 --- a/sources/awesome-widget/plugin/awdbusadaptor.cpp +++ b/sources/awesome-widget/plugin/awdbusadaptor.cpp @@ -35,19 +35,19 @@ AWDBusAdaptor::~AWDBusAdaptor() } -QString AWDBusAdaptor::Info(const QString key) const +QString AWDBusAdaptor::Info(const QString &key) const { return m_plugin->infoByKey(key); } -QStringList AWDBusAdaptor::Keys(const QString regexp) const +QStringList AWDBusAdaptor::Keys(const QString ®exp) const { return m_plugin->dictKeys(true, regexp); } -QString AWDBusAdaptor::Value(const QString key) const +QString AWDBusAdaptor::Value(const QString &key) const { return m_plugin->valueByKey(key); } @@ -59,7 +59,7 @@ qlonglong AWDBusAdaptor::WhoAmI() const } -void AWDBusAdaptor::SetLogLevel(const QString what, const int level) +void AWDBusAdaptor::SetLogLevel(const QString &what, const int level) { qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what; @@ -69,12 +69,12 @@ void AWDBusAdaptor::SetLogLevel(const QString what, const int level) return; } - for (auto lev : m_logLevels) + for (auto &lev : m_logLevels) SetLogLevel(what, lev, m_logLevels.indexOf(lev) >= level); } -void AWDBusAdaptor::SetLogLevel(const QString what, const QString level, +void AWDBusAdaptor::SetLogLevel(const QString &what, const QString &level, const bool enabled) { qCDebug(LOG_DBUS) << "Set log level" << level << "enabled" << enabled diff --git a/sources/awesome-widget/plugin/awdbusadaptor.h b/sources/awesome-widget/plugin/awdbusadaptor.h index 18d736d..181d352 100644 --- a/sources/awesome-widget/plugin/awdbusadaptor.h +++ b/sources/awesome-widget/plugin/awdbusadaptor.h @@ -37,13 +37,13 @@ public: public slots: // get methods - QString Info(const QString key) const; - QStringList Keys(const QString regexp) const; - QString Value(const QString key) const; + QString Info(const QString &key) const; + QStringList Keys(const QString ®exp) const; + QString Value(const QString &key) const; qlonglong WhoAmI() const; // set methods - void SetLogLevel(const QString what, const int level); - void SetLogLevel(const QString what, const QString level, + void SetLogLevel(const QString &what, const int level); + void SetLogLevel(const QString &what, const QString &level, const bool enabled); private: diff --git a/sources/awesome-widget/plugin/awformatterconfig.cpp b/sources/awesome-widget/plugin/awformatterconfig.cpp index d91f66b..5903498 100644 --- a/sources/awesome-widget/plugin/awformatterconfig.cpp +++ b/sources/awesome-widget/plugin/awformatterconfig.cpp @@ -27,7 +27,7 @@ #include "awformatterhelper.h" -AWFormatterConfig::AWFormatterConfig(QWidget *parent, const QStringList keys) +AWFormatterConfig::AWFormatterConfig(QWidget *parent, const QStringList &keys) : QDialog(parent) , ui(new Ui::AWFormatterConfig) , m_keys(keys) @@ -114,7 +114,7 @@ void AWFormatterConfig::addSelector(const QStringList &keys, void AWFormatterConfig::clearSelectors() { - for (auto selector : m_selectors) { + for (auto &selector : m_selectors) { disconnect(selector, SIGNAL(selectionChanged()), this, SLOT(updateUi())); ui->verticalLayout->removeWidget(selector); @@ -128,7 +128,7 @@ void AWFormatterConfig::execDialog() { int ret = exec(); QHash data; - for (auto selector : m_selectors) { + for (auto &selector : m_selectors) { QPair select = selector->current(); if (select.first.isEmpty()) continue; @@ -175,7 +175,7 @@ void AWFormatterConfig::updateDialog() QHash appliedFormatters = m_helper->getFormatters(); auto keys = initKeys(); - for (auto key : appliedFormatters.keys()) + for (auto &key : appliedFormatters.keys()) addSelector(keys.first, keys.second, QPair(key, appliedFormatters[key])); // empty one diff --git a/sources/awesome-widget/plugin/awformatterconfig.h b/sources/awesome-widget/plugin/awformatterconfig.h index f3a9fde..3a66230 100644 --- a/sources/awesome-widget/plugin/awformatterconfig.h +++ b/sources/awesome-widget/plugin/awformatterconfig.h @@ -35,7 +35,7 @@ class AWFormatterConfig : public QDialog public: explicit AWFormatterConfig(QWidget *parent = nullptr, - const QStringList keys = QStringList()); + const QStringList &keys = QStringList()); virtual ~AWFormatterConfig(); Q_INVOKABLE void showDialog(); diff --git a/sources/awesome-widget/plugin/awformatterconfigfactory.cpp b/sources/awesome-widget/plugin/awformatterconfigfactory.cpp index d7da52d..9afdff7 100644 --- a/sources/awesome-widget/plugin/awformatterconfigfactory.cpp +++ b/sources/awesome-widget/plugin/awformatterconfigfactory.cpp @@ -34,7 +34,7 @@ AWFormatterConfigFactory::~AWFormatterConfigFactory() } -void AWFormatterConfigFactory::showDialog(const QStringList keys) +void AWFormatterConfigFactory::showDialog(const QStringList &keys) { AWFormatterConfig *config = new AWFormatterConfig(nullptr, keys); config->showDialog(); diff --git a/sources/awesome-widget/plugin/awformatterconfigfactory.h b/sources/awesome-widget/plugin/awformatterconfigfactory.h index edfd49f..94ae3df 100644 --- a/sources/awesome-widget/plugin/awformatterconfigfactory.h +++ b/sources/awesome-widget/plugin/awformatterconfigfactory.h @@ -29,7 +29,7 @@ class AWFormatterConfigFactory : public QObject public: explicit AWFormatterConfigFactory(QObject *parent = nullptr); virtual ~AWFormatterConfigFactory(); - Q_INVOKABLE void showDialog(const QStringList keys); + Q_INVOKABLE void showDialog(const QStringList &keys); private: }; diff --git a/sources/awesome-widget/plugin/awformatterhelper.cpp b/sources/awesome-widget/plugin/awformatterhelper.cpp index 4ec9596..7f2a12a 100644 --- a/sources/awesome-widget/plugin/awformatterhelper.cpp +++ b/sources/awesome-widget/plugin/awformatterhelper.cpp @@ -71,7 +71,7 @@ QStringList AWFormatterHelper::definedFormatters() const QHash AWFormatterHelper::getFormatters() const { QHash map; - for (auto tag : m_formatters.keys()) + for (auto &tag : m_formatters.keys()) map[tag] = m_formatters[tag]->name(); return map; @@ -81,7 +81,7 @@ QHash AWFormatterHelper::getFormatters() const QList AWFormatterHelper::items() const { QList converted; - for (auto item : m_formattersClasses.values()) + for (auto &item : m_formattersClasses.values()) converted.append(item); return converted; @@ -94,7 +94,7 @@ QStringList AWFormatterHelper::knownFormatters() const } -bool AWFormatterHelper::removeUnusedFormatters(const QStringList keys) const +bool AWFormatterHelper::removeUnusedFormatters(const QStringList &keys) const { qCDebug(LOG_AW) << "Remove formatters" << keys; @@ -107,7 +107,7 @@ bool AWFormatterHelper::removeUnusedFormatters(const QStringList keys) const settings.beginGroup(QString("Formatters")); QStringList foundKeys = settings.childKeys(); - for (auto key : foundKeys) { + for (auto &key : foundKeys) { if (keys.contains(key)) continue; settings.remove(key); @@ -121,7 +121,7 @@ bool AWFormatterHelper::removeUnusedFormatters(const QStringList keys) const bool AWFormatterHelper::writeFormatters( - const QHash configuration) const + const QHash &configuration) const { qCDebug(LOG_AW) << "Write configuration" << configuration; @@ -133,7 +133,7 @@ bool AWFormatterHelper::writeFormatters( qCInfo(LOG_AW) << "Configuration file" << fileName; settings.beginGroup(QString("Formatters")); - for (auto key : configuration.keys()) + for (auto &key : configuration.keys()) settings.setValue(key, configuration[key]); settings.endGroup(); @@ -152,7 +152,7 @@ void AWFormatterHelper::editItems() AWAbstractFormatter::FormatterClass -AWFormatterHelper::defineFormatterClass(const QString stringType) const +AWFormatterHelper::defineFormatterClass(const QString &stringType) const { qCDebug(LOG_AW) << "Define formatter class for" << stringType; @@ -186,7 +186,7 @@ void AWFormatterHelper::initFormatters() for (int i = m_directories.count() - 1; i >= 0; i--) { QStringList files = QDir(m_directories.at(i)).entryList(QDir::Files, QDir::Name); - for (auto file : files) { + for (auto &file : files) { if (!file.endsWith(QString(".desktop"))) continue; qCInfo(LOG_AW) << "Found file" << file << "in" @@ -238,13 +238,13 @@ void AWFormatterHelper::initKeys() QStringList configs = QStandardPaths::locateAll( QStandardPaths::GenericDataLocation, m_filePath); - for (auto fileName : configs) { + for (auto &fileName : configs) { QSettings settings(fileName, QSettings::IniFormat); qCInfo(LOG_AW) << "Configuration file" << settings.fileName(); settings.beginGroup(QString("Formatters")); QStringList keys = settings.childKeys(); - for (auto key : keys) { + for (auto &key : keys) { QString name = settings.value(key).toString(); qCInfo(LOG_AW) << "Found formatter" << name << "for key" << key << "in" << settings.fileName(); @@ -281,7 +281,7 @@ void AWFormatterHelper::installDirectories() QPair -AWFormatterHelper::readMetadata(const QString filePath) const +AWFormatterHelper::readMetadata(const QString &filePath) const { qCDebug(LOG_AW) << "Read initial parameters from" << filePath; diff --git a/sources/awesome-widget/plugin/awformatterhelper.h b/sources/awesome-widget/plugin/awformatterhelper.h index 42339d4..6061ae3 100644 --- a/sources/awesome-widget/plugin/awformatterhelper.h +++ b/sources/awesome-widget/plugin/awformatterhelper.h @@ -38,8 +38,8 @@ public: QHash getFormatters() const; QList items() const; QStringList knownFormatters() const; - bool removeUnusedFormatters(const QStringList keys) const; - bool writeFormatters(const QHash configuration) const; + bool removeUnusedFormatters(const QStringList &keys) const; + bool writeFormatters(const QHash &configuration) const; public slots: void editItems(); @@ -47,12 +47,12 @@ public slots: private: // methods AWAbstractFormatter::FormatterClass - defineFormatterClass(const QString stringType) const; + defineFormatterClass(const QString &stringType) const; void initFormatters(); void initKeys(); void installDirectories(); QPair - readMetadata(const QString filePath) const; + readMetadata(const QString &filePath) const; // parent methods void doCreateItem(); void initItems(); diff --git a/sources/awesome-widget/plugin/awkeycache.cpp b/sources/awesome-widget/plugin/awkeycache.cpp index a668908..b705a5d 100644 --- a/sources/awesome-widget/plugin/awkeycache.cpp +++ b/sources/awesome-widget/plugin/awkeycache.cpp @@ -26,7 +26,7 @@ #include "awdebug.h" -bool AWKeyCache::addKeyToCache(const QString type, const QString key) +bool AWKeyCache::addKeyToCache(const QString &type, const QString &key) { qCDebug(LOG_AW) << "Key" << key << "with type" << type; @@ -38,7 +38,7 @@ bool AWKeyCache::addKeyToCache(const QString type, const QString key) cache.beginGroup(type); QStringList cachedValues; - for (auto number : cache.allKeys()) + for (auto &number : cache.allKeys()) cachedValues.append(cache.value(number).toString()); if (type == QString("hdd")) { @@ -46,7 +46,7 @@ bool AWKeyCache::addKeyToCache(const QString type, const QString key) = QDir(QString("/dev")).entryList(QDir::System, QDir::Name); QStringList devices = allDevices.filter(QRegExp(QString("^[hms]d[a-z]$"))); - for (auto dev : devices) { + for (auto &dev : devices) { QString device = QString("/dev/%1").arg(dev); if (cachedValues.contains(device)) continue; @@ -59,7 +59,7 @@ bool AWKeyCache::addKeyToCache(const QString type, const QString key) } else if (type == QString("net")) { QList rawInterfaceList = QNetworkInterface::allInterfaces(); - for (auto interface : rawInterfaceList) { + for (auto &interface : rawInterfaceList) { QString device = interface.name(); if (cachedValues.contains(device)) continue; @@ -95,7 +95,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &keys, QSet used = QSet::fromList(keys); used.unite(QSet::fromList(bars)); // insert keys from tooltip - for (auto key : tooltip.keys()) { + for (auto &key : tooltip.keys()) { if ((key.endsWith(QString("Tooltip"))) && (tooltip[key].toBool())) { key.remove(QString("Tooltip")); used << key; @@ -104,7 +104,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &keys, // insert depending keys, refer to AWKeys::calculateValues() // hddtotmb* - for (auto key : allKeys.filter(QRegExp(QString("^hddtotmb")))) { + for (auto &key : allKeys.filter(QRegExp(QString("^hddtotmb")))) { if (!used.contains(key)) continue; key.remove(QString("hddtotmb")); @@ -113,7 +113,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &keys, << QString("hddmb%1").arg(index); } // hddtotgb* - for (auto key : allKeys.filter(QRegExp(QString("^hddtotgb")))) { + for (auto &key : allKeys.filter(QRegExp(QString("^hddtotgb")))) { if (!used.contains(key)) continue; key.remove(QString("hddtotgb")); @@ -146,12 +146,12 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &keys, << QString("upunits") << QString("down") << QString("downkb") << QString("downtotal") << QString("downtotalkb") << QString("downunits")); - for (auto key : netKeys) { + for (auto &key : netKeys) { if (!used.contains(key)) continue; QStringList filt = allKeys.filter(QRegExp(QString("^%1[0-9]{1,}").arg(key))); - for (auto filtered : filt) + for (auto &filtered : filt) used << filtered; } // netdev key @@ -177,9 +177,9 @@ QHash AWKeyCache::loadKeysFromCache() QSettings cache(fileName, QSettings::IniFormat); QHash devices; - for (auto group : cache.childGroups()) { + for (auto &group : cache.childGroups()) { cache.beginGroup(group); - for (auto key : cache.allKeys()) + for (auto &key : cache.allKeys()) devices[group].append(cache.value(key).toString()); cache.endGroup(); } diff --git a/sources/awesome-widget/plugin/awkeycache.h b/sources/awesome-widget/plugin/awkeycache.h index 9685122..ae5e76f 100644 --- a/sources/awesome-widget/plugin/awkeycache.h +++ b/sources/awesome-widget/plugin/awkeycache.h @@ -26,7 +26,7 @@ namespace AWKeyCache { -bool addKeyToCache(const QString type, const QString key = QString("")); +bool addKeyToCache(const QString &type, const QString &key = QString("")); QStringList getRequiredKeys(const QStringList &keys, const QStringList &bars, const QVariantMap &tooltip, const QStringList &allKeys); diff --git a/sources/awesome-widget/plugin/awkeyoperations.cpp b/sources/awesome-widget/plugin/awkeyoperations.cpp index d4cbd6c..a14cb5d 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.cpp +++ b/sources/awesome-widget/plugin/awkeyoperations.cpp @@ -55,7 +55,7 @@ AWKeyOperations::~AWKeyOperations() } -QStringList AWKeyOperations::devices(const QString type) const +QStringList AWKeyOperations::devices(const QString &type) const { qCDebug(LOG_AW) << "Looking for type" << type; @@ -81,7 +81,7 @@ QStringList AWKeyOperations::dictKeys() const { QStringList allKeys; // weather - for (auto item : m_extWeather->activeItems()) { + for (auto &item : m_extWeather->activeItems()) { allKeys.append(item->tag(QString("weatherId"))); allKeys.append(item->tag(QString("weather"))); allKeys.append(item->tag(QString("humidity"))); @@ -136,10 +136,10 @@ QStringList AWKeyOperations::dictKeys() const for (int i = 0; i < allBatteryDevices.count(); i++) allKeys.append(QString("bat%1").arg(i)); // package manager - for (auto item : m_extUpgrade->activeItems()) + for (auto &item : m_extUpgrade->activeItems()) allKeys.append(item->tag(QString("pkgcount"))); // quotes - for (auto item : m_extQuotes->activeItems()) { + for (auto &item : m_extQuotes->activeItems()) { allKeys.append(item->tag(QString("ask"))); allKeys.append(item->tag(QString("askchg"))); allKeys.append(item->tag(QString("percaskchg"))); @@ -151,13 +151,13 @@ QStringList AWKeyOperations::dictKeys() const allKeys.append(item->tag(QString("percpricechg"))); } // custom - for (auto item : m_extScripts->activeItems()) + for (auto &item : m_extScripts->activeItems()) allKeys.append(item->tag(QString("custom"))); // network requests - for (auto item : m_extNetRequest->activeItems()) + for (auto &item : m_extNetRequest->activeItems()) allKeys.append(item->tag(QString("response"))); // bars - for (auto item : m_graphicalItems->activeItems()) + for (auto &item : m_graphicalItems->activeItems()) allKeys.append(item->tag(QString("bar"))); // static keys allKeys.append(QString(STATIC_KEYS).split(QChar(','))); @@ -172,7 +172,7 @@ QStringList AWKeyOperations::dictKeys() const // this method is required to provide GraphicalItem functions (e.g. paint()) to // parent classes -GraphicalItem *AWKeyOperations::giByKey(const QString key) const +GraphicalItem *AWKeyOperations::giByKey(const QString &key) const { qCDebug(LOG_AW) << "Looking for item" << key; @@ -180,7 +180,7 @@ GraphicalItem *AWKeyOperations::giByKey(const QString key) const } -QString AWKeyOperations::infoByKey(QString key) const +QString AWKeyOperations::infoByKey(const QString &key) const { qCDebug(LOG_AW) << "Requested key" << key; @@ -197,22 +197,22 @@ QString AWKeyOperations::infoByKey(QString key) const if (item) output = item->uniq(); } else if (key.contains(QRegExp(QString("^hdd[rw]")))) { - output = m_devices[QString("disk")] - [key.remove(QRegExp(QString("hdd[rw]"))).toInt()]; + QString index = key; + index.remove(QRegExp("hdd[rw]")); + output = m_devices["disk"][index.toInt()]; } else if (key.contains(QRegExp( QString("^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)")))) { - output - = m_devices[QString("mount")] - [key - .remove(QRegExp(QString( - "^hdd([0-9]|mb|gb|freemb|freegb|totmb|totgb)"))) - .toInt()]; + QString index = key; + index.remove(QRegExp("^hdd(|mb|gb|freemb|freegb|totmb|totgb)")); + output = m_devices[QString("mount")][index.toInt()]; } else if (key.startsWith(QString("hddtemp"))) { - output - = m_devices[QString("hdd")][key.remove(QString("hddtemp")).toInt()]; + QString index = key; + index.remove("hddtemp"); + output = m_devices[QString("hdd")][index.toInt()]; } else if (key.contains(QRegExp(QString("^(down|up)[0-9]")))) { - output = m_devices[QString("net")] - [key.remove(QRegExp(QString("^(down|up)"))).toInt()]; + QString index = key; + index.remove(QRegExp("^(down|up)")); + output = m_devices[QString("net")][index.toInt()]; } else if (key.startsWith(QString("pkgcount"))) { AbstractExtItem *item = m_extUpgrade->itemByTag(key, stripped); if (item) @@ -228,8 +228,9 @@ QString AWKeyOperations::infoByKey(QString key) const if (item) output = item->uniq(); } else if (key.startsWith(QString("temp"))) { - output - = m_devices[QString("temp")][key.remove(QString("temp")).toInt()]; + QString index = key; + index.remove("temp"); + output = m_devices[QString("temp")][index.toInt()]; } else if (key.startsWith(QString("response"))) { AbstractExtItem *item = m_extNetRequest->itemByTag(key, stripped); if (item) @@ -248,7 +249,7 @@ QString AWKeyOperations::pattern() const } -void AWKeyOperations::setPattern(const QString currentPattern) +void AWKeyOperations::setPattern(const QString ¤tPattern) { qCDebug(LOG_AW) << "Set pattern" << currentPattern; @@ -256,7 +257,7 @@ void AWKeyOperations::setPattern(const QString currentPattern) } -void AWKeyOperations::editItem(const QString type) +void AWKeyOperations::editItem(const QString &type) { qCDebug(LOG_AW) << "Item type" << type; @@ -302,7 +303,7 @@ void AWKeyOperations::addDevice(const QString &source) } -void AWKeyOperations::addKeyToCache(const QString type, const QString key) +void AWKeyOperations::addKeyToCache(const QString &type, const QString &key) { qCDebug(LOG_AW) << "Key" << key << "with type" << type; diff --git a/sources/awesome-widget/plugin/awkeyoperations.h b/sources/awesome-widget/plugin/awkeyoperations.h index 2a39c9c..c7016ac 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.h +++ b/sources/awesome-widget/plugin/awkeyoperations.h @@ -46,28 +46,28 @@ class AWKeyOperations : public QObject public: explicit AWKeyOperations(QObject *parent = nullptr); virtual ~AWKeyOperations(); - QStringList devices(const QString type) const; + QStringList devices(const QString &type) const; QHash devices() const; void updateCache(); // keys QStringList dictKeys() const; - GraphicalItem *giByKey(const QString key) const; + GraphicalItem *giByKey(const QString &key) const; // values - QString infoByKey(QString key) const; + QString infoByKey(const QString &key) const; QString pattern() const; - void setPattern(const QString currentPattern); + void setPattern(const QString ¤tPattern); // configuration - void editItem(const QString type); + void editItem(const QString &type); signals: - void updateKeys(const QStringList currentKeys); + void updateKeys(const QStringList ¤tKeys); public slots: void addDevice(const QString &source); private: // methods - void addKeyToCache(const QString type, const QString key = QString("")); + void addKeyToCache(const QString &type, const QString &key = QString("")); void reinitKeys(); // objects ExtItemAggregator *m_graphicalItems = nullptr; diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp index c9d4b1b..1d4f24d 100644 --- a/sources/awesome-widget/plugin/awkeys.cpp +++ b/sources/awesome-widget/plugin/awkeys.cpp @@ -97,7 +97,7 @@ bool AWKeys::isDBusActive() const } -void AWKeys::initDataAggregator(const QVariantMap tooltipParams) +void AWKeys::initDataAggregator(const QVariantMap &tooltipParams) { qCDebug(LOG_AW) << "Tooltip parameters" << tooltipParams; @@ -107,7 +107,7 @@ void AWKeys::initDataAggregator(const QVariantMap tooltipParams) } -void AWKeys::initKeys(const QString currentPattern, const int interval, +void AWKeys::initKeys(const QString ¤tPattern, const int interval, const int limit, const bool optimize) { qCDebug(LOG_AW) << "Pattern" << currentPattern << "with interval" @@ -131,7 +131,7 @@ void AWKeys::initKeys(const QString currentPattern, const int interval, } -void AWKeys::setAggregatorProperty(const QString key, const QVariant value) +void AWKeys::setAggregatorProperty(const QString &key, const QVariant &value) { qCDebug(LOG_AW) << "Key" << key << "with value" << value; @@ -153,7 +153,7 @@ void AWKeys::updateCache() } -QStringList AWKeys::dictKeys(const bool sorted, const QString regexp) const +QStringList AWKeys::dictKeys(const bool sorted, const QString ®exp) const { qCDebug(LOG_AW) << "Should be sorted" << sorted << "and filter applied" << regexp; @@ -180,7 +180,7 @@ QVariantList AWKeys::getHddDevices() const // build model QVariantList devices; - for (auto device : hddDevices) { + for (auto &device : hddDevices) { QVariantMap model; model[QString("label")] = device; model[QString("name")] = device; @@ -191,7 +191,7 @@ QVariantList AWKeys::getHddDevices() const } -QString AWKeys::infoByKey(QString key) const +QString AWKeys::infoByKey(const QString &key) const { qCDebug(LOG_AW) << "Requested info for key" << key; @@ -200,7 +200,7 @@ QString AWKeys::infoByKey(QString key) const // HACK this method requires to define tag value from bar from UI interface -QString AWKeys::valueByKey(QString key) const +QString AWKeys::valueByKey(const QString &key) const { qCDebug(LOG_AW) << "Requested value for key" << key; @@ -211,7 +211,7 @@ QString AWKeys::valueByKey(QString key) const } -void AWKeys::editItem(const QString type) +void AWKeys::editItem(const QString &type) { qCDebug(LOG_AW) << "Item type" << type; @@ -228,7 +228,7 @@ void AWKeys::dataUpdated(const QString &sourceName, } -void AWKeys::reinitKeys(const QStringList currentKeys) +void AWKeys::reinitKeys(const QStringList ¤tKeys) { qCDebug(LOG_AW) << "Update found keys by using list" << currentKeys; @@ -240,7 +240,7 @@ void AWKeys::reinitKeys(const QStringList currentKeys) m_foundLambdas = AWPatternFunctions::findLambdas(m_keyOperator->pattern()); // generate list of required keys for bars QStringList barKeys; - for (auto bar : m_foundBars) { + for (auto &bar : m_foundBars) { GraphicalItem *item = m_keyOperator->giByKey(bar); if (item->isCustom()) item->setUsedKeys( @@ -279,7 +279,7 @@ void AWKeys::calculateValues() { // hddtot* QStringList mountDevices = m_keyOperator->devices(QString("mount")); - for (auto device : mountDevices) { + for (auto &device : mountDevices) { int index = mountDevices.indexOf(device); m_values[QString("hddtotmb%1").arg(index)] = m_values[QString("hddfreemb%1").arg(index)].toFloat() @@ -327,7 +327,7 @@ void AWKeys::calculateValues() / m_values[QString("swaptotmb")].toFloat(); // lambdas - for (auto key : m_foundLambdas) + for (auto &key : m_foundLambdas) m_values[key] = AWPatternFunctions::expandLambdas( key, m_aggregator, m_values, m_foundKeys); } @@ -360,11 +360,11 @@ QString AWKeys::parsePattern(QString pattern) const pattern.replace(QString("$$"), QString(0x1d)); // lambdas - for (auto key : m_foundLambdas) + for (auto &key : m_foundLambdas) pattern.replace(QString("${{%1}}").arg(key), m_values[key].toString()); // main keys - for (auto key : m_foundKeys) + for (auto &key : m_foundKeys) pattern.replace(QString("$%1").arg(key), [this](const QString &tag, const QVariant &value) { QString strValue = m_aggregator->formatter(value, tag); @@ -375,7 +375,7 @@ QString AWKeys::parsePattern(QString pattern) const }(key, m_values[key])); // bars - for (auto bar : m_foundBars) { + for (auto &bar : m_foundBars) { GraphicalItem *item = m_keyOperator->giByKey(bar); QString image = item->isCustom() diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h index 6b3cb4e..2c0b043 100644 --- a/sources/awesome-widget/plugin/awkeys.h +++ b/sources/awesome-widget/plugin/awkeys.h @@ -40,24 +40,24 @@ 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, + Q_INVOKABLE void initDataAggregator(const QVariantMap &tooltipParams); + Q_INVOKABLE void initKeys(const QString ¤tPattern, const int interval, const int limit, const bool optimize); - Q_INVOKABLE void setAggregatorProperty(const QString key, - const QVariant value); + Q_INVOKABLE void setAggregatorProperty(const QString &key, + const QVariant &value); Q_INVOKABLE void setWrapNewLines(const bool wrap = false); // additional method to force load keys from Qml UI. Used in some // configuration pages Q_INVOKABLE void updateCache(); // keys Q_INVOKABLE QStringList dictKeys(const bool sorted = false, - const QString regexp = QString()) const; + const QString ®exp = QString()) const; Q_INVOKABLE QVariantList getHddDevices() const; // values - Q_INVOKABLE QString infoByKey(QString key) const; - Q_INVOKABLE QString valueByKey(QString key) const; + Q_INVOKABLE QString infoByKey(const QString &key) const; + Q_INVOKABLE QString valueByKey(const QString &key) const; // configuration - Q_INVOKABLE void editItem(const QString type); + Q_INVOKABLE void editItem(const QString &type); public slots: void dataUpdated(const QString &sourceName, @@ -66,12 +66,12 @@ public slots: void modelChanged(QString, QAbstractItemModel *){}; signals: - void dropSourceFromDataengine(const QString source); - void needTextToBeUpdated(const QString newText) const; - void needToolTipToBeUpdated(const QString newText) const; + void dropSourceFromDataengine(const QString &source); + void needTextToBeUpdated(const QString &newText) const; + void needToolTipToBeUpdated(const QString &newText) const; private slots: - void reinitKeys(const QStringList currentKeys); + void reinitKeys(const QStringList ¤tKeys); void updateTextData(); private: diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp index 7835418..9e9af4f 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.cpp +++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp @@ -136,7 +136,7 @@ QString AWKeysAggregator::formatter(const QVariant &data, case FormatterType::TimeCustom: output = m_customTime; [&output, loc, this](const QDateTime dt) { - for (auto key : m_timeKeys) + for (auto &key : m_timeKeys) output.replace(QString("$%1").arg(key), loc.toString(dt, key)); }(data.toDateTime()); break; @@ -197,7 +197,7 @@ QStringList AWKeysAggregator::keysFromSource(const QString &source) const } -void AWKeysAggregator::setAcOffline(const QString inactive) +void AWKeysAggregator::setAcOffline(const QString &inactive) { qCDebug(LOG_AW) << "Inactive AC string" << inactive; @@ -205,7 +205,7 @@ void AWKeysAggregator::setAcOffline(const QString inactive) } -void AWKeysAggregator::setAcOnline(const QString active) +void AWKeysAggregator::setAcOnline(const QString &active) { qCDebug(LOG_AW) << "Active AC string" << active; @@ -213,7 +213,7 @@ void AWKeysAggregator::setAcOnline(const QString active) } -void AWKeysAggregator::setCustomTime(const QString customTime) +void AWKeysAggregator::setCustomTime(const QString &customTime) { qCDebug(LOG_AW) << "Format" << customTime; @@ -221,7 +221,7 @@ void AWKeysAggregator::setCustomTime(const QString customTime) } -void AWKeysAggregator::setCustomUptime(const QString customUptime) +void AWKeysAggregator::setCustomUptime(const QString &customUptime) { qCDebug(LOG_AW) << "Format" << customUptime; @@ -229,7 +229,7 @@ void AWKeysAggregator::setCustomUptime(const QString customUptime) } -void AWKeysAggregator::setDevices(const QHash devices) +void AWKeysAggregator::setDevices(const QHash &devices) { qCDebug(LOG_AW) << "Devices" << devices; @@ -237,7 +237,7 @@ void AWKeysAggregator::setDevices(const QHash devices) } -void AWKeysAggregator::setTempUnits(const QString units) +void AWKeysAggregator::setTempUnits(const QString &units) { qCDebug(LOG_AW) << "Units" << units; @@ -596,7 +596,7 @@ QStringList AWKeysAggregator::registerSource(const QString &source, customFormattersKeys = m_customFormatters->definedFormatters(); qCInfo(LOG_AW) << "Looking for fprmatters" << foundKeys << "in" << customFormattersKeys; - for (auto key : foundKeys) { + for (auto &key : foundKeys) { if (!customFormattersKeys.contains(key)) continue; m_formatter[key] = FormatterType::Custom; @@ -611,7 +611,7 @@ QStringList AWKeysAggregator::registerSource(const QString &source, }); if (!required) { m_map.remove(source); - for (auto key : foundKeys) + for (auto &key : foundKeys) m_formatter.remove(key); } diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h index ab60a8c..aa79b75 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.h +++ b/sources/awesome-widget/plugin/awkeysaggregator.h @@ -74,12 +74,12 @@ public: QString formatter(const QVariant &data, const QString &key) const; QStringList keysFromSource(const QString &source) const; // set methods - void setAcOffline(const QString inactive); - void setAcOnline(const QString active); - void setCustomTime(const QString customTime); - void setCustomUptime(const QString customUptime); - void setDevices(const QHash devices); - void setTempUnits(const QString units); + void setAcOffline(const QString &inactive); + void setAcOnline(const QString &active); + void setCustomTime(const QString &customTime); + void setCustomUptime(const QString &customUptime); + void setDevices(const QHash &devices); + void setTempUnits(const QString &units); void setTranslate(const bool translate); public slots: diff --git a/sources/awesome-widget/plugin/awpatternfunctions.cpp b/sources/awesome-widget/plugin/awpatternfunctions.cpp index 0f76f49..fdbc9c7 100644 --- a/sources/awesome-widget/plugin/awpatternfunctions.cpp +++ b/sources/awesome-widget/plugin/awpatternfunctions.cpp @@ -35,7 +35,7 @@ QString AWPatternFunctions::expandLambdas(QString code, // apply $this values code.replace(QString("$this"), metadata[code].toString()); // parsed values - for (auto lambdaKey : usedKeys) + for (auto &lambdaKey : usedKeys) code.replace(QString("$%1").arg(lambdaKey), aggregator->formatter(metadata[lambdaKey], lambdaKey)); qCInfo(LOG_AW) << "Expression" << code; @@ -87,8 +87,8 @@ QString AWPatternFunctions::expandTemplates(QString code) QList -AWPatternFunctions::findFunctionCalls(const QString function, - const QString code) +AWPatternFunctions::findFunctionCalls(const QString &function, + const QString &code) { qCDebug(LOG_AW) << "Looking for function" << function << "in" << code; @@ -135,14 +135,14 @@ AWPatternFunctions::findFunctionCalls(const QString function, } -QString AWPatternFunctions::insertAllKeys(QString code, const QStringList keys) +QString AWPatternFunctions::insertAllKeys(QString code, const QStringList &keys) { qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list" << keys; QList found = AWPatternFunctions::findFunctionCalls(QString("aw_all"), code); - for (auto function : found) { + for (auto &function : found) { QString separator = function.args.isEmpty() ? QString(",") : function.args.at(0); QStringList required = keys.filter(QRegExp(function.body)); @@ -157,14 +157,15 @@ QString AWPatternFunctions::insertAllKeys(QString code, const QStringList keys) } -QString AWPatternFunctions::insertKeyCount(QString code, const QStringList keys) +QString AWPatternFunctions::insertKeyCount(QString code, + const QStringList &keys) { qCDebug(LOG_AW) << "Looking for count in code" << code << "using list" << keys; QList found = AWPatternFunctions::findFunctionCalls(QString("aw_count"), code); - for (auto function : found) { + for (auto &function : found) { int count = keys.filter(QRegExp(function.body)).count(); code.replace(function.what, QString::number(count)); @@ -174,14 +175,15 @@ QString AWPatternFunctions::insertKeyCount(QString code, const QStringList keys) } -QString AWPatternFunctions::insertKeyNames(QString code, const QStringList keys) +QString AWPatternFunctions::insertKeyNames(QString code, + const QStringList &keys) { qCDebug(LOG_AW) << "Looking for key names in code" << code << "using list" << keys; QList found = AWPatternFunctions::findFunctionCalls(QString("aw_names"), code); - for (auto function : found) { + for (auto &function : found) { QString separator = function.args.isEmpty() ? QString(",") : function.args.at(0); QStringList required = keys.filter(QRegExp(function.body)); @@ -193,14 +195,14 @@ QString AWPatternFunctions::insertKeyNames(QString code, const QStringList keys) } -QString AWPatternFunctions::insertKeys(QString code, const QStringList keys) +QString AWPatternFunctions::insertKeys(QString code, const QStringList &keys) { qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list" << keys; QList found = AWPatternFunctions::findFunctionCalls(QString("aw_keys"), code); - for (auto function : found) { + for (auto &function : found) { QString separator = function.args.isEmpty() ? QString(",") : function.args.at(0); QStringList required = keys.filter(QRegExp(function.body)); @@ -221,7 +223,7 @@ QString AWPatternFunctions::insertMacros(QString code) QList found = AWPatternFunctions::findFunctionCalls(QString("aw_macro"), code); - for (auto macro : found) { + for (auto ¯o : found) { // get macro params if (macro.args.isEmpty()) { qCWarning(LOG_AW) << "No macro name found for" << macro.what; @@ -232,7 +234,7 @@ QString AWPatternFunctions::insertMacros(QString code) QList macroUsage = AWPatternFunctions::findFunctionCalls( QString("aw_macro_%1").arg(name), code); - for (auto function : macroUsage) { + for (auto &function : macroUsage) { if (function.args.count() != macro.args.count()) { qCWarning(LOG_AW) << "Invalid args count found for call" << function.what @@ -259,8 +261,8 @@ QString AWPatternFunctions::insertMacros(QString code) } -QStringList AWPatternFunctions::findKeys(const QString code, - const QStringList keys, +QStringList AWPatternFunctions::findKeys(const QString &code, + const QStringList &keys, const bool isBars) { qCDebug(LOG_AW) << "Looking for keys in code" << code << "using list" @@ -268,7 +270,7 @@ QStringList AWPatternFunctions::findKeys(const QString code, QStringList selectedKeys; QString replacedCode = code; - for (auto key : keys) + for (auto &key : keys) if ((key.startsWith(QString("bar")) == isBars) && (replacedCode.contains(QString("$%1").arg(key)))) { qCInfo(LOG_AW) << "Found key" << key << "with bar enabled" @@ -283,7 +285,7 @@ QStringList AWPatternFunctions::findKeys(const QString code, } -QStringList AWPatternFunctions::findLambdas(const QString code) +QStringList AWPatternFunctions::findLambdas(const QString &code) { qCDebug(LOG_AW) << "Looking for lambdas in code" << code; diff --git a/sources/awesome-widget/plugin/awpatternfunctions.h b/sources/awesome-widget/plugin/awpatternfunctions.h index b5544b0..75f051d 100644 --- a/sources/awesome-widget/plugin/awpatternfunctions.h +++ b/sources/awesome-widget/plugin/awpatternfunctions.h @@ -38,16 +38,17 @@ QString expandLambdas(QString code, AWKeysAggregator *aggregator, const QVariantHash &metadata, const QStringList &usedKeys); QString expandTemplates(QString code); -QList findFunctionCalls(const QString function, const QString code); -QString insertAllKeys(QString code, const QStringList keys); -QString insertKeyCount(QString code, const QStringList keys); -QString insertKeyNames(QString code, const QStringList keys); -QString insertKeys(QString code, const QStringList keys); +QList findFunctionCalls(const QString &function, + const QString &code); +QString insertAllKeys(QString code, const QStringList &keys); +QString insertKeyCount(QString code, const QStringList &keys); +QString insertKeyNames(QString code, const QStringList &keys); +QString insertKeys(QString code, const QStringList &keys); QString insertMacros(QString code); // find methods -QStringList findKeys(const QString code, const QStringList keys, +QStringList findKeys(const QString &code, const QStringList &keys, const bool isBars); -QStringList findLambdas(const QString code); +QStringList findLambdas(const QString &code); }; diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.cpp b/sources/awesome-widget/plugin/awtelemetryhandler.cpp index 194016c..9d33455 100644 --- a/sources/awesome-widget/plugin/awtelemetryhandler.cpp +++ b/sources/awesome-widget/plugin/awtelemetryhandler.cpp @@ -29,7 +29,7 @@ #include "awdebug.h" -AWTelemetryHandler::AWTelemetryHandler(QObject *parent, const QString clientId) +AWTelemetryHandler::AWTelemetryHandler(QObject *parent, const QString &clientId) : QObject(parent) { qCDebug(LOG_AW) << __PRETTY_FUNCTION__; @@ -50,7 +50,7 @@ AWTelemetryHandler::~AWTelemetryHandler() } -QStringList AWTelemetryHandler::get(const QString group) const +QStringList AWTelemetryHandler::get(const QString &group) const { qCDebug(LOG_AW) << "Get stored data for group" << group; @@ -58,7 +58,7 @@ QStringList AWTelemetryHandler::get(const QString group) const QSettings settings(m_localFile, QSettings::IniFormat); settings.beginGroup(group); - for (auto key : settings.childKeys()) + for (auto &key : settings.childKeys()) values.append(settings.value(key).toString()); settings.endGroup(); @@ -66,7 +66,7 @@ QStringList AWTelemetryHandler::get(const QString group) const } -QString AWTelemetryHandler::getLast(const QString group) const +QString AWTelemetryHandler::getLast(const QString &group) const { qCDebug(LOG_AW) << "Get last stored data for group" << group; @@ -75,7 +75,7 @@ QString AWTelemetryHandler::getLast(const QString group) const void AWTelemetryHandler::init(const int count, const bool enableRemote, - const QString clientId) + const QString &clientId) { qCDebug(LOG_AW) << "Init telemetry with count" << count << "enable remote" << enableRemote << "client ID" << clientId; @@ -86,7 +86,7 @@ void AWTelemetryHandler::init(const int count, const bool enableRemote, } -bool AWTelemetryHandler::put(const QString group, const QString value) const +bool AWTelemetryHandler::put(const QString &group, const QString &value) const { qCDebug(LOG_AW) << "Store data with group" << group << "and value" << value; @@ -95,7 +95,7 @@ bool AWTelemetryHandler::put(const QString group, const QString value) const // values will be stored as num=value inside specified group // load all values to memory QStringList saved; - for (auto key : settings.childKeys()) + for (auto &key : settings.childKeys()) saved.append(settings.value(key).toString()); // check if this value is already saved if (saved.contains(value)) { @@ -110,7 +110,7 @@ bool AWTelemetryHandler::put(const QString group, const QString value) const // clear group settings.remove(QString("")); // and save now - for (auto value : saved) { + for (auto &value : saved) { QString key = getKey(settings.childKeys().count()); settings.setValue(key, value); } @@ -123,8 +123,8 @@ bool AWTelemetryHandler::put(const QString group, const QString value) const } -void AWTelemetryHandler::uploadTelemetry(const QString group, - const QString value) +void AWTelemetryHandler::uploadTelemetry(const QString &group, + const QString &value) { qCDebug(LOG_AW) << "Upload data with group" << group << "and value" << value; diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.h b/sources/awesome-widget/plugin/awtelemetryhandler.h index 8ce092c..a77c571 100644 --- a/sources/awesome-widget/plugin/awtelemetryhandler.h +++ b/sources/awesome-widget/plugin/awtelemetryhandler.h @@ -34,17 +34,18 @@ public: const char *REMOTE_TELEMETRY_URL = "https://arcanis.me/telemetry"; explicit AWTelemetryHandler(QObject *parent = nullptr, - const QString clientId = QString()); + const QString &clientId = QString()); virtual ~AWTelemetryHandler(); - Q_INVOKABLE QStringList get(const QString group) const; - Q_INVOKABLE QString getLast(const QString group) const; + Q_INVOKABLE QStringList get(const QString &group) const; + Q_INVOKABLE QString getLast(const QString &group) const; Q_INVOKABLE void init(const int count, const bool enableRemote, - const QString clientId); - Q_INVOKABLE bool put(const QString group, const QString value) const; - Q_INVOKABLE void uploadTelemetry(const QString group, const QString value); + const QString &clientId); + Q_INVOKABLE bool put(const QString &group, const QString &value) const; + Q_INVOKABLE void uploadTelemetry(const QString &group, + const QString &value); signals: - void replyReceived(QString message); + void replyReceived(const QString &message); private slots: void telemetryReplyRecieved(QNetworkReply *reply); diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp index 37becf3..ea9764f 100644 --- a/sources/awesome-widget/plugin/awupdatehelper.cpp +++ b/sources/awesome-widget/plugin/awupdatehelper.cpp @@ -92,7 +92,7 @@ bool AWUpdateHelper::checkVersion() } -void AWUpdateHelper::showInfo(const QVersionNumber version) +void AWUpdateHelper::showInfo(const QVersionNumber &version) { qCDebug(LOG_AW) << "Version" << version; @@ -105,7 +105,7 @@ void AWUpdateHelper::showInfo(const QVersionNumber version) } -void AWUpdateHelper::showUpdates(const QVersionNumber version) +void AWUpdateHelper::showUpdates(const QVersionNumber &version) { qCDebug(LOG_AW) << "Version" << version; @@ -176,7 +176,7 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *reply, // additional method which is used to show message box which does not block UI QMessageBox * -AWUpdateHelper::genMessageBox(const QString title, const QString body, +AWUpdateHelper::genMessageBox(const QString &title, const QString &body, const QMessageBox::StandardButtons buttons) { qCDebug(LOG_AW) << "Construct message box with title" << title << "and body" diff --git a/sources/awesome-widget/plugin/awupdatehelper.h b/sources/awesome-widget/plugin/awupdatehelper.h index 359cdb2..213384a 100644 --- a/sources/awesome-widget/plugin/awupdatehelper.h +++ b/sources/awesome-widget/plugin/awupdatehelper.h @@ -37,13 +37,13 @@ public: bool checkVersion(); private slots: - void showInfo(const QVersionNumber version); - void showUpdates(const QVersionNumber version); + void showInfo(const QVersionNumber &version); + void showUpdates(const QVersionNumber &version); void userReplyOnUpdates(QAbstractButton *button); void versionReplyRecieved(QNetworkReply *reply, const bool showAnyway); private: - QMessageBox *genMessageBox(const QString title, const QString body, + QMessageBox *genMessageBox(const QString &title, const QString &body, const QMessageBox::StandardButtons buttons); QVersionNumber m_foundVersion; QString m_genericConfig; diff --git a/sources/awesomewidgets/abstractextitem.cpp b/sources/awesomewidgets/abstractextitem.cpp index b0468f6..4e925f6 100644 --- a/sources/awesomewidgets/abstractextitem.cpp +++ b/sources/awesomewidgets/abstractextitem.cpp @@ -28,7 +28,7 @@ #include "qcronscheduler.h" -AbstractExtItem::AbstractExtItem(QWidget *parent, const QString filePath) +AbstractExtItem::AbstractExtItem(QWidget *parent, const QString &filePath) : QDialog(parent) , m_fileName(filePath) { @@ -166,7 +166,7 @@ QString AbstractExtItem::socket() const } -QString AbstractExtItem::tag(const QString _type) const +QString AbstractExtItem::tag(const QString &_type) const { qCDebug(LOG_LIB) << "Tag type" << _type; @@ -190,7 +190,7 @@ void AbstractExtItem::setActive(const bool _state) } -void AbstractExtItem::setComment(const QString _comment) +void AbstractExtItem::setComment(const QString &_comment) { qCDebug(LOG_LIB) << "Comment" << _comment; @@ -198,7 +198,7 @@ void AbstractExtItem::setComment(const QString _comment) } -void AbstractExtItem::setCron(const QString _cron) +void AbstractExtItem::setCron(const QString &_cron) { qCDebug(LOG_LIB) << "Cron string" << _cron; // deinit module first @@ -230,7 +230,7 @@ void AbstractExtItem::setInterval(const int _interval) } -void AbstractExtItem::setName(const QString _name) +void AbstractExtItem::setName(const QString &_name) { qCDebug(LOG_LIB) << "Name" << _name; @@ -259,7 +259,7 @@ void AbstractExtItem::setNumber(int _number) } -void AbstractExtItem::setSocket(const QString _socket) +void AbstractExtItem::setSocket(const QString &_socket) { qCDebug(LOG_LIB) << "Socket" << _socket; // remove old socket first diff --git a/sources/awesomewidgets/abstractextitem.h b/sources/awesomewidgets/abstractextitem.h index 05bc6c4..efafcca 100644 --- a/sources/awesomewidgets/abstractextitem.h +++ b/sources/awesomewidgets/abstractextitem.h @@ -41,10 +41,10 @@ class AbstractExtItem : public QDialog public: explicit AbstractExtItem(QWidget *parent, - const QString filePath = QString()); + const QString &filePath = QString()); virtual ~AbstractExtItem(); virtual void bumpApi(const int _newVer); - virtual AbstractExtItem *copy(const QString _fileName, const int _number) + virtual AbstractExtItem *copy(const QString &_fileName, const int _number) = 0; virtual void copyDefaults(AbstractExtItem *_other) const; virtual void startTimer(); @@ -59,17 +59,17 @@ public: QString name() const; int number() const; QString socket() const; - QString tag(const QString _type) const; + QString tag(const QString &_type) const; virtual QString uniq() const = 0; // set methods void setApiVersion(const int _apiVersion = 0); void setActive(const bool _state = true); - void setComment(const QString _comment = QString("empty")); - void setCron(const QString _cron = ""); + void setComment(const QString &_comment = QString("empty")); + void setCron(const QString &_cron = ""); void setInterval(const int _interval = 1); - void setName(const QString _name = QString("none")); + void setName(const QString &_name = QString("none")); void setNumber(int _number = -1); - void setSocket(const QString _socket = QString("")); + void setSocket(const QString &_socket = QString("")); signals: void dataReceived(const QVariantHash &data); @@ -80,7 +80,7 @@ public slots: virtual void initSocket(); virtual void readConfiguration(); virtual QVariantHash run() = 0; - virtual int showConfiguration(const QVariant args = QVariant()) = 0; + virtual int showConfiguration(const QVariant &args = QVariant()) = 0; virtual bool tryDelete() const; virtual void writeConfiguration() const; diff --git a/sources/awesomewidgets/abstractextitemaggregator.cpp b/sources/awesomewidgets/abstractextitemaggregator.cpp index cba2f6e..3a601e1 100644 --- a/sources/awesomewidgets/abstractextitemaggregator.cpp +++ b/sources/awesomewidgets/abstractextitemaggregator.cpp @@ -26,7 +26,7 @@ AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *parent, - const QString type) + const QString &type) : QDialog(parent) , ui(new Ui::AbstractExtItemAggregator) , m_type(type) @@ -132,7 +132,7 @@ AbstractExtItem *AbstractExtItemAggregator::itemFromWidget() return nullptr; AbstractExtItem *found = nullptr; - for (auto item : items()) { + for (auto &item : items()) { QString fileName = QFileInfo(item->fileName()).fileName(); if (fileName != widgetItem->text()) continue; @@ -150,7 +150,7 @@ AbstractExtItem *AbstractExtItemAggregator::itemFromWidget() void AbstractExtItemAggregator::repaintList() { ui->listWidget->clear(); - for (auto _item : items()) { + for (auto &_item : items()) { QString fileName = QFileInfo(_item->fileName()).fileName(); QListWidgetItem *item = new QListWidgetItem(fileName, ui->listWidget); QStringList tooltip; @@ -166,7 +166,7 @@ void AbstractExtItemAggregator::repaintList() int AbstractExtItemAggregator::uniqNumber() const { QList tagList; - for (auto item : items()) + for (auto &item : items()) tagList.append(item->number()); int number = 0; while (tagList.contains(number)) @@ -188,7 +188,7 @@ QString AbstractExtItemAggregator::type() const } -void AbstractExtItemAggregator::setConfigArgs(const QVariant _configArgs) +void AbstractExtItemAggregator::setConfigArgs(const QVariant &_configArgs) { qCDebug(LOG_LIB) << "Configuration arguments" << _configArgs; diff --git a/sources/awesomewidgets/abstractextitemaggregator.h b/sources/awesomewidgets/abstractextitemaggregator.h index cb1cb52..69afa9e 100644 --- a/sources/awesomewidgets/abstractextitemaggregator.h +++ b/sources/awesomewidgets/abstractextitemaggregator.h @@ -39,7 +39,7 @@ class AbstractExtItemAggregator : public QDialog Q_PROPERTY(QVariant type READ type) public: - explicit AbstractExtItemAggregator(QWidget *parent, const QString type); + explicit AbstractExtItemAggregator(QWidget *parent, const QString &type); virtual ~AbstractExtItemAggregator(); // methods void copyItem(); @@ -75,7 +75,7 @@ public: virtual QList items() const = 0; QString type() const; // set methods - void setConfigArgs(const QVariant _configArgs); + void setConfigArgs(const QVariant &_configArgs); private slots: void editItemActivated(QListWidgetItem *); diff --git a/sources/awesomewidgets/abstractweatherprovider.h b/sources/awesomewidgets/abstractweatherprovider.h index 9582cac..dab7de5 100644 --- a/sources/awesomewidgets/abstractweatherprovider.h +++ b/sources/awesomewidgets/abstractweatherprovider.h @@ -32,7 +32,7 @@ public: : QObject(parent) , m_number(number){}; virtual ~AbstractWeatherProvider(){}; - virtual void initUrl(const QString city, const QString country, + virtual void initUrl(const QString &city, const QString &country, const int ts) = 0; virtual QVariantHash parse(const QVariantMap &json) const = 0; diff --git a/sources/awesomewidgets/awabstractformatter.cpp b/sources/awesomewidgets/awabstractformatter.cpp index b97a4e6..d0f3d13 100644 --- a/sources/awesomewidgets/awabstractformatter.cpp +++ b/sources/awesomewidgets/awabstractformatter.cpp @@ -23,7 +23,7 @@ AWAbstractFormatter::AWAbstractFormatter(QWidget *parent, - const QString filePath) + const QString &filePath) : AbstractExtItem(parent, filePath) { qCDebug(LOG_LIB) << __PRETTY_FUNCTION__; @@ -87,7 +87,7 @@ AWAbstractFormatter::FormatterClass AWAbstractFormatter::type() const } -void AWAbstractFormatter::setStrType(const QString _type) +void AWAbstractFormatter::setStrType(const QString &_type) { qCDebug(LOG_LIB) << "Type" << _type; diff --git a/sources/awesomewidgets/awabstractformatter.h b/sources/awesomewidgets/awabstractformatter.h index 12db5e6..5e6014b 100644 --- a/sources/awesomewidgets/awabstractformatter.h +++ b/sources/awesomewidgets/awabstractformatter.h @@ -39,7 +39,7 @@ public: }; explicit AWAbstractFormatter(QWidget *parent, - const QString filePath = QString()); + const QString &filePath = QString()); virtual ~AWAbstractFormatter(); virtual QString convert(const QVariant &_value) const = 0; void copyDefaults(AbstractExtItem *_other) const; @@ -47,7 +47,7 @@ public: // properties QString strType() const; FormatterClass type() const; - void setStrType(const QString type); + void setStrType(const QString &type); void setType(const FormatterClass _type = FormatterClass::NoFormat); public slots: diff --git a/sources/awesomewidgets/awdatetimeformatter.cpp b/sources/awesomewidgets/awdatetimeformatter.cpp index 4680da6..b1da52e 100644 --- a/sources/awesomewidgets/awdatetimeformatter.cpp +++ b/sources/awesomewidgets/awdatetimeformatter.cpp @@ -29,7 +29,7 @@ AWDateTimeFormatter::AWDateTimeFormatter(QWidget *parent, - const QString filePath) + const QString &filePath) : AWAbstractFormatter(parent, filePath) , ui(new Ui::AWDateTimeFormatter) { @@ -58,7 +58,7 @@ QString AWDateTimeFormatter::convert(const QVariant &_value) const } -AWDateTimeFormatter *AWDateTimeFormatter::copy(const QString _fileName, +AWDateTimeFormatter *AWDateTimeFormatter::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -86,7 +86,7 @@ bool AWDateTimeFormatter::translateString() const } -void AWDateTimeFormatter::setFormat(const QString _format) +void AWDateTimeFormatter::setFormat(const QString &_format) { qCDebug(LOG_LIB) << "Set format" << _format; @@ -119,7 +119,7 @@ void AWDateTimeFormatter::readConfiguration() } -int AWDateTimeFormatter::showConfiguration(const QVariant args) +int AWDateTimeFormatter::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/awdatetimeformatter.h b/sources/awesomewidgets/awdatetimeformatter.h index 0cdf153..b5e03be 100644 --- a/sources/awesomewidgets/awdatetimeformatter.h +++ b/sources/awesomewidgets/awdatetimeformatter.h @@ -36,19 +36,19 @@ class AWDateTimeFormatter : public AWAbstractFormatter public: explicit AWDateTimeFormatter(QWidget *parent, - const QString filePath = QString()); + const QString &filePath = QString()); virtual ~AWDateTimeFormatter(); QString convert(const QVariant &_value) const; - AWDateTimeFormatter *copy(const QString _fileName, const int _number); + AWDateTimeFormatter *copy(const QString &_fileName, const int _number); // properties QString format() const; bool translateString() const; - void setFormat(const QString _format); + void setFormat(const QString &_format); void setTranslateString(const bool _translate); public slots: void readConfiguration(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private: diff --git a/sources/awesomewidgets/awfloatformatter.cpp b/sources/awesomewidgets/awfloatformatter.cpp index e39f8fd..7b48b12 100644 --- a/sources/awesomewidgets/awfloatformatter.cpp +++ b/sources/awesomewidgets/awfloatformatter.cpp @@ -27,7 +27,7 @@ #include "awdebug.h" -AWFloatFormatter::AWFloatFormatter(QWidget *parent, const QString filePath) +AWFloatFormatter::AWFloatFormatter(QWidget *parent, const QString &filePath) : AWAbstractFormatter(parent, filePath) , ui(new Ui::AWFloatFormatter) { @@ -62,7 +62,7 @@ QString AWFloatFormatter::convert(const QVariant &_value) const } -AWFloatFormatter *AWFloatFormatter::copy(const QString _fileName, +AWFloatFormatter *AWFloatFormatter::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -133,7 +133,7 @@ void AWFloatFormatter::setCount(const int _count) } -void AWFloatFormatter::setFillChar(const QChar _fillChar) +void AWFloatFormatter::setFillChar(const QChar &_fillChar) { qCDebug(LOG_LIB) << "Set char" << _fillChar; @@ -214,7 +214,7 @@ void AWFloatFormatter::readConfiguration() } -int AWFloatFormatter::showConfiguration(const QVariant args) +int AWFloatFormatter::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/awfloatformatter.h b/sources/awesomewidgets/awfloatformatter.h index 7a687c7..a849131 100644 --- a/sources/awesomewidgets/awfloatformatter.h +++ b/sources/awesomewidgets/awfloatformatter.h @@ -39,10 +39,10 @@ class AWFloatFormatter : public AWAbstractFormatter public: explicit AWFloatFormatter(QWidget *parent, - const QString filePath = QString()); + const QString &filePath = QString()); virtual ~AWFloatFormatter(); QString convert(const QVariant &_value) const; - AWFloatFormatter *copy(const QString _fileName, const int _number); + AWFloatFormatter *copy(const QString &_fileName, const int _number); // properties int count() const; QChar fillChar() const; @@ -52,7 +52,7 @@ public: int precision() const; double summand() const; void setCount(const int _count); - void setFillChar(const QChar _fillChar); + void setFillChar(const QChar &_fillChar); void setForceWidth(const bool _forceWidth); void setFormat(char _format); void setMultiplier(const double _multiplier); @@ -61,7 +61,7 @@ public: public slots: void readConfiguration(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private: diff --git a/sources/awesomewidgets/awjsonformatter.cpp b/sources/awesomewidgets/awjsonformatter.cpp index 81d12ee..613498c 100644 --- a/sources/awesomewidgets/awjsonformatter.cpp +++ b/sources/awesomewidgets/awjsonformatter.cpp @@ -27,7 +27,7 @@ #include "awdebug.h" -AWJsonFormatter::AWJsonFormatter(QWidget *parent, const QString filePath) +AWJsonFormatter::AWJsonFormatter(QWidget *parent, const QString &filePath) : AWAbstractFormatter(parent, filePath) , ui(new Ui::AWJsonFormatter) { @@ -65,7 +65,7 @@ QString AWJsonFormatter::convert(const QVariant &_value) const } -AWJsonFormatter *AWJsonFormatter::copy(const QString _fileName, +AWJsonFormatter *AWJsonFormatter::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -86,7 +86,7 @@ QString AWJsonFormatter::path() const } -void AWJsonFormatter::setPath(const QString _path) +void AWJsonFormatter::setPath(const QString &_path) { qCDebug(LOG_LIB) << "Path" << _path; @@ -109,7 +109,7 @@ void AWJsonFormatter::readConfiguration() } -int AWJsonFormatter::showConfiguration(const QVariant args) +int AWJsonFormatter::showConfiguration(const QVariant &args) { Q_UNUSED(args) @@ -190,10 +190,7 @@ void AWJsonFormatter::initPath() for (auto &element : splittedByDot) { bool ok; int number = element.toInt(&ok); - if (ok) - m_splittedPath.append(number); - else - m_splittedPath.append(element); + m_splittedPath.append(ok ? QVariant(number) : QVariant(element)); } } diff --git a/sources/awesomewidgets/awjsonformatter.h b/sources/awesomewidgets/awjsonformatter.h index 338d2d8..7e37d89 100644 --- a/sources/awesomewidgets/awjsonformatter.h +++ b/sources/awesomewidgets/awjsonformatter.h @@ -33,17 +33,17 @@ class AWJsonFormatter : public AWAbstractFormatter public: explicit AWJsonFormatter(QWidget *parent, - const QString filePath = QString()); + const QString &filePath = QString()); virtual ~AWJsonFormatter(); QString convert(const QVariant &_value) const; - AWJsonFormatter *copy(const QString _fileName, const int _number); + AWJsonFormatter *copy(const QString &_fileName, const int _number); // properties QString path() const; - void setPath(const QString _path); + void setPath(const QString &_path); public slots: void readConfiguration(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private: diff --git a/sources/awesomewidgets/awlistformatter.cpp b/sources/awesomewidgets/awlistformatter.cpp index a72d97f..792e5cf 100644 --- a/sources/awesomewidgets/awlistformatter.cpp +++ b/sources/awesomewidgets/awlistformatter.cpp @@ -26,7 +26,7 @@ #include "awdebug.h" -AWListFormatter::AWListFormatter(QWidget *parent, const QString filePath) +AWListFormatter::AWListFormatter(QWidget *parent, const QString &filePath) : AWAbstractFormatter(parent, filePath) , ui(new Ui::AWListFormatter) { @@ -59,7 +59,7 @@ QString AWListFormatter::convert(const QVariant &_value) const } -AWListFormatter *AWListFormatter::copy(const QString _fileName, +AWListFormatter *AWListFormatter::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -94,7 +94,7 @@ QString AWListFormatter::separator() const } -void AWListFormatter::setFilter(const QString _filter) +void AWListFormatter::setFilter(const QString &_filter) { qCDebug(LOG_LIB) << "Filter" << _filter; @@ -103,7 +103,7 @@ void AWListFormatter::setFilter(const QString _filter) } -void AWListFormatter::setSeparator(const QString _separator) +void AWListFormatter::setSeparator(const QString &_separator) { qCDebug(LOG_LIB) << "Separtor" << _separator; @@ -136,7 +136,7 @@ void AWListFormatter::readConfiguration() } -int AWListFormatter::showConfiguration(const QVariant args) +int AWListFormatter::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/awlistformatter.h b/sources/awesomewidgets/awlistformatter.h index 36438a6..4ca509e 100644 --- a/sources/awesomewidgets/awlistformatter.h +++ b/sources/awesomewidgets/awlistformatter.h @@ -35,21 +35,21 @@ class AWListFormatter : public AWAbstractFormatter public: explicit AWListFormatter(QWidget *parent, - const QString filePath = QString()); + const QString &filePath = QString()); virtual ~AWListFormatter(); QString convert(const QVariant &_value) const; - AWListFormatter *copy(const QString _fileName, const int _number); + AWListFormatter *copy(const QString &_fileName, const int _number); // properties QString filter() const; bool isSorted() const; QString separator() const; - void setFilter(const QString _filter); - void setSeparator(const QString _separator); + void setFilter(const QString &_filter); + void setSeparator(const QString &_separator); void setSorted(const bool _sorted); public slots: void readConfiguration(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private: diff --git a/sources/awesomewidgets/awnoformatter.cpp b/sources/awesomewidgets/awnoformatter.cpp index 1ca4946..96f7486 100644 --- a/sources/awesomewidgets/awnoformatter.cpp +++ b/sources/awesomewidgets/awnoformatter.cpp @@ -24,7 +24,7 @@ #include "awdebug.h" -AWNoFormatter::AWNoFormatter(QWidget *parent, const QString filePath) +AWNoFormatter::AWNoFormatter(QWidget *parent, const QString &filePath) : AWAbstractFormatter(parent, filePath) , ui(new Ui::AWNoFormatter) { @@ -53,7 +53,7 @@ QString AWNoFormatter::convert(const QVariant &_value) const } -AWNoFormatter *AWNoFormatter::copy(const QString _fileName, const int _number) +AWNoFormatter *AWNoFormatter::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -66,7 +66,7 @@ AWNoFormatter *AWNoFormatter::copy(const QString _fileName, const int _number) } -int AWNoFormatter::showConfiguration(const QVariant args) +int AWNoFormatter::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/awnoformatter.h b/sources/awesomewidgets/awnoformatter.h index de79817..4c965b4 100644 --- a/sources/awesomewidgets/awnoformatter.h +++ b/sources/awesomewidgets/awnoformatter.h @@ -31,13 +31,13 @@ class AWNoFormatter : public AWAbstractFormatter Q_OBJECT public: - explicit AWNoFormatter(QWidget *parent, const QString filePath = QString()); + explicit AWNoFormatter(QWidget *parent, const QString &filePath = QString()); virtual ~AWNoFormatter(); QString convert(const QVariant &_value) const; - AWNoFormatter *copy(const QString _fileName, const int _number); + AWNoFormatter *copy(const QString &_fileName, const int _number); public slots: - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); private: Ui::AWNoFormatter *ui = nullptr; diff --git a/sources/awesomewidgets/awscriptformatter.cpp b/sources/awesomewidgets/awscriptformatter.cpp index 1393182..68e762c 100644 --- a/sources/awesomewidgets/awscriptformatter.cpp +++ b/sources/awesomewidgets/awscriptformatter.cpp @@ -28,7 +28,7 @@ #include "awdebug.h" -AWScriptFormatter::AWScriptFormatter(QWidget *parent, const QString filePath) +AWScriptFormatter::AWScriptFormatter(QWidget *parent, const QString &filePath) : AWAbstractFormatter(parent, filePath) , ui(new Ui::AWScriptFormatter) { @@ -70,7 +70,7 @@ QString AWScriptFormatter::convert(const QVariant &_value) const } -AWScriptFormatter *AWScriptFormatter::copy(const QString _fileName, +AWScriptFormatter *AWScriptFormatter::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -120,7 +120,7 @@ void AWScriptFormatter::setAppendCode(const bool _appendCode) } -void AWScriptFormatter::setCode(const QString _code) +void AWScriptFormatter::setCode(const QString &_code) { qCDebug(LOG_LIB) << "Set code" << _code; @@ -156,7 +156,7 @@ void AWScriptFormatter::readConfiguration() } -int AWScriptFormatter::showConfiguration(const QVariant args) +int AWScriptFormatter::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/awscriptformatter.h b/sources/awesomewidgets/awscriptformatter.h index ec9fdbf..ca85603 100644 --- a/sources/awesomewidgets/awscriptformatter.h +++ b/sources/awesomewidgets/awscriptformatter.h @@ -36,22 +36,22 @@ class AWScriptFormatter : public AWAbstractFormatter public: explicit AWScriptFormatter(QWidget *parent, - const QString filePath = QString()); + const QString &filePath = QString()); virtual ~AWScriptFormatter(); QString convert(const QVariant &_value) const; - AWScriptFormatter *copy(const QString _fileName, const int _number); + AWScriptFormatter *copy(const QString &_fileName, const int _number); // properties bool appendCode() const; QString code() const; bool hasReturn() const; QString program() const; void setAppendCode(const bool _appendCode); - void setCode(const QString _code); + void setCode(const QString &_code); void setHasReturn(const bool _hasReturn); public slots: void readConfiguration(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private: diff --git a/sources/awesomewidgets/awstringformatter.cpp b/sources/awesomewidgets/awstringformatter.cpp index 0b26cc8..4654435 100644 --- a/sources/awesomewidgets/awstringformatter.cpp +++ b/sources/awesomewidgets/awstringformatter.cpp @@ -27,7 +27,7 @@ #include "awdebug.h" -AWStringFormatter::AWStringFormatter(QWidget *parent, const QString filePath) +AWStringFormatter::AWStringFormatter(QWidget *parent, const QString &filePath) : AWAbstractFormatter(parent, filePath) , ui(new Ui::AWStringFormatter) { @@ -60,7 +60,7 @@ QString AWStringFormatter::convert(const QVariant &_value) const } -AWStringFormatter *AWStringFormatter::copy(const QString _fileName, +AWStringFormatter *AWStringFormatter::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -103,7 +103,7 @@ void AWStringFormatter::setCount(const int _count) } -void AWStringFormatter::setFillChar(const QChar _fillChar) +void AWStringFormatter::setFillChar(const QChar &_fillChar) { qCDebug(LOG_LIB) << "Set char" << _fillChar; @@ -137,7 +137,7 @@ void AWStringFormatter::readConfiguration() } -int AWStringFormatter::showConfiguration(const QVariant args) +int AWStringFormatter::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/awstringformatter.h b/sources/awesomewidgets/awstringformatter.h index aff823a..c99fbfe 100644 --- a/sources/awesomewidgets/awstringformatter.h +++ b/sources/awesomewidgets/awstringformatter.h @@ -35,21 +35,21 @@ class AWStringFormatter : public AWAbstractFormatter public: explicit AWStringFormatter(QWidget *parent, - const QString filePath = QString()); + const QString &filePath = QString()); virtual ~AWStringFormatter(); QString convert(const QVariant &_value) const; - AWStringFormatter *copy(const QString _fileName, const int _number); + AWStringFormatter *copy(const QString &_fileName, const int _number); // properties int count() const; QChar fillChar() const; bool forceWidth() const; void setCount(const int _count); - void setFillChar(const QChar _fillChar); + void setFillChar(const QChar &_fillChar); void setForceWidth(const bool _forceWidth); public slots: void readConfiguration(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private: diff --git a/sources/awesomewidgets/extitemaggregator.h b/sources/awesomewidgets/extitemaggregator.h index 83e367f..4180798 100644 --- a/sources/awesomewidgets/extitemaggregator.h +++ b/sources/awesomewidgets/extitemaggregator.h @@ -31,7 +31,7 @@ template class ExtItemAggregator : public AbstractExtItemAggregator { public: - explicit ExtItemAggregator(QWidget *parent, const QString type) + explicit ExtItemAggregator(QWidget *parent, const QString &type) : AbstractExtItemAggregator(parent, type) { qSetMessagePattern(AWDebug::LOG_FORMAT); @@ -66,16 +66,16 @@ public: // HACK as soon as per one widget instance we have two objects each of // them will try to control socket, whereas actually only one of them // should be owner of the socket - for (auto item : m_items) + for (auto &item : m_items) item->initSocket(); } - T *itemByTag(const QString _tag, const QString _type) const + T *itemByTag(const QString &_tag, const QString &_type) const { qCDebug(LOG_LIB) << "Tag" << _tag << "with used type" << _type; T *found = nullptr; - for (auto item : m_items) { + for (auto &item : m_items) { if (item->tag(_type) != _tag) continue; found = static_cast(item); @@ -92,7 +92,7 @@ public: qCDebug(LOG_LIB) << "Number" << _number; T *found = nullptr; - for (auto item : m_items) { + for (auto &item : m_items) { if (item->number() != _number) continue; found = static_cast(item); @@ -129,9 +129,9 @@ private: QStandardPaths::LocateDirectory); QStringList names; QList items; - for (auto dir : dirs) { + for (auto &dir : dirs) { QStringList files = QDir(dir).entryList(QDir::Files, QDir::Name); - for (auto file : files) { + for (auto &file : files) { if ((!file.endsWith(QString(".desktop"))) || (names.contains(file))) continue; @@ -156,7 +156,7 @@ private: m_activeItems.clear(); m_items = getItems(); - for (auto item : m_items) { + for (auto &item : m_items) { if (!item->isActive()) continue; m_activeItems.append(static_cast(item)); diff --git a/sources/awesomewidgets/extnetworkrequest.cpp b/sources/awesomewidgets/extnetworkrequest.cpp index 92e3203..0a2a8f8 100644 --- a/sources/awesomewidgets/extnetworkrequest.cpp +++ b/sources/awesomewidgets/extnetworkrequest.cpp @@ -31,7 +31,7 @@ #include "awdebug.h" -ExtNetworkRequest::ExtNetworkRequest(QWidget *parent, const QString filePath) +ExtNetworkRequest::ExtNetworkRequest(QWidget *parent, const QString &filePath) : AbstractExtItem(parent, filePath) , ui(new Ui::ExtNetworkRequest) { @@ -67,7 +67,7 @@ ExtNetworkRequest::~ExtNetworkRequest() } -ExtNetworkRequest *ExtNetworkRequest::copy(const QString _fileName, +ExtNetworkRequest *ExtNetworkRequest::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -94,7 +94,7 @@ QString ExtNetworkRequest::uniq() const } -void ExtNetworkRequest::setStringUrl(const QString _url) +void ExtNetworkRequest::setStringUrl(const QString &_url) { qCDebug(LOG_LIB) << "Url" << _url; @@ -127,7 +127,7 @@ QVariantHash ExtNetworkRequest::run() } -int ExtNetworkRequest::showConfiguration(const QVariant args) +int ExtNetworkRequest::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/extnetworkrequest.h b/sources/awesomewidgets/extnetworkrequest.h index fb979c0..4828862 100644 --- a/sources/awesomewidgets/extnetworkrequest.h +++ b/sources/awesomewidgets/extnetworkrequest.h @@ -35,19 +35,19 @@ class ExtNetworkRequest : public AbstractExtItem public: explicit ExtNetworkRequest(QWidget *parent, - const QString filePath = QString()); + const QString &filePath = QString()); virtual ~ExtNetworkRequest(); - ExtNetworkRequest *copy(const QString _fileName, const int _number); + ExtNetworkRequest *copy(const QString &_fileName, const int _number); // get methods QString stringUrl() const; QString uniq() const; // set methods - void setStringUrl(const QString _url = QString("https://httpbin.org/get")); + void setStringUrl(const QString &_url = QString("https://httpbin.org/get")); public slots: void readConfiguration(); QVariantHash run(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private slots: diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp index 4f8096a..6b10bda 100644 --- a/sources/awesomewidgets/extquotes.cpp +++ b/sources/awesomewidgets/extquotes.cpp @@ -33,7 +33,7 @@ #include "awdebug.h" -ExtQuotes::ExtQuotes(QWidget *parent, const QString filePath) +ExtQuotes::ExtQuotes(QWidget *parent, const QString &filePath) : AbstractExtItem(parent, filePath) , ui(new Ui::ExtQuotes) { @@ -77,7 +77,7 @@ ExtQuotes::~ExtQuotes() } -ExtQuotes *ExtQuotes::copy(const QString _fileName, const int _number) +ExtQuotes *ExtQuotes::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -103,7 +103,7 @@ QString ExtQuotes::uniq() const } -void ExtQuotes::setTicker(const QString _ticker) +void ExtQuotes::setTicker(const QString &_ticker) { qCDebug(LOG_LIB) << "Ticker" << _ticker; @@ -136,7 +136,7 @@ QVariantHash ExtQuotes::run() } -int ExtQuotes::showConfiguration(const QVariant args) +int ExtQuotes::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/extquotes.h b/sources/awesomewidgets/extquotes.h index ac1fc42..42aedc4 100644 --- a/sources/awesomewidgets/extquotes.h +++ b/sources/awesomewidgets/extquotes.h @@ -38,19 +38,19 @@ public: const char *YAHOO_QUOTES_QUERY = "select * from yahoo.finance.quotes where symbol='%1'"; - explicit ExtQuotes(QWidget *parent, const QString filePath = QString()); + explicit ExtQuotes(QWidget *parent, const QString &filePath = QString()); virtual ~ExtQuotes(); - ExtQuotes *copy(const QString _fileName, const int _number); + ExtQuotes *copy(const QString &_fileName, const int _number); // get methods QString ticker() const; QString uniq() const; // set methods - void setTicker(const QString _ticker = QString("EURUSD=X")); + void setTicker(const QString &_ticker = QString("EURUSD=X")); public slots: void readConfiguration(); QVariantHash run(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private slots: diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp index acab312..e0fc119 100644 --- a/sources/awesomewidgets/extscript.cpp +++ b/sources/awesomewidgets/extscript.cpp @@ -30,7 +30,7 @@ #include "awdebug.h" -ExtScript::ExtScript(QWidget *parent, const QString filePath) +ExtScript::ExtScript(QWidget *parent, const QString &filePath) : AbstractExtItem(parent, filePath) , ui(new Ui::ExtScript) { @@ -66,7 +66,7 @@ ExtScript::~ExtScript() } -ExtScript *ExtScript::copy(const QString _fileName, const int _number) +ExtScript *ExtScript::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -147,7 +147,7 @@ QString ExtScript::strRedirect() const } -void ExtScript::setExecutable(const QString _executable) +void ExtScript::setExecutable(const QString &_executable) { qCDebug(LOG_LIB) << "Executable" << _executable; @@ -155,7 +155,7 @@ void ExtScript::setExecutable(const QString _executable) } -void ExtScript::setFilters(const QStringList _filters) +void ExtScript::setFilters(const QStringList &_filters) { qCDebug(LOG_LIB) << "Filters" << _filters; @@ -164,7 +164,7 @@ void ExtScript::setFilters(const QStringList _filters) } -void ExtScript::setPrefix(const QString _prefix) +void ExtScript::setPrefix(const QString &_prefix) { qCDebug(LOG_LIB) << "Prefix" << _prefix; @@ -180,7 +180,7 @@ void ExtScript::setRedirect(const Redirect _redirect) } -void ExtScript::setStrRedirect(const QString _redirect) +void ExtScript::setStrRedirect(const QString &_redirect) { qCDebug(LOG_LIB) << "Redirect" << _redirect; @@ -199,7 +199,7 @@ QString ExtScript::applyFilters(QString _value) const { qCDebug(LOG_LIB) << "Value" << _value; - for (auto filt : filters()) { + for (auto &filt : filters()) { qCInfo(LOG_LIB) << "Found filter" << filt; QVariantMap filter = m_jsonFilters[filt].toMap(); if (filter.isEmpty()) { @@ -207,7 +207,7 @@ QString ExtScript::applyFilters(QString _value) const << "Could not find filter" << _value << "in the json"; continue; } - for (auto f : filter.keys()) + for (auto &f : filter.keys()) _value.replace(f, filter[f].toString()); } @@ -215,7 +215,7 @@ QString ExtScript::applyFilters(QString _value) const } -void ExtScript::updateFilter(const QString _filter, const bool _add) +void ExtScript::updateFilter(const QString &_filter, const bool _add) { qCDebug(LOG_LIB) << "Should be added filters" << _add << "from" << _filter; @@ -283,7 +283,7 @@ QVariantHash ExtScript::run() } -int ExtScript::showConfiguration(const QVariant args) +int ExtScript::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/extscript.h b/sources/awesomewidgets/extscript.h index 002b716..efbf725 100644 --- a/sources/awesomewidgets/extscript.h +++ b/sources/awesomewidgets/extscript.h @@ -44,9 +44,9 @@ public: swap = 3 }; - explicit ExtScript(QWidget *parent, const QString filePath = QString()); + explicit ExtScript(QWidget *parent, const QString &filePath = QString()); virtual ~ExtScript(); - ExtScript *copy(const QString _fileName, const int _number); + ExtScript *copy(const QString &_fileName, const int _number); QString jsonFiltersFile() const; // get methods QString executable() const; @@ -57,20 +57,20 @@ public: // derivatives QString strRedirect() const; // set methods - void setExecutable(const QString _executable = QString("/usr/bin/true")); - void setFilters(const QStringList _filters = QStringList()); - void setPrefix(const QString _prefix = QString("")); + void setExecutable(const QString &_executable = QString("/usr/bin/true")); + void setFilters(const QStringList &_filters = QStringList()); + void setPrefix(const QString &_prefix = QString("")); void setRedirect(const Redirect _redirect = Redirect::nothing); - void setStrRedirect(const QString _redirect = QString("nothing")); + void setStrRedirect(const QString &_redirect = QString("nothing")); // filters QString applyFilters(QString _value) const; - void updateFilter(const QString _filter, const bool _add = true); + void updateFilter(const QString &_filter, const bool _add = true); public slots: void readConfiguration(); void readJsonFilters(); QVariantHash run(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private slots: diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp index c87da54..c4809a4 100644 --- a/sources/awesomewidgets/extupgrade.cpp +++ b/sources/awesomewidgets/extupgrade.cpp @@ -28,7 +28,7 @@ #include "awdebug.h" -ExtUpgrade::ExtUpgrade(QWidget *parent, const QString filePath) +ExtUpgrade::ExtUpgrade(QWidget *parent, const QString &filePath) : AbstractExtItem(parent, filePath) , ui(new Ui::ExtUpgrade) { @@ -60,7 +60,7 @@ ExtUpgrade::~ExtUpgrade() } -ExtUpgrade *ExtUpgrade::copy(const QString _fileName, const int _number) +ExtUpgrade *ExtUpgrade::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -100,7 +100,7 @@ QString ExtUpgrade::uniq() const } -void ExtUpgrade::setExecutable(const QString _executable) +void ExtUpgrade::setExecutable(const QString &_executable) { qCDebug(LOG_LIB) << "Executable" << _executable; @@ -108,7 +108,7 @@ void ExtUpgrade::setExecutable(const QString _executable) } -void ExtUpgrade::setFilter(const QString _filter) +void ExtUpgrade::setFilter(const QString &_filter) { qCDebug(LOG_LIB) << "Filter" << _filter; @@ -153,7 +153,7 @@ QVariantHash ExtUpgrade::run() } -int ExtUpgrade::showConfiguration(const QVariant args) +int ExtUpgrade::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/extupgrade.h b/sources/awesomewidgets/extupgrade.h index d4c7c55..3dd3068 100644 --- a/sources/awesomewidgets/extupgrade.h +++ b/sources/awesomewidgets/extupgrade.h @@ -36,23 +36,23 @@ class ExtUpgrade : public AbstractExtItem Q_PROPERTY(int null READ null WRITE setNull) public: - explicit ExtUpgrade(QWidget *parent, const QString filePath = QString()); + explicit ExtUpgrade(QWidget *parent, const QString &filePath = QString()); virtual ~ExtUpgrade(); - ExtUpgrade *copy(const QString _fileName, const int _number); + ExtUpgrade *copy(const QString &_fileName, const int _number); // get methods QString executable() const; QString filter() const; int null() const; QString uniq() const; // set methods - void setExecutable(const QString _executable = QString("/usr/bin/true")); - void setFilter(const QString _filter = QString()); + void setExecutable(const QString &_executable = QString("/usr/bin/true")); + void setFilter(const QString &_filter = QString()); void setNull(const int _null = 0); public slots: void readConfiguration(); QVariantHash run(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private slots: diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp index 0791edc..624f543 100644 --- a/sources/awesomewidgets/extweather.cpp +++ b/sources/awesomewidgets/extweather.cpp @@ -35,7 +35,7 @@ #include "yahooweatherprovider.h" -ExtWeather::ExtWeather(QWidget *parent, const QString filePath) +ExtWeather::ExtWeather(QWidget *parent, const QString &filePath) : AbstractExtItem(parent, filePath) , ui(new Ui::ExtWeather) { @@ -77,7 +77,7 @@ ExtWeather::~ExtWeather() } -ExtWeather *ExtWeather::copy(const QString _fileName, const int _number) +ExtWeather *ExtWeather::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "number" << _number; @@ -168,7 +168,7 @@ QString ExtWeather::uniq() const } -void ExtWeather::setCity(const QString _city) +void ExtWeather::setCity(const QString &_city) { qCDebug(LOG_LIB) << "City" << _city; @@ -177,7 +177,7 @@ void ExtWeather::setCity(const QString _city) } -void ExtWeather::setCountry(const QString _country) +void ExtWeather::setCountry(const QString &_country) { qCDebug(LOG_LIB) << "Country" << _country; @@ -203,7 +203,7 @@ void ExtWeather::setProvider(const Provider _provider) } -void ExtWeather::setStrProvider(const QString _provider) +void ExtWeather::setStrProvider(const QString &_provider) { qCDebug(LOG_LIB) << "Provider" << _provider; @@ -278,7 +278,7 @@ QVariantHash ExtWeather::run() } -int ExtWeather::showConfiguration(const QVariant args) +int ExtWeather::showConfiguration(const QVariant &args) { Q_UNUSED(args) diff --git a/sources/awesomewidgets/extweather.h b/sources/awesomewidgets/extweather.h index 201758c..eb45d7b 100644 --- a/sources/awesomewidgets/extweather.h +++ b/sources/awesomewidgets/extweather.h @@ -42,9 +42,9 @@ class ExtWeather : public AbstractExtItem public: enum class Provider { OWM = 0, Yahoo = 1 }; - explicit ExtWeather(QWidget *parent, const QString filePath = QString()); + explicit ExtWeather(QWidget *parent, const QString &filePath = QString()); virtual ~ExtWeather(); - ExtWeather *copy(const QString _fileName, const int _number); + ExtWeather *copy(const QString &_fileName, const int _number); QString jsonMapFile() const; QString weatherFromInt(const int _id) const; // get methods @@ -56,18 +56,18 @@ public: int ts() const; QString uniq() const; // set methods - void setCity(const QString _city = QString("London")); - void setCountry(const QString _country = QString("uk")); + void setCity(const QString &_city = QString("London")); + void setCountry(const QString &_country = QString("uk")); void setImage(const bool _image = false); void setProvider(const Provider _provider = Provider::OWM); - void setStrProvider(const QString _provider = QString("OWM")); + void setStrProvider(const QString &_provider = QString("OWM")); void setTs(const int _ts = 0); public slots: void readConfiguration(); void readJsonMap(); QVariantHash run(); - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private slots: diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp index 596cb17..a9380a6 100644 --- a/sources/awesomewidgets/graphicalitem.cpp +++ b/sources/awesomewidgets/graphicalitem.cpp @@ -32,7 +32,7 @@ #include "graphicalitemhelper.h" -GraphicalItem::GraphicalItem(QWidget *parent, const QString filePath) +GraphicalItem::GraphicalItem(QWidget *parent, const QString &filePath) : AbstractExtItem(parent, filePath) , ui(new Ui::GraphicalItem) { @@ -64,7 +64,7 @@ GraphicalItem::~GraphicalItem() } -GraphicalItem *GraphicalItem::copy(const QString _fileName, const int _number) +GraphicalItem *GraphicalItem::copy(const QString &_fileName, const int _number) { qCDebug(LOG_LIB) << "File" << _fileName << "with number" << _number; @@ -283,7 +283,7 @@ QString GraphicalItem::uniq() const } -void GraphicalItem::setBar(const QString _bar) +void GraphicalItem::setBar(const QString &_bar) { qCDebug(LOG_LIB) << "Bar" << _bar; @@ -291,7 +291,7 @@ void GraphicalItem::setBar(const QString _bar) } -void GraphicalItem::setActiveColor(const QString _color) +void GraphicalItem::setActiveColor(const QString &_color) { qCDebug(LOG_LIB) << "Color" << _color; @@ -317,7 +317,7 @@ void GraphicalItem::setCustom(const bool _custom) } -void GraphicalItem::setInactiveColor(const QString _color) +void GraphicalItem::setInactiveColor(const QString &_color) { qCDebug(LOG_LIB) << "Color" << _color; @@ -369,7 +369,7 @@ void GraphicalItem::setType(const Type _type) } -void GraphicalItem::setStrType(const QString _type) +void GraphicalItem::setStrType(const QString &_type) { qCDebug(LOG_LIB) << "Type" << _type; @@ -394,7 +394,7 @@ void GraphicalItem::setDirection(const Direction _direction) } -void GraphicalItem::setStrDirection(const QString _direction) +void GraphicalItem::setStrDirection(const QString &_direction) { qCDebug(LOG_LIB) << "Direction" << _direction; @@ -405,14 +405,14 @@ void GraphicalItem::setStrDirection(const QString _direction) } -void GraphicalItem::setUsedKeys(const QStringList _usedKeys) +void GraphicalItem::setUsedKeys(const QStringList &_usedKeys) { qCDebug(LOG_LIB) << "Used keys" << _usedKeys; // remove dubs // HACK converting to set may break order usedKeys().clear(); - for (auto key : _usedKeys) { + for (auto &key : _usedKeys) { if (usedKeys().contains(key)) continue; usedKeys().append(key); @@ -460,7 +460,7 @@ void GraphicalItem::readConfiguration() } -int GraphicalItem::showConfiguration(const QVariant args) +int GraphicalItem::showConfiguration(const QVariant &args) { qCDebug(LOG_LIB) << "Combobox arguments" << args; QStringList tags = args.toStringList(); diff --git a/sources/awesomewidgets/graphicalitem.h b/sources/awesomewidgets/graphicalitem.h index cbfe3a2..e9c0750 100644 --- a/sources/awesomewidgets/graphicalitem.h +++ b/sources/awesomewidgets/graphicalitem.h @@ -58,9 +58,9 @@ public: Bars = 4 }; - explicit GraphicalItem(QWidget *parent, const QString filePath = QString()); + explicit GraphicalItem(QWidget *parent, const QString &filePath = QString()); virtual ~GraphicalItem(); - GraphicalItem *copy(const QString _fileName, const int _number); + GraphicalItem *copy(const QString &_fileName, const int _number); QString image(const QVariant &value); void initScene(); // get methods @@ -80,26 +80,26 @@ public: QStringList usedKeys() const; QString uniq() const; // set methods - void setBar(const QString _bar = QString("cpu")); - void setActiveColor(const QString _color = QString("color://0,0,0,130")); + void setBar(const QString &_bar = QString("cpu")); + void setActiveColor(const QString &_color = QString("color://0,0,0,130")); void setCount(const int _count = 100); void setCustom(const bool _custom = false); - void setInactiveColor(const QString _color + void setInactiveColor(const QString &_color = QString("color://255,255,255,130")); void setItemHeight(const int _height = 100); void setItemWidth(const int _width = 100); void setMinValue(const float _value = 0.0); void setMaxValue(const float _value = 100.0); void setType(const Type _type = Type::Horizontal); - void setStrType(const QString _type = QString("Horizontal")); + void setStrType(const QString &_type = QString("Horizontal")); void setDirection(const Direction _direction = Direction::LeftToRight); - void setStrDirection(const QString _direction = QString("LeftToRight")); - void setUsedKeys(const QStringList _usedKeys = QStringList()); + void setStrDirection(const QString &_direction = QString("LeftToRight")); + void setUsedKeys(const QStringList &_usedKeys = QStringList()); public slots: void readConfiguration(); QVariantHash run() { return QVariantHash(); }; - int showConfiguration(const QVariant args = QVariant()); + int showConfiguration(const QVariant &args = QVariant()); void writeConfiguration() const; private slots: diff --git a/sources/awesomewidgets/graphicalitemhelper.cpp b/sources/awesomewidgets/graphicalitemhelper.cpp index 3faa0c4..7debada 100644 --- a/sources/awesomewidgets/graphicalitemhelper.cpp +++ b/sources/awesomewidgets/graphicalitemhelper.cpp @@ -41,8 +41,8 @@ GraphicalItemHelper::~GraphicalItemHelper() } -void GraphicalItemHelper::setParameters(const QString active, - const QString inactive, const int width, +void GraphicalItemHelper::setParameters(const QString &active, + const QString &inactive, const int width, const int height, const int count) { qCDebug(LOG_LIB) << "Use active color" << active << ", inactive" << inactive @@ -81,7 +81,7 @@ void GraphicalItemHelper::setParameters(const QString active, } -void GraphicalItemHelper::paintBars(const float &value) +void GraphicalItemHelper::paintBars(const float value) { qCDebug(LOG_LIB) << "Paint with value" << value; @@ -105,7 +105,7 @@ void GraphicalItemHelper::paintBars(const float &value) } -void GraphicalItemHelper::paintCircle(const float &percent) +void GraphicalItemHelper::paintCircle(const float percent) { qCDebug(LOG_LIB) << "Paint with percent" << percent; @@ -128,7 +128,7 @@ void GraphicalItemHelper::paintCircle(const float &percent) } -void GraphicalItemHelper::paintGraph(const float &value) +void GraphicalItemHelper::paintGraph(const float value) { qCDebug(LOG_LIB) << "Paint with value" << value; @@ -153,7 +153,7 @@ void GraphicalItemHelper::paintGraph(const float &value) } -void GraphicalItemHelper::paintHorizontal(const float &percent) +void GraphicalItemHelper::paintHorizontal(const float percent) { qCDebug(LOG_LIB) << "Paint with percent" << percent; @@ -169,7 +169,7 @@ void GraphicalItemHelper::paintHorizontal(const float &percent) } -void GraphicalItemHelper::paintVertical(const float &percent) +void GraphicalItemHelper::paintVertical(const float percent) { qCDebug(LOG_LIB) << "Paint with percent" << percent; @@ -184,8 +184,8 @@ void GraphicalItemHelper::paintVertical(const float &percent) } -float GraphicalItemHelper::getPercents(const float &value, const float &min, - const float &max) +float GraphicalItemHelper::getPercents(const float value, const float min, + const float max) { qCDebug(LOG_LIB) << "Get percent value from" << value; // newest Qt crashes here if value is nan @@ -224,7 +224,7 @@ QColor GraphicalItemHelper::stringToColor(const QString &color) } -void GraphicalItemHelper::storeValue(const float &value) +void GraphicalItemHelper::storeValue(const float value) { qCDebug(LOG_LIB) << "Save value to array" << value; diff --git a/sources/awesomewidgets/graphicalitemhelper.h b/sources/awesomewidgets/graphicalitemhelper.h index 171b7f4..b0fca4d 100644 --- a/sources/awesomewidgets/graphicalitemhelper.h +++ b/sources/awesomewidgets/graphicalitemhelper.h @@ -34,21 +34,21 @@ public: QGraphicsScene *scene = nullptr); virtual ~GraphicalItemHelper(); // parameters - void setParameters(const QString active, const QString inactive, + void setParameters(const QString &active, const QString &inactive, const int width, const int height, const int count); // paint methods - void paintBars(const float &value); - void paintCircle(const float &percent); - void paintGraph(const float &value); - void paintHorizontal(const float &percent); - void paintVertical(const float &percent); + void paintBars(const float value); + void paintCircle(const float percent); + void paintGraph(const float value); + void paintHorizontal(const float percent); + void paintVertical(const float percent); // additional conversion methods - float getPercents(const float &value, const float &min, const float &max); + float getPercents(const float value, const float min, const float max); bool isColor(const QString &input); QColor stringToColor(const QString &color); private: - void storeValue(const float &value); + void storeValue(const float value); QGraphicsScene *m_scene = nullptr; int m_count = 100; QPen m_activePen; diff --git a/sources/awesomewidgets/owmweatherprovider.cpp b/sources/awesomewidgets/owmweatherprovider.cpp index f3057b9..67289db 100644 --- a/sources/awesomewidgets/owmweatherprovider.cpp +++ b/sources/awesomewidgets/owmweatherprovider.cpp @@ -36,7 +36,7 @@ OWMWeatherProvider::~OWMWeatherProvider() } -void OWMWeatherProvider::initUrl(const QString city, const QString country, +void OWMWeatherProvider::initUrl(const QString &city, const QString &country, const int ts) { qCDebug(LOG_LIB) << "Init query for" << city << country << "with ts" << ts; diff --git a/sources/awesomewidgets/owmweatherprovider.h b/sources/awesomewidgets/owmweatherprovider.h index c25d791..c4071a5 100644 --- a/sources/awesomewidgets/owmweatherprovider.h +++ b/sources/awesomewidgets/owmweatherprovider.h @@ -33,7 +33,7 @@ public: explicit OWMWeatherProvider(QObject *parent, const int number); virtual ~OWMWeatherProvider(); - void initUrl(const QString city, const QString country, const int); + void initUrl(const QString &city, const QString &country, const int); QVariantHash parse(const QVariantMap &json) const; QUrl url() const; diff --git a/sources/awesomewidgets/qcronscheduler.cpp b/sources/awesomewidgets/qcronscheduler.cpp index 09275d6..436616d 100644 --- a/sources/awesomewidgets/qcronscheduler.cpp +++ b/sources/awesomewidgets/qcronscheduler.cpp @@ -147,7 +147,7 @@ QList QCronScheduler::QCronField::toList() return QList(); QList output; - for (auto i = minValue; i <= maxValue; ++i) { + for (auto &i = minValue; i <= maxValue; ++i) { if (i % div != 0) continue; output.append(i); diff --git a/sources/awesomewidgets/yahooweatherprovider.cpp b/sources/awesomewidgets/yahooweatherprovider.cpp index 8d4c7e2..ebad1b1 100644 --- a/sources/awesomewidgets/yahooweatherprovider.cpp +++ b/sources/awesomewidgets/yahooweatherprovider.cpp @@ -35,7 +35,7 @@ YahooWeatherProvider::~YahooWeatherProvider() } -void YahooWeatherProvider::initUrl(const QString city, const QString country, +void YahooWeatherProvider::initUrl(const QString &city, const QString &country, const int ts) { qCDebug(LOG_LIB) << "Init query for" << city << country << "with ts" << ts; diff --git a/sources/awesomewidgets/yahooweatherprovider.h b/sources/awesomewidgets/yahooweatherprovider.h index 4c31c1d..f309860 100644 --- a/sources/awesomewidgets/yahooweatherprovider.h +++ b/sources/awesomewidgets/yahooweatherprovider.h @@ -33,7 +33,7 @@ public: explicit YahooWeatherProvider(QObject *parent, const int number); virtual ~YahooWeatherProvider(); - void initUrl(const QString city, const QString country, const int); + void initUrl(const QString &city, const QString &country, const int); QVariantHash parse(const QVariantMap &json) const; QUrl url() const; diff --git a/sources/desktop-panel/plugin/dpadds.cpp b/sources/desktop-panel/plugin/dpadds.cpp index d2a953a..9fc9a75 100644 --- a/sources/desktop-panel/plugin/dpadds.cpp +++ b/sources/desktop-panel/plugin/dpadds.cpp @@ -72,7 +72,7 @@ int DPAdds::currentDesktop() const } -QStringList DPAdds::dictKeys(const bool sorted, const QString regexp) const +QStringList DPAdds::dictKeys(const bool sorted, const QString ®exp) const { qCDebug(LOG_DP) << "Should be sorted" << sorted << "and filter applied" << regexp; @@ -123,9 +123,9 @@ QString DPAdds::toolTipImage(const int desktop) const toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff); toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff); // update - float margin = 5.0 * info.desktop.width() / 400.0; - toolTipView->resize(info.desktop.width() + 2.0 * margin, - info.desktop.height() + 2.0 * margin); + float margin = 5.0f * info.desktop.width() / 400.0f; + toolTipView->resize(info.desktop.width() + 2.0f * margin, + info.desktop.height() + 2.0f * margin); toolTipScene->clear(); toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush)); // borders @@ -142,7 +142,7 @@ QString DPAdds::toolTipImage(const int desktop) const QPen pen = QPen(); pen.setWidthF(2.0 * info.desktop.width() / 400.0); pen.setColor(QColor(m_tooltipColor)); - for (auto data : info.windowsData) { + for (auto &data : info.windowsData) { QRect rect = data.rect; toolTipScene->addLine(rect.left() + margin, rect.bottom() + margin, rect.left() + margin, rect.top() + margin, @@ -194,13 +194,13 @@ QString DPAdds::toolTipImage(const int desktop) const } -QString DPAdds::parsePattern(const QString pattern, const int desktop) const +QString DPAdds::parsePattern(const QString &pattern, const int desktop) const { qCDebug(LOG_DP) << "Pattern" << pattern << "for desktop" << desktop; QString parsed = pattern; parsed.replace(QString("$$"), QString("$\\$\\")); - for (auto key : dictKeys()) + for (auto &key : dictKeys()) parsed.replace(QString("$%1").arg(key), valueByKey(key, desktop)); parsed.replace(QString("$\\$\\"), QString("$$")); @@ -208,7 +208,7 @@ QString DPAdds::parsePattern(const QString pattern, const int desktop) const } -void DPAdds::setMark(const QString newMark) +void DPAdds::setMark(const QString &newMark) { qCDebug(LOG_DP) << "Mark" << newMark; @@ -216,7 +216,7 @@ void DPAdds::setMark(const QString newMark) } -void DPAdds::setToolTipData(const QVariantMap tooltipData) +void DPAdds::setToolTipData(const QVariantMap &tooltipData) { qCDebug(LOG_DP) << "Data" << tooltipData; @@ -226,7 +226,7 @@ void DPAdds::setToolTipData(const QVariantMap tooltipData) } -QString DPAdds::infoByKey(QString key) const +QString DPAdds::infoByKey(const QString &key) const { qCDebug(LOG_AW) << "Requested info for key" << key; @@ -234,7 +234,7 @@ QString DPAdds::infoByKey(QString key) const } -QString DPAdds::valueByKey(const QString key, int desktop) const +QString DPAdds::valueByKey(const QString &key, int desktop) const { qCDebug(LOG_DP) << "Requested key" << key << "for desktop" << desktop; if (desktop == -1) @@ -258,7 +258,7 @@ QString DPAdds::valueByKey(const QString key, int desktop) const // HACK: this method uses variables from version.h -QString DPAdds::getAboutText(const QString type) const +QString DPAdds::getAboutText(const QString &type) const { qCDebug(LOG_DP) << "Type" << type; @@ -266,7 +266,7 @@ QString DPAdds::getAboutText(const QString type) const } -QVariantMap DPAdds::getFont(const QVariantMap defaultFont) const +QVariantMap DPAdds::getFont(const QVariantMap &defaultFont) const { qCDebug(LOG_DP) << "Default font is" << defaultFont; @@ -288,7 +288,7 @@ QVariantMap DPAdds::getFont(const QVariantMap defaultFont) const // to avoid additional object definition this method is static -void DPAdds::sendNotification(const QString eventId, const QString message) +void DPAdds::sendNotification(const QString &eventId, const QString &message) { qCDebug(LOG_DP) << "Event" << eventId << "with message" << message; @@ -316,7 +316,7 @@ DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int desktop) const DesktopWindowsInfo info; info.desktop = KWindowSystem::workArea(desktop); - for (auto id : KWindowSystem::windows()) { + for (auto &id : KWindowSystem::windows()) { KWindowInfo winInfo = KWindowInfo( id, NET::Property::WMDesktop | NET::Property::WMGeometry diff --git a/sources/desktop-panel/plugin/dpadds.h b/sources/desktop-panel/plugin/dpadds.h index f645c02..2fac3e7 100644 --- a/sources/desktop-panel/plugin/dpadds.h +++ b/sources/desktop-panel/plugin/dpadds.h @@ -46,27 +46,27 @@ public: Q_INVOKABLE bool isDebugEnabled() const; Q_INVOKABLE int currentDesktop() const; Q_INVOKABLE QStringList dictKeys(const bool sorted = true, - const QString regexp = QString()) const; + const QString ®exp = QString()) const; Q_INVOKABLE int numberOfDesktops() const; Q_INVOKABLE QString toolTipImage(const int desktop) const; - Q_INVOKABLE QString parsePattern(const QString pattern, + Q_INVOKABLE QString parsePattern(const QString &pattern, const int desktop) const; // values - Q_INVOKABLE void setMark(const QString newMark); - Q_INVOKABLE void setToolTipData(const QVariantMap tooltipData); - Q_INVOKABLE QString infoByKey(QString key) const; - Q_INVOKABLE QString valueByKey(const QString key, int desktop = -1) const; + Q_INVOKABLE void setMark(const QString &newMark); + Q_INVOKABLE void setToolTipData(const QVariantMap &tooltipData); + Q_INVOKABLE QString infoByKey(const QString &key) const; + Q_INVOKABLE QString valueByKey(const QString &key, int desktop = -1) const; // configuration slots - Q_INVOKABLE QString getAboutText(const QString type = "header") const; - Q_INVOKABLE QVariantMap getFont(const QVariantMap defaultFont) const; + Q_INVOKABLE QString getAboutText(const QString &type = "header") const; + Q_INVOKABLE QVariantMap getFont(const QVariantMap &defaultFont) const; signals: void desktopChanged() const; void windowListChanged() const; public slots: - Q_INVOKABLE static void sendNotification(const QString eventId, - const QString message); + Q_INVOKABLE static void sendNotification(const QString &eventId, + const QString &message); Q_INVOKABLE void setCurrentDesktop(const int desktop) const; private: diff --git a/sources/extsysmon/extsysmon.cpp b/sources/extsysmon/extsysmon.cpp index 4b0b579..eb98ba4 100644 --- a/sources/extsysmon/extsysmon.cpp +++ b/sources/extsysmon/extsysmon.cpp @@ -42,7 +42,7 @@ ExtendedSysMon::ExtendedSysMon(QObject *parent, const QVariantList &args) // init aggregator m_aggregator = new ExtSysMonAggregator(this, m_configuration); - for (auto source : m_aggregator->sources()) + for (auto &source : m_aggregator->sources()) setData(source, m_aggregator->initialData(source)); } @@ -149,7 +149,7 @@ ExtendedSysMon::updateConfiguration(QHash rawConfig) const QChar(','), QString::SkipEmptyParts); QStringList devices; QRegExp diskRegexp = QRegExp("^/dev/[hms]d[a-z]$"); - for (auto device : deviceList) + for (auto &device : deviceList) if ((QFile::exists(device)) && (device.contains(diskRegexp))) devices.append(device); if (devices.isEmpty()) @@ -166,7 +166,7 @@ ExtendedSysMon::updateConfiguration(QHash rawConfig) const if (rawConfig[QString("PLAYERSYMBOLS")].toInt() <= 0) rawConfig[QString("PLAYERSYMBOLS")] = QString("10"); - for (auto key : rawConfig.keys()) + for (auto &key : rawConfig.keys()) qCInfo(LOG_ESM) << key << "=" << rawConfig[key]; return rawConfig; } diff --git a/sources/extsysmon/extsysmonaggregator.cpp b/sources/extsysmon/extsysmonaggregator.cpp index 3c7a130..6905bec 100644 --- a/sources/extsysmon/extsysmonaggregator.cpp +++ b/sources/extsysmon/extsysmonaggregator.cpp @@ -35,7 +35,7 @@ ExtSysMonAggregator::ExtSysMonAggregator(QObject *parent, - const QHash config) + const QHash &config) : QObject(parent) { qCDebug(LOG_ESM) << __PRETTY_FUNCTION__; @@ -52,7 +52,7 @@ ExtSysMonAggregator::~ExtSysMonAggregator() } -QVariant ExtSysMonAggregator::data(const QString source) const +QVariant ExtSysMonAggregator::data(const QString &source) const { qCDebug(LOG_ESM) << "Source" << source; @@ -60,7 +60,7 @@ QVariant ExtSysMonAggregator::data(const QString source) const } -bool ExtSysMonAggregator::hasSource(const QString source) const +bool ExtSysMonAggregator::hasSource(const QString &source) const { qCDebug(LOG_ESM) << "Source" << source; @@ -68,7 +68,7 @@ bool ExtSysMonAggregator::hasSource(const QString source) const } -QVariantMap ExtSysMonAggregator::initialData(const QString source) const +QVariantMap ExtSysMonAggregator::initialData(const QString &source) const { qCDebug(LOG_ESM) << "Source" << source; @@ -83,45 +83,45 @@ QStringList ExtSysMonAggregator::sources() const } -void ExtSysMonAggregator::init(const QHash config) +void ExtSysMonAggregator::init(const QHash &config) { qCDebug(LOG_ESM) << "Configuration" << config; // battery AbstractExtSysMonSource *batteryItem = new BatterySource(this, QStringList() << config[QString("ACPIPATH")]); - for (auto source : batteryItem->sources()) + for (auto &source : batteryItem->sources()) m_map[source] = batteryItem; // custom AbstractExtSysMonSource *customItem = new CustomSource(this, QStringList()); - for (auto source : customItem->sources()) + for (auto &source : customItem->sources()) m_map[source] = customItem; // desktop AbstractExtSysMonSource *desktopItem = new DesktopSource(this, QStringList()); - for (auto source : desktopItem->sources()) + for (auto &source : desktopItem->sources()) m_map[source] = desktopItem; // gpu load AbstractExtSysMonSource *gpuLoadItem = new GPULoadSource(this, QStringList() << config[QString("GPUDEV")]); - for (auto source : gpuLoadItem->sources()) + for (auto &source : gpuLoadItem->sources()) m_map[source] = gpuLoadItem; // gpu temperature AbstractExtSysMonSource *gpuTempItem = new GPUTemperatureSource( this, QStringList() << config[QString("GPUDEV")]); - for (auto source : gpuTempItem->sources()) + for (auto &source : gpuTempItem->sources()) m_map[source] = gpuTempItem; // hdd temperature AbstractExtSysMonSource *hddTempItem = new HDDTemperatureSource( this, QStringList() << config[QString("HDDDEV")] << config[QString("HDDTEMPCMD")]); - for (auto source : hddTempItem->sources()) + for (auto &source : hddTempItem->sources()) m_map[source] = hddTempItem; // network AbstractExtSysMonSource *networkItem = new NetworkSource(this, QStringList()); - for (auto source : networkItem->sources()) + for (auto &source : networkItem->sources()) m_map[source] = networkItem; // player AbstractExtSysMonSource *playerItem = new PlayerSource( @@ -130,36 +130,36 @@ void ExtSysMonAggregator::init(const QHash config) << config[QString("MPDADDRESS")] << config[QString("MPDPORT")] << config[QString("MPRIS")] << config[QString("PLAYERSYMBOLS")]); - for (auto source : playerItem->sources()) + for (auto &source : playerItem->sources()) m_map[source] = playerItem; // processes AbstractExtSysMonSource *processesItem = new ProcessesSource(this, QStringList()); - for (auto source : processesItem->sources()) + for (auto &source : processesItem->sources()) m_map[source] = processesItem; // network request AbstractExtSysMonSource *requestItem = new RequestSource(this, QStringList()); - for (auto source : requestItem->sources()) + for (auto &source : requestItem->sources()) m_map[source] = requestItem; // quotes AbstractExtSysMonSource *quotesItem = new QuotesSource(this, QStringList()); - for (auto source : quotesItem->sources()) + for (auto &source : quotesItem->sources()) m_map[source] = quotesItem; // upgrade AbstractExtSysMonSource *upgradeItem = new UpgradeSource(this, QStringList()); - for (auto source : upgradeItem->sources()) + for (auto &source : upgradeItem->sources()) m_map[source] = upgradeItem; // weather AbstractExtSysMonSource *weatherItem = new WeatherSource(this, QStringList()); - for (auto source : weatherItem->sources()) + for (auto &source : weatherItem->sources()) m_map[source] = weatherItem; #ifdef BUILD_LOAD // additional load source AbstractExtSysMonSource *loadItem = new LoadSource(this, QStringList()); - for (auto source : loadItem->sources()) + for (auto &source : loadItem->sources()) m_map[source] = loadItem; #endif /* BUILD_LOAD */ } diff --git a/sources/extsysmon/extsysmonaggregator.h b/sources/extsysmon/extsysmonaggregator.h index ff7cad9..6d3a5a9 100644 --- a/sources/extsysmon/extsysmonaggregator.h +++ b/sources/extsysmon/extsysmonaggregator.h @@ -29,15 +29,15 @@ class ExtSysMonAggregator : public QObject public: explicit ExtSysMonAggregator(QObject *parent, - const QHash config); + const QHash &config); virtual ~ExtSysMonAggregator(); - QVariant data(const QString source) const; - bool hasSource(const QString source) const; - QVariantMap initialData(const QString source) const; + QVariant data(const QString &source) const; + bool hasSource(const QString &source) const; + QVariantMap initialData(const QString &source) const; QStringList sources() const; private: - void init(const QHash config); + void init(const QHash &config); QHash m_map; }; diff --git a/sources/extsysmonsources/abstractextsysmonsource.h b/sources/extsysmonsources/abstractextsysmonsource.h index 00d82fb..96754b8 100644 --- a/sources/extsysmonsources/abstractextsysmonsource.h +++ b/sources/extsysmonsources/abstractextsysmonsource.h @@ -28,15 +28,15 @@ class AbstractExtSysMonSource : public QObject Q_OBJECT public: - explicit AbstractExtSysMonSource(QObject *parent, const QStringList) + explicit AbstractExtSysMonSource(QObject *parent, const QStringList &) : QObject(parent){}; virtual ~AbstractExtSysMonSource(){}; - virtual QVariant data(QString source) = 0; - virtual QVariantMap initialData(QString source) const = 0; + virtual QVariant data(const QString &source) = 0; + virtual QVariantMap initialData(const QString &source) const = 0; virtual void run() = 0; virtual QStringList sources() const = 0; // used by extensions - int index(const QString source) const + int index(const QString &source) const { QRegExp rx(QString("\\d+")); rx.indexIn(source); diff --git a/sources/extsysmonsources/batterysource.cpp b/sources/extsysmonsources/batterysource.cpp index 22d1fbf..d25f39f 100644 --- a/sources/extsysmonsources/batterysource.cpp +++ b/sources/extsysmonsources/batterysource.cpp @@ -23,7 +23,7 @@ #include "awdebug.h" -BatterySource::BatterySource(QObject *parent, const QStringList args) +BatterySource::BatterySource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 1); @@ -59,7 +59,7 @@ QStringList BatterySource::getSources() } -QVariant BatterySource::data(QString source) +QVariant BatterySource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; @@ -70,7 +70,7 @@ QVariant BatterySource::data(QString source) } -QVariantMap BatterySource::initialData(QString source) const +QVariantMap BatterySource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; diff --git a/sources/extsysmonsources/batterysource.h b/sources/extsysmonsources/batterysource.h index 2c49b0d..52e4874 100644 --- a/sources/extsysmonsources/batterysource.h +++ b/sources/extsysmonsources/batterysource.h @@ -28,11 +28,11 @@ class BatterySource : public AbstractExtSysMonSource Q_OBJECT public: - explicit BatterySource(QObject *parent, const QStringList args); + explicit BatterySource(QObject *parent, const QStringList &args); virtual ~BatterySource(); QStringList getSources(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(); QStringList sources() const; diff --git a/sources/extsysmonsources/customsource.cpp b/sources/extsysmonsources/customsource.cpp index abfe4a0..9ef1f60 100644 --- a/sources/extsysmonsources/customsource.cpp +++ b/sources/extsysmonsources/customsource.cpp @@ -22,7 +22,7 @@ #include "extscript.h" -CustomSource::CustomSource(QObject *parent, const QStringList args) +CustomSource::CustomSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 0); @@ -43,7 +43,7 @@ CustomSource::~CustomSource() } -QVariant CustomSource::data(QString source) +QVariant CustomSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; @@ -52,7 +52,7 @@ QVariant CustomSource::data(QString source) } -QVariantMap CustomSource::initialData(QString source) const +QVariantMap CustomSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; @@ -78,7 +78,7 @@ QStringList CustomSource::sources() const QStringList CustomSource::getSources() { QStringList sources; - for (auto item : m_extScripts->activeItems()) + for (auto &item : m_extScripts->activeItems()) sources.append(QString("custom/%1").arg(item->tag(QString("custom")))); return sources; diff --git a/sources/extsysmonsources/customsource.h b/sources/extsysmonsources/customsource.h index 2243107..cf997f0 100644 --- a/sources/extsysmonsources/customsource.h +++ b/sources/extsysmonsources/customsource.h @@ -31,10 +31,10 @@ class CustomSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit CustomSource(QObject *parent, const QStringList args); + explicit CustomSource(QObject *parent, const QStringList &args); virtual ~CustomSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(){}; QStringList sources() const; diff --git a/sources/extsysmonsources/desktopsource.cpp b/sources/extsysmonsources/desktopsource.cpp index 5723557..78237af 100644 --- a/sources/extsysmonsources/desktopsource.cpp +++ b/sources/extsysmonsources/desktopsource.cpp @@ -23,7 +23,7 @@ #include "awdebug.h" -DesktopSource::DesktopSource(QObject *parent, const QStringList args) +DesktopSource::DesktopSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 0); @@ -37,7 +37,7 @@ DesktopSource::~DesktopSource() } -QVariant DesktopSource::data(QString source) +QVariant DesktopSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; @@ -61,7 +61,7 @@ QVariant DesktopSource::data(QString source) } -QVariantMap DesktopSource::initialData(QString source) const +QVariantMap DesktopSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; diff --git a/sources/extsysmonsources/desktopsource.h b/sources/extsysmonsources/desktopsource.h index fb7cf5e..3935b26 100644 --- a/sources/extsysmonsources/desktopsource.h +++ b/sources/extsysmonsources/desktopsource.h @@ -28,10 +28,10 @@ class DesktopSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit DesktopSource(QObject *parent, const QStringList args); + explicit DesktopSource(QObject *parent, const QStringList &args); virtual ~DesktopSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(){}; QStringList sources() const; }; diff --git a/sources/extsysmonsources/gpuloadsource.cpp b/sources/extsysmonsources/gpuloadsource.cpp index dcefab8..1354f8c 100644 --- a/sources/extsysmonsources/gpuloadsource.cpp +++ b/sources/extsysmonsources/gpuloadsource.cpp @@ -25,7 +25,7 @@ #include "awdebug.h" -GPULoadSource::GPULoadSource(QObject *parent, const QStringList args) +GPULoadSource::GPULoadSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 1); @@ -74,7 +74,7 @@ QString GPULoadSource::autoGpu() } -QVariant GPULoadSource::data(QString source) +QVariant GPULoadSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; @@ -85,7 +85,7 @@ QVariant GPULoadSource::data(QString source) } -QVariantMap GPULoadSource::initialData(QString source) const +QVariantMap GPULoadSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; @@ -138,7 +138,7 @@ void GPULoadSource::updateValue() qCInfo(LOG_ESS) << "Output" << qoutput; if (m_device == QString("nvidia")) { - for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { + for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { if (!str.contains(QString(""))) continue; QString load = str.remove(QString("")) @@ -148,7 +148,7 @@ void GPULoadSource::updateValue() break; } } else if (m_device == QString("ati")) { - for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { + for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { if (!str.contains(QString("load"))) continue; QString load diff --git a/sources/extsysmonsources/gpuloadsource.h b/sources/extsysmonsources/gpuloadsource.h index b0951ca..bee30d2 100644 --- a/sources/extsysmonsources/gpuloadsource.h +++ b/sources/extsysmonsources/gpuloadsource.h @@ -30,11 +30,11 @@ class GPULoadSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit GPULoadSource(QObject *parent, const QStringList args); + explicit GPULoadSource(QObject *parent, const QStringList &args); virtual ~GPULoadSource(); static QString autoGpu(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(); QStringList sources() const; diff --git a/sources/extsysmonsources/gputempsource.cpp b/sources/extsysmonsources/gputempsource.cpp index 17f607e..bf2540b 100644 --- a/sources/extsysmonsources/gputempsource.cpp +++ b/sources/extsysmonsources/gputempsource.cpp @@ -26,7 +26,7 @@ GPUTemperatureSource::GPUTemperatureSource(QObject *parent, - const QStringList args) + const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 1); @@ -75,7 +75,7 @@ QString GPUTemperatureSource::autoGpu() } -QVariant GPUTemperatureSource::data(QString source) +QVariant GPUTemperatureSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; @@ -86,7 +86,7 @@ QVariant GPUTemperatureSource::data(QString source) } -QVariantMap GPUTemperatureSource::initialData(QString source) const +QVariantMap GPUTemperatureSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; @@ -139,7 +139,7 @@ void GPUTemperatureSource::updateValue() qCInfo(LOG_ESS) << "Output" << qoutput; if (m_device == QString("nvidia")) { - for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { + for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { if (!str.contains(QString(""))) continue; QString temp = str.remove(QString("")) @@ -148,7 +148,7 @@ void GPUTemperatureSource::updateValue() break; } } else if (m_device == QString("ati")) { - for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { + for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { if (!str.contains(QString("Temperature"))) continue; QString temp = str.split(QChar(' '), QString::SkipEmptyParts).at(4); diff --git a/sources/extsysmonsources/gputempsource.h b/sources/extsysmonsources/gputempsource.h index c2c0469..ae1b2c2 100644 --- a/sources/extsysmonsources/gputempsource.h +++ b/sources/extsysmonsources/gputempsource.h @@ -30,11 +30,11 @@ class GPUTemperatureSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit GPUTemperatureSource(QObject *parent, const QStringList args); + explicit GPUTemperatureSource(QObject *parent, const QStringList &args); virtual ~GPUTemperatureSource(); static QString autoGpu(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(); QStringList sources() const; diff --git a/sources/extsysmonsources/hddtempsource.cpp b/sources/extsysmonsources/hddtempsource.cpp index 3fffff2..aca5805 100644 --- a/sources/extsysmonsources/hddtempsource.cpp +++ b/sources/extsysmonsources/hddtempsource.cpp @@ -26,7 +26,7 @@ HDDTemperatureSource::HDDTemperatureSource(QObject *parent, - const QStringList args) + const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 2); @@ -38,7 +38,7 @@ HDDTemperatureSource::HDDTemperatureSource(QObject *parent, m_smartctl = m_cmd.contains(QString("smartctl")); qCInfo(LOG_ESS) << "Parse as smartctl" << m_smartctl; - for (auto device : m_devices) { + for (auto &device : m_devices) { m_processes[device] = new QProcess(nullptr); // fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished connect(m_processes[device], @@ -56,7 +56,7 @@ HDDTemperatureSource::~HDDTemperatureSource() { qCDebug(LOG_ESS) << __PRETTY_FUNCTION__; - for (auto device : m_devices) { + for (auto &device : m_devices) { m_processes[device]->kill(); m_processes[device]->deleteLater(); } @@ -76,11 +76,12 @@ QStringList HDDTemperatureSource::allHdd() } -QVariant HDDTemperatureSource::data(QString source) +QVariant HDDTemperatureSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; - QString device = source.remove(QString("hdd/temperature")); + QString device = source; + device.remove("hdd/temperature"); // run cmd if (m_processes[device]->state() == QProcess::NotRunning) m_processes[device]->start(QString("%1 %2").arg(m_cmd).arg(device)); @@ -89,11 +90,12 @@ QVariant HDDTemperatureSource::data(QString source) } -QVariantMap HDDTemperatureSource::initialData(QString source) const +QVariantMap HDDTemperatureSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; - QString device = source.remove(QString("hdd/temperature")); + QString device = source; + device.remove("hdd/temperature"); QVariantMap data; data[QString("min")] = 0.0; data[QString("max")] = 0.0; @@ -108,7 +110,7 @@ QVariantMap HDDTemperatureSource::initialData(QString source) const QStringList HDDTemperatureSource::sources() const { QStringList sources; - for (auto device : m_devices) + for (auto &device : m_devices) sources.append(QString("hdd/temperature%1").arg(device)); return sources; @@ -134,7 +136,7 @@ void HDDTemperatureSource::updateValue(const QString &device) // parse if (m_smartctl) { QStringList lines = qoutput.split(QChar('\n'), QString::SkipEmptyParts); - for (auto str : lines) { + for (auto &str : lines) { if (!str.startsWith(QString("194"))) continue; if (str.split(QChar(' '), QString::SkipEmptyParts).count() < 9) diff --git a/sources/extsysmonsources/hddtempsource.h b/sources/extsysmonsources/hddtempsource.h index 6e54fe3..82a5ac3 100644 --- a/sources/extsysmonsources/hddtempsource.h +++ b/sources/extsysmonsources/hddtempsource.h @@ -30,11 +30,11 @@ class HDDTemperatureSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit HDDTemperatureSource(QObject *parent, const QStringList args); + explicit HDDTemperatureSource(QObject *parent, const QStringList &args); virtual ~HDDTemperatureSource(); static QStringList allHdd(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(){}; QStringList sources() const; diff --git a/sources/extsysmonsources/loadsource.cpp b/sources/extsysmonsources/loadsource.cpp index 7b9d008..31fdedc 100644 --- a/sources/extsysmonsources/loadsource.cpp +++ b/sources/extsysmonsources/loadsource.cpp @@ -21,7 +21,7 @@ #include "awdebug.h" -LoadSource::LoadSource(QObject *parent, const QStringList args) +LoadSource::LoadSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 0); @@ -35,16 +35,17 @@ LoadSource::~LoadSource() } -QVariant LoadSource::data(QString source) +QVariant LoadSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; - source.remove(QString("load/load")); - return source.toInt(); + auto data = source; + data.remove("load/load"); + return data.toInt(); } -QVariantMap LoadSource::initialData(QString source) const +QVariantMap LoadSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; diff --git a/sources/extsysmonsources/loadsource.h b/sources/extsysmonsources/loadsource.h index b50a939..6cea0ab 100644 --- a/sources/extsysmonsources/loadsource.h +++ b/sources/extsysmonsources/loadsource.h @@ -28,10 +28,10 @@ class LoadSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit LoadSource(QObject *parent, const QStringList args); + explicit LoadSource(QObject *parent, const QStringList &args); virtual ~LoadSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(){}; QStringList sources() const; }; diff --git a/sources/extsysmonsources/networksource.cpp b/sources/extsysmonsources/networksource.cpp index 249601d..f284899 100644 --- a/sources/extsysmonsources/networksource.cpp +++ b/sources/extsysmonsources/networksource.cpp @@ -23,7 +23,7 @@ #include "awdebug.h" -NetworkSource::NetworkSource(QObject *parent, const QStringList args) +NetworkSource::NetworkSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 0); @@ -37,7 +37,7 @@ NetworkSource::~NetworkSource() } -QVariant NetworkSource::data(QString source) +QVariant NetworkSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; @@ -46,7 +46,7 @@ QVariant NetworkSource::data(QString source) QList rawInterfaceList = QNetworkInterface::allInterfaces(); qCInfo(LOG_ESS) << "Devices" << rawInterfaceList; - for (auto interface : rawInterfaceList) { + for (auto &interface : rawInterfaceList) { if ((interface.flags().testFlag(QNetworkInterface::IsLoopBack)) || (interface.flags().testFlag( QNetworkInterface::IsPointToPoint))) @@ -63,7 +63,7 @@ QVariant NetworkSource::data(QString source) } -QVariantMap NetworkSource::initialData(QString source) const +QVariantMap NetworkSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; diff --git a/sources/extsysmonsources/networksource.h b/sources/extsysmonsources/networksource.h index 99db545..8a4d199 100644 --- a/sources/extsysmonsources/networksource.h +++ b/sources/extsysmonsources/networksource.h @@ -28,10 +28,10 @@ class NetworkSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit NetworkSource(QObject *parent, const QStringList args); + explicit NetworkSource(QObject *parent, const QStringList &args); virtual ~NetworkSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(){}; QStringList sources() const; }; diff --git a/sources/extsysmonsources/playersource.cpp b/sources/extsysmonsources/playersource.cpp index b5d4320..2d85e2a 100644 --- a/sources/extsysmonsources/playersource.cpp +++ b/sources/extsysmonsources/playersource.cpp @@ -28,7 +28,7 @@ #include "awdebug.h" -PlayerSource::PlayerSource(QObject *parent, const QStringList args) +PlayerSource::PlayerSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 5); @@ -58,7 +58,7 @@ PlayerSource::~PlayerSource() } -QVariant PlayerSource::data(QString source) +QVariant PlayerSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; @@ -77,7 +77,7 @@ QString PlayerSource::getAutoMpris() const return QString(); QStringList arguments = listServices.arguments().first().toStringList(); - for (auto arg : arguments) { + for (auto &arg : arguments) { if (!arg.startsWith(QString("org.mpris.MediaPlayer2."))) continue; qCInfo(LOG_ESS) << "Service found" << arg; @@ -90,7 +90,7 @@ QString PlayerSource::getAutoMpris() const } -QVariantMap PlayerSource::initialData(QString source) const +QVariantMap PlayerSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; @@ -276,7 +276,7 @@ void PlayerSource::mpdSocketReadyRead() qCInfo(LOG_ESS) << "Output" << qoutput; // parse - for (auto str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { + for (auto &str : qoutput.split(QChar('\n'), QString::SkipEmptyParts)) { if (str.split(QString(": "), QString::SkipEmptyParts).count() == 2) { // "Metadata: data" QString metadata = str.split(QString(": "), QString::SkipEmptyParts) @@ -337,7 +337,7 @@ QVariantHash PlayerSource::getPlayerMpdInfo() } -QVariantHash PlayerSource::getPlayerMprisInfo(const QString mpris) const +QVariantHash PlayerSource::getPlayerMprisInfo(const QString &mpris) const { qCDebug(LOG_ESS) << "MPRIS" << mpris; diff --git a/sources/extsysmonsources/playersource.h b/sources/extsysmonsources/playersource.h index b7b80a7..70a7cb0 100644 --- a/sources/extsysmonsources/playersource.h +++ b/sources/extsysmonsources/playersource.h @@ -34,11 +34,11 @@ class PlayerSource : public AbstractExtSysMonSource public: const char *MPD_STATUS_REQUEST = "currentsong\nstatus\n"; - explicit PlayerSource(QObject *parent, const QStringList args); + explicit PlayerSource(QObject *parent, const QStringList &args); virtual ~PlayerSource(); - QVariant data(QString source); + QVariant data(const QString &source); QString getAutoMpris() const; - QVariantMap initialData(QString source) const; + QVariantMap initialData(const QString &source) const; void run(); QStringList sources() const; // additional method to build dynamic tags @@ -56,7 +56,7 @@ private slots: private: inline QVariantHash defaultInfo() const; QVariantHash getPlayerMpdInfo(); - QVariantHash getPlayerMprisInfo(const QString mpris) const; + QVariantHash getPlayerMprisInfo(const QString &mpris) const; QTcpSocket m_mpdSocket; // configuration and values QString m_mpdAddress; diff --git a/sources/extsysmonsources/processessource.cpp b/sources/extsysmonsources/processessource.cpp index 63fe151..59bb2ef 100644 --- a/sources/extsysmonsources/processessource.cpp +++ b/sources/extsysmonsources/processessource.cpp @@ -23,7 +23,7 @@ #include "awdebug.h" -ProcessesSource::ProcessesSource(QObject *parent, const QStringList args) +ProcessesSource::ProcessesSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 0); @@ -37,7 +37,7 @@ ProcessesSource::~ProcessesSource() } -QVariant ProcessesSource::data(QString source) +QVariant ProcessesSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; @@ -48,7 +48,7 @@ QVariant ProcessesSource::data(QString source) } -QVariantMap ProcessesSource::initialData(QString source) const +QVariantMap ProcessesSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; @@ -85,7 +85,7 @@ void ProcessesSource::run() QStringList directories = allDirectories.filter(QRegExp(QString("(\\d+)"))); QStringList running; - for (auto dir : directories) { + for (auto &dir : directories) { QFile statusFile(QString("/proc/%1/status").arg(dir)); if (!statusFile.open(QIODevice::ReadOnly | QIODevice::Text)) continue; diff --git a/sources/extsysmonsources/processessource.h b/sources/extsysmonsources/processessource.h index 1ad5b38..63fad65 100644 --- a/sources/extsysmonsources/processessource.h +++ b/sources/extsysmonsources/processessource.h @@ -28,10 +28,10 @@ class ProcessesSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit ProcessesSource(QObject *parent, const QStringList args); + explicit ProcessesSource(QObject *parent, const QStringList &args); virtual ~ProcessesSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(); QStringList sources() const; diff --git a/sources/extsysmonsources/quotessource.cpp b/sources/extsysmonsources/quotessource.cpp index 1e57c89..6bb193c 100644 --- a/sources/extsysmonsources/quotessource.cpp +++ b/sources/extsysmonsources/quotessource.cpp @@ -22,7 +22,7 @@ #include "extquotes.h" -QuotesSource::QuotesSource(QObject *parent, const QStringList args) +QuotesSource::QuotesSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 0); @@ -42,23 +42,24 @@ QuotesSource::~QuotesSource() } -QVariant QuotesSource::data(QString source) +QVariant QuotesSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; int ind = index(source); - source.remove(QString("quotes/")); - if (!m_values.contains(source)) { + auto service = source; + service.remove(QString("quotes/")); + if (!m_values.contains(service)) { QVariantHash data = m_extQuotes->itemByTagNumber(ind)->run(); - for (auto key : data.keys()) + for (auto &key : data.keys()) m_values[key] = data[key]; } - QVariant value = m_values.take(source); + QVariant value = m_values.take(service); return value; } -QVariantMap QuotesSource::initialData(QString source) const +QVariantMap QuotesSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; @@ -151,7 +152,7 @@ QStringList QuotesSource::sources() const QStringList QuotesSource::getSources() { QStringList sources; - for (auto item : m_extQuotes->activeItems()) { + for (auto &item : m_extQuotes->activeItems()) { sources.append(QString("quotes/%1").arg(item->tag(QString("ask")))); sources.append(QString("quotes/%1").arg(item->tag(QString("askchg")))); sources.append( diff --git a/sources/extsysmonsources/quotessource.h b/sources/extsysmonsources/quotessource.h index 28fe709..f32df8a 100644 --- a/sources/extsysmonsources/quotessource.h +++ b/sources/extsysmonsources/quotessource.h @@ -31,10 +31,10 @@ class QuotesSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit QuotesSource(QObject *parent, const QStringList args); + explicit QuotesSource(QObject *parent, const QStringList &args); virtual ~QuotesSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(){}; QStringList sources() const; diff --git a/sources/extsysmonsources/requestsource.cpp b/sources/extsysmonsources/requestsource.cpp index 976b9c8..252a006 100644 --- a/sources/extsysmonsources/requestsource.cpp +++ b/sources/extsysmonsources/requestsource.cpp @@ -22,7 +22,7 @@ #include "extnetworkrequest.h" -RequestSource::RequestSource(QObject *parent, const QStringList args) +RequestSource::RequestSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 0); @@ -43,23 +43,24 @@ RequestSource::~RequestSource() } -QVariant RequestSource::data(QString source) +QVariant RequestSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; int ind = index(source); - source.remove(QString("network/")); - if (!m_values.contains(source)) { + auto service = source; + service.remove("network/"); + if (!m_values.contains(service)) { QVariantHash data = m_extNetRequest->itemByTagNumber(ind)->run(); - for (auto key : data.keys()) + for (auto &key : data.keys()) m_values[key] = data[key]; } - QVariant value = m_values.take(source); + QVariant value = m_values.take(service); return value; } -QVariantMap RequestSource::initialData(QString source) const +QVariantMap RequestSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; @@ -88,7 +89,7 @@ QStringList RequestSource::sources() const QStringList RequestSource::getSources() { QStringList sources; - for (auto item : m_extNetRequest->activeItems()) + for (auto &item : m_extNetRequest->activeItems()) sources.append( QString("network/%1").arg(item->tag(QString("response")))); diff --git a/sources/extsysmonsources/requestsource.h b/sources/extsysmonsources/requestsource.h index 02cb47c..2448728 100644 --- a/sources/extsysmonsources/requestsource.h +++ b/sources/extsysmonsources/requestsource.h @@ -31,10 +31,10 @@ class RequestSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit RequestSource(QObject *parent, const QStringList args); + explicit RequestSource(QObject *parent, const QStringList &args); virtual ~RequestSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(){}; QStringList sources() const; diff --git a/sources/extsysmonsources/upgradesource.cpp b/sources/extsysmonsources/upgradesource.cpp index a402ff6..c438e03 100644 --- a/sources/extsysmonsources/upgradesource.cpp +++ b/sources/extsysmonsources/upgradesource.cpp @@ -22,7 +22,7 @@ #include "extupgrade.h" -UpgradeSource::UpgradeSource(QObject *parent, const QStringList args) +UpgradeSource::UpgradeSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 0); @@ -43,7 +43,7 @@ UpgradeSource::~UpgradeSource() } -QVariant UpgradeSource::data(QString source) +QVariant UpgradeSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; @@ -52,7 +52,7 @@ QVariant UpgradeSource::data(QString source) } -QVariantMap UpgradeSource::initialData(QString source) const +QVariantMap UpgradeSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; @@ -78,7 +78,7 @@ QStringList UpgradeSource::sources() const QStringList UpgradeSource::getSources() { QStringList sources; - for (auto item : m_extUpgrade->activeItems()) + for (auto &item : m_extUpgrade->activeItems()) sources.append( QString("upgrade/%1").arg(item->tag(QString("pkgcount")))); diff --git a/sources/extsysmonsources/upgradesource.h b/sources/extsysmonsources/upgradesource.h index 1341f2d..ffdb959 100644 --- a/sources/extsysmonsources/upgradesource.h +++ b/sources/extsysmonsources/upgradesource.h @@ -31,10 +31,10 @@ class UpgradeSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit UpgradeSource(QObject *parent, const QStringList args); + explicit UpgradeSource(QObject *parent, const QStringList &args); virtual ~UpgradeSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(){}; QStringList sources() const; diff --git a/sources/extsysmonsources/weathersource.cpp b/sources/extsysmonsources/weathersource.cpp index 1abe824..445deea 100644 --- a/sources/extsysmonsources/weathersource.cpp +++ b/sources/extsysmonsources/weathersource.cpp @@ -22,7 +22,7 @@ #include "extweather.h" -WeatherSource::WeatherSource(QObject *parent, const QStringList args) +WeatherSource::WeatherSource(QObject *parent, const QStringList &args) : AbstractExtSysMonSource(parent, args) { Q_ASSERT(args.count() == 0); @@ -43,23 +43,24 @@ WeatherSource::~WeatherSource() } -QVariant WeatherSource::data(QString source) +QVariant WeatherSource::data(const QString &source) { qCDebug(LOG_ESS) << "Source" << source; int ind = index(source); - source.remove(QString("weather/")); - if (!m_values.contains(source)) { + auto service = source; + service.remove("weather/"); + if (!m_values.contains(service)) { QVariantHash data = m_extWeather->itemByTagNumber(ind)->run(); - for (auto key : data.keys()) + for (auto &key : data.keys()) m_values[key] = data[key]; } - QVariant value = m_values.take(source); + QVariant value = m_values.take(service); return value; } -QVariantMap WeatherSource::initialData(QString source) const +QVariantMap WeatherSource::initialData(const QString &source) const { qCDebug(LOG_ESS) << "Source" << source; @@ -128,7 +129,7 @@ QStringList WeatherSource::sources() const QStringList WeatherSource::getSources() { QStringList sources; - for (auto item : m_extWeather->activeItems()) { + for (auto &item : m_extWeather->activeItems()) { sources.append( QString("weather/%1").arg(item->tag(QString("weatherId")))); sources.append( diff --git a/sources/extsysmonsources/weathersource.h b/sources/extsysmonsources/weathersource.h index de35feb..cd19b82 100644 --- a/sources/extsysmonsources/weathersource.h +++ b/sources/extsysmonsources/weathersource.h @@ -31,10 +31,10 @@ class WeatherSource : public AbstractExtSysMonSource Q_OBJECT public: - explicit WeatherSource(QObject *parent, const QStringList args); + explicit WeatherSource(QObject *parent, const QStringList &args); virtual ~WeatherSource(); - QVariant data(QString source); - QVariantMap initialData(QString source) const; + QVariant data(const QString &source); + QVariantMap initialData(const QString &source) const; void run(){}; QStringList sources() const; diff --git a/sources/qml/AWTagSelector.qml b/sources/qml/AWTagSelector.qml index 1d30894..628d6e3 100644 --- a/sources/qml/AWTagSelector.qml +++ b/sources/qml/AWTagSelector.qml @@ -53,7 +53,7 @@ Row { onClicked: { if (!tags.currentText) return - textArea.insert(textArea.cursorPosition, "$" + tags.currentText) + textArea.insert("$" + tags.currentText) } } diff --git a/sources/qml/AWTextEditor.qml b/sources/qml/AWTextEditor.qml index b084b53..d9ebe6a 100644 --- a/sources/qml/AWTextEditor.qml +++ b/sources/qml/AWTextEditor.qml @@ -71,7 +71,7 @@ Item { } function appendTag(tag, substring) { - textArea.insert(textArea.cursorPosition, tag.substring(substring.length)) + insert(tag.substring(substring.length)) } function changeTooltipPosition() { @@ -89,6 +89,10 @@ Item { // get current tag text return substring.substr(signIndex) } + + function insert(text) { + textArea.insert(textArea.cursorPosition, text) + } } diff --git a/sources/test/testawbugreporter.cpp b/sources/test/testawbugreporter.cpp index 071b20d..d57d88e 100644 --- a/sources/test/testawbugreporter.cpp +++ b/sources/test/testawbugreporter.cpp @@ -43,14 +43,14 @@ void TestAWBugReporter::test_generateText() QString output = plugin->generateText(data.at(0), data.at(1), data.at(2), data.at(3)); - for (auto string : data) + for (auto &string : data) QVERIFY(output.contains(string)); } void TestAWBugReporter::test_sendBugReport() { - QSignalSpy spy(plugin, SIGNAL(replyReceived(int, QString))); + QSignalSpy spy(plugin, SIGNAL(replyReceived(int, QString &))); plugin->sendBugReport( AWTestLibrary::randomString(), plugin->generateText(data.at(0), data.at(1), data.at(2), data.at(3))); diff --git a/sources/test/testawconfighelper.cpp b/sources/test/testawconfighelper.cpp index daa9525..79ee180 100644 --- a/sources/test/testawconfighelper.cpp +++ b/sources/test/testawconfighelper.cpp @@ -46,7 +46,7 @@ void TestAWConfigHelper::test_configurationDirectory() void TestAWConfigHelper::test_exportConfiguration() { QStringList keys = AWTestLibrary::randomStringList(); - for (auto key : keys) + for (auto &key : keys) map[key] = AWTestLibrary::randomString(); filename = AWTestLibrary::randomFilenames().first; @@ -59,7 +59,7 @@ void TestAWConfigHelper::test_importConfiguration() QVariantMap imported = plugin->importConfiguration(filename, true, true, true); QVariantMap converted; - for (auto key : map.keys()) + for (auto &key : map.keys()) converted[key] = map.value(key); QCOMPARE(imported, converted); diff --git a/sources/test/testawkeys.cpp b/sources/test/testawkeys.cpp index d4c597d..e93d232 100644 --- a/sources/test/testawkeys.cpp +++ b/sources/test/testawkeys.cpp @@ -106,7 +106,7 @@ void TestAWKeys::test_pattern() QEXPECT_FAIL("", "Pattern should be parsed", Continue); QCOMPARE(text, pattern); QStringList keys = plugin->dictKeys(true); - for (auto key : keys) + for (auto &key : keys) QVERIFY(!text.contains(key)); } @@ -143,7 +143,7 @@ void TestAWKeys::test_infoByKey() { int notEmpty = 0; QStringList keys = plugin->dictKeys(true); - for (auto key : keys) { + for (auto &key : keys) { QString info = plugin->infoByKey(key); QVERIFY(!info.isEmpty()); // append non-empty field count @@ -158,7 +158,7 @@ void TestAWKeys::test_valueByKey() { int notEmpty = 0; QStringList keys = plugin->dictKeys(true); - for (auto key : keys) { + for (auto &key : keys) { if (!plugin->valueByKey(key).isEmpty()) notEmpty++; } diff --git a/sources/test/testawtelemetryhandler.cpp b/sources/test/testawtelemetryhandler.cpp index 6c914c0..be93605 100644 --- a/sources/test/testawtelemetryhandler.cpp +++ b/sources/test/testawtelemetryhandler.cpp @@ -64,7 +64,7 @@ void TestAWTelemetryHandler::test_getLast() void TestAWTelemetryHandler::test_uploadTelemetry() { - QSignalSpy spy(plugin, SIGNAL(replyReceived(QString))); + QSignalSpy spy(plugin, SIGNAL(replyReceived(QString &))); plugin->uploadTelemetry(telemetryValidGroup, telemetryData); QVERIFY(spy.wait(5000)); diff --git a/sources/test/testdpplugin.cpp b/sources/test/testdpplugin.cpp index 0db977f..fc684ab 100644 --- a/sources/test/testdpplugin.cpp +++ b/sources/test/testdpplugin.cpp @@ -93,7 +93,7 @@ void TestDPPlugin::test_parsePattern() QString result = plugin->parsePattern(pattern, plugin->currentDesktop()); QVERIFY(!result.isEmpty()); QVERIFY(result != pattern); - for (auto key : plugin->dictKeys()) + for (auto &key : plugin->dictKeys()) QVERIFY(!result.contains(key)); } diff --git a/sources/test/testextquotes.cpp b/sources/test/testextquotes.cpp index 71fa3ed..2ae1506 100644 --- a/sources/test/testextquotes.cpp +++ b/sources/test/testextquotes.cpp @@ -62,7 +62,7 @@ void TestExtQuotes::test_run() for (auto &type : types) cache[type] = arguments.at(0).toHash()[extQuotes->tag(type)]; - for (auto type : types) { + for (auto &type : types) { QCOMPARE(firstValue[extQuotes->tag(type)].toDouble(), 0.0); QVERIFY((cache[type].toDouble() > price.first) && (cache[type].toDouble() < price.second)); @@ -80,10 +80,10 @@ void TestExtQuotes::test_derivatives() QVERIFY(spy.wait(5000)); QList arguments = spy.takeFirst(); QVariantHash values; - for (auto type : types) + for (auto &type : types) values[type] = arguments.at(0).toHash()[extQuotes->tag(type)]; - for (auto type : types) { + for (auto &type : types) { QCOMPARE(arguments.at(0) .toHash()[extQuotes->tag(QString("%1chg").arg(type))] .toDouble(), diff --git a/sources/version.h.in b/sources/version.h.in index fd39d2e..78f4f7c 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -10,7 +10,7 @@ const char AUTHOR[] = "@PROJECT_AUTHOR@"; const char TRANSLATORS[] = "Ernesto Aviles Vzqz (Spanish),Mermouy " "(French),underr (Brazillian Portuguese),Viktor " "Slobodyan (Ukrainian),Lemueler (Chinese),Heimen " - "Stoffels (Dutch), Mariusz Kocoń (Polish)"; + "Stoffels (Dutch),Mariusz Kocoń (Polish)"; const char EMAIL[] = "@PROJECT_CONTACT@"; const char LICENSE[] = "@PROJECT_LICENSE@"; const char TRDPARTY_LICENSE[] = "QReplyTimeout "