diff --git a/sources/.clang-format b/sources/.clang-format
index 05d985c..5c60523 100644
--- a/sources/.clang-format
+++ b/sources/.clang-format
@@ -20,7 +20,7 @@ BreakBeforeBinaryOperators: All
BreakBeforeBraces: Linux
BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: true
-ColumnLimit: 100
+ColumnLimit: 120
CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: false
ConstructorInitializerIndentWidth: 4
@@ -58,7 +58,7 @@ SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false
SpacesInParentheses: false
SpacesInSquareBrackets: false
-Standard: Cpp11
+Standard: Latest
TabWidth: 8
UseTab: Never
...
diff --git a/sources/awdebug.cpp b/sources/awdebug.cpp
index 7135db6..4edf5ff 100644
--- a/sources/awdebug.cpp
+++ b/sources/awdebug.cpp
@@ -41,25 +41,15 @@ QString AWDebug::getAboutText(const QString &_type)
} else if (_type == "description") {
text = i18n("A set of minimalistic plasmoid widgets");
} else if (_type == "links") {
- text = i18n("Links:") + "
"
- + QString("- %2
").arg(HOMEPAGE).arg(i18n("Homepage"))
+ text = i18n("Links:") + "" + QString("- %2
").arg(HOMEPAGE).arg(i18n("Homepage"))
+ QString("- %2
").arg(REPOSITORY).arg(i18n("Repository"))
+ QString("- %2
").arg(BUGTRACKER).arg(i18n("Bugtracker"))
- + QString("- %2
")
- .arg(TRANSLATION)
- .arg(i18n("Translation issue"))
- + QString("- %2
")
- .arg(AUR_PACKAGES)
- .arg(i18n("AUR packages"))
- + QString("- %2
")
- .arg(OPENSUSE_PACKAGES)
- .arg(i18n("openSUSE packages"))
+ + QString("- %2
").arg(TRANSLATION).arg(i18n("Translation issue"))
+ + QString("- %2
").arg(AUR_PACKAGES).arg(i18n("AUR packages"))
+ + QString("- %2
").arg(OPENSUSE_PACKAGES).arg(i18n("openSUSE packages"))
+ "
";
} else if (_type == "copy") {
- text = QString("© %1 %3
")
- .arg(DATE)
- .arg(EMAIL)
- .arg(AUTHOR)
+ text = QString("© %1 %3
").arg(DATE).arg(EMAIL).arg(AUTHOR)
+ i18nc("This software is licensed under %1", LICENSE) + "";
} else if (_type == "translators") {
QStringList translatorList = QString(TRANSLATORS).split(',');
@@ -114,8 +104,7 @@ QStringList AWDebug::getBuildData()
metadata.append(QString(" CMAKE_CXX_FLAGS: %1").arg(CMAKE_CXX_FLAGS));
metadata.append(QString(" CMAKE_CXX_FLAGS_DEBUG: %1").arg(CMAKE_CXX_FLAGS_DEBUG));
metadata.append(QString(" CMAKE_CXX_FLAGS_RELEASE: %1").arg(CMAKE_CXX_FLAGS_RELEASE));
- metadata.append(
- QString(" CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
+ metadata.append(QString(" CMAKE_CXX_FLAGS_OPTIMIZATION: %1").arg(CMAKE_CXX_FLAGS_OPTIMIZATION));
metadata.append(QString(" CMAKE_DEFINITIONS: %1").arg(CMAKE_DEFINITIONS));
metadata.append(QString(" CMAKE_INSTALL_PREFIX: %1").arg(CMAKE_INSTALL_PREFIX));
metadata.append(QString(" CMAKE_MODULE_LINKER_FLAGS: %1").arg(CMAKE_MODULE_LINKER_FLAGS));
diff --git a/sources/awesome-widget/plugin/awabstractpairconfig.cpp b/sources/awesome-widget/plugin/awabstractpairconfig.cpp
index 95ea6b9..1563146 100644
--- a/sources/awesome-widget/plugin/awabstractpairconfig.cpp
+++ b/sources/awesome-widget/plugin/awabstractpairconfig.cpp
@@ -107,8 +107,7 @@ void AWAbstractPairConfig::updateUi()
void AWAbstractPairConfig::addSelector(const QStringList &_keys, const QStringList &_values,
const QPair &_current)
{
- qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values
- << "and current ones" << _current;
+ qCDebug(LOG_AW) << "Add selector with keys" << _keys << "values" << _values << "and current ones" << _current;
auto *selector = new AWAbstractSelector(ui->scrollAreaWidgetContents, m_editable);
selector->init(_keys, _values, _current);
diff --git a/sources/awesome-widget/plugin/awabstractpairconfig.h b/sources/awesome-widget/plugin/awabstractpairconfig.h
index 2f36b37..e5b6411 100644
--- a/sources/awesome-widget/plugin/awabstractpairconfig.h
+++ b/sources/awesome-widget/plugin/awabstractpairconfig.h
@@ -35,8 +35,7 @@ class AWAbstractPairConfig : public QDialog
Q_OBJECT
public:
- explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false,
- QStringList _keys = QStringList());
+ explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false, QStringList _keys = QStringList());
~AWAbstractPairConfig() override;
template void initHelper()
{
@@ -62,8 +61,7 @@ private:
bool m_hasEdit = false;
QStringList m_keys;
// methods
- void addSelector(const QStringList &_keys, const QStringList &_values,
- const QPair &_current);
+ void addSelector(const QStringList &_keys, const QStringList &_values, const QPair &_current);
void clearSelectors();
void execDialog();
[[nodiscard]] QPair initKeys() const;
diff --git a/sources/awesome-widget/plugin/awabstractpairhelper.cpp b/sources/awesome-widget/plugin/awabstractpairhelper.cpp
index 55a4e91..a111030 100644
--- a/sources/awesome-widget/plugin/awabstractpairhelper.cpp
+++ b/sources/awesome-widget/plugin/awabstractpairhelper.cpp
@@ -69,8 +69,7 @@ void AWAbstractPairHelper::initItems()
{
m_pairs.clear();
- QStringList configs
- = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_filePath);
+ QStringList configs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, m_filePath);
for (auto &fileName : configs) {
QSettings settings(fileName, QSettings::IniFormat);
@@ -80,8 +79,7 @@ void AWAbstractPairHelper::initItems()
QStringList keys = settings.childKeys();
for (auto &key : keys) {
QString value = settings.value(key).toString();
- qCInfo(LOG_AW) << "Found key" << key << "for value" << value << "in"
- << settings.fileName();
+ qCInfo(LOG_AW) << "Found key" << key << "for value" << value << "in" << settings.fileName();
if (value.isEmpty()) {
qCInfo(LOG_AW) << "Skip empty value for" << key;
continue;
@@ -98,9 +96,7 @@ bool AWAbstractPairHelper::writeItems(const QHash &_configurat
qCDebug(LOG_AW) << "Write configuration" << _configuration;
QString fileName
- = QString("%1/%2")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
- .arg(m_filePath);
+ = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)).arg(m_filePath);
QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << fileName;
@@ -120,9 +116,7 @@ bool AWAbstractPairHelper::removeUnusedKeys(const QStringList &_keys) const
qCDebug(LOG_AW) << "Remove keys" << _keys;
QString fileName
- = QString("%1/%2")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
- .arg(m_filePath);
+ = QString("%1/%2").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation)).arg(m_filePath);
QSettings settings(fileName, QSettings::IniFormat);
qCInfo(LOG_AW) << "Configuration file" << fileName;
diff --git a/sources/awesome-widget/plugin/awabstractselector.cpp b/sources/awesome-widget/plugin/awabstractselector.cpp
index aaa816c..463fb8e 100644
--- a/sources/awesome-widget/plugin/awabstractselector.cpp
+++ b/sources/awesome-widget/plugin/awabstractselector.cpp
@@ -60,8 +60,8 @@ void AWAbstractSelector::init(const QStringList &_keys, const QStringList &_valu
qCWarning(LOG_AW) << "Invalid current value" << _current << "not found in default ones";
return;
}
- qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values" << _values
- << "and current ones are" << _current;
+ qCDebug(LOG_AW) << "Init selector with keys" << _keys << "and values" << _values << "and current ones are"
+ << _current;
// set data
ui->comboBox_key->clear();
diff --git a/sources/awesome-widget/plugin/awabstractselector.h b/sources/awesome-widget/plugin/awabstractselector.h
index 1faffc9..9b5c9a5 100644
--- a/sources/awesome-widget/plugin/awabstractselector.h
+++ b/sources/awesome-widget/plugin/awabstractselector.h
@@ -32,12 +32,10 @@ class AWAbstractSelector : public QWidget
Q_OBJECT
public:
- explicit AWAbstractSelector(QWidget *_parent = nullptr,
- const QPair &_editable = {false, false});
+ explicit AWAbstractSelector(QWidget *_parent = nullptr, const QPair &_editable = {false, false});
~AWAbstractSelector() override;
[[nodiscard]] QPair current() const;
- void init(const QStringList &_keys, const QStringList &_values,
- const QPair &_current);
+ void init(const QStringList &_keys, const QStringList &_values, const QPair &_current);
signals:
void selectionChanged();
diff --git a/sources/awesome-widget/plugin/awactions.cpp b/sources/awesome-widget/plugin/awactions.cpp
index cd1afa3..57dd85e 100644
--- a/sources/awesome-widget/plugin/awactions.cpp
+++ b/sources/awesome-widget/plugin/awactions.cpp
@@ -124,8 +124,8 @@ QVariantMap AWActions::getFont(const QVariantMap &_defaultFont)
QVariantMap fontMap;
int ret = 0;
- CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400,
- false, _defaultFont["color"].toString());
+ CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400, false,
+ _defaultFont["color"].toString());
CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
fontMap["applied"] = ret;
diff --git a/sources/awesome-widget/plugin/awbugreporter.cpp b/sources/awesome-widget/plugin/awbugreporter.cpp
index 13390ee..9a44924 100644
--- a/sources/awesome-widget/plugin/awbugreporter.cpp
+++ b/sources/awesome-widget/plugin/awbugreporter.cpp
@@ -44,13 +44,12 @@ AWBugReporter::~AWBugReporter()
void AWBugReporter::doConnect()
{
// additional method for testing needs
- connect(this, SIGNAL(replyReceived(const int, const QString &)), this,
- SLOT(showInformation(int, const QString &)));
+ connect(this, SIGNAL(replyReceived(const int, const QString &)), this, SLOT(showInformation(int, const QString &)));
}
-QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce,
- const QString &_expected, const QString &_logs)
+QString AWBugReporter::generateText(const QString &_description, const QString &_reproduce, const QString &_expected,
+ const QString &_logs)
{
// do not log _logs here, it may have quite large size
qCDebug(LOG_AW) << "Generate text with description" << _description << "steps" << _reproduce
@@ -73,8 +72,7 @@ void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
qCDebug(LOG_AW) << "Send bug report with title" << _title << "and body" << _body;
auto *manager = new QNetworkAccessManager(nullptr);
- connect(manager, SIGNAL(finished(QNetworkReply *)), this,
- SLOT(issueReplyRecieved(QNetworkReply *)));
+ connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(issueReplyRecieved(QNetworkReply *)));
QNetworkRequest request = QNetworkRequest(QUrl(BUGTRACKER_API));
request.setHeader(QNetworkRequest::ContentTypeHeader, "application/json");
@@ -95,8 +93,7 @@ void AWBugReporter::sendBugReport(const QString &_title, const QString &_body)
void AWBugReporter::issueReplyRecieved(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
- << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
return emit(replyReceived(0, ""));
}
diff --git a/sources/awesome-widget/plugin/awconfighelper.cpp b/sources/awesome-widget/plugin/awconfighelper.cpp
index 30a7289..7c716af 100644
--- a/sources/awesome-widget/plugin/awconfighelper.cpp
+++ b/sources/awesome-widget/plugin/awconfighelper.cpp
@@ -31,8 +31,7 @@ AWConfigHelper::AWConfigHelper(QObject *_parent)
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
- m_baseDir = QString("%1/awesomewidgets")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+ m_baseDir = QString("%1/awesomewidgets").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
}
@@ -45,9 +44,8 @@ AWConfigHelper::~AWConfigHelper()
QString AWConfigHelper::configurationDirectory()
{
// get readable directory
- QString localDir
- = QString("%1/awesomewidgets/configs")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+ QString localDir = QString("%1/awesomewidgets/configs")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
// create directory and copy files from default settings
QDir localDirectory;
@@ -63,8 +61,7 @@ QString AWConfigHelper::configurationDirectory()
bool AWConfigHelper::dropCache()
{
QString fileName
- = QString("%1/awesomewidgets.ndx")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+ = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
return QFile(fileName).remove();
}
@@ -88,8 +85,8 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
// extensions
for (auto &item : m_dirs) {
- QStringList items = QDir(QString("%1/%2").arg(m_baseDir).arg(item))
- .entryList(QStringList() << "*.desktop", QDir::Files);
+ QStringList items
+ = QDir(QString("%1/%2").arg(m_baseDir).arg(item)).entryList(QStringList() << "*.desktop", QDir::Files);
settings.beginGroup(item);
for (auto &it : items)
copyExtensions(it, item, settings, false);
@@ -99,11 +96,9 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
// additional files
settings.beginGroup("json");
// script filters
- readFile(settings, "filters",
- QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
+ readFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
// weather icon settings
- readFile(settings, "weathers",
- QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+ readFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
settings.endGroup();
settings.beginGroup("ini");
@@ -120,10 +115,8 @@ bool AWConfigHelper::exportConfiguration(QObject *_nativeConfig, const QString &
}
-QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
- const bool _importPlasmoid,
- const bool _importExtensions,
- const bool _importAdds) const
+QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName, const bool _importPlasmoid,
+ const bool _importExtensions, const bool _importAdds) const
{
qCDebug(LOG_AW) << "Selected filename" << _fileName;
@@ -144,11 +137,9 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
if (_importAdds) {
settings.beginGroup("json");
// script filters
- writeFile(settings, "filters",
- QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
+ writeFile(settings, "filters", QString("%1/scripts/awesomewidgets-extscripts-filters.json").arg(m_baseDir));
// weather icon settings
- writeFile(settings, "weathers",
- QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
+ writeFile(settings, "weathers", QString("%1/weather/awesomewidgets-extweather-ids.json").arg(m_baseDir));
settings.endGroup();
settings.beginGroup("ini");
@@ -173,8 +164,7 @@ QVariantMap AWConfigHelper::importConfiguration(const QString &_fileName,
QVariantMap AWConfigHelper::readDataEngineConfiguration()
{
- QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation,
- "plasma-dataengine-extsysmon.conf");
+ QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
qCInfo(LOG_AW) << "Configuration file" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
QVariantMap configuration;
@@ -228,9 +218,8 @@ void AWConfigHelper::copyConfigs(const QString &_localDir)
{
qCDebug(LOG_AW) << "Local directory" << _localDir;
- QStringList dirs
- = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
- QStandardPaths::LocateDirectory);
+ QStringList dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, "awesomewidgets/configs",
+ QStandardPaths::LocateDirectory);
for (auto &dir : dirs) {
if (dir == _localDir)
continue;
@@ -238,21 +227,19 @@ void AWConfigHelper::copyConfigs(const QString &_localDir)
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);
- qCInfo(LOG_AW) << "File" << source << "has been copied to" << destination
- << "with status" << status;
+ qCInfo(LOG_AW) << "File" << source << "has been copied to" << destination << "with status" << status;
}
}
}
-void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type,
- QSettings &_settings, const bool _inverse) const
+void AWConfigHelper::copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
+ const bool _inverse) const
{
qCDebug(LOG_AW) << "Extension" << _item << "has type" << _type << "inverse copying" << _inverse;
_settings.beginGroup(_item);
- QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item),
- QSettings::IniFormat);
+ QSettings itemSettings(QString("%1/%2/%3").arg(m_baseDir).arg(_type).arg(_item), QSettings::IniFormat);
itemSettings.beginGroup("Desktop Entry");
if (_inverse)
copySettings(_settings, itemSettings);
diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h
index 496334f..47e6a64 100644
--- a/sources/awesome-widget/plugin/awconfighelper.h
+++ b/sources/awesome-widget/plugin/awconfighelper.h
@@ -35,10 +35,8 @@ public:
Q_INVOKABLE [[nodiscard]] static QString configurationDirectory();
Q_INVOKABLE static bool dropCache();
Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const;
- Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName,
- bool _importPlasmoid,
- bool _importExtensions,
- bool _importAdds) const;
+ Q_INVOKABLE [[nodiscard]] QVariantMap importConfiguration(const QString &_fileName, bool _importPlasmoid,
+ bool _importExtensions, bool _importAdds) const;
// dataengine
Q_INVOKABLE static QVariantMap readDataEngineConfiguration();
Q_INVOKABLE static bool writeDataEngineConfiguration(const QVariantMap &_configuration);
@@ -46,8 +44,7 @@ public:
private:
// methods
static void copyConfigs(const QString &_localDir);
- void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
- bool _inverse) const;
+ void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings, bool _inverse) const;
static void copySettings(QSettings &_from, QSettings &_to);
static void readFile(QSettings &_settings, const QString &_key, const QString &_fileName);
static void writeFile(QSettings &_settings, const QString &_key, const QString &_fileName);
diff --git a/sources/awesome-widget/plugin/awcustomkeysconfig.h b/sources/awesome-widget/plugin/awcustomkeysconfig.h
index 794956e..bb44b16 100644
--- a/sources/awesome-widget/plugin/awcustomkeysconfig.h
+++ b/sources/awesome-widget/plugin/awcustomkeysconfig.h
@@ -27,8 +27,7 @@ class AWCustomKeysConfig : public AWAbstractPairConfig
Q_OBJECT
public:
- explicit AWCustomKeysConfig(QWidget *_parent = nullptr,
- const QStringList &_keys = QStringList());
+ explicit AWCustomKeysConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
~AWCustomKeysConfig() override;
};
diff --git a/sources/awesome-widget/plugin/awdataaggregator.cpp b/sources/awesome-widget/plugin/awdataaggregator.cpp
index 145d665..6c8267e 100644
--- a/sources/awesome-widget/plugin/awdataaggregator.cpp
+++ b/sources/awesome-widget/plugin/awdataaggregator.cpp
@@ -61,8 +61,7 @@ QString AWDataAggregator::htmlImage(const QPixmap &_source)
_source.save(&buffer, "PNG");
return byteArray.isEmpty() ? ""
- : QString("
")
- .arg(QString(byteArray.toBase64()));
+ : QString("
").arg(QString(byteArray.toBase64()));
}
@@ -102,10 +101,9 @@ void AWDataAggregator::setParameters(const QVariantMap &_settings)
requiredKeys.append("batTooltip");
// background
- m_toolTipScene->setBackgroundBrush(
- m_configuration["useTooltipBackground"].toBool()
- ? QBrush(QColor(m_configuration["tooltipBackground"].toString()))
- : QBrush(Qt::NoBrush));
+ m_toolTipScene->setBackgroundBrush(m_configuration["useTooltipBackground"].toBool()
+ ? QBrush(QColor(m_configuration["tooltipBackground"].toString()))
+ : QBrush(Qt::NoBrush));
}
@@ -156,11 +154,10 @@ void AWDataAggregator::dataUpdate(const QVariantHash &_values)
}
-void AWDataAggregator::checkValue(const QString &_source, const float _value,
- const float _extremum) const
+void AWDataAggregator::checkValue(const QString &_source, const float _value, const float _extremum) const
{
- qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value
- << "called with extremum" << _extremum;
+ qCDebug(LOG_AW) << "Notification source" << _source << "with value" << _value << "called with extremum"
+ << _extremum;
if (_value >= 0.0) {
if ((m_enablePopup) && (_value > _extremum) && (m_values[_source].last() < _extremum))
@@ -172,11 +169,10 @@ 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 &_current, const QString &_received) const
{
- qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current
- << "and received one" << _received;
+ qCDebug(LOG_AW) << "Notification source" << _source << "with current value" << _current << "and received one"
+ << _received;
if ((m_enablePopup) && (_current != _received) && (!_received.isEmpty()))
return AWActions::sendNotification("event", notificationText(_source, _received));
@@ -231,8 +227,7 @@ void AWDataAggregator::setData(const QVariantHash &_values)
{
// do not log these arguments
// battery update requires info is AC online or not
- setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip",
- _values["bat"].toFloat());
+ setData(_values["ac"].toString() == m_configuration["acOnline"], "batTooltip", _values["bat"].toFloat());
// usual case
setData("cpuTooltip", _values["cpu"].toFloat(), 90.0);
setData("cpuclTooltip", _values["cpucl"].toFloat());
@@ -269,8 +264,7 @@ void AWDataAggregator::setData(const QString &_source, float _value, const float
QList netValues = m_values["downkbTooltip"] + m_values["upkbTooltip"];
// to avoid inf value of normY
netValues << 1.0;
- m_boundaries["downkbTooltip"]
- = 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
+ m_boundaries["downkbTooltip"] = 1.2f * *std::max_element(netValues.cbegin(), netValues.cend());
m_boundaries["upkbTooltip"] = m_boundaries["downkbTooltip"];
}
}
@@ -278,8 +272,7 @@ void AWDataAggregator::setData(const QString &_source, float _value, const float
void AWDataAggregator::setData(const bool _dontInvert, const QString &_source, float _value)
{
- qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source"
- << _source;
+ qCDebug(LOG_AW) << "Do not invert" << _dontInvert << "value" << _value << "for source" << _source;
// invert values for different battery colours
_value = _dontInvert ? _value : -_value;
diff --git a/sources/awesome-widget/plugin/awdataaggregator.h b/sources/awesome-widget/plugin/awdataaggregator.h
index fb0824f..0b5f0ce 100644
--- a/sources/awesome-widget/plugin/awdataaggregator.h
+++ b/sources/awesome-widget/plugin/awdataaggregator.h
@@ -50,8 +50,7 @@ private:
QGraphicsScene *m_toolTipScene = nullptr;
QGraphicsView *m_toolTipView = nullptr;
void checkValue(const QString &_source, float _value, float _extremum) const;
- void checkValue(const QString &_source, const QString &_current,
- const QString &_received) const;
+ void checkValue(const QString &_source, const QString &_current, const QString &_received) const;
void initScene();
static QString notificationText(const QString &_source, float _value);
static QString notificationText(const QString &_source, const QString &_value);
diff --git a/sources/awesome-widget/plugin/awdataengineaggregator.cpp b/sources/awesome-widget/plugin/awdataengineaggregator.cpp
index 1f69dd3..1d46774 100644
--- a/sources/awesome-widget/plugin/awdataengineaggregator.cpp
+++ b/sources/awesome-widget/plugin/awdataengineaggregator.cpp
@@ -35,11 +35,10 @@ AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
// additional method required by systemmonitor structure
m_newSourceConnection
- = connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
- [this](const QString &source) {
- emit(deviceAdded(source));
- m_dataEngines["systemmonitor"]->connectSource(source, parent(), 1000);
- });
+ = connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded, [this](const QString &source) {
+ emit(deviceAdded(source));
+ m_dataEngines["systemmonitor"]->connectSource(source, parent(), 1000);
+ });
// required to define Qt::QueuedConnection for signal-slot connection
qRegisterMetaType("Plasma::DataEngine::Data");
@@ -74,8 +73,7 @@ void AWDataEngineAggregator::reconnectSources(const int _interval)
m_dataEngines["time"]->connectSource("Local", parent(), 1000);
m_newSourceConnection = connect(
- m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
- [this, _interval](const QString &source) {
+ m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded, [this, _interval](const QString &source) {
emit(deviceAdded(source));
m_dataEngines["systemmonitor"]->connectSource(source, parent(), (uint)_interval);
});
@@ -103,12 +101,10 @@ void AWDataEngineAggregator::createQueuedConnection()
// for more details refer to plasma-framework source code
for (auto &dataEngine : m_dataEngines.keys()) {
// different source set for different engines
- QStringList sources = dataEngine == "time" ? QStringList() << "Local"
- : m_dataEngines[dataEngine]->sources();
+ QStringList sources = dataEngine == "time" ? QStringList() << "Local" : m_dataEngines[dataEngine]->sources();
// reconnect sources
for (auto &source : sources) {
- Plasma::DataContainer *container
- = m_dataEngines[dataEngine]->containerForSource(source);
+ Plasma::DataContainer *container = m_dataEngines[dataEngine]->containerForSource(source);
// disconnect old connections first
disconnect(container, SIGNAL(dataUpdated(QString, Plasma::DataEngine::Data)), parent(),
SLOT(dataUpdated(QString, Plasma::DataEngine::Data)));
diff --git a/sources/awesome-widget/plugin/awdataenginemapper.cpp b/sources/awesome-widget/plugin/awdataenginemapper.cpp
index 7357198..9c2a9bd 100644
--- a/sources/awesome-widget/plugin/awdataenginemapper.cpp
+++ b/sources/awesome-widget/plugin/awdataenginemapper.cpp
@@ -76,8 +76,7 @@ QStringList AWDataEngineMapper::keysFromSource(const QString &_source) const
// HACK units required to define should the value be calculated as temperature
// or fan data
-QStringList AWDataEngineMapper::registerSource(const QString &_source, const QString &_units,
- const QStringList &_keys)
+QStringList AWDataEngineMapper::registerSource(const QString &_source, const QString &_units, const QStringList &_keys)
{
qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
@@ -180,10 +179,8 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
m_map.insert(_source, key);
m_formatter[key] = AWKeysAggregator::FormatterType::Float;
// additional keys
- m_formatter[QString("hddtotmb%1").arg(index)]
- = AWKeysAggregator::FormatterType::MemMBFormat;
- m_formatter[QString("hddtotgb%1").arg(index)]
- = AWKeysAggregator::FormatterType::MemGBFormat;
+ m_formatter[QString("hddtotmb%1").arg(index)] = AWKeysAggregator::FormatterType::MemMBFormat;
+ m_formatter[QString("hddtotgb%1").arg(index)] = AWKeysAggregator::FormatterType::MemGBFormat;
}
} else if (_source.contains(mountFreeRegExp)) {
// free space
@@ -427,9 +424,9 @@ QStringList AWDataEngineMapper::registerSource(const QString &_source, const QSt
// drop key from dictionary if no one user requested key required it
qCInfo(LOG_AW) << "Looking for keys" << foundKeys << "in" << _keys;
- bool required = _keys.isEmpty()
- || std::any_of(foundKeys.cbegin(), foundKeys.cend(),
- [&_keys](const QString &key) { return _keys.contains(key); });
+ bool required = _keys.isEmpty() || std::any_of(foundKeys.cbegin(), foundKeys.cend(), [&_keys](const QString &key) {
+ return _keys.contains(key);
+ });
if (!required) {
m_map.remove(_source);
for (auto &key : foundKeys)
diff --git a/sources/awesome-widget/plugin/awdataenginemapper.h b/sources/awesome-widget/plugin/awdataenginemapper.h
index 0d55f03..5ee7124 100644
--- a/sources/awesome-widget/plugin/awdataenginemapper.h
+++ b/sources/awesome-widget/plugin/awdataenginemapper.h
@@ -38,8 +38,7 @@ public:
[[nodiscard]] AWKeysAggregator::FormatterType formatter(const QString &_key) const;
[[nodiscard]] QStringList keysFromSource(const QString &_source) const;
// set methods
- QStringList registerSource(const QString &_source, const QString &_units,
- const QStringList &_keys);
+ QStringList registerSource(const QString &_source, const QString &_units, const QStringList &_keys);
void setDevices(const QHash &_devices);
private:
diff --git a/sources/awesome-widget/plugin/awdbusadaptor.cpp b/sources/awesome-widget/plugin/awdbusadaptor.cpp
index eece264..362f48c 100644
--- a/sources/awesome-widget/plugin/awdbusadaptor.cpp
+++ b/sources/awesome-widget/plugin/awdbusadaptor.cpp
@@ -40,8 +40,7 @@ AWDBusAdaptor::~AWDBusAdaptor()
QStringList AWDBusAdaptor::ActiveServices() const
{
- QDBusMessage listServices
- = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
+ QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
if (listServices.arguments().isEmpty()) {
qCWarning(LOG_DBUS) << "Could not find any DBus service";
return {};
@@ -86,8 +85,7 @@ void AWDBusAdaptor::SetLogLevel(const QString &what, const int level)
qCDebug(LOG_DBUS) << "Set log level" << level << "for" << what;
if (level >= m_logLevels.count()) {
- qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than"
- << m_logLevels.count();
+ qCDebug(LOG_DBUS) << "Invalid logging level" << level << "should be less than" << m_logLevels.count();
return;
}
diff --git a/sources/awesome-widget/plugin/awformatterconfig.h b/sources/awesome-widget/plugin/awformatterconfig.h
index 9af1e1d..c7a5a6a 100644
--- a/sources/awesome-widget/plugin/awformatterconfig.h
+++ b/sources/awesome-widget/plugin/awformatterconfig.h
@@ -27,8 +27,7 @@ class AWFormatterConfig : public AWAbstractPairConfig
Q_OBJECT
public:
- explicit AWFormatterConfig(QWidget *_parent = nullptr,
- const QStringList &_keys = QStringList());
+ explicit AWFormatterConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList());
~AWFormatterConfig() override;
};
diff --git a/sources/awesome-widget/plugin/awformatterhelper.cpp b/sources/awesome-widget/plugin/awformatterhelper.cpp
index ef5d0b1..29a7a94 100644
--- a/sources/awesome-widget/plugin/awformatterhelper.cpp
+++ b/sources/awesome-widget/plugin/awformatterhelper.cpp
@@ -120,8 +120,7 @@ void AWFormatterHelper::editItems()
}
-AWAbstractFormatter::FormatterClass
-AWFormatterHelper::defineFormatterClass(const QString &_stringType)
+AWAbstractFormatter::FormatterClass AWFormatterHelper::defineFormatterClass(const QString &_stringType)
{
qCDebug(LOG_AW) << "Define formatter class for" << _stringType;
@@ -163,9 +162,7 @@ void AWFormatterHelper::initFormatters()
// check if already exists
auto values = m_formattersClasses.values();
if (std::any_of(values.cbegin(), values.cend(),
- [&filePath](const AWAbstractFormatter *item) {
- return (item->fileName() == filePath);
- }))
+ [&filePath](const AWAbstractFormatter *item) { return (item->fileName() == filePath); }))
continue;
auto metadata = readMetadata(filePath);
@@ -197,8 +194,7 @@ void AWFormatterHelper::initFormatters()
}
-QPair
-AWFormatterHelper::readMetadata(const QString &_filePath)
+QPair AWFormatterHelper::readMetadata(const QString &_filePath)
{
qCDebug(LOG_AW) << "Read initial parameters from" << _filePath;
@@ -217,8 +213,7 @@ void AWFormatterHelper::doCreateItem()
{
QStringList selection = {"NoFormat", "DateTime", "Float", "List", "Script", "String", "Json"};
bool ok;
- QString select
- = QInputDialog::getItem(this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
+ QString select = QInputDialog::getItem(this, i18n("Select type"), i18n("Type:"), selection, 0, false, &ok);
if (!ok) {
qCWarning(LOG_AW) << "No type selected";
return;
diff --git a/sources/awesome-widget/plugin/awformatterhelper.h b/sources/awesome-widget/plugin/awformatterhelper.h
index 66864bf..31b4703 100644
--- a/sources/awesome-widget/plugin/awformatterhelper.h
+++ b/sources/awesome-widget/plugin/awformatterhelper.h
@@ -49,8 +49,7 @@ private:
// methods
static AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType);
void initFormatters();
- [[nodiscard]] static QPair
- readMetadata(const QString &_filePath);
+ [[nodiscard]] static QPair readMetadata(const QString &_filePath);
// parent methods
void doCreateItem() override;
// properties
diff --git a/sources/awesome-widget/plugin/awkeycache.cpp b/sources/awesome-widget/plugin/awkeycache.cpp
index 15aab94..d618cc2 100644
--- a/sources/awesome-widget/plugin/awkeycache.cpp
+++ b/sources/awesome-widget/plugin/awkeycache.cpp
@@ -31,8 +31,7 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
qCDebug(LOG_AW) << "Key" << _key << "with type" << _type;
QString fileName
- = QString("%1/awesomewidgets.ndx")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+ = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
qCInfo(LOG_AW) << "Cache file" << fileName;
QSettings cache(fileName, QSettings::IniFormat);
@@ -75,12 +74,10 @@ bool AWKeyCache::addKeyToCache(const QString &_type, const QString &_key)
}
-QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
- const QVariantMap &_tooltip, const QStringList &_userKeys,
- const QStringList &_allKeys)
+QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
+ const QStringList &_userKeys, const QStringList &_allKeys)
{
- qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings"
- << _tooltip;
+ qCDebug(LOG_AW) << "Looking for required keys in" << _keys << _bars << "using tooltip settings" << _tooltip;
// initial copy
QSet used(_keys.cbegin(), _keys.cend());
@@ -136,8 +133,8 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
used << "swapgb"
<< "swapfreegb";
// network keys
- QStringList netKeys({"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot",
- "downtotkb", "downunits"});
+ QStringList netKeys(
+ {"up", "upkb", "uptot", "uptotkb", "upunits", "down", "downkb", "downtot", "downtotkb", "downunits"});
for (auto &key : netKeys) {
if (!used.contains(key))
continue;
@@ -146,8 +143,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
used << filtered;
}
// netdev key
- if (std::any_of(netKeys.cbegin(), netKeys.cend(),
- [&used](const QString &key) { return used.contains(key); }))
+ if (std::any_of(netKeys.cbegin(), netKeys.cend(), [&used](const QString &key) { return used.contains(key); }))
used << "netdev";
// HACK append dummy if there are no other keys. This hack is required
@@ -162,8 +158,7 @@ QStringList AWKeyCache::getRequiredKeys(const QStringList &_keys, const QStringL
QHash AWKeyCache::loadKeysFromCache()
{
QString fileName
- = QString("%1/awesomewidgets.ndx")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
+ = QString("%1/awesomewidgets.ndx").arg(QStandardPaths::writableLocation(QStandardPaths::GenericCacheLocation));
qCInfo(LOG_AW) << "Cache file" << fileName;
QSettings cache(fileName, QSettings::IniFormat);
diff --git a/sources/awesome-widget/plugin/awkeycache.h b/sources/awesome-widget/plugin/awkeycache.h
index 272c6ee..a982c82 100644
--- a/sources/awesome-widget/plugin/awkeycache.h
+++ b/sources/awesome-widget/plugin/awkeycache.h
@@ -27,9 +27,8 @@
namespace AWKeyCache
{
bool addKeyToCache(const QString &_type, const QString &_key = "");
-QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars,
- const QVariantMap &_tooltip, const QStringList &_userKeys,
- const QStringList &_allKeys);
+QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QVariantMap &_tooltip,
+ const QStringList &_userKeys, const QStringList &_allKeys);
QHash loadKeysFromCache();
} // namespace AWKeyCache
diff --git a/sources/awesome-widget/plugin/awkeyoperations.cpp b/sources/awesome-widget/plugin/awkeyoperations.cpp
index f3e3a5c..21880cb 100644
--- a/sources/awesome-widget/plugin/awkeyoperations.cpp
+++ b/sources/awesome-widget/plugin/awkeyoperations.cpp
@@ -281,8 +281,7 @@ void AWKeyOperations::editItem(const QString &_type)
qCDebug(LOG_AW) << "Item type" << _type;
if (_type == "graphicalitem") {
- QStringList keys
- = dictKeys().filter(QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
+ QStringList keys = dictKeys().filter(QRegExp("^(cpu(?!cl).*|gpu$|mem$|swap$|hdd[0-9].*|bat.*)"));
keys.sort();
m_graphicalItems->setConfigArgs(keys);
return m_graphicalItems->editItems();
diff --git a/sources/awesome-widget/plugin/awkeys.cpp b/sources/awesome-widget/plugin/awkeys.cpp
index 9d4e57c..922f8b6 100644
--- a/sources/awesome-widget/plugin/awkeys.cpp
+++ b/sources/awesome-widget/plugin/awkeys.cpp
@@ -56,8 +56,7 @@ AWKeys::AWKeys(QObject *_parent)
createDBusInterface();
// update key data if required
- connect(m_keyOperator, SIGNAL(updateKeys(const QStringList &)), this,
- SLOT(reinitKeys(const QStringList &)));
+ connect(m_keyOperator, SIGNAL(updateKeys(const QStringList &)), this, SLOT(reinitKeys(const QStringList &)));
connect(m_timer, SIGNAL(timeout()), this, SLOT(updateTextData()));
// transfer signal from AWDataAggregator object to QML ui
connect(m_dataAggregator, SIGNAL(toolTipPainted(const QString &)), this,
@@ -91,11 +90,10 @@ void AWKeys::initDataAggregator(const QVariantMap &_tooltipParams)
}
-void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const int _limit,
- const bool _optimize)
+void AWKeys::initKeys(const QString &_currentPattern, const int _interval, const int _limit, const bool _optimize)
{
- qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval" << _interval
- << "and queue limit" << _limit << "with optimization" << _optimize;
+ qCDebug(LOG_AW) << "Pattern" << _currentPattern << "with interval" << _interval << "and queue limit" << _limit
+ << "with optimization" << _optimize;
// init
m_optimize = _optimize;
@@ -227,10 +225,9 @@ void AWKeys::reinitKeys(const QStringList &_currentKeys)
barKeys.append(item->usedKeys());
}
// get required keys
- m_requiredKeys
- = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
- m_keyOperator->requiredUserKeys(), _currentKeys)
- : QStringList();
+ m_requiredKeys = m_optimize ? AWKeyCache::getRequiredKeys(m_foundKeys, barKeys, m_tooltipParams,
+ m_keyOperator->requiredUserKeys(), _currentKeys)
+ : QStringList();
// set key data to m_aggregator
m_aggregator->setDevices(m_keyOperator->devices());
@@ -260,11 +257,9 @@ void AWKeys::calculateValues()
for (auto &device : mountDevices) {
int index = mountDevices.indexOf(device);
m_values[QString("hddtotmb%1").arg(index)]
- = m_values[QString("hddfreemb%1").arg(index)].toFloat()
- + m_values[QString("hddmb%1").arg(index)].toFloat();
+ = m_values[QString("hddfreemb%1").arg(index)].toFloat() + m_values[QString("hddmb%1").arg(index)].toFloat();
m_values[QString("hddtotgb%1").arg(index)]
- = m_values[QString("hddfreegb%1").arg(index)].toFloat()
- + m_values[QString("hddgb%1").arg(index)].toFloat();
+ = m_values[QString("hddfreegb%1").arg(index)].toFloat() + m_values[QString("hddgb%1").arg(index)].toFloat();
}
// memtot*
@@ -312,20 +307,16 @@ void AWKeys::createDBusInterface()
// HACK we are going to use different services because it binds to
// application
if (instanceBus.registerService(QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id))) {
- if (!instanceBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this),
- QDBusConnection::ExportAllContents))
- qCWarning(LOG_AW) << "Could not register DBus object, last error"
- << instanceBus.lastError().message();
+ if (!instanceBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this), QDBusConnection::ExportAllContents))
+ qCWarning(LOG_AW) << "Could not register DBus object, last error" << instanceBus.lastError().message();
} else {
- qCWarning(LOG_AW) << "Could not register DBus service, last error"
- << instanceBus.lastError().message();
+ qCWarning(LOG_AW) << "Could not register DBus service, last error" << instanceBus.lastError().message();
}
// and same instance but for id independent service
QDBusConnection commonBus = QDBusConnection::sessionBus();
if (commonBus.registerService(AWDBUS_SERVICE))
- commonBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this),
- QDBusConnection::ExportAllContents);
+ commonBus.registerObject(AWDBUS_PATH, new AWDBusAdaptor(this), QDBusConnection::ExportAllContents);
}
@@ -340,14 +331,13 @@ QString AWKeys::parsePattern(QString _pattern) const
// main keys
for (auto &key : m_foundKeys)
- _pattern.replace(QString("$%1").arg(key),
- m_aggregator->formatter(m_values[key], key, true));
+ _pattern.replace(QString("$%1").arg(key), m_aggregator->formatter(m_values[key], key, true));
// bars
for (auto &bar : m_foundBars) {
GraphicalItem *item = m_keyOperator->giByKey(bar);
- QString image = item->isCustom() ? item->image(AWPatternFunctions::expandLambdas(
- item->bar(), m_aggregator, m_values, item->usedKeys()))
+ QString image = item->isCustom() ? item->image(
+ AWPatternFunctions::expandLambdas(item->bar(), m_aggregator, m_values, item->usedKeys()))
: item->image(m_values[item->bar()]);
_pattern.replace(QString("$%1").arg(bar), image);
}
diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h
index 756eb86..747dd36 100644
--- a/sources/awesome-widget/plugin/awkeys.h
+++ b/sources/awesome-widget/plugin/awkeys.h
@@ -40,16 +40,14 @@ public:
explicit AWKeys(QObject *_parent = nullptr);
~AWKeys() override;
Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
- Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, int _limit,
- bool _optimize);
+ Q_INVOKABLE void initKeys(const QString &_currentPattern, int _interval, int _limit, bool _optimize);
Q_INVOKABLE void setAggregatorProperty(const QString &_key, const QVariant &_value);
Q_INVOKABLE void setWrapNewLines(bool _wrap);
// additional method to force load keys from Qml UI. Used in some
// configuration pages
Q_INVOKABLE void updateCache();
// keys
- Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false,
- const QString &_regexp = "") const;
+ Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false, const QString &_regexp = "") const;
Q_INVOKABLE [[nodiscard]] QVariantList getHddDevices() const;
// values
Q_INVOKABLE [[nodiscard]] QString infoByKey(const QString &_key) const;
diff --git a/sources/awesome-widget/plugin/awkeysaggregator.cpp b/sources/awesome-widget/plugin/awkeysaggregator.cpp
index 669fc47..6cd3309 100644
--- a/sources/awesome-widget/plugin/awkeysaggregator.cpp
+++ b/sources/awesome-widget/plugin/awkeysaggregator.cpp
@@ -55,8 +55,7 @@ void AWKeysAggregator::initFormatters()
}
-QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key,
- bool replaceSpace) const
+QString AWKeysAggregator::formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const
{
qCDebug(LOG_AW) << "Data" << _data << "for key" << _key;
@@ -235,8 +234,7 @@ void AWKeysAggregator::setTranslate(const bool _translate)
}
-QStringList AWKeysAggregator::registerSource(const QString &_source, const QString &_units,
- const QStringList &_keys)
+QStringList AWKeysAggregator::registerSource(const QString &_source, const QString &_units, const QStringList &_keys)
{
qCDebug(LOG_AW) << "Source" << _source << "with units" << _units;
diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h
index 4c1def7..8bc93ae 100644
--- a/sources/awesome-widget/plugin/awkeysaggregator.h
+++ b/sources/awesome-widget/plugin/awkeysaggregator.h
@@ -69,8 +69,7 @@ public:
~AWKeysAggregator() override;
void initFormatters();
// get methods
- [[nodiscard]] QString formatter(const QVariant &_data, const QString &_key,
- bool replaceSpace) const;
+ [[nodiscard]] QString formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const;
[[nodiscard]] QStringList keysFromSource(const QString &_source) const;
// set methods
void setAcOffline(const QString &_inactive);
@@ -82,8 +81,7 @@ public:
void setTranslate(bool _translate);
public slots:
- QStringList registerSource(const QString &_source, const QString &_units,
- const QStringList &_keys);
+ QStringList registerSource(const QString &_source, const QString &_units, const QStringList &_keys);
private:
[[nodiscard]] float temperature(float temp) const;
diff --git a/sources/awesome-widget/plugin/awpatternfunctions.cpp b/sources/awesome-widget/plugin/awpatternfunctions.cpp
index 1e5e00f..51695ef 100644
--- a/sources/awesome-widget/plugin/awpatternfunctions.cpp
+++ b/sources/awesome-widget/plugin/awpatternfunctions.cpp
@@ -24,8 +24,7 @@
#include "awkeysaggregator.h"
-QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggregator,
- const QVariantHash &_metadata,
+QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggregator, const QVariantHash &_metadata,
const QStringList &_usedKeys)
{
qCDebug(LOG_AW) << "Expand lambdas in" << _code;
@@ -35,13 +34,12 @@ QString AWPatternFunctions::expandLambdas(QString _code, AWKeysAggregator *_aggr
_code.replace("$this", _metadata[_code].toString());
// parsed values
for (auto &lambdaKey : _usedKeys)
- _code.replace(QString("$%1").arg(lambdaKey),
- _aggregator->formatter(_metadata[lambdaKey], lambdaKey, false));
+ _code.replace(QString("$%1").arg(lambdaKey), _aggregator->formatter(_metadata[lambdaKey], lambdaKey, false));
qCInfo(LOG_AW) << "Expression" << _code;
QJSValue result = engine.evaluate(_code);
if (result.isError()) {
- qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt()
- << ":" << result.toString();
+ qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
+ << result.toString();
return "";
} else {
return result.toString();
@@ -67,8 +65,8 @@ QString AWPatternFunctions::expandTemplates(QString _code)
QJSValue result = engine.evaluate(body);
QString templateResult = "";
if (result.isError()) {
- qCWarning(LOG_AW) << "Uncaught exception at line"
- << result.property("lineNumber").toInt() << ":" << result.toString();
+ qCWarning(LOG_AW) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
+ << result.toString();
} else {
templateResult = result.toString();
}
@@ -81,8 +79,8 @@ QString AWPatternFunctions::expandTemplates(QString _code)
}
-QList
-AWPatternFunctions::findFunctionCalls(const QString &_function, const QString &_code)
+QList AWPatternFunctions::findFunctionCalls(const QString &_function,
+ const QString &_code)
{
qCDebug(LOG_AW) << "Looking for function" << _function << "in" << _code;
@@ -109,8 +107,7 @@ AWPatternFunctions::findFunctionCalls(const QString &_function, const QString &_
// replace '$,' to 0x1d
argsString.replace("$,", QString(0x1d));
QStringList args = argsString.split(',');
- std::for_each(args.begin(), args.end(),
- [](QString &arg) { arg.replace(QString(0x1d), ","); });
+ std::for_each(args.begin(), args.end(), [](QString &arg) { arg.replace(QString(0x1d), ","); });
metadata.args = args;
}
// other variables
@@ -130,13 +127,11 @@ QString AWPatternFunctions::insertAllKeys(QString _code, const QStringList &_key
{
qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
- QList found
- = AWPatternFunctions::findFunctionCalls("aw_all", _code);
+ QList found = AWPatternFunctions::findFunctionCalls("aw_all", _code);
for (auto &function : found) {
QString separator = function.args.isEmpty() ? "," : function.args.at(0);
QStringList required = _keys.filter(QRegExp(function.body));
- std::for_each(required.begin(), required.end(),
- [](QString &value) { value = QString("%1: $%1").arg(value); });
+ std::for_each(required.begin(), required.end(), [](QString &value) { value = QString("%1: $%1").arg(value); });
_code.replace(function.what, required.join(separator));
}
@@ -149,8 +144,7 @@ QString AWPatternFunctions::insertKeyCount(QString _code, const QStringList &_ke
{
qCDebug(LOG_AW) << "Looking for count in code" << _code << "using list" << _keys;
- QList found
- = AWPatternFunctions::findFunctionCalls("aw_count", _code);
+ QList found = AWPatternFunctions::findFunctionCalls("aw_count", _code);
for (auto &function : found) {
int count = _keys.filter(QRegExp(function.body)).count();
@@ -165,8 +159,7 @@ QString AWPatternFunctions::insertKeyNames(QString _code, const QStringList &_ke
{
qCDebug(LOG_AW) << "Looking for key names in code" << _code << "using list" << _keys;
- QList found
- = AWPatternFunctions::findFunctionCalls("aw_names", _code);
+ QList found = AWPatternFunctions::findFunctionCalls("aw_names", _code);
for (auto &function : found) {
QString separator = function.args.isEmpty() ? "," : function.args.at(0);
QStringList required = _keys.filter(QRegExp(function.body));
@@ -182,13 +175,11 @@ QString AWPatternFunctions::insertKeys(QString _code, const QStringList &_keys)
{
qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
- QList found
- = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
+ QList found = AWPatternFunctions::findFunctionCalls("aw_keys", _code);
for (auto &function : found) {
QString separator = function.args.isEmpty() ? "," : function.args.at(0);
QStringList required = _keys.filter(QRegExp(function.body));
- std::for_each(required.begin(), required.end(),
- [](QString &value) { value = QString("$%1").arg(value); });
+ std::for_each(required.begin(), required.end(), [](QString &value) { value = QString("$%1").arg(value); });
_code.replace(function.what, required.join(separator));
}
@@ -201,8 +192,7 @@ QString AWPatternFunctions::insertMacros(QString _code)
{
qCDebug(LOG_AW) << "Looking for macros in code" << _code;
- QList found
- = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
+ QList found = AWPatternFunctions::findFunctionCalls("aw_macro", _code);
for (auto ¯o : found) {
// get macro params
if (macro.args.isEmpty()) {
@@ -215,17 +205,15 @@ QString AWPatternFunctions::insertMacros(QString _code)
= AWPatternFunctions::findFunctionCalls(QString("aw_macro_%1").arg(name), _code);
for (auto &function : macroUsage) {
if (function.args.count() != macro.args.count()) {
- qCWarning(LOG_AW) << "Invalid args count found for call" << function.what
- << "with macro" << macro.what;
+ qCWarning(LOG_AW) << "Invalid args count found for call" << function.what << "with macro" << macro.what;
continue;
}
// generate body to replace
QString result = macro.body;
- std::for_each(macro.args.cbegin(), macro.args.cend(),
- [&result, macro, function](const QString &arg) {
- int index = macro.args.indexOf(arg);
- result.replace(QString("$%1").arg(arg), function.args.at(index));
- });
+ std::for_each(macro.args.cbegin(), macro.args.cend(), [&result, macro, function](const QString &arg) {
+ int index = macro.args.indexOf(arg);
+ result.replace(QString("$%1").arg(arg), function.args.at(index));
+ });
// do replace
_code.replace(function.what, result);
}
@@ -238,16 +226,14 @@ QString AWPatternFunctions::insertMacros(QString _code)
}
-QStringList AWPatternFunctions::findKeys(const QString &_code, const QStringList &_keys,
- const bool _isBars)
+QStringList AWPatternFunctions::findKeys(const QString &_code, const QStringList &_keys, const bool _isBars)
{
qCDebug(LOG_AW) << "Looking for keys in code" << _code << "using list" << _keys;
QStringList selectedKeys;
QString replacedCode = _code;
for (auto &key : _keys)
- if ((key.startsWith("bar") == _isBars)
- && (replacedCode.contains(QString("$%1").arg(key)))) {
+ if ((key.startsWith("bar") == _isBars) && (replacedCode.contains(QString("$%1").arg(key)))) {
qCInfo(LOG_AW) << "Found key" << key << "with bar enabled" << _isBars;
selectedKeys.append(key);
replacedCode.replace(QString("$%1").arg(key), "");
diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.cpp b/sources/awesome-widget/plugin/awtelemetryhandler.cpp
index 08ce41a..b568598 100644
--- a/sources/awesome-widget/plugin/awtelemetryhandler.cpp
+++ b/sources/awesome-widget/plugin/awtelemetryhandler.cpp
@@ -73,8 +73,8 @@ QString AWTelemetryHandler::getLast(const QString &_group) const
void AWTelemetryHandler::init(const int _count, const bool _enableRemote, const QString &_clientId)
{
- qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote" << _enableRemote
- << "client ID" << _clientId;
+ qCDebug(LOG_AW) << "Init telemetry with count" << _count << "enable remote" << _enableRemote << "client ID"
+ << _clientId;
m_storeCount = _count;
m_uploadEnabled = _enableRemote;
@@ -127,8 +127,7 @@ void AWTelemetryHandler::uploadTelemetry(const QString &_group, const QString &_
}
auto *manager = new QNetworkAccessManager(nullptr);
- connect(manager, SIGNAL(finished(QNetworkReply *)), this,
- SLOT(telemetryReplyRecieved(QNetworkReply *)));
+ connect(manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(telemetryReplyRecieved(QNetworkReply *)));
QUrl url(REMOTE_TELEMETRY_URL);
QNetworkRequest request(url);
@@ -151,8 +150,7 @@ void AWTelemetryHandler::uploadTelemetry(const QString &_group, const QString &_
void AWTelemetryHandler::telemetryReplyRecieved(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
- << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
return;
}
diff --git a/sources/awesome-widget/plugin/awupdatehelper.cpp b/sources/awesome-widget/plugin/awupdatehelper.cpp
index 3142d70..2d07752 100644
--- a/sources/awesome-widget/plugin/awupdatehelper.cpp
+++ b/sources/awesome-widget/plugin/awupdatehelper.cpp
@@ -34,9 +34,8 @@ AWUpdateHelper::AWUpdateHelper(QObject *_parent)
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
m_foundVersion = QVersionNumber::fromString(VERSION);
- m_genericConfig
- = QString("%1/awesomewidgets/general.ini")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+ m_genericConfig = QString("%1/awesomewidgets/general.ini")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
}
@@ -53,9 +52,8 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
// showAnyway options requires to show message if no updates found on direct
// request. In case of automatic check no message will be shown
auto *manager = new QNetworkAccessManager(nullptr);
- connect(manager, &QNetworkAccessManager::finished, [_showAnyway, this](QNetworkReply *reply) {
- return versionReplyRecieved(reply, _showAnyway);
- });
+ connect(manager, &QNetworkAccessManager::finished,
+ [_showAnyway, this](QNetworkReply *reply) { return versionReplyRecieved(reply, _showAnyway); });
manager->get(QNetworkRequest(QUrl(VERSION_API)));
}
@@ -64,16 +62,14 @@ void AWUpdateHelper::checkUpdates(const bool _showAnyway)
bool AWUpdateHelper::checkVersion()
{
QSettings settings(m_genericConfig, QSettings::IniFormat);
- QVersionNumber version
- = QVersionNumber::fromString(settings.value("Version", QString(VERSION)).toString());
+ QVersionNumber version = QVersionNumber::fromString(settings.value("Version", QString(VERSION)).toString());
// update version
settings.setValue("Version", QString(VERSION));
settings.sync();
qCInfo(LOG_AW) << "Found version" << version << "actual one is" << m_foundVersion;
if ((version != m_foundVersion) && (!QString(CHANGELOG).isEmpty())) {
- genMessageBox(i18nc("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'),
- QMessageBox::Ok)
+ genMessageBox(i18nc("Changelog of %1", VERSION), QString(CHANGELOG).replace('@', '\n'), QMessageBox::Ok)
->open();
return true;
} else if (version != m_foundVersion) {
@@ -133,8 +129,7 @@ void AWUpdateHelper::versionReplyRecieved(QNetworkReply *_reply, const bool _sho
{
qCDebug(LOG_AW) << "Show message anyway" << _showAnyway;
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
- << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
return;
}
diff --git a/sources/awesomewidgets/abstractextitemaggregator.cpp b/sources/awesomewidgets/abstractextitemaggregator.cpp
index b15be31..b0ecea9 100644
--- a/sources/awesomewidgets/abstractextitemaggregator.cpp
+++ b/sources/awesomewidgets/abstractextitemaggregator.cpp
@@ -34,10 +34,9 @@ AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *_parent, QString _
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
// create directory at $HOME
- QString localDir
- = QString("%1/awesomewidgets/%2")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
- .arg(type());
+ QString localDir = QString("%1/awesomewidgets/%2")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+ .arg(type());
QDir localDirectory;
if (localDirectory.mkpath(localDir))
qCInfo(LOG_LIB) << "Created directory" << localDir;
@@ -47,11 +46,9 @@ AbstractExtItemAggregator::AbstractExtItemAggregator(QWidget *_parent, QString _
createButton = ui->buttonBox->addButton(i18n("Create"), QDialogButtonBox::ActionRole);
deleteButton = ui->buttonBox->addButton(i18n("Remove"), QDialogButtonBox::ActionRole);
- connect(ui->buttonBox, SIGNAL(clicked(QAbstractButton *)), this,
- SLOT(editItemButtonPressed(QAbstractButton *)));
+ connect(ui->buttonBox, SIGNAL(clicked(QAbstractButton *)), this, SLOT(editItemButtonPressed(QAbstractButton *)));
connect(ui->buttonBox, SIGNAL(rejected()), this, SLOT(reject()));
- connect(ui->listWidget, SIGNAL(itemActivated(QListWidgetItem *)), this,
- SLOT(editItemActivated(QListWidgetItem *)));
+ connect(ui->listWidget, SIGNAL(itemActivated(QListWidgetItem *)), this, SLOT(editItemActivated(QListWidgetItem *)));
}
@@ -118,8 +115,7 @@ void AbstractExtItemAggregator::editItem()
QString AbstractExtItemAggregator::getName()
{
bool ok;
- QString name = QInputDialog::getText(this, i18n("Enter file name"), i18n("File name"),
- QLineEdit::Normal, "", &ok);
+ QString name = QInputDialog::getText(this, i18n("Enter file name"), i18n("File name"), QLineEdit::Normal, "", &ok);
if ((!ok) || (name.isEmpty()))
return "";
if (!name.endsWith(".desktop"))
@@ -187,8 +183,7 @@ QVariant AbstractExtItemAggregator::configArgs() const
QStringList AbstractExtItemAggregator::directories() const
{
- auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation,
- QString("awesomewidgets/%1").arg(type()),
+ auto dirs = QStandardPaths::locateAll(QStandardPaths::GenericDataLocation, QString("awesomewidgets/%1").arg(type()),
QStandardPaths::LocateDirectory);
return dirs;
diff --git a/sources/awesomewidgets/abstractextitemaggregator.h b/sources/awesomewidgets/abstractextitemaggregator.h
index 08da486..e65e08b 100644
--- a/sources/awesomewidgets/abstractextitemaggregator.h
+++ b/sources/awesomewidgets/abstractextitemaggregator.h
@@ -47,10 +47,9 @@ public:
{
QString fileName = getName();
int number = uniqNumber();
- QString dir
- = QString("%1/awesomewidgets/%2")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
- .arg(m_type);
+ QString dir = QString("%1/awesomewidgets/%2")
+ .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation))
+ .arg(m_type);
if (fileName.isEmpty()) {
qCWarning(LOG_LIB) << "Nothing to create";
return;
diff --git a/sources/awesomewidgets/abstractquotesprovider.h b/sources/awesomewidgets/abstractquotesprovider.h
index 26f7586..2de5455 100644
--- a/sources/awesomewidgets/abstractquotesprovider.h
+++ b/sources/awesomewidgets/abstractquotesprovider.h
@@ -33,8 +33,7 @@ public:
: QObject(_parent){};
~AbstractQuotesProvider() override = default;
virtual void initUrl(const QString &_asset) = 0;
- [[nodiscard]] virtual QVariantHash parse(const QByteArray &_source,
- const QVariantHash &_oldValues) const = 0;
+ [[nodiscard]] virtual QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const = 0;
[[nodiscard]] QString tag(const QString &_type) const
{
return dynamic_cast(parent())->tag(_type);
diff --git a/sources/awesomewidgets/awfloatformatter.cpp b/sources/awesomewidgets/awfloatformatter.cpp
index 4089711..a441828 100644
--- a/sources/awesomewidgets/awfloatformatter.cpp
+++ b/sources/awesomewidgets/awfloatformatter.cpp
@@ -51,8 +51,8 @@ QString AWFloatFormatter::convert(const QVariant &_value) const
{
qCDebug(LOG_LIB) << "Convert value" << _value;
- QString output = QString("%1").arg(_value.toDouble() * multiplier() + summand(), count(),
- format(), precision(), fillChar());
+ QString output
+ = QString("%1").arg(_value.toDouble() * multiplier() + summand(), count(), format(), precision(), fillChar());
if (forceWidth())
output = output.left(count());
@@ -149,8 +149,7 @@ void AWFloatFormatter::setFormat(char _format)
{
qCDebug(LOG_LIB) << "Set format" << _format;
// http://doc.qt.io/qt-5/qstring.html#argument-formats
- if ((_format != 'e') && (_format != 'E') && (_format != 'f') && (_format != 'g')
- && (_format != 'G')) {
+ if ((_format != 'e') && (_format != 'E') && (_format != 'f') && (_format != 'g') && (_format != 'G')) {
qCWarning(LOG_LIB) << "Invalid format" << _format;
_format = 'f';
}
diff --git a/sources/awesomewidgets/awjsonformatter.cpp b/sources/awesomewidgets/awjsonformatter.cpp
index bbdd7ce..e0b1366 100644
--- a/sources/awesomewidgets/awjsonformatter.cpp
+++ b/sources/awesomewidgets/awjsonformatter.cpp
@@ -53,9 +53,8 @@ QString AWJsonFormatter::convert(const QVariant &_value) const
qCDebug(LOG_LIB) << "Convert value" << _value;
// check if _value is string and parse first if required
- QJsonDocument json = _value.type() == QVariant::String
- ? QJsonDocument::fromJson(_value.toString().toUtf8())
- : QJsonDocument::fromVariant(_value);
+ QJsonDocument json = _value.type() == QVariant::String ? QJsonDocument::fromJson(_value.toString().toUtf8())
+ : QJsonDocument::fromVariant(_value);
QVariant converted = json.toVariant();
for (auto &element : m_splittedPath)
converted = getFromJson(converted, element);
diff --git a/sources/awesomewidgets/awscriptformatter.cpp b/sources/awesomewidgets/awscriptformatter.cpp
index 7990983..ea38671 100644
--- a/sources/awesomewidgets/awscriptformatter.cpp
+++ b/sources/awesomewidgets/awscriptformatter.cpp
@@ -59,8 +59,8 @@ QString AWScriptFormatter::convert(const QVariant &_value) const
QJSValue result = fn.call(args);
if (result.isError()) {
- qCWarning(LOG_LIB) << "Uncaught exception at line" << result.property("lineNumber").toInt()
- << ":" << result.toString();
+ qCWarning(LOG_LIB) << "Uncaught exception at line" << result.property("lineNumber").toInt() << ":"
+ << result.toString();
return "";
} else {
return result.toString();
@@ -199,9 +199,7 @@ void AWScriptFormatter::initProgram()
{
// init JS code
if (appendCode())
- m_program = QString("(function(value) { %1%2 })")
- .arg(code())
- .arg(hasReturn() ? "" : "; return output;");
+ m_program = QString("(function(value) { %1%2 })").arg(code()).arg(hasReturn() ? "" : "; return output;");
else
m_program = code();
diff --git a/sources/awesomewidgets/extitemaggregator.h b/sources/awesomewidgets/extitemaggregator.h
index 0487152..3925b16 100644
--- a/sources/awesomewidgets/extitemaggregator.h
+++ b/sources/awesomewidgets/extitemaggregator.h
@@ -139,9 +139,8 @@ private:
qCInfo(LOG_LIB) << "Found file" << file << "in" << dir;
QString filePath = QString("%1/%2").arg(dir).arg(file);
// check if already exists
- if (std::any_of(items.cbegin(), items.cend(), [&filePath](AbstractExtItem *item) {
- return (item->fileName() == filePath);
- }))
+ if (std::any_of(items.cbegin(), items.cend(),
+ [&filePath](AbstractExtItem *item) { return (item->fileName() == filePath); }))
continue;
items.append(new T(this, filePath));
}
@@ -149,9 +148,7 @@ private:
// sort items
std::sort(items.begin(), items.end(),
- [](const AbstractExtItem *lhs, const AbstractExtItem *rhs) {
- return lhs->number() < rhs->number();
- });
+ [](const AbstractExtItem *lhs, const AbstractExtItem *rhs) { return lhs->number() < rhs->number(); });
return items;
};
};
diff --git a/sources/awesomewidgets/extnetworkrequest.cpp b/sources/awesomewidgets/extnetworkrequest.cpp
index 3acd2f4..c218b43 100644
--- a/sources/awesomewidgets/extnetworkrequest.cpp
+++ b/sources/awesomewidgets/extnetworkrequest.cpp
@@ -45,8 +45,7 @@ ExtNetworkRequest::ExtNetworkRequest(QWidget *_parent, const QString &_filePath)
// HACK declare as child of nullptr to avoid crash with plasmawindowed
// in the destructor
m_manager = new QNetworkAccessManager(nullptr);
- connect(m_manager, SIGNAL(finished(QNetworkReply *)), this,
- SLOT(networkReplyReceived(QNetworkReply *)));
+ connect(m_manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(networkReplyReceived(QNetworkReply *)));
connect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
}
@@ -56,8 +55,7 @@ ExtNetworkRequest::~ExtNetworkRequest()
{
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
- disconnect(m_manager, SIGNAL(finished(QNetworkReply *)), this,
- SLOT(networkReplyReceived(QNetworkReply *)));
+ disconnect(m_manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(networkReplyReceived(QNetworkReply *)));
disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
m_manager->deleteLater();
@@ -171,14 +169,12 @@ void ExtNetworkRequest::writeConfiguration() const
void ExtNetworkRequest::networkReplyReceived(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
- << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
return;
}
m_isRunning = false;
- m_values[tag("response")]
- = QTextCodec::codecForMib(106)->toUnicode(_reply->readAll()).trimmed();
+ m_values[tag("response")] = QTextCodec::codecForMib(106)->toUnicode(_reply->readAll()).trimmed();
emit(dataReceived(m_values));
}
diff --git a/sources/awesomewidgets/extquotes.cpp b/sources/awesomewidgets/extquotes.cpp
index a7bfa06..c2e5090 100644
--- a/sources/awesomewidgets/extquotes.cpp
+++ b/sources/awesomewidgets/extquotes.cpp
@@ -50,8 +50,7 @@ ExtQuotes::ExtQuotes(QWidget *_parent, const QString &_filePath)
// HACK declare as child of nullptr to avoid crash with plasmawindowed
// in the destructor
m_manager = new QNetworkAccessManager(nullptr);
- connect(m_manager, SIGNAL(finished(QNetworkReply *)), this,
- SLOT(quotesReplyReceived(QNetworkReply *)));
+ connect(m_manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(quotesReplyReceived(QNetworkReply *)));
connect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
}
@@ -61,8 +60,7 @@ ExtQuotes::~ExtQuotes()
{
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
- disconnect(m_manager, SIGNAL(finished(QNetworkReply *)), this,
- SLOT(quotesReplyReceived(QNetworkReply *)));
+ disconnect(m_manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(quotesReplyReceived(QNetworkReply *)));
disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
m_manager->deleteLater();
@@ -176,8 +174,7 @@ void ExtQuotes::writeConfiguration() const
void ExtQuotes::quotesReplyReceived(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
- << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
return;
}
@@ -218,10 +215,9 @@ void ExtQuotes::translate()
ui->label_name->setText(i18n("Name"));
ui->label_comment->setText(i18n("Comment"));
ui->label_number->setText(i18n("Tag"));
- ui->label->setText(
- i18n("Use Stooq ticker to get quotes for the instrument. Refer to https://stooq.com/
"));
+ ui->label->setText(i18n("Use Stooq ticker to get quotes for the instrument. Refer to https://stooq.com/
"));
ui->label_ticker->setText(i18n("Ticker"));
ui->checkBox_active->setText(i18n("Active"));
ui->label_schedule->setText(i18n("Schedule"));
diff --git a/sources/awesomewidgets/extscript.cpp b/sources/awesomewidgets/extscript.cpp
index 3017dac..007822f 100644
--- a/sources/awesomewidgets/extscript.cpp
+++ b/sources/awesomewidgets/extscript.cpp
@@ -80,9 +80,8 @@ ExtScript *ExtScript::copy(const QString &_fileName, const int _number)
QString ExtScript::jsonFiltersFile()
{
- QString fileName
- = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
- "awesomewidgets/scripts/awesomewidgets-extscripts-filters.json");
+ QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+ "awesomewidgets/scripts/awesomewidgets-extscripts-filters.json");
qCInfo(LOG_LIB) << "Filters file" << fileName;
return fileName;
@@ -272,12 +271,9 @@ int ExtScript::showConfiguration(const QVariant &_args)
ui->lineEdit_socket->setText(socket());
ui->spinBox_interval->setValue(interval());
// filters
- ui->checkBox_colorFilter->setCheckState(filters().contains("color") ? Qt::Checked
- : Qt::Unchecked);
- ui->checkBox_linesFilter->setCheckState(filters().contains("newline") ? Qt::Checked
- : Qt::Unchecked);
- ui->checkBox_spaceFilter->setCheckState(filters().contains("space") ? Qt::Checked
- : Qt::Unchecked);
+ ui->checkBox_colorFilter->setCheckState(filters().contains("color") ? Qt::Checked : Qt::Unchecked);
+ ui->checkBox_linesFilter->setCheckState(filters().contains("newline") ? Qt::Checked : Qt::Unchecked);
+ ui->checkBox_spaceFilter->setCheckState(filters().contains("space") ? Qt::Checked : Qt::Unchecked);
int ret = exec();
if (ret != 1)
@@ -329,11 +325,9 @@ void ExtScript::startProcess()
void ExtScript::updateValue()
{
qCInfo(LOG_LIB) << "Cmd returns" << m_process->exitCode();
- QString qdebug
- = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
+ QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
qCInfo(LOG_LIB) << "Error" << qdebug;
- QString qoutput
- = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
qCInfo(LOG_LIB) << "Output" << qoutput;
QString strValue;
diff --git a/sources/awesomewidgets/extupgrade.cpp b/sources/awesomewidgets/extupgrade.cpp
index 0195779..05b20ac 100644
--- a/sources/awesomewidgets/extupgrade.cpp
+++ b/sources/awesomewidgets/extupgrade.cpp
@@ -215,12 +215,10 @@ void ExtUpgrade::updateValue()
qCInfo(LOG_LIB) << "Cmd returns" << m_process->exitCode();
qCInfo(LOG_LIB) << "Error" << m_process->readAllStandardError();
- QString qoutput
- = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
m_values[tag("pkgcount")] = [this](const QString &output) {
- return filter().isEmpty()
- ? output.split('\n', Qt::SkipEmptyParts).count() - null()
- : output.split('\n', Qt::SkipEmptyParts).filter(QRegExp(filter())).count();
+ return filter().isEmpty() ? output.split('\n', Qt::SkipEmptyParts).count() - null()
+ : output.split('\n', Qt::SkipEmptyParts).filter(QRegExp(filter())).count();
}(qoutput);
emit(dataReceived(m_values));
diff --git a/sources/awesomewidgets/extweather.cpp b/sources/awesomewidgets/extweather.cpp
index 31cd0e4..0e5f781 100644
--- a/sources/awesomewidgets/extweather.cpp
+++ b/sources/awesomewidgets/extweather.cpp
@@ -53,8 +53,7 @@ ExtWeather::ExtWeather(QWidget *_parent, const QString &_filePath)
// HACK declare as child of nullptr to avoid crash with plasmawindowed
// in the destructor
m_manager = new QNetworkAccessManager(nullptr);
- connect(m_manager, SIGNAL(finished(QNetworkReply *)), this,
- SLOT(weatherReplyReceived(QNetworkReply *)));
+ connect(m_manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(weatherReplyReceived(QNetworkReply *)));
connect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
}
@@ -64,8 +63,7 @@ ExtWeather::~ExtWeather()
{
qCDebug(LOG_LIB) << __PRETTY_FUNCTION__;
- disconnect(m_manager, SIGNAL(finished(QNetworkReply *)), this,
- SLOT(weatherReplyReceived(QNetworkReply *)));
+ disconnect(m_manager, SIGNAL(finished(QNetworkReply *)), this, SLOT(weatherReplyReceived(QNetworkReply *)));
disconnect(this, SIGNAL(requestDataUpdate()), this, SLOT(sendRequest()));
m_manager->deleteLater();
@@ -92,9 +90,8 @@ ExtWeather *ExtWeather::copy(const QString &_fileName, const int _number)
QString ExtWeather::jsonMapFile()
{
- QString fileName
- = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
- "awesomewidgets/weather/awesomewidgets-extweather-ids.json");
+ QString fileName = QStandardPaths::locate(QStandardPaths::GenericDataLocation,
+ "awesomewidgets/weather/awesomewidgets-extweather-ids.json");
qCInfo(LOG_LIB) << "Map file" << fileName;
return fileName;
@@ -339,8 +336,7 @@ void ExtWeather::sendRequest()
void ExtWeather::weatherReplyReceived(QNetworkReply *_reply)
{
if (_reply->error() != QNetworkReply::NoError) {
- qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message"
- << _reply->errorString();
+ qCWarning(LOG_AW) << "An error occurs" << _reply->error() << "with message" << _reply->errorString();
return;
}
diff --git a/sources/awesomewidgets/graphicalitem.cpp b/sources/awesomewidgets/graphicalitem.cpp
index fd0ac10..22bba1f 100644
--- a/sources/awesomewidgets/graphicalitem.cpp
+++ b/sources/awesomewidgets/graphicalitem.cpp
@@ -136,8 +136,7 @@ QString GraphicalItem::image(const QVariant &value)
QByteArray byteArray;
QBuffer buffer(&byteArray);
pixmap.save(&buffer, "PNG");
- QString url
- = QString("
").arg(QString(byteArray.toBase64()));
+ QString url = QString("
").arg(QString(byteArray.toBase64()));
return url;
}
@@ -541,8 +540,7 @@ void GraphicalItem::changeColor()
QString outputColor;
if (state == 0) {
QColor color = m_helper->stringToColor(lineEdit->text());
- QColor newColor = QColorDialog::getColor(color, this, i18n("Select color"),
- QColorDialog::ShowAlphaChannel);
+ QColor newColor = QColorDialog::getColor(color, this, i18n("Select color"), QColorDialog::ShowAlphaChannel);
if (!newColor.isValid())
return;
qCInfo(LOG_LIB) << "Selected color" << newColor;
@@ -557,10 +555,9 @@ void GraphicalItem::changeColor()
} else if (state == 1) {
QString path = lineEdit->text();
QString directory = QFileInfo(path).absolutePath();
- outputColor
- = QFileDialog::getOpenFileUrl(this, i18n("Select path"), directory,
- i18n("Images (*.png *.bpm *.jpg);;All files (*.*)"))
- .toString();
+ outputColor = QFileDialog::getOpenFileUrl(this, i18n("Select path"), directory,
+ i18n("Images (*.png *.bpm *.jpg);;All files (*.*)"))
+ .toString();
qCInfo(LOG_LIB) << "Selected path" << outputColor;
}
diff --git a/sources/awesomewidgets/graphicalitemhelper.cpp b/sources/awesomewidgets/graphicalitemhelper.cpp
index 1df798f..6de8a72 100644
--- a/sources/awesomewidgets/graphicalitemhelper.cpp
+++ b/sources/awesomewidgets/graphicalitemhelper.cpp
@@ -40,11 +40,11 @@ GraphicalItemHelper::~GraphicalItemHelper()
}
-void GraphicalItemHelper::setParameters(const QString &_active, const QString &_inactive,
- const int _width, const int _height, const int _count)
+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 << ", width"
- << _width << ", height" << _height << ", count" << _count;
+ qCDebug(LOG_LIB) << "Use active color" << _active << ", inactive" << _inactive << ", width" << _width << ", height"
+ << _height << ", count" << _count;
// put images to pens if any otherwise set pen colors
// Images resize to content here as well
@@ -155,11 +155,10 @@ void GraphicalItemHelper::paintHorizontal(const float _percent)
m_inactivePen.setWidth(m_height);
// inactive
auto width = static_cast(m_width);
- m_scene->addLine(_percent * width + 0.5 * m_height, 0.5 * m_height, m_width + 0.5 * m_height,
- 0.5 * m_height, m_inactivePen);
+ m_scene->addLine(_percent * width + 0.5 * m_height, 0.5 * m_height, m_width + 0.5 * m_height, 0.5 * m_height,
+ m_inactivePen);
// active
- m_scene->addLine(-0.5 * m_height, 0.5 * m_height, _percent * width - 0.5 * m_height,
- 0.5 * m_height, m_activePen);
+ m_scene->addLine(-0.5 * m_height, 0.5 * m_height, _percent * width - 0.5 * m_height, 0.5 * m_height, m_activePen);
}
@@ -170,8 +169,8 @@ void GraphicalItemHelper::paintVertical(const float _percent)
m_activePen.setWidth(m_height);
m_inactivePen.setWidth(m_height);
// inactive
- m_scene->addLine(0.5 * m_width, -0.5 * m_width, 0.5 * m_width,
- (1.0 - _percent) * m_height - 0.5 * m_width, m_inactivePen);
+ m_scene->addLine(0.5 * m_width, -0.5 * m_width, 0.5 * m_width, (1.0 - _percent) * m_height - 0.5 * m_width,
+ m_inactivePen);
// active
m_scene->addLine(0.5 * m_width, (1.0 - _percent) * m_height + 0.5 * m_width, 0.5 * m_width,
m_height + 0.5 * m_width, m_activePen);
diff --git a/sources/awesomewidgets/graphicalitemhelper.h b/sources/awesomewidgets/graphicalitemhelper.h
index a7dd2d5..1c0c27b 100644
--- a/sources/awesomewidgets/graphicalitemhelper.h
+++ b/sources/awesomewidgets/graphicalitemhelper.h
@@ -33,8 +33,7 @@ public:
explicit GraphicalItemHelper(QObject *_parent = nullptr, QGraphicsScene *_scene = nullptr);
~GraphicalItemHelper() override;
// parameters
- void setParameters(const QString &_active, const QString &_inactive, int _width, int _height,
- int _count);
+ void setParameters(const QString &_active, const QString &_inactive, int _width, int _height, int _count);
// paint methods
void paintBars(float _value);
void paintCircle(float _percent);
diff --git a/sources/awesomewidgets/owmweatherprovider.cpp b/sources/awesomewidgets/owmweatherprovider.cpp
index 6397ea7..91a849d 100644
--- a/sources/awesomewidgets/owmweatherprovider.cpp
+++ b/sources/awesomewidgets/owmweatherprovider.cpp
@@ -66,8 +66,7 @@ QVariantHash OWMWeatherProvider::parse(const QVariantMap &_json) const
return parseSingleJson(_json);
} else {
QVariantList list = _json["list"].toList();
- return parseSingleJson(list.count() <= m_ts ? list.at(m_ts - 1).toMap()
- : list.last().toMap());
+ return parseSingleJson(list.count() <= m_ts ? list.at(m_ts - 1).toMap() : list.last().toMap());
}
}
diff --git a/sources/awesomewidgets/qcronscheduler.cpp b/sources/awesomewidgets/qcronscheduler.cpp
index 6f67590..c85adee 100644
--- a/sources/awesomewidgets/qcronscheduler.cpp
+++ b/sources/awesomewidgets/qcronscheduler.cpp
@@ -67,10 +67,8 @@ void QCronScheduler::expired()
{
QDateTime now = QDateTime::currentDateTime();
- if (m_schedule.minutes.contains(now.time().minute())
- && m_schedule.hours.contains(now.time().hour())
- && m_schedule.days.contains(now.date().day())
- && m_schedule.months.contains(now.date().month())
+ if (m_schedule.minutes.contains(now.time().minute()) && m_schedule.hours.contains(now.time().hour())
+ && m_schedule.days.contains(now.date().day()) && m_schedule.months.contains(now.date().month())
&& m_schedule.weekdays.contains(now.date().dayOfWeek()))
emit(activated());
}
diff --git a/sources/awesomewidgets/stooqquotesprovider.cpp b/sources/awesomewidgets/stooqquotesprovider.cpp
index dafa060..591d927 100644
--- a/sources/awesomewidgets/stooqquotesprovider.cpp
+++ b/sources/awesomewidgets/stooqquotesprovider.cpp
@@ -49,15 +49,13 @@ void StooqQuotesProvider::initUrl(const QString &_asset)
}
-QVariantHash StooqQuotesProvider::parse(const QByteArray &_source,
- const QVariantHash &_oldValues) const
+QVariantHash StooqQuotesProvider::parse(const QByteArray &_source, const QVariantHash &_oldValues) const
{
qCDebug(LOG_LIB) << "Parse csv" << _source;
QVariantHash values;
- QStringList sourceValues
- = QTextCodec::codecForMib(106)->toUnicode(_source).trimmed().split(',');
+ QStringList sourceValues = QTextCodec::codecForMib(106)->toUnicode(_source).trimmed().split(',');
if (sourceValues.count() != 2) {
qCWarning(LOG_LIB) << "Parse error" << sourceValues;
return values;
diff --git a/sources/awesomewidgets/stooqquotesprovider.h b/sources/awesomewidgets/stooqquotesprovider.h
index e83ea69..35e0434 100644
--- a/sources/awesomewidgets/stooqquotesprovider.h
+++ b/sources/awesomewidgets/stooqquotesprovider.h
@@ -31,8 +31,7 @@ public:
explicit StooqQuotesProvider(QObject *_parent);
~StooqQuotesProvider() override;
void initUrl(const QString &_asset) override;
- [[nodiscard]] QVariantHash parse(const QByteArray &_source,
- const QVariantHash &_oldValues) const override;
+ [[nodiscard]] QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const override;
[[nodiscard]] QUrl url() const override;
private:
diff --git a/sources/awesomewidgets/yahooquotesprovider.cpp b/sources/awesomewidgets/yahooquotesprovider.cpp
index d7ddac6..aaa71f9 100644
--- a/sources/awesomewidgets/yahooquotesprovider.cpp
+++ b/sources/awesomewidgets/yahooquotesprovider.cpp
@@ -49,8 +49,7 @@ void YahooQuotesProvider::initUrl(const QString &_asset)
}
-QVariantHash YahooQuotesProvider::parse(const QByteArray &_source,
- const QVariantHash &_oldValues) const
+QVariantHash YahooQuotesProvider::parse(const QByteArray &_source, const QVariantHash &_oldValues) const
{
qCDebug(LOG_LIB) << "Parse json" << _source;
diff --git a/sources/awesomewidgets/yahooquotesprovider.h b/sources/awesomewidgets/yahooquotesprovider.h
index 58cc6e0..ad6c1a4 100644
--- a/sources/awesomewidgets/yahooquotesprovider.h
+++ b/sources/awesomewidgets/yahooquotesprovider.h
@@ -32,8 +32,7 @@ public:
explicit YahooQuotesProvider(QObject *_parent);
~YahooQuotesProvider() override;
void initUrl(const QString &_asset) override;
- [[nodiscard]] QVariantHash parse(const QByteArray &_source,
- const QVariantHash &_oldValues) const override;
+ [[nodiscard]] QVariantHash parse(const QByteArray &_source, const QVariantHash &_oldValues) const override;
[[nodiscard]] QUrl url() const override;
private:
diff --git a/sources/awesomewidgets/yahooweatherprovider.cpp b/sources/awesomewidgets/yahooweatherprovider.cpp
index efac315..07a2b5b 100644
--- a/sources/awesomewidgets/yahooweatherprovider.cpp
+++ b/sources/awesomewidgets/yahooweatherprovider.cpp
@@ -73,8 +73,7 @@ QUrl YahooWeatherProvider::url() const
}
-QVariantHash YahooWeatherProvider::parseCurrent(const QVariantMap &_json,
- const QVariantMap &_atmosphere) const
+QVariantHash YahooWeatherProvider::parseCurrent(const QVariantMap &_json, const QVariantMap &_atmosphere) const
{
qCDebug(LOG_LIB) << "Parse current weather from" << _json;
@@ -99,8 +98,7 @@ QVariantHash YahooWeatherProvider::parseForecast(const QVariantMap &_json) const
QVariantHash values;
QVariantList weatherList = _json["forecast"].toList();
- QVariantMap weatherMap
- = weatherList.count() < m_ts ? weatherList.last().toMap() : weatherList.at(m_ts).toMap();
+ QVariantMap weatherMap = weatherList.count() < m_ts ? weatherList.last().toMap() : weatherList.at(m_ts).toMap();
int id = weatherMap["code"].toInt();
values[tag("weatherId")] = id;
values[tag("timestamp")] = weatherMap["date"].toString();
diff --git a/sources/awesomewidgets/yahooweatherprovider.h b/sources/awesomewidgets/yahooweatherprovider.h
index cd8c476..c8d5bdc 100644
--- a/sources/awesomewidgets/yahooweatherprovider.h
+++ b/sources/awesomewidgets/yahooweatherprovider.h
@@ -38,8 +38,7 @@ public:
[[nodiscard]] QUrl url() const override;
private:
- [[nodiscard]] QVariantHash parseCurrent(const QVariantMap &_json,
- const QVariantMap &_atmosphere) const;
+ [[nodiscard]] QVariantHash parseCurrent(const QVariantMap &_json, const QVariantMap &_atmosphere) const;
[[nodiscard]] QVariantHash parseForecast(const QVariantMap &_json) const;
int m_ts = 0;
QUrl m_url;
diff --git a/sources/compiler.cmake b/sources/compiler.cmake
index 9dd0fda..2526ea2 100644
--- a/sources/compiler.cmake
+++ b/sources/compiler.cmake
@@ -17,7 +17,7 @@ else ()
endif ()
# some flags
-set(CMAKE_CXX_STANDARD 23)
+set(CMAKE_CXX_STANDARD 20)
set(CMAKE_CXX_STANDARD_REQUIRED ON)
# verbose output for debug builds
diff --git a/sources/desktop-panel/package/contents/config/main.xml b/sources/desktop-panel/package/contents/config/main.xml
index 606d7ba..7c147f6 100644
--- a/sources/desktop-panel/package/contents/config/main.xml
+++ b/sources/desktop-panel/package/contents/config/main.xml
@@ -30,7 +30,7 @@
¤
- windows
+ contours
200
diff --git a/sources/desktop-panel/package/contents/ui/advanced.qml b/sources/desktop-panel/package/contents/ui/advanced.qml
index 84a5dd3..38ac1c8 100644
--- a/sources/desktop-panel/package/contents/ui/advanced.qml
+++ b/sources/desktop-panel/package/contents/ui/advanced.qml
@@ -147,14 +147,6 @@ Item {
'label': i18n("contours"),
'name': "contours"
},
- {
- 'label': i18n("windows"),
- 'name': "windows"
- },
- {
- 'label': i18n("clean desktop"),
- 'name': "clean"
- },
{
'label': i18n("names"),
'name': "names"
diff --git a/sources/desktop-panel/package/contents/ui/main.qml b/sources/desktop-panel/package/contents/ui/main.qml
index fcdf154..e8382ad 100644
--- a/sources/desktop-panel/package/contents/ui/main.qml
+++ b/sources/desktop-panel/package/contents/ui/main.qml
@@ -77,13 +77,13 @@ Item {
verticalAlignment: Text.AlignVCenter
- text: dpAdds.parsePattern(plasmoid.configuration.text, index + 1)
+ text: dpAdds.parsePattern(plasmoid.configuration.text, index)
property alias tooltip: tooltip
MouseArea {
hoverEnabled: true
anchors.fill: parent
- onClicked: dpAdds.setCurrentDesktop(index + 1)
+ onClicked: dpAdds.setCurrentDesktop(index)
onEntered: needTooltipUpdate()
}
@@ -117,11 +117,11 @@ Item {
timer.start()
return
}
- repeater.itemAt(i).text = dpAdds.parsePattern(plasmoid.configuration.text, i + 1)
- if (dpAdds.currentDesktop() == i + 1) {
+ repeater.itemAt(i).text = dpAdds.parsePattern(plasmoid.configuration.text, i)
+ if (dpAdds.currentDesktop() == i) {
repeater.itemAt(i).color = plasmoid.configuration.currentFontColor
repeater.itemAt(i).font.family = plasmoid.configuration.currentFontFamily
- repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle == "italic" ? true : false
+ repeater.itemAt(i).font.italic = plasmoid.configuration.currentFontStyle == "italic"
repeater.itemAt(i).font.pointSize = plasmoid.configuration.currentFontSize
repeater.itemAt(i).font.weight = General.fontWeight[plasmoid.configuration.currentFontWeight]
repeater.itemAt(i).style = General.textStyle[plasmoid.configuration.currentTextStyle]
@@ -129,7 +129,7 @@ Item {
} else {
repeater.itemAt(i).color = plasmoid.configuration.fontColor
repeater.itemAt(i).font.family = plasmoid.configuration.fontFamily
- repeater.itemAt(i).font.italic = plasmoid.configuration.fontStyle == "italic" ? true : false
+ repeater.itemAt(i).font.italic = plasmoid.configuration.fontStyle == "italic"
repeater.itemAt(i).font.pointSize = plasmoid.configuration.fontSize
repeater.itemAt(i).font.weight = General.fontWeight[plasmoid.configuration.fontWeight]
repeater.itemAt(i).style = General.textStyle[plasmoid.configuration.textStyle]
@@ -146,7 +146,7 @@ Item {
if (debug) console.debug()
for (var i=0; i
#include
#include
-#include
+#include
+#include
+#include
+#include
#include
#include
@@ -43,8 +46,10 @@ DPAdds::DPAdds(QObject *_parent)
for (auto &metadata : AWDebug::getBuildData())
qCDebug(LOG_DP) << metadata;
- connect(KWindowSystem::self(), SIGNAL(currentDesktopChanged(int)), this,
- SIGNAL(desktopChanged()));
+ m_vdi = new TaskManager::VirtualDesktopInfo(this);
+ m_taskModel = new TaskManager::WindowTasksModel(this);
+
+ connect(m_vdi, SIGNAL(currentDesktopChanged()), this, SIGNAL(desktopChanged()));
connect(KWindowSystem::self(), SIGNAL(windowAdded(WId)), this, SIGNAL(windowListChanged()));
connect(KWindowSystem::self(), SIGNAL(windowRemoved(WId)), this, SIGNAL(windowListChanged()));
}
@@ -53,6 +58,9 @@ DPAdds::DPAdds(QObject *_parent)
DPAdds::~DPAdds()
{
qCDebug(LOG_DP) << __PRETTY_FUNCTION__;
+
+ delete m_vdi;
+ delete m_taskModel;
}
@@ -63,9 +71,11 @@ bool DPAdds::isDebugEnabled()
}
-int DPAdds::currentDesktop()
+int DPAdds::currentDesktop() const
{
- return KX11Extras::currentDesktop();
+ auto current = m_vdi->currentDesktop();
+ auto decrement = KWindowSystem::isPlatformX11() ? 1 : 0;
+ return m_vdi->position(current) - decrement;
}
@@ -86,9 +96,9 @@ QStringList DPAdds::dictKeys(const bool _sorted, const QString &_regexp)
}
-int DPAdds::numberOfDesktops()
+int DPAdds::numberOfDesktops() const
{
- return KX11Extras::numberOfDesktops();
+ return m_vdi->numberOfDesktops();
}
@@ -118,12 +128,17 @@ QString DPAdds::toolTipImage(const int _desktop) const
toolTipView->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
toolTipView->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+ auto screens = QGuiApplication::screens();
+ auto desktop
+ = std::accumulate(screens.cbegin(), screens.cend(), QRect(0, 0, 0, 0), [](QRect source, const QScreen *screen) {
+ return source.united(screen->availableGeometry());
+ });
+
// update
- auto width = static_cast(info.desktop.width());
- auto height = static_cast(info.desktop.height());
+ auto width = static_cast(desktop.width());
+ auto height = static_cast(desktop.height());
float margin = 5.0f * width / 400.0f;
- toolTipView->resize(static_cast(width + 2.0f * margin),
- static_cast(height + 2.0f * margin));
+ toolTipView->resize(static_cast(width + 2.0f * margin), static_cast(height + 2.0f * margin));
toolTipScene->clear();
toolTipScene->setBackgroundBrush(QBrush(Qt::NoBrush));
// borders
@@ -132,45 +147,20 @@ QString DPAdds::toolTipImage(const int _desktop) const
toolTipScene->addLine(width + 2.0 * margin, height + 2.0 * margin, width + 2.0 * margin, 0);
toolTipScene->addLine(width + 2.0 * margin, 0, 0, 0);
- if (m_tooltipType == "contours") {
- QPen pen = QPen();
- pen.setWidthF(2.0 * width / 400.0);
- pen.setColor(QColor(m_tooltipColor));
- for (auto &data : info.windowsData) {
- QRect rect = data.rect;
- auto left = static_cast(rect.left());
- auto right = static_cast(rect.right());
- auto top = static_cast(rect.top());
- auto bottom = static_cast(rect.bottom());
- toolTipScene->addLine(left + margin, bottom + margin, left + margin, top + margin, pen);
- toolTipScene->addLine(left + margin, top + margin, right + margin, top + margin, pen);
- toolTipScene->addLine(right + margin, top + margin, right + margin, bottom + margin,
- pen);
- toolTipScene->addLine(right + margin, bottom + margin, left + margin, bottom + margin,
- pen);
- }
- } else if (m_tooltipType == "clean") {
- QScreen *screen = QGuiApplication::primaryScreen();
- std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(),
- [&toolTipScene, &screen](const WindowData &data) {
- QPixmap desktop = screen->grabWindow(data.id);
- toolTipScene->addPixmap(desktop)->setOffset(data.rect.left(),
- data.rect.top());
- });
- } else if (m_tooltipType == "windows") {
- QScreen *screen = QGuiApplication::primaryScreen();
- std::for_each(info.desktopsData.cbegin(), info.desktopsData.cend(),
- [&toolTipScene, &screen](const WindowData &data) {
- QPixmap desktop = screen->grabWindow(data.id);
- toolTipScene->addPixmap(desktop)->setOffset(data.rect.left(),
- data.rect.top());
- });
- std::for_each(info.windowsData.cbegin(), info.windowsData.cend(),
- [&toolTipScene, &screen](const WindowData &data) {
- QPixmap window = screen->grabWindow(data.id);
- toolTipScene->addPixmap(window)->setOffset(data.rect.left(),
- data.rect.top());
- });
+ // with wayland countours only are supported
+ QPen pen = QPen();
+ pen.setWidthF(2.0 * width / 400.0);
+ pen.setColor(QColor(m_tooltipColor));
+ for (auto &data : info.windowsData) {
+ QRect rect = data.rect;
+ auto left = static_cast(rect.left());
+ auto right = static_cast(rect.right());
+ auto top = static_cast(rect.top());
+ auto bottom = static_cast(rect.bottom());
+ toolTipScene->addLine(left + margin, bottom + margin, left + margin, top + margin, pen);
+ toolTipScene->addLine(left + margin, top + margin, right + margin, top + margin, pen);
+ toolTipScene->addLine(right + margin, top + margin, right + margin, bottom + margin, pen);
+ toolTipScene->addLine(right + margin, bottom + margin, left + margin, bottom + margin, pen);
}
QPixmap image = toolTipView->grab().scaledToWidth(m_tooltipWidth);
@@ -233,13 +223,12 @@ QString DPAdds::valueByKey(const QString &_key, int _desktop) const
QString currentMark = currentDesktop() == _desktop ? m_mark : "";
if (_key == "mark")
- return QString("%1")
- .arg(currentMark, m_mark.count(), QLatin1Char(' '))
- .replace(" ", " ");
- else if (_key == "name")
- return KX11Extras::desktopName(_desktop).replace(" ", " ");
- else if (_key == "number")
- return QString::number(_desktop);
+ return QString("%1").arg(currentMark, m_mark.count(), QLatin1Char(' ')).replace(" ", " ");
+ else if (_key == "name") {
+ auto name = m_vdi->desktopNames().at(_desktop);
+ return name.replace(" ", " ");
+ } else if (_key == "number")
+ return QString::number(_desktop + 1);
else if (_key == "total")
return QString::number(numberOfDesktops());
else
@@ -262,8 +251,8 @@ QVariantMap DPAdds::getFont(const QVariantMap &_defaultFont)
QVariantMap fontMap;
int ret = 0;
- CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400,
- false, _defaultFont["color"].toString());
+ CFont defaultCFont = CFont(_defaultFont["family"].toString(), _defaultFont["size"].toInt(), 400, false,
+ _defaultFont["color"].toString());
CFont font = CFontDialog::getFont(i18n("Select font"), defaultCFont, false, false, &ret);
fontMap["applied"] = ret;
@@ -291,35 +280,33 @@ void DPAdds::setCurrentDesktop(const int _desktop)
{
qCDebug(LOG_DP) << "Desktop" << _desktop;
- KX11Extras::setCurrentDesktop(_desktop);
+ m_vdi->requestActivate(m_vdi->desktopIds().at(_desktop));
}
-DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int _desktop)
+DPAdds::DesktopWindowsInfo DPAdds::getInfoByDesktop(const int _desktop) const
{
qCDebug(LOG_DP) << "Desktop" << _desktop;
+ auto desktop = m_vdi->desktopIds().at(_desktop);
DesktopWindowsInfo info;
- info.desktop = KX11Extras::workArea(_desktop);
-
- for (auto &id : KX11Extras::windows()) {
- KWindowInfo winInfo = KWindowInfo(
- id, NET::Property::WMDesktop | NET::Property::WMGeometry | NET::Property::WMState
- | NET::Property::WMWindowType | NET::Property::WMVisibleName);
- if (!winInfo.isOnDesktop(_desktop))
- continue;
+ for (auto i = 0; i < m_taskModel->rowCount(); i++) {
+ auto model = m_taskModel->index(i, 0);
WindowData data;
- data.id = id;
- data.name = winInfo.visibleName();
- data.rect = winInfo.geometry();
- if (winInfo.windowType(NET::WindowTypeMask::NormalMask) == NET::WindowType::Normal) {
- if (winInfo.isMinimized())
+
+ data.name = model.data(TaskManager::AbstractTasksModel::AppName).toString();
+ data.rect = model.data(TaskManager::AbstractTasksModel::Geometry).toRect();
+
+ auto desktops = model.data(TaskManager::AbstractTasksModel::VirtualDesktops).toList();
+ if (desktops.isEmpty()) {
+ // don't think it is possible to put desktop to desktop
+ info.desktopsData.append(data);
+ } else {
+ auto isMinimized = model.data(TaskManager::AbstractTasksModel::IsMinimized).toBool();
+ if (isMinimized || !desktops.contains(desktop))
continue;
info.windowsData.append(data);
- } else if (winInfo.windowType(NET::WindowTypeMask::DesktopMask)
- == NET::WindowType::Desktop) {
- info.desktopsData.append(data);
}
}
diff --git a/sources/desktop-panel/plugin/dpadds.h b/sources/desktop-panel/plugin/dpadds.h
index d3f6fa6..a2e3be2 100644
--- a/sources/desktop-panel/plugin/dpadds.h
+++ b/sources/desktop-panel/plugin/dpadds.h
@@ -24,18 +24,21 @@
#include
+namespace TaskManager
+{
+class VirtualDesktopInfo;
+class WindowTasksModel;
+} // namespace TaskManager
class DPAdds : public QObject
{
Q_OBJECT
typedef struct {
- WId id;
QString name;
QRect rect;
} WindowData;
typedef struct {
- QRect desktop;
QList desktopsData;
QList windowsData;
} DesktopWindowsInfo;
@@ -44,9 +47,9 @@ public:
explicit DPAdds(QObject *_parent = nullptr);
~DPAdds() override;
Q_INVOKABLE static bool isDebugEnabled();
- Q_INVOKABLE static int currentDesktop();
+ Q_INVOKABLE [[nodiscard]] int currentDesktop() const;
Q_INVOKABLE static QStringList dictKeys(bool _sorted = true, const QString &_regexp = "");
- Q_INVOKABLE static int numberOfDesktops();
+ Q_INVOKABLE [[nodiscard]] int numberOfDesktops() const;
Q_INVOKABLE [[nodiscard]] QString toolTipImage(int _desktop) const;
Q_INVOKABLE [[nodiscard]] QString parsePattern(const QString &_pattern, int _desktop) const;
// values
@@ -64,11 +67,13 @@ signals:
public slots:
Q_INVOKABLE static void sendNotification(const QString &_eventId, const QString &_message);
- Q_INVOKABLE static void setCurrentDesktop(int _desktop);
+ Q_INVOKABLE void setCurrentDesktop(int _desktop);
private:
- static DesktopWindowsInfo getInfoByDesktop(int _desktop);
+ [[nodiscard]] DesktopWindowsInfo getInfoByDesktop(int _desktop) const;
// variables
+ TaskManager::VirtualDesktopInfo *m_vdi = nullptr;
+ TaskManager::WindowTasksModel *m_taskModel = nullptr;
int m_tooltipWidth = 200;
QString m_mark = "*";
QString m_tooltipColor = "#000000";
diff --git a/sources/extsysmon/extsysmon.cpp b/sources/extsysmon/extsysmon.cpp
index 88b6e39..68b5e02 100644
--- a/sources/extsysmon/extsysmon.cpp
+++ b/sources/extsysmon/extsysmon.cpp
@@ -86,8 +86,7 @@ bool ExtendedSysMon::updateSourceEvent(const QString &_source)
void ExtendedSysMon::readConfiguration()
{
- QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation,
- "plasma-dataengine-extsysmon.conf");
+ QString fileName = QStandardPaths::locate(QStandardPaths::ConfigLocation, "plasma-dataengine-extsysmon.conf");
qCInfo(LOG_ESM) << "Configuration file" << fileName;
QSettings settings(fileName, QSettings::IniFormat);
QHash rawConfig;
@@ -138,8 +137,7 @@ QHash ExtendedSysMon::updateConfiguration(QHash m_configuration;
// methods
void readConfiguration();
- [[nodiscard]] static QHash
- updateConfiguration(QHash _rawConfig);
+ [[nodiscard]] static QHash updateConfiguration(QHash _rawConfig);
};
diff --git a/sources/extsysmon/extsysmonaggregator.cpp b/sources/extsysmon/extsysmonaggregator.cpp
index 36f8dff..0bd5868 100644
--- a/sources/extsysmon/extsysmonaggregator.cpp
+++ b/sources/extsysmon/extsysmonaggregator.cpp
@@ -87,8 +87,7 @@ void ExtSysMonAggregator::init(const QHash &_config)
qCDebug(LOG_ESM) << "Configuration" << _config;
// battery
- AbstractExtSysMonSource *batteryItem
- = new BatterySource(this, QStringList() << _config["ACPIPATH"]);
+ AbstractExtSysMonSource *batteryItem = new BatterySource(this, QStringList() << _config["ACPIPATH"]);
for (auto &source : batteryItem->sources())
m_map[source] = batteryItem;
// custom
@@ -100,13 +99,11 @@ void ExtSysMonAggregator::init(const QHash &_config)
for (auto &source : desktopItem->sources())
m_map[source] = desktopItem;
// gpu load
- AbstractExtSysMonSource *gpuLoadItem
- = new GPULoadSource(this, QStringList({_config["GPUDEV"]}));
+ AbstractExtSysMonSource *gpuLoadItem = new GPULoadSource(this, QStringList({_config["GPUDEV"]}));
for (auto &source : gpuLoadItem->sources())
m_map[source] = gpuLoadItem;
// gpu temperature
- AbstractExtSysMonSource *gpuTempItem
- = new GPUTemperatureSource(this, QStringList({_config["GPUDEV"]}));
+ AbstractExtSysMonSource *gpuTempItem = new GPUTemperatureSource(this, QStringList({_config["GPUDEV"]}));
for (auto &source : gpuTempItem->sources())
m_map[source] = gpuTempItem;
// hdd temperature
@@ -119,9 +116,9 @@ void ExtSysMonAggregator::init(const QHash &_config)
for (auto &source : networkItem->sources())
m_map[source] = networkItem;
// player
- AbstractExtSysMonSource *playerItem = new PlayerSource(
- this, QStringList({_config["PLAYER"], _config["MPDADDRESS"], _config["MPDPORT"],
- _config["MPRIS"], _config["PLAYERSYMBOLS"]}));
+ AbstractExtSysMonSource *playerItem
+ = new PlayerSource(this, QStringList({_config["PLAYER"], _config["MPDADDRESS"], _config["MPDPORT"],
+ _config["MPRIS"], _config["PLAYERSYMBOLS"]}));
for (auto &source : playerItem->sources())
m_map[source] = playerItem;
// processes
diff --git a/sources/extsysmonsources/batterysource.cpp b/sources/extsysmonsources/batterysource.cpp
index af25bda..a424f79 100644
--- a/sources/extsysmonsources/batterysource.cpp
+++ b/sources/extsysmonsources/batterysource.cpp
@@ -56,9 +56,7 @@ QStringList BatterySource::getSources()
if (directory.exists()) {
m_batteriesCount
- = directory
- .entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name)
- .count();
+ = directory.entryList(QStringList({"BAT*"}), QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name).count();
qCInfo(LOG_ESS) << "Init batteries count as" << m_batteriesCount;
for (int i = 0; i < m_batteriesCount; i++) {
@@ -185,8 +183,7 @@ void BatterySource::run()
// total
QFile fullLevelFile(QString("%1/BAT%2/energy_full").arg(m_acpiPath).arg(i));
if (fullLevelFile.open(QIODevice::ReadOnly | QIODevice::Text))
- m_values[QString("battery/battotal%1").arg(i)]
- = QString(fullLevelFile.readLine()).toInt();
+ m_values[QString("battery/battotal%1").arg(i)] = QString(fullLevelFile.readLine()).toInt();
fullLevelFile.close();
m_values[QString("battery/bat%1").arg(i)]
diff --git a/sources/extsysmonsources/customsource.cpp b/sources/extsysmonsources/customsource.cpp
index 912a501..a4af21b 100644
--- a/sources/extsysmonsources/customsource.cpp
+++ b/sources/extsysmonsources/customsource.cpp
@@ -56,8 +56,7 @@ QVariantMap CustomSource::initialData(const QString &_source) const
QVariantMap data;
data["min"] = "";
data["max"] = "";
- data["name"] = QString("Custom command '%1' output")
- .arg(m_extScripts->itemByTagNumber(index(_source))->uniq());
+ data["name"] = QString("Custom command '%1' output").arg(m_extScripts->itemByTagNumber(index(_source))->uniq());
data["type"] = "QString";
data["units"] = "";
diff --git a/sources/extsysmonsources/desktopsource.cpp b/sources/extsysmonsources/desktopsource.cpp
index ad6146d..adddf5a 100644
--- a/sources/extsysmonsources/desktopsource.cpp
+++ b/sources/extsysmonsources/desktopsource.cpp
@@ -18,7 +18,8 @@
#include "desktopsource.h"
-#include
+#include
+#include
#include "awdebug.h"
@@ -28,12 +29,16 @@ DesktopSource::DesktopSource(QObject *_parent, const QStringList &_args)
{
Q_ASSERT(_args.count() == 0);
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
+
+ m_vdi = new TaskManager::VirtualDesktopInfo(this);
}
DesktopSource::~DesktopSource()
{
qCDebug(LOG_ESS) << __PRETTY_FUNCTION__;
+
+ delete m_vdi;
}
@@ -41,20 +46,17 @@ QVariant DesktopSource::data(const QString &_source)
{
qCDebug(LOG_ESS) << "Source" << _source;
- int current = KX11Extras::currentDesktop();
- int total = KX11Extras::numberOfDesktops();
+ auto increment = KWindowSystem::isPlatformX11() ? 0 : 1;
+ auto current = m_vdi->position(m_vdi->currentDesktop()) + increment;
if (_source == "desktop/current/name") {
- return KX11Extras::desktopName(current);
+ return m_vdi->desktopNames().at(current);
} else if (_source == "desktop/current/number") {
return current;
} else if (_source == "desktop/total/name") {
- QStringList desktops;
- for (int i = 1; i < total + 1; i++)
- desktops.append(KX11Extras::desktopName(i));
- return desktops;
+ return m_vdi->desktopNames();
} else if (_source == "desktop/total/number") {
- return total;
+ return m_vdi->numberOfDesktops();
}
return QVariant();
diff --git a/sources/extsysmonsources/desktopsource.h b/sources/extsysmonsources/desktopsource.h
index 1de29d1..05222ee 100644
--- a/sources/extsysmonsources/desktopsource.h
+++ b/sources/extsysmonsources/desktopsource.h
@@ -23,6 +23,10 @@
#include "abstractextsysmonsource.h"
+namespace TaskManager
+{
+class VirtualDesktopInfo;
+}
class DesktopSource : public AbstractExtSysMonSource
{
Q_OBJECT
@@ -34,6 +38,9 @@ public:
[[nodiscard]] QVariantMap initialData(const QString &_source) const override;
void run() override{};
[[nodiscard]] QStringList sources() const override;
+
+private:
+ TaskManager::VirtualDesktopInfo *m_vdi = nullptr;
};
diff --git a/sources/extsysmonsources/gpuloadsource.cpp b/sources/extsysmonsources/gpuloadsource.cpp
index 6281637..74078df 100644
--- a/sources/extsysmonsources/gpuloadsource.cpp
+++ b/sources/extsysmonsources/gpuloadsource.cpp
@@ -36,7 +36,7 @@ GPULoadSource::GPULoadSource(QObject *_parent, const QStringList &_args)
m_process = new QProcess(nullptr);
// fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
connect(m_process, QOverload::of(&QProcess::finished),
- [=](int, QProcess::ExitStatus) { return updateValue(); });
+ [this](int, QProcess::ExitStatus) { return updateValue(); });
m_process->waitForFinished(0);
}
@@ -124,11 +124,9 @@ QStringList GPULoadSource::sources() const
void GPULoadSource::updateValue()
{
qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
- QString qdebug
- = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
+ QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
qCInfo(LOG_ESS) << "Error" << qdebug;
- QString qoutput
- = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
if (m_device == "nvidia") {
diff --git a/sources/extsysmonsources/gputempsource.cpp b/sources/extsysmonsources/gputempsource.cpp
index 55fbadc..de13ff4 100644
--- a/sources/extsysmonsources/gputempsource.cpp
+++ b/sources/extsysmonsources/gputempsource.cpp
@@ -36,7 +36,7 @@ GPUTemperatureSource::GPUTemperatureSource(QObject *_parent, const QStringList &
m_process = new QProcess(nullptr);
// fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
connect(m_process, QOverload::of(&QProcess::finished),
- [=](int, QProcess::ExitStatus) { return updateValue(); });
+ [this](int, QProcess::ExitStatus) { return updateValue(); });
m_process->waitForFinished(0);
}
@@ -84,8 +84,7 @@ void GPUTemperatureSource::run()
return;
// build cmd
QString cmd = m_device == "nvidia" ? "nvidia-smi" : "aticonfig";
- auto args
- = m_device == "nvidia" ? QStringList({"-q", "-x"}) : QStringList({"--od-gettemperature"});
+ auto args = m_device == "nvidia" ? QStringList({"-q", "-x"}) : QStringList({"--od-gettemperature"});
qCInfo(LOG_ESS) << "cmd" << cmd;
m_process->start(cmd, args);
@@ -104,11 +103,9 @@ QStringList GPUTemperatureSource::sources() const
void GPUTemperatureSource::updateValue()
{
qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
- QString qdebug
- = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
+ QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
qCInfo(LOG_ESS) << "Error" << qdebug;
- QString qoutput
- = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
if (m_device == "nvidia") {
diff --git a/sources/extsysmonsources/hddtempsource.cpp b/sources/extsysmonsources/hddtempsource.cpp
index efaae08..322ffd1 100644
--- a/sources/extsysmonsources/hddtempsource.cpp
+++ b/sources/extsysmonsources/hddtempsource.cpp
@@ -41,7 +41,7 @@ HDDTemperatureSource::HDDTemperatureSource(QObject *_parent, const QStringList &
m_processes[device] = new QProcess(nullptr);
// fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
connect(m_processes[device], QOverload::of(&QProcess::finished),
- [=](int, QProcess::ExitStatus) { return updateValue(device); });
+ [this, &device](int, QProcess::ExitStatus) { return updateValue(device); });
m_processes[device]->waitForFinished(0);
}
}
@@ -120,13 +120,9 @@ void HDDTemperatureSource::updateValue(const QString &_device)
qCDebug(LOG_ESS) << "Called with device" << _device;
qCInfo(LOG_ESS) << "Cmd returns" << m_processes[_device]->exitCode();
- QString qdebug = QTextCodec::codecForMib(106)
- ->toUnicode(m_processes[_device]->readAllStandardError())
- .trimmed();
+ QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_processes[_device]->readAllStandardError()).trimmed();
qCInfo(LOG_ESS) << "Error" << qdebug;
- QString qoutput = QTextCodec::codecForMib(106)
- ->toUnicode(m_processes[_device]->readAllStandardOutput())
- .trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_processes[_device]->readAllStandardOutput()).trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
// parse
diff --git a/sources/extsysmonsources/networksource.cpp b/sources/extsysmonsources/networksource.cpp
index a34cdcc..e56c7b5 100644
--- a/sources/extsysmonsources/networksource.cpp
+++ b/sources/extsysmonsources/networksource.cpp
@@ -34,7 +34,7 @@ NetworkSource::NetworkSource(QObject *_parent, const QStringList &_args)
m_process = new QProcess(nullptr);
// fucking magic from http://doc.qt.io/qt-5/qprocess.html#finished
connect(m_process, QOverload::of(&QProcess::finished),
- [=](int, QProcess::ExitStatus) { return updateSsid(); });
+ [this](int, QProcess::ExitStatus) { return updateSsid(); });
m_process->waitForFinished(0);
}
@@ -101,11 +101,9 @@ QStringList NetworkSource::sources() const
void NetworkSource::updateSsid()
{
qCInfo(LOG_ESS) << "Cmd returns" << m_process->exitCode();
- QString qdebug
- = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
+ QString qdebug = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardError()).trimmed();
qCInfo(LOG_ESS) << "Error" << qdebug;
- QString qoutput
- = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
+ QString qoutput = QTextCodec::codecForMib(106)->toUnicode(m_process->readAllStandardOutput()).trimmed();
qCInfo(LOG_ESS) << "Output" << qoutput;
m_values["network/current/ssid"] = qoutput;
diff --git a/sources/extsysmonsources/playersource.cpp b/sources/extsysmonsources/playersource.cpp
index aaca22f..b56d07e 100644
--- a/sources/extsysmonsources/playersource.cpp
+++ b/sources/extsysmonsources/playersource.cpp
@@ -68,8 +68,7 @@ QVariant PlayerSource::data(const QString &_source)
QString PlayerSource::getAutoMpris()
{
- QDBusMessage listServices
- = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
+ QDBusMessage listServices = QDBusConnection::sessionBus().interface()->call(QDBus::BlockWithGui, "ListNames");
if (listServices.arguments().isEmpty()) {
qCWarning(LOG_ESS) << "Could not find any DBus service";
return "";
@@ -187,12 +186,12 @@ void PlayerSource::run()
m_values["player/sartist"] = stripString(m_values["player/artist"].toString(), m_symbols);
m_values["player/stitle"] = stripString(m_values["player/title"].toString(), m_symbols);
// dynamic
- m_values["player/dalbum"] = buildString(m_values["player/dalbum"].toString(),
- m_values["player/album"].toString(), m_symbols);
- m_values["player/dartist"] = buildString(m_values["player/dartist"].toString(),
- m_values["player/artist"].toString(), m_symbols);
- m_values["player/dtitle"] = buildString(m_values["player/dtitle"].toString(),
- m_values["player/title"].toString(), m_symbols);
+ m_values["player/dalbum"]
+ = buildString(m_values["player/dalbum"].toString(), m_values["player/album"].toString(), m_symbols);
+ m_values["player/dartist"]
+ = buildString(m_values["player/dartist"].toString(), m_values["player/artist"].toString(), m_symbols);
+ m_values["player/dtitle"]
+ = buildString(m_values["player/dtitle"].toString(), m_values["player/title"].toString(), m_symbols);
}
@@ -217,8 +216,7 @@ QStringList PlayerSource::sources() const
QString PlayerSource::buildString(const QString &_current, const QString &_value, const int _s)
{
- qCDebug(LOG_ESS) << "Current value" << _current << "received" << _value
- << "will be stripped after" << _s;
+ qCDebug(LOG_ESS) << "Current value" << _current << "received" << _value << "will be stripped after" << _s;
int index = _value.indexOf(_current);
if ((_current.isEmpty()) || ((index + _s + 1) > _value.count()))
@@ -245,8 +243,7 @@ bool PlayerSource::isMpdSocketConnected() const
void PlayerSource::mpdSocketConnected()
{
- qCDebug(LOG_ESS) << "MPD socket connected to" << m_mpdSocket.peerName() << "with state"
- << m_mpdSocket.state();
+ qCDebug(LOG_ESS) << "MPD socket connected to" << m_mpdSocket.peerName() << "with state" << m_mpdSocket.state();
}
@@ -329,9 +326,9 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris)
// /org/mpris/MediaPlayer2 org.freedesktop.DBus.Properties.Get
// string:'org.mpris.MediaPlayer2.Player' string:'Metadata'
auto args = QVariantList({"org.mpris.MediaPlayer2.Player", "Metadata"});
- QDBusMessage request = QDBusMessage::createMethodCall(
- QString("org.mpris.MediaPlayer2.%1").arg(_mpris), "/org/mpris/MediaPlayer2",
- "org.freedesktop.DBus.Properties", "Get");
+ QDBusMessage request
+ = QDBusMessage::createMethodCall(QString("org.mpris.MediaPlayer2.%1").arg(_mpris), "/org/mpris/MediaPlayer2",
+ "org.freedesktop.DBus.Properties", "Get");
request.setArguments(args);
auto response = bus.call(request, QDBus::BlockWithGui, REQUEST_TIMEOUT);
if ((response.type() != QDBusMessage::ReplyMessage) || (response.arguments().isEmpty())) {
@@ -356,8 +353,7 @@ QVariantHash PlayerSource::getPlayerMprisInfo(const QString &_mpris)
} else {
// this cast is simpler than the previous one ;)
info["player/progress"]
- = response.arguments().first().value().variant().toLongLong()
- / (1000 * 1000);
+ = response.arguments().first().value().variant().toLongLong() / (1000 * 1000);
}
return info;
diff --git a/sources/extsysmonsources/processessource.cpp b/sources/extsysmonsources/processessource.cpp
index 99b3287..9d434e0 100644
--- a/sources/extsysmonsources/processessource.cpp
+++ b/sources/extsysmonsources/processessource.cpp
@@ -79,8 +79,7 @@ QVariantMap ProcessesSource::initialData(const QString &_source) const
void ProcessesSource::run()
{
- QStringList allDirectories
- = QDir("/proc").entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
+ QStringList allDirectories = QDir("/proc").entryList(QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name);
QStringList directories = allDirectories.filter(QRegExp("(\\d+)"));
QStringList running;
diff --git a/sources/extsysmonsources/quotessource.cpp b/sources/extsysmonsources/quotessource.cpp
index 3b07f08..b1955e1 100644
--- a/sources/extsysmonsources/quotessource.cpp
+++ b/sources/extsysmonsources/quotessource.cpp
@@ -66,8 +66,7 @@ QVariantMap QuotesSource::initialData(const QString &_source) const
if (_source.startsWith("quotes/pricechg")) {
data["min"] = 0.0;
data["max"] = 0.0;
- data["name"] = QString("Absolute prie changes for '%1'")
- .arg(m_extQuotes->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Absolute prie changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data["type"] = "double";
data["units"] = "";
} else if (_source.startsWith("quotes/price")) {
@@ -79,15 +78,13 @@ QVariantMap QuotesSource::initialData(const QString &_source) const
} else if (_source.startsWith("quotes/percpricechg")) {
data["min"] = -100.0;
data["max"] = 100.0;
- data["name"]
- = QString("Price changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Price changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data["type"] = "double";
data["units"] = "";
} else if (_source.startsWith("quotes/volumechg")) {
data["min"] = 0;
data["max"] = 0;
- data["name"] = QString("Absolute volume changes for '%1'")
- .arg(m_extQuotes->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Absolute volume changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data["type"] = "int";
data["units"] = "";
} else if (_source.startsWith("quotes/volume")) {
@@ -99,8 +96,7 @@ QVariantMap QuotesSource::initialData(const QString &_source) const
} else if (_source.startsWith("quotes/percvolumechg")) {
data["min"] = -100.0;
data["max"] = 100.0;
- data["name"]
- = QString("Volume changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Volume changes for '%1'").arg(m_extQuotes->itemByTagNumber(ind)->uniq());
data["type"] = "double";
data["units"] = "";
}
diff --git a/sources/extsysmonsources/requestsource.cpp b/sources/extsysmonsources/requestsource.cpp
index 4e85008..628fb0d 100644
--- a/sources/extsysmonsources/requestsource.cpp
+++ b/sources/extsysmonsources/requestsource.cpp
@@ -66,8 +66,7 @@ QVariantMap RequestSource::initialData(const QString &_source) const
if (_source.startsWith("network/response")) {
data["min"] = "";
data["max"] = "";
- data["name"]
- = QString("Network response for %1").arg(m_extNetRequest->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Network response for %1").arg(m_extNetRequest->itemByTagNumber(ind)->uniq());
data["type"] = "QString";
data["units"] = "";
}
diff --git a/sources/extsysmonsources/systeminfosource.cpp b/sources/extsysmonsources/systeminfosource.cpp
index 54848b1..6849704 100644
--- a/sources/extsysmonsources/systeminfosource.cpp
+++ b/sources/extsysmonsources/systeminfosource.cpp
@@ -101,14 +101,12 @@ float SystemInfoSource::getCurrentBrightness()
{
qCDebug(LOG_ESS) << "Get current brightness";
- auto maxBrightness = sendDBusRequest("org.kde.Solid.PowerManagement",
- "/org/kde/Solid/PowerManagement/Actions/BrightnessControl",
- "org.kde.Solid.PowerManagement.Actions.BrightnessControl",
- "brightnessMax")
- .toFloat();
+ auto maxBrightness
+ = sendDBusRequest("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement/Actions/BrightnessControl",
+ "org.kde.Solid.PowerManagement.Actions.BrightnessControl", "brightnessMax")
+ .toFloat();
auto brightness
- = sendDBusRequest("org.kde.Solid.PowerManagement",
- "/org/kde/Solid/PowerManagement/Actions/BrightnessControl",
+ = sendDBusRequest("org.kde.Solid.PowerManagement", "/org/kde/Solid/PowerManagement/Actions/BrightnessControl",
"org.kde.Solid.PowerManagement.Actions.BrightnessControl", "brightness")
.toFloat();
@@ -122,9 +120,8 @@ float SystemInfoSource::getCurrentVolume()
// current device first
auto currentMixer
- = fromDBusVariant(
- sendDBusRequest("org.kde.kmix", "/Mixers", "org.freedesktop.DBus.Properties", "Get",
- QVariantList({"org.kde.KMix.MixSet", "currentMasterMixer"})))
+ = fromDBusVariant(sendDBusRequest("org.kde.kmix", "/Mixers", "org.freedesktop.DBus.Properties", "Get",
+ QVariantList({"org.kde.KMix.MixSet", "currentMasterMixer"})))
.toString();
if (currentMixer.isEmpty()) {
@@ -135,9 +132,8 @@ float SystemInfoSource::getCurrentVolume()
// get capture device
auto currentControl
- = fromDBusVariant(
- sendDBusRequest("org.kde.kmix", "/Mixers", "org.freedesktop.DBus.Properties", "Get",
- QVariantList({"org.kde.KMix.MixSet", "currentMasterControl"})))
+ = fromDBusVariant(sendDBusRequest("org.kde.kmix", "/Mixers", "org.freedesktop.DBus.Properties", "Get",
+ QVariantList({"org.kde.KMix.MixSet", "currentMasterControl"})))
.toString();
if (currentControl.isEmpty()) {
qCWarning(LOG_ESS) << "Control is empty";
@@ -146,15 +142,14 @@ float SystemInfoSource::getCurrentVolume()
currentControl.replace(":", "_").replace(".", "_").replace("-", "_");
auto path = QString("/Mixers/%1/%2").arg(currentMixer).arg(currentControl);
- return fromDBusVariant(sendDBusRequest("org.kde.kmix", path, "org.freedesktop.DBus.Properties",
- "Get", QVariantList({"org.kde.KMix.Control", "volume"})))
+ return fromDBusVariant(sendDBusRequest("org.kde.kmix", path, "org.freedesktop.DBus.Properties", "Get",
+ QVariantList({"org.kde.KMix.Control", "volume"})))
.toFloat();
}
-QVariant SystemInfoSource::sendDBusRequest(const QString &destination, const QString &path,
- const QString &interface, const QString &method,
- const QVariantList &args)
+QVariant SystemInfoSource::sendDBusRequest(const QString &destination, const QString &path, const QString &interface,
+ const QString &method, const QVariantList &args)
{
qCDebug(LOG_ESS) << "Send dbus request" << destination << path << interface << method << args;
diff --git a/sources/extsysmonsources/systeminfosource.h b/sources/extsysmonsources/systeminfosource.h
index 88b6c10..b700b8a 100644
--- a/sources/extsysmonsources/systeminfosource.h
+++ b/sources/extsysmonsources/systeminfosource.h
@@ -41,9 +41,8 @@ private:
static QVariant fromDBusVariant(const QVariant &value);
static float getCurrentBrightness();
static float getCurrentVolume();
- static QVariant sendDBusRequest(const QString &destination, const QString &path,
- const QString &interface, const QString &method,
- const QVariantList &args = QVariantList());
+ static QVariant sendDBusRequest(const QString &destination, const QString &path, const QString &interface,
+ const QString &method, const QVariantList &args = QVariantList());
};
diff --git a/sources/extsysmonsources/upgradesource.cpp b/sources/extsysmonsources/upgradesource.cpp
index 1ece01f..914d4e1 100644
--- a/sources/extsysmonsources/upgradesource.cpp
+++ b/sources/extsysmonsources/upgradesource.cpp
@@ -56,8 +56,7 @@ QVariantMap UpgradeSource::initialData(const QString &_source) const
QVariantMap data;
data["min"] = "";
data["max"] = "";
- data["name"] = QString("Package manager '%1' metadata")
- .arg(m_extUpgrade->itemByTagNumber(index(_source))->uniq());
+ data["name"] = QString("Package manager '%1' metadata").arg(m_extUpgrade->itemByTagNumber(index(_source))->uniq());
data["type"] = "QString";
data["units"] = "";
diff --git a/sources/extsysmonsources/weathersource.cpp b/sources/extsysmonsources/weathersource.cpp
index 6973ca1..e3a618a 100644
--- a/sources/extsysmonsources/weathersource.cpp
+++ b/sources/extsysmonsources/weathersource.cpp
@@ -66,15 +66,13 @@ QVariantMap WeatherSource::initialData(const QString &_source) const
if (_source.startsWith("weather/weatherId")) {
data["min"] = 0;
data["max"] = 1000;
- data["name"] = QString("Numeric weather ID for '%1'")
- .arg(m_extWeather->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Numeric weather ID for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data["type"] = "integer";
data["units"] = "";
} else if (_source.startsWith("weather/weather")) {
data["min"] = "";
data["max"] = "";
- data["name"]
- = QString("ID string map for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("ID string map for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data["type"] = "QString";
data["units"] = "";
} else if (_source.startsWith("weather/humidity")) {
@@ -86,22 +84,19 @@ QVariantMap WeatherSource::initialData(const QString &_source) const
} else if (_source.startsWith("weather/pressure")) {
data["min"] = 0;
data["max"] = 0;
- data["name"] = QString("Atmospheric pressure for '%1'")
- .arg(m_extWeather->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Atmospheric pressure for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data["type"] = "integer";
data["units"] = "mb";
} else if (_source.startsWith("weather/temperature")) {
data["min"] = 0.0;
data["max"] = 0.0;
- data["name"]
- = QString("Temperature for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Temperature for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data["type"] = "float";
data["units"] = "°C";
} else if (_source.startsWith("weather/timestamp")) {
data["min"] = "";
data["max"] = "";
- data["name"]
- = QString("Timestamp for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
+ data["name"] = QString("Timestamp for '%1'").arg(m_extWeather->itemByTagNumber(ind)->uniq());
data["type"] = "QString";
data["units"] = "";
}
diff --git a/sources/libraries.cmake b/sources/libraries.cmake
index 6f171a6..4046f95 100644
--- a/sources/libraries.cmake
+++ b/sources/libraries.cmake
@@ -20,9 +20,10 @@ set(Qt_LIBRARIES
find_package(ECM 0.0.11 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
find_package(KF5 REQUIRED COMPONENTS I18n Notifications Plasma Service WindowSystem)
+find_package(LibTaskManager REQUIRED)
include(KDEInstallDirs)
include(KDECMakeSettings)
include(KDECompilerSettings)
set(Kf5_INCLUDE ${I18n_INCLUDE_DIR} ${Notifications_INCLUDE_DIR} ${Plasma_INCLUDE_DIR})
-set(Kf5_LIBRARIES KF5::I18n KF5::Notifications KF5::Plasma KF5::WindowSystem)
+set(Kf5_LIBRARIES KF5::I18n KF5::Notifications KF5::Plasma KF5::WindowSystem PW::LibTaskManager)
diff --git a/sources/test/awtestlibrary.cpp b/sources/test/awtestlibrary.cpp
index 2413c26..e3ef226 100644
--- a/sources/test/awtestlibrary.cpp
+++ b/sources/test/awtestlibrary.cpp
@@ -50,11 +50,9 @@ char AWTestLibrary::randomChar()
QPair AWTestLibrary::randomFilenames()
{
- QString fileName
- = QString("%1/").arg(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
+ QString fileName = QString("%1/").arg(QStandardPaths::writableLocation(QStandardPaths::TempLocation));
QString writeFileName
- = QString("%1/awesomewidgets/tmp/")
- .arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
+ = QString("%1/awesomewidgets/tmp/").arg(QStandardPaths::writableLocation(QStandardPaths::GenericDataLocation));
QString name = randomString(1, 20);
fileName += name;
diff --git a/sources/test/testawkeys.cpp b/sources/test/testawkeys.cpp
index bbd80a2..909753c 100644
--- a/sources/test/testawkeys.cpp
+++ b/sources/test/testawkeys.cpp
@@ -175,15 +175,15 @@ void TestAWKeys::test_dbus()
QDBusConnection bus = QDBusConnection::sessionBus();
// check if there is active sessions first
- QDBusMessage sessions = QDBusMessage::createMethodCall(AWDBUS_SERVICE, AWDBUS_PATH,
- AWDBUS_SERVICE, "ActiveServices");
+ QDBusMessage sessions
+ = QDBusMessage::createMethodCall(AWDBUS_SERVICE, AWDBUS_PATH, AWDBUS_SERVICE, "ActiveServices");
QDBusMessage sessionsResponse = bus.call(sessions, QDBus::BlockWithGui);
if (sessionsResponse.arguments().isEmpty())
QSKIP("No active sessions found, skip DBus tests");
// dbus checks
- QDBusMessage request = QDBusMessage::createMethodCall(
- QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id), AWDBUS_PATH, AWDBUS_SERVICE, "WhoAmI");
+ QDBusMessage request = QDBusMessage::createMethodCall(QString("%1.i%2").arg(AWDBUS_SERVICE).arg(id), AWDBUS_PATH,
+ AWDBUS_SERVICE, "WhoAmI");
// send message to dbus
QDBusMessage response = bus.call(request, QDBus::BlockWithGui);
diff --git a/sources/test/testawpatternfunctions.cpp b/sources/test/testawpatternfunctions.cpp
index 8247996..80fc975 100644
--- a/sources/test/testawpatternfunctions.cpp
+++ b/sources/test/testawpatternfunctions.cpp
@@ -42,8 +42,7 @@ void TestAWPatternFunctions::test_findFunctionCalls()
QString pattern = AWTestLibrary::randomString() + function + AWTestLibrary::randomString();
- QList found
- = AWPatternFunctions::findFunctionCalls(name, pattern);
+ QList found = AWPatternFunctions::findFunctionCalls(name, pattern);
QCOMPARE(found.count(), 1);
QCOMPARE(found.at(0).args, args);
@@ -87,8 +86,8 @@ void TestAWPatternFunctions::test_findKeys()
void TestAWPatternFunctions::test_findLambdas()
{
QStringList lambdas = AWTestLibrary::randomStringList(20);
- QString pattern = AWTestLibrary::randomString() + QString("${{%1}}").arg(lambdas.join("}}${{"))
- + AWTestLibrary::randomString();
+ QString pattern
+ = AWTestLibrary::randomString() + QString("${{%1}}").arg(lambdas.join("}}${{")) + AWTestLibrary::randomString();
QCOMPARE(AWPatternFunctions::findLambdas(pattern), lambdas);
}
diff --git a/sources/test/testextquotes.cpp b/sources/test/testextquotes.cpp
index e400609..21bd4d2 100644
--- a/sources/test/testextquotes.cpp
+++ b/sources/test/testextquotes.cpp
@@ -64,8 +64,7 @@ void TestExtQuotes::test_run()
for (auto &type : types) {
QCOMPARE(firstValue[extQuotes->tag(type)].toDouble(), 0.0);
- QVERIFY((cache[type].toDouble() >= price.first)
- && (cache[type].toDouble() <= price.second));
+ QVERIFY((cache[type].toDouble() >= price.first) && (cache[type].toDouble() <= price.second));
}
}
diff --git a/sources/test/testextscript.cpp b/sources/test/testextscript.cpp
index bd89f00..379fd4e 100644
--- a/sources/test/testextscript.cpp
+++ b/sources/test/testextscript.cpp
@@ -65,8 +65,7 @@ void TestExtScript::test_run()
QList arguments = spy.takeFirst();
QCOMPARE(firstValue[extScript->tag("custom")].toString(), QString());
- QCOMPARE(arguments.at(0).toHash()[extScript->tag("custom")].toString(),
- QString("\n%1").arg(randomString));
+ QCOMPARE(arguments.at(0).toHash()[extScript->tag("custom")].toString(), QString("\n%1").arg(randomString));
}
@@ -83,8 +82,7 @@ void TestExtScript::test_filters()
// check values
QVERIFY(spy.wait(5000));
QList arguments = spy.takeFirst();
- QCOMPARE(arguments.at(0).toHash()[extScript->tag("custom")].toString(),
- QString("
%1").arg(randomString));
+ QCOMPARE(arguments.at(0).toHash()[extScript->tag("custom")].toString(), QString("
%1").arg(randomString));
}
diff --git a/sources/test/testextupgrade.cpp b/sources/test/testextupgrade.cpp
index 129c1b3..f3fe249 100644
--- a/sources/test/testextupgrade.cpp
+++ b/sources/test/testextupgrade.cpp
@@ -78,8 +78,7 @@ void TestExtUpgrade::test_null()
// check values
QVERIFY(spy.wait(5000));
QList arguments = spy.takeFirst();
- QCOMPARE(arguments.at(0).toHash()[extUpgrade->tag("pkgcount")].toInt(),
- randomStrings.count() - null);
+ QCOMPARE(arguments.at(0).toHash()[extUpgrade->tag("pkgcount")].toInt(), randomStrings.count() - null);
}
diff --git a/sources/test/testhddtempsource.cpp b/sources/test/testhddtempsource.cpp
index 225ba14..5e675bb 100644
--- a/sources/test/testhddtempsource.cpp
+++ b/sources/test/testhddtempsource.cpp
@@ -29,10 +29,8 @@ void TestHDDTemperatureSource::initTestCase()
AWTestLibrary::init();
devices = HDDTemperatureSource::allHdd();
- hddtempSource
- = new HDDTemperatureSource(this, QStringList() << devices.join(',') << hddtempCmd);
- smartctlSource
- = new HDDTemperatureSource(this, QStringList() << devices.join(',') << smartctlCmd);
+ hddtempSource = new HDDTemperatureSource(this, QStringList() << devices.join(',') << hddtempCmd);
+ smartctlSource = new HDDTemperatureSource(this, QStringList() << devices.join(',') << smartctlCmd);
}
@@ -48,8 +46,7 @@ void TestHDDTemperatureSource::test_sources()
if (devices.isEmpty())
QSKIP("No hdd devices found, test will be skipped");
- std::for_each(devices.begin(), devices.end(),
- [](QString &device) { device.prepend("hdd/temperature"); });
+ std::for_each(devices.begin(), devices.end(), [](QString &device) { device.prepend("hdd/temperature"); });
QCOMPARE(hddtempSource->sources(), devices);
QCOMPARE(smartctlSource->sources(), devices);
diff --git a/sources/test/testplayersource.cpp b/sources/test/testplayersource.cpp
index 6472546..ab7f26b 100644
--- a/sources/test/testplayersource.cpp
+++ b/sources/test/testplayersource.cpp
@@ -79,8 +79,7 @@ void TestPlayerSource::test_autoMpris()
void TestPlayerSource::test_mpd()
{
- QStringList args(QStringList() << "mpd" << mpdAddress << QString::number(mpdPort) << "auto"
- << QString::number(10));
+ QStringList args(QStringList() << "mpd" << mpdAddress << QString::number(mpdPort) << "auto" << QString::number(10));
PlayerSource *source = new PlayerSource(this, args);
_test_sources(source);
diff --git a/sources/version.h.in b/sources/version.h.in
index 05e080e..78efeb1 100644
--- a/sources/version.h.in
+++ b/sources/version.h.in
@@ -7,12 +7,11 @@ const char NAME[] = "Awesome Widgets";
const char VERSION[] = "@PROJECT_VERSION@";
const char COMMIT_SHA[] = "@PROJECT_COMMIT_SHA@";
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),Ibnu "
- "Daru Aji (Indonesian),Antonio Vivace (Italian)";
+const char TRANSLATORS[] = "Ernesto Aviles Vzqz (Spanish),Mermouy "
+ "(French),underr (Brazillian Portuguese),Viktor "
+ "Slobodyan (Ukrainian),Lemueler (Chinese),Heimen "
+ "Stoffels (Dutch),Mariusz Kocoń (Polish),Ibnu "
+ "Daru Aji (Indonesian),Antonio Vivace (Italian)";
const char EMAIL[] = "@PROJECT_CONTACT@";
const char LICENSE[] = "@PROJECT_LICENSE@";
const char TRDPARTY_LICENSE[] = "QReplyTimeout "
@@ -54,14 +53,13 @@ const char TIME_KEYS[] = "d,dd,ddd,dddd,M,MM,MMM,MMMM,yy,yyyy,h,hh,H,HH,m,mm,s,s
const char STATIC_FUNCTIONS[] = "{{\n\n}},template{{\n\n}},aw_all<>{{}},aw_"
"count<>{{}},aw_keys<>{{}},aw_macro<>{{}},aw_"
"names<>{{}}";
-const char STATIC_KEYS[]
- = "time,isotime,shorttime,longtime,tstime,ctime,uptime,cuptime,cpucl,cpu,"
- "gputemp,gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb,"
- "memusedgb,mem,swapmb,swapgb,swapfreemb,swapfreegb,swaptotmb,swaptotgb,"
- "swap,downunits,upunits,downkb,downtotkb,downtot,down,uptotkb,uptot,upkb,"
- "up,netdev,ac,bat,batleft,batnow,batrate,battotal,album,artist,duration,"
- "progress,title,dalbum,dartist,dtitle,salbum,sartist,stitle,pscount,pstot"
- ",ps,desktop,ndesktop,tdesktops,la15,la5,la1,ssid,volume,brightness";
+const char STATIC_KEYS[] = "time,isotime,shorttime,longtime,tstime,ctime,uptime,cuptime,cpucl,cpu,"
+ "gputemp,gpu,memmb,memgb,memfreemb,memfreegb,memtotmb,memtotgb,memusedmb,"
+ "memusedgb,mem,swapmb,swapgb,swapfreemb,swapfreegb,swaptotmb,swaptotgb,"
+ "swap,downunits,upunits,downkb,downtotkb,downtot,down,uptotkb,uptot,upkb,"
+ "up,netdev,ac,bat,batleft,batnow,batrate,battotal,album,artist,duration,"
+ "progress,title,dalbum,dartist,dtitle,salbum,sartist,stitle,pscount,pstot"
+ ",ps,desktop,ndesktop,tdesktops,la15,la5,la1,ssid,volume,brightness";
#cmakedefine BUILD_FUTURE
#cmakedefine BUILD_LOAD
#cmakedefine BUILD_TESTING