arcanis/awesome-widgets
1
0
Fork 0
mirror of https://github.com/arcan1s/awesome-widgets.git synced 2025-07-15 06:45:48 +00:00
Code Issues Projects Releases Wiki Activity

clang-tidy warning fixes

Browse Source
This commit is contained in:
Evgenii Alekseev
2020-11-03 04:23:01 +03:00
parent e81d765098
commit 91abbdcd96
99 changed files with 392 additions and 436 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
sources/awesome-widget/plugin/awabstractpairconfig.cpp
View File

@ -141,15 +141,17 @@ void AWAbstractPairConfig::execDialog()
}
// save configuration if required
auto status = true;
switch (ret) {
case 0:
break;
case 1:
default:
m_helper->writeItems(data);
m_helper->removeUnusedKeys(data.keys());
status &= m_helper->writeItems(data);
status &= m_helper->removeUnusedKeys(data.keys());
break;
}
qCDebug(LOG_AW) << "Configuration save status" << status;
}

6
sources/awesome-widget/plugin/awabstractpairconfig.h
View File

@ -35,7 +35,7 @@ class AWAbstractPairConfig : public QDialog
Q_OBJECT
public:
explicit AWAbstractPairConfig(QWidget *_parent = nullptr, const bool _hasEdit = false,
explicit AWAbstractPairConfig(QWidget *_parent = nullptr, bool _hasEdit = false,
QStringList _keys = QStringList());
~AWAbstractPairConfig() override;
template <class T> void initHelper()
@ -46,7 +46,7 @@ public:
}
void showDialog();
// properties
void setEditable(const bool _first, const bool _second);
void setEditable(bool _first, bool _second);
private slots:
void edit();
@ -66,7 +66,7 @@ private:
const QPair<QString, QString> &_current);
void clearSelectors();
void execDialog();
QPair<QStringList, QStringList> initKeys() const;
[[nodiscard]] QPair<QStringList, QStringList> initKeys() const;
void updateDialog();
};

2
sources/awesome-widget/plugin/awabstractpairhelper.cpp
View File

@ -30,7 +30,7 @@ AWAbstractPairHelper::AWAbstractPairHelper(QString _filePath, QString _section)
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
initItems();
AWAbstractPairHelper::initItems();
}

12
sources/awesome-widget/plugin/awabstractpairhelper.h
View File

@ -27,14 +27,14 @@ class AWAbstractPairHelper
public:
explicit AWAbstractPairHelper(QString _filePath = "", QString _section = "");
virtual ~AWAbstractPairHelper();
QStringList keys() const;
QHash<QString, QString> pairs() const;
QStringList values() const;
QSet<QString> valuesSet() const;
[[nodiscard]] QStringList keys() const;
[[nodiscard]] QHash<QString, QString> pairs() const;
[[nodiscard]] QStringList values() const;
[[nodiscard]] QSet<QString> valuesSet() const;
// read-write methods
virtual void initItems();
virtual bool writeItems(const QHash<QString, QString> &_configuration) const;
virtual bool removeUnusedKeys(const QStringList &_keys) const;
[[nodiscard]] virtual bool writeItems(const QHash<QString, QString> &_configuration) const;
[[nodiscard]] virtual bool removeUnusedKeys(const QStringList &_keys) const;
// configuration related
virtual void editPairs() = 0;
virtual QStringList leftKeys() = 0;

2
sources/awesome-widget/plugin/awabstractselector.h
View File

@ -35,7 +35,7 @@ public:
explicit AWAbstractSelector(QWidget *_parent = nullptr,
const QPair<bool, bool> &_editable = {false, false});
~AWAbstractSelector() override;
QPair<QString, QString> current() const;
[[nodiscard]] QPair<QString, QString> current() const;
void init(const QStringList &_keys, const QStringList &_values,
const QPair<QString, QString> &_current);

2
sources/awesome-widget/plugin/awactions.h
View File

@ -32,7 +32,7 @@ class AWActions : public QObject
public:
explicit AWActions(QObject *_parent = nullptr);
~AWActions() override;
Q_INVOKABLE void checkUpdates(const bool _showAnyway = false);
Q_INVOKABLE void checkUpdates(bool _showAnyway = false);
Q_INVOKABLE static QString getFileContent(const QString &_path);
Q_INVOKABLE static bool isDebugEnabled();
Q_INVOKABLE static bool runCmd(const QString &_cmd, const QStringList &_args);

2
sources/awesome-widget/plugin/awbugreporter.cpp
View File

@ -45,7 +45,7 @@ void AWBugReporter::doConnect()
{
// additional method for testing needs
connect(this, SIGNAL(replyReceived(const int, const QString &)), this,
SLOT(showInformation(const int, const QString &)));
SLOT(showInformation(int, const QString &)));
}

2
sources/awesome-widget/plugin/awbugreporter.h
View File

@ -42,7 +42,7 @@ signals:
private slots:
void issueReplyRecieved(QNetworkReply *_reply);
void showInformation(const int _number, const QString &_url);
void showInformation(int _number, const QString &_url);
void userReplyOnBugReport(QAbstractButton *_button);
private:

2
sources/awesome-widget/plugin/awconfighelper.cpp
View File

@ -42,7 +42,7 @@ AWConfigHelper::~AWConfigHelper()
}
QString AWConfigHelper::configurationDirectory() const
QString AWConfigHelper::configurationDirectory()
{
// get readable directory
QString localDir

12
sources/awesome-widget/plugin/awconfighelper.h
View File

@ -32,13 +32,13 @@ class AWConfigHelper : public QObject
public:
explicit AWConfigHelper(QObject *_parent = nullptr);
~AWConfigHelper() override;
Q_INVOKABLE QString configurationDirectory() const;
Q_INVOKABLE [[nodiscard]] static QString configurationDirectory();
Q_INVOKABLE static bool dropCache();
Q_INVOKABLE bool exportConfiguration(QObject *_nativeConfig, const QString &_fileName) const;
Q_INVOKABLE QVariantMap importConfiguration(const QString &_fileName,
const bool _importPlasmoid,
const bool _importExtensions,
const 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);
@ -47,7 +47,7 @@ private:
// methods
static void copyConfigs(const QString &_localDir);
void copyExtensions(const QString &_item, const QString &_type, QSettings &_settings,
const bool _inverse) const;
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);

6
sources/awesome-widget/plugin/awcustomkeyshelper.h
View File

@ -32,9 +32,9 @@ public:
explicit AWCustomKeysHelper(QObject *_parent = nullptr);
~AWCustomKeysHelper() override;
// get
QString source(const QString &_key) const;
QStringList sources() const;
QStringList refinedSources() const;
[[nodiscard]] QString source(const QString &_key) const;
[[nodiscard]] QStringList sources() const;
[[nodiscard]] QStringList refinedSources() const;
// configuration related
void editPairs() override{};
QStringList leftKeys() override;

2
sources/awesome-widget/plugin/awdataaggregator.cpp
View File

@ -119,7 +119,7 @@ QPixmap AWDataAggregator::tooltipImage()
// create frame
float normX = 100.0f / static_cast<float>(m_values[key].count());
float normY = 100.0f / (1.5f * m_boundaries[key]);
float shift = requiredKeys.indexOf(key) * 100.0f;
float shift = static_cast<float>(requiredKeys.indexOf(key)) * 100.0f;
if (down)
shift -= 100.0;
// apply pen color

8
sources/awesome-widget/plugin/awdataaggregator.h
View File

@ -49,17 +49,17 @@ private:
// ui
QGraphicsScene *m_toolTipScene = nullptr;
QGraphicsView *m_toolTipView = nullptr;
void checkValue(const QString &_source, const float _value, const float _extremum) const;
void checkValue(const QString &_source, float _value, float _extremum) const;
void checkValue(const QString &_source, const QString &_current,
const QString &_received) const;
void initScene();
static QString notificationText(const QString &_source, const float _value);
static QString notificationText(const QString &_source, float _value);
static QString notificationText(const QString &_source, const QString &_value);
// main method
void setData(const QVariantHash &_values);
void setData(const QString &_source, float _value, const float _extremum = -1.0f);
void setData(const QString &_source, float _value, float _extremum = -1.0f);
// different signature for battery device
void setData(const bool _dontInvert, const QString &_source, float _value);
void setData(bool _dontInvert, const QString &_source, float _value);
// variables
int m_counts = 0;
QVariantHash m_configuration;

14
sources/awesome-widget/plugin/awdataengineaggregator.cpp
View File

@ -36,7 +36,7 @@ AWDataEngineAggregator::AWDataEngineAggregator(QObject *_parent)
// additional method required by systemmonitor structure
m_newSourceConnection
= connect(m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
[this](const QString source) {
[this](const QString &source) {
emit(deviceAdded(source));
m_dataEngines["systemmonitor"]->connectSource(source, parent(), 1000);
});
@ -56,9 +56,9 @@ AWDataEngineAggregator::~AWDataEngineAggregator()
void AWDataEngineAggregator::disconnectSources()
{
for (auto dataengine : m_dataEngines.values())
for (auto &source : dataengine->sources())
dataengine->disconnectSource(source, parent());
for (auto dataEngine : m_dataEngines.values())
for (auto &source : dataEngine->sources())
dataEngine->disconnectSource(source, parent());
disconnect(m_newSourceConnection);
}
@ -75,7 +75,7 @@ void AWDataEngineAggregator::reconnectSources(const int _interval)
m_newSourceConnection = connect(
m_dataEngines["systemmonitor"], &Plasma::DataEngine::sourceAdded,
[this, _interval](const QString source) {
[this, _interval](const QString &source) {
emit(deviceAdded(source));
m_dataEngines["systemmonitor"]->connectSource(source, parent(), (uint)_interval);
});
@ -92,8 +92,8 @@ void AWDataEngineAggregator::dropSource(const QString &_source)
// HACK there is no possibility to check to which dataengine source
// connected we will try to disconnect it from all engines
for (auto dataengine : m_dataEngines.values())
dataengine->disconnectSource(_source, parent());
for (auto dataEngine : m_dataEngines.values())
dataEngine->disconnectSource(_source, parent());
}

2
sources/awesome-widget/plugin/awdataengineaggregator.h
View File

@ -33,7 +33,7 @@ public:
explicit AWDataEngineAggregator(QObject *_parent = nullptr);
~AWDataEngineAggregator() override;
void disconnectSources();
void reconnectSources(const int _interval);
void reconnectSources(int _interval);
signals:
void deviceAdded(const QString &_source);

4
sources/awesome-widget/plugin/awdataenginemapper.h
View File

@ -35,8 +35,8 @@ public:
explicit AWDataEngineMapper(QObject *_parent = nullptr, AWFormatterHelper *_custom = nullptr);
~AWDataEngineMapper() override;
// get methods
AWKeysAggregator::FormatterType formatter(const QString &_key) const;
QStringList keysFromSource(const QString &_source) const;
[[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);

2
sources/awesome-widget/plugin/awdbusadaptor.cpp
View File

@ -49,7 +49,7 @@ QStringList AWDBusAdaptor::ActiveServices() const
QStringList arguments = listServices.arguments().first().toStringList();
return std::accumulate(arguments.cbegin(), arguments.cend(), QStringList(),
[](QStringList &source, QString service) {
[](QStringList &source, const QString &service) {
if (service.startsWith(AWDBUS_SERVICE))
source.append(service);
return source;

14
sources/awesome-widget/plugin/awdbusadaptor.h
View File

@ -37,14 +37,14 @@ public:
public slots:
// get methods
QStringList ActiveServices() const;
QString Info(const QString &key) const;
QStringList Keys(const QString &regexp) const;
QString Value(const QString &key) const;
qlonglong WhoAmI() const;
[[nodiscard]] QStringList ActiveServices() const;
[[nodiscard]] QString Info(const QString &key) const;
[[nodiscard]] QStringList Keys(const QString &regexp) const;
[[nodiscard]] QString Value(const QString &key) const;
[[nodiscard]] qlonglong WhoAmI() const;
// set methods
void SetLogLevel(const QString &what, const int level);
void SetLogLevel(const QString &what, const QString &level, const bool enabled);
void SetLogLevel(const QString &what, int level);
void SetLogLevel(const QString &what, const QString &level, bool enabled);
private:
AWKeys *m_plugin = nullptr;

5
sources/awesome-widget/plugin/awformatterhelper.cpp
View File

@ -39,7 +39,7 @@ AWFormatterHelper::AWFormatterHelper(QWidget *_parent)
{
qCDebug(LOG_AW) << __PRETTY_FUNCTION__;
initItems();
AWFormatterHelper::initItems();
}
@ -55,7 +55,6 @@ AWFormatterHelper::~AWFormatterHelper()
void AWFormatterHelper::initItems()
{
initFormatters();
AWAbstractPairHelper::initItems();
// assign internal storage
m_formatters.clear();
@ -199,7 +198,7 @@ void AWFormatterHelper::initFormatters()
QPair<QString, AWAbstractFormatter::FormatterClass>
AWFormatterHelper::readMetadata(const QString &_filePath) const
AWFormatterHelper::readMetadata(const QString &_filePath)
{
qCDebug(LOG_AW) << "Read initial parameters from" << _filePath;

10
sources/awesome-widget/plugin/awformatterhelper.h
View File

@ -34,9 +34,9 @@ public:
// read-write methods
void initItems() override;
// methods
QString convert(const QVariant &_value, const QString &_name) const;
QStringList definedFormatters() const;
QList<AbstractExtItem *> items() const override;
[[nodiscard]] QString convert(const QVariant &_value, const QString &_name) const;
[[nodiscard]] QStringList definedFormatters() const;
[[nodiscard]] QList<AbstractExtItem *> items() const override;
// configuration related
void editPairs() override;
QStringList leftKeys() override;
@ -49,8 +49,8 @@ private:
// methods
static AWAbstractFormatter::FormatterClass defineFormatterClass(const QString &_stringType);
void initFormatters();
QPair<QString, AWAbstractFormatter::FormatterClass>
readMetadata(const QString &_filePath) const;
[[nodiscard]] static QPair<QString, AWAbstractFormatter::FormatterClass>
readMetadata(const QString &_filePath);
// parent methods
void doCreateItem() override;
// properties

18
sources/awesome-widget/plugin/awkeyoperations.h
View File

@ -40,18 +40,18 @@ class AWKeyOperations : public QObject
public:
explicit AWKeyOperations(QObject *_parent = nullptr);
~AWKeyOperations() override;
QStringList devices(const QString &_type) const;
QHash<QString, QStringList> devices() const;
[[nodiscard]] QStringList devices(const QString &_type) const;
[[nodiscard]] QHash<QString, QStringList> devices() const;
void updateCache();
// keys
QStringList dictKeys() const;
GraphicalItem *giByKey(const QString &_key) const;
QStringList requiredUserKeys() const;
QStringList userKeys() const;
QString userKeySource(const QString &_key) const;
[[nodiscard]] QStringList dictKeys() const;
[[nodiscard]] GraphicalItem *giByKey(const QString &_key) const;
[[nodiscard]] QStringList requiredUserKeys() const;
[[nodiscard]] QStringList userKeys() const;
[[nodiscard]] QString userKeySource(const QString &_key) const;
// values
QString infoByKey(const QString &_key) const;
QString pattern() const;
[[nodiscard]] QString infoByKey(const QString &_key) const;
[[nodiscard]] QString pattern() const;
void setPattern(const QString &_currentPattern);
// configuration
void editItem(const QString &_type);

4
sources/awesome-widget/plugin/awkeys.cpp
View File

@ -76,7 +76,7 @@ AWKeys::~AWKeys()
m_timer->stop();
// delete dbus session
qlonglong id = reinterpret_cast<qlonglong>(this);
auto id = reinterpret_cast<qlonglong>(this);
QDBusConnection::sessionBus().unregisterObject(QString("/%1").arg(id));
}
@ -305,7 +305,7 @@ void AWKeys::calculateValues()
void AWKeys::createDBusInterface()
{
// get this object id
qlonglong id = reinterpret_cast<qlonglong>(this);
auto id = reinterpret_cast<qlonglong>(this);
// create session
QDBusConnection instanceBus = QDBusConnection::sessionBus();

17
sources/awesome-widget/plugin/awkeys.h
View File

@ -40,19 +40,20 @@ public:
explicit AWKeys(QObject *_parent = nullptr);
~AWKeys() override;
Q_INVOKABLE void initDataAggregator(const QVariantMap &_tooltipParams);
Q_INVOKABLE void initKeys(const QString &_currentPattern, const int _interval, const int _limit,
const 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(const bool _wrap);
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 QStringList dictKeys(const bool _sorted = false, const QString &_regexp = "") const;
Q_INVOKABLE QVariantList getHddDevices() const;
Q_INVOKABLE [[nodiscard]] QStringList dictKeys(bool _sorted = false,
const QString &_regexp = "") const;
Q_INVOKABLE [[nodiscard]] QVariantList getHddDevices() const;
// values
Q_INVOKABLE QString infoByKey(const QString &_key) const;
Q_INVOKABLE QString valueByKey(const QString &_key) const;
Q_INVOKABLE [[nodiscard]] QString infoByKey(const QString &_key) const;
Q_INVOKABLE [[nodiscard]] QString valueByKey(const QString &_key) const;
// configuration
Q_INVOKABLE void editItem(const QString &_type);
@ -74,7 +75,7 @@ private:
// methods
void calculateValues();
void createDBusInterface();
QString parsePattern(QString _pattern) const;
[[nodiscard]] QString parsePattern(QString _pattern) const;
void setDataBySource(const QString &_sourceName, const QVariantMap &_data);
// objects
AWDataAggregator *m_dataAggregator = nullptr;

9
sources/awesome-widget/plugin/awkeysaggregator.h
View File

@ -69,8 +69,9 @@ public:
~AWKeysAggregator() override;
void initFormatters();
// get methods
QString formatter(const QVariant &_data, const QString &_key, bool replaceSpace) const;
QStringList keysFromSource(const QString &_source) 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);
void setAcOnline(const QString &_active);
@ -78,14 +79,14 @@ public:
void setCustomUptime(const QString &_customUptime);
void setDevices(const QHash<QString, QStringList> &_devices);
void setTempUnits(const QString &_units);
void setTranslate(const bool _translate);
void setTranslate(bool _translate);
public slots:
QStringList registerSource(const QString &_source, const QString &_units,
const QStringList &_keys);
private:
float temperature(const float temp) const;
[[nodiscard]] float temperature(float temp) const;
AWFormatterHelper *m_customFormatters = nullptr;
AWDataEngineMapper *m_mapper = nullptr;
QStringList m_timeKeys;

2
sources/awesome-widget/plugin/awpatternfunctions.h
View File

@ -44,7 +44,7 @@ QString insertKeyNames(QString _code, const QStringList &_keys);
QString insertKeys(QString _code, const QStringList &_keys);
QString insertMacros(QString _code);
// find methods
QStringList findKeys(const QString &_code, const QStringList &_keys, const bool _isBars);
QStringList findKeys(const QString &_code, const QStringList &_keys, bool _isBars);
QStringList findLambdas(const QString &_code);
} // namespace AWPatternFunctions

10
sources/awesome-widget/plugin/awtelemetryhandler.h
View File

@ -33,10 +33,10 @@ public:
explicit AWTelemetryHandler(QObject *_parent = nullptr, const QString &_clientId = "");
~AWTelemetryHandler() override;
Q_INVOKABLE QStringList get(const QString &_group) const;
Q_INVOKABLE QString getLast(const QString &_group) const;
Q_INVOKABLE void init(const int _count, const bool _enableRemote, const QString &_clientId);
Q_INVOKABLE bool put(const QString &_group, const QString &_value) const;
Q_INVOKABLE [[nodiscard]] QStringList get(const QString &_group) const;
Q_INVOKABLE [[nodiscard]] QString getLast(const QString &_group) const;
Q_INVOKABLE void init(int _count, bool _enableRemote, const QString &_clientId);
Q_INVOKABLE [[nodiscard]] bool put(const QString &_group, const QString &_value) const;
Q_INVOKABLE void uploadTelemetry(const QString &_group, const QString &_value);
signals:
@ -46,7 +46,7 @@ private slots:
void telemetryReplyRecieved(QNetworkReply *_reply);
private:
static QString getKey(const int _count);
static QString getKey(int _count);
QString m_clientId;
QString m_localFile;
int m_storeCount = 0;

6
sources/awesome-widget/plugin/awupdatehelper.h
View File

@ -33,18 +33,18 @@ class AWUpdateHelper : public QObject
public:
explicit AWUpdateHelper(QObject *_parent = nullptr);
~AWUpdateHelper() override;
void checkUpdates(const bool _showAnyway = false);
void checkUpdates(bool _showAnyway = false);
bool checkVersion();
private slots:
static void showInfo(const QVersionNumber &_version);
void showUpdates(const QVersionNumber &_version);
void userReplyOnUpdates(QAbstractButton *_button);
void versionReplyRecieved(QNetworkReply *_reply, const bool _showAnyway);
void versionReplyRecieved(QNetworkReply *_reply, bool _showAnyway);
private:
static QMessageBox *genMessageBox(const QString &_title, const QString &_body,
const QMessageBox::StandardButtons _buttons);
QMessageBox::StandardButtons _buttons);
QVersionNumber m_foundVersion;
QString m_genericConfig;
};