diff --git a/sources/3rdparty/fontdialog/fontdialog.cpp b/sources/3rdparty/fontdialog/fontdialog.cpp index 2cfb6cf..03ecd74 100644 --- a/sources/3rdparty/fontdialog/fontdialog.cpp +++ b/sources/3rdparty/fontdialog/fontdialog.cpp @@ -58,7 +58,7 @@ CFontDialog::CFontDialog(QWidget *parent, bool needWeight, bool needItalic) setLayout(mainGrid); colorBox = new QComboBox(this); - connect(colorBox, SIGNAL(currentIndexChanged(QString)), this, SLOT(updateColor(QString))); + connect(colorBox, &QComboBox::currentTextChanged, this, &CFontDialog::updateColor); QStringList colorNames = QColor::colorNames(); int index = 0; for (int i=0; iaddWidget(buttons, 1, 0, 1, 5); italicBox->setHidden(!needItalic); diff --git a/sources/3rdparty/fontdialog/fontdialog.h b/sources/3rdparty/fontdialog/fontdialog.h index 6302e33..237acb0 100644 --- a/sources/3rdparty/fontdialog/fontdialog.h +++ b/sources/3rdparty/fontdialog/fontdialog.h @@ -15,8 +15,7 @@ * License along with this library. * ***************************************************************************/ -#ifndef FONTDIALOG_H -#define FONTDIALOG_H +#pragma once #include #include @@ -72,6 +71,3 @@ private: QSpinBox *sizeBox; QSpinBox *weightBox; }; - - -#endif /* FONTDIALOG_H */ diff --git a/sources/awdebug.h b/sources/awdebug.h index a43db77..560974c 100644 --- a/sources/awdebug.h +++ b/sources/awdebug.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWDEBUG_H -#define AWDEBUG_H +#pragma once #include @@ -42,6 +40,3 @@ Q_DECLARE_LOGGING_CATEGORY(LOG_DP) Q_DECLARE_LOGGING_CATEGORY(LOG_ESM) Q_DECLARE_LOGGING_CATEGORY(LOG_ESS) Q_DECLARE_LOGGING_CATEGORY(LOG_LIB) - - -#endif /* AWDEBUG_H */ diff --git a/sources/awesome-widget/plugin/awabstractpairconfig.h b/sources/awesome-widget/plugin/awabstractpairconfig.h index e5b6411..67ce85e 100644 --- a/sources/awesome-widget/plugin/awabstractpairconfig.h +++ b/sources/awesome-widget/plugin/awabstractpairconfig.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWABSTRACTPAIRCONFIG_H -#define AWABSTRACTPAIRCONFIG_H +#pragma once #include @@ -67,6 +65,3 @@ private: [[nodiscard]] QPair initKeys() const; void updateDialog(); }; - - -#endif /* AWABSTRACTPAIRCONFIG_H */ diff --git a/sources/awesome-widget/plugin/awabstractpairhelper.h b/sources/awesome-widget/plugin/awabstractpairhelper.h index b5817c4..3f18052 100644 --- a/sources/awesome-widget/plugin/awabstractpairhelper.h +++ b/sources/awesome-widget/plugin/awabstractpairhelper.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWABSTRACTPAIRHELPER_H -#define AWABSTRACTPAIRHELPER_H +#pragma once #include @@ -46,6 +44,3 @@ private: QString m_filePath; QString m_section; }; - - -#endif /* AWABSTRACTPAIRHELPER_H */ diff --git a/sources/awesome-widget/plugin/awabstractselector.h b/sources/awesome-widget/plugin/awabstractselector.h index 9b5c9a5..e368071 100644 --- a/sources/awesome-widget/plugin/awabstractselector.h +++ b/sources/awesome-widget/plugin/awabstractselector.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWABSTRACTSELECTOR_H -#define AWABSTRACTSELECTOR_H +#pragma once #include @@ -43,6 +41,3 @@ signals: private: Ui::AWAbstractSelector *ui = nullptr; }; - - -#endif /* AWABSTRACTSELECTOR_H */ diff --git a/sources/awesome-widget/plugin/awactions.h b/sources/awesome-widget/plugin/awactions.h index 08c359a..afb2ef0 100644 --- a/sources/awesome-widget/plugin/awactions.h +++ b/sources/awesome-widget/plugin/awactions.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWACTIONS_H -#define AWACTIONS_H +#pragma once #include #include @@ -47,6 +45,3 @@ public slots: private: AWUpdateHelper *m_updateHelper = nullptr; }; - - -#endif /* AWACTIONS_H */ diff --git a/sources/awesome-widget/plugin/awbugreporter.h b/sources/awesome-widget/plugin/awbugreporter.h index 82e53ca..70c7bd5 100644 --- a/sources/awesome-widget/plugin/awbugreporter.h +++ b/sources/awesome-widget/plugin/awbugreporter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWBUGREPORTER_H -#define AWBUGREPORTER_H +#pragma once #include @@ -48,6 +46,3 @@ private slots: private: QString m_lastBugUrl; }; - - -#endif /* AWBUGREPORTER_H */ diff --git a/sources/awesome-widget/plugin/awconfighelper.h b/sources/awesome-widget/plugin/awconfighelper.h index 47e6a64..dfbcf66 100644 --- a/sources/awesome-widget/plugin/awconfighelper.h +++ b/sources/awesome-widget/plugin/awconfighelper.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWCONFIGHELPER_H -#define AWCONFIGHELPER_H +#pragma once #include #include @@ -52,6 +50,3 @@ private: QString m_baseDir; QStringList m_dirs = {"desktops", "quotes", "scripts", "upgrade", "weather", "formatters"}; }; - - -#endif /* AWCONFIGHELPER_H */ diff --git a/sources/awesome-widget/plugin/awcustomkeysconfig.h b/sources/awesome-widget/plugin/awcustomkeysconfig.h index bb44b16..52e35e8 100644 --- a/sources/awesome-widget/plugin/awcustomkeysconfig.h +++ b/sources/awesome-widget/plugin/awcustomkeysconfig.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWCUSTOMKEYSCONFIG_H -#define AWCUSTOMKEYSCONFIG_H +#pragma once #include "awabstractpairconfig.h" @@ -30,6 +28,3 @@ public: explicit AWCustomKeysConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList()); ~AWCustomKeysConfig() override; }; - - -#endif /* AWCUSTOMKEYSCONFIG_H */ diff --git a/sources/awesome-widget/plugin/awcustomkeyshelper.h b/sources/awesome-widget/plugin/awcustomkeyshelper.h index 87dff8a..0012310 100644 --- a/sources/awesome-widget/plugin/awcustomkeyshelper.h +++ b/sources/awesome-widget/plugin/awcustomkeyshelper.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWCUSTOMKEYSHELPER_H -#define AWCUSTOMKEYSHELPER_H +#pragma once #include @@ -42,6 +40,3 @@ public: private: }; - - -#endif /* AWCUSTOMKEYSHELPER_H */ diff --git a/sources/awesome-widget/plugin/awdataaggregator.h b/sources/awesome-widget/plugin/awdataaggregator.h index 0b5f0ce..8d39853 100644 --- a/sources/awesome-widget/plugin/awdataaggregator.h +++ b/sources/awesome-widget/plugin/awdataaggregator.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWTOOLTIP_H -#define AWTOOLTIP_H +#pragma once #include #include @@ -68,6 +66,3 @@ private: bool m_enablePopup = false; QStringList requiredKeys; }; - - -#endif /* AWTOOLTIP_H */ diff --git a/sources/awesome-widget/plugin/awdataenginemapper.h b/sources/awesome-widget/plugin/awdataenginemapper.h index aa65bfa..6903d4f 100644 --- a/sources/awesome-widget/plugin/awdataenginemapper.h +++ b/sources/awesome-widget/plugin/awdataenginemapper.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWDATAENGINEMAPPER_H -#define AWDATAENGINEMAPPER_H +#pragma once #include @@ -50,6 +48,3 @@ private: QHash m_formatter; QMultiHash m_map; }; - - -#endif /* AWDATAENGINEMAPPER_H */ diff --git a/sources/awesome-widget/plugin/awdbusadaptor.h b/sources/awesome-widget/plugin/awdbusadaptor.h index 5495a34..dc75fd6 100644 --- a/sources/awesome-widget/plugin/awdbusadaptor.h +++ b/sources/awesome-widget/plugin/awdbusadaptor.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWDBUSADAPTOR_H -#define AWDBUSADAPTOR_H +#pragma once #include @@ -50,6 +48,3 @@ private: AWKeys *m_plugin = nullptr; QStringList m_logLevels = {"debug", "info", "warning", "critical"}; }; - - -#endif /* AWDBUSADAPTOR_H */ diff --git a/sources/awesome-widget/plugin/awesomewidget.h b/sources/awesome-widget/plugin/awesomewidget.h index 86ab973..2de1c9b 100644 --- a/sources/awesome-widget/plugin/awesomewidget.h +++ b/sources/awesome-widget/plugin/awesomewidget.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWPLUGIN_H -#define AWPLUGIN_H +#pragma once #include @@ -30,6 +28,3 @@ class AWPlugin : public QQmlExtensionPlugin public: void registerTypes(const char *uri) override; }; - - -#endif /* AWPLUGIN_H */ diff --git a/sources/awesome-widget/plugin/awformatterconfig.h b/sources/awesome-widget/plugin/awformatterconfig.h index c7a5a6a..cdbe75e 100644 --- a/sources/awesome-widget/plugin/awformatterconfig.h +++ b/sources/awesome-widget/plugin/awformatterconfig.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWFORMATTERCONFIG_H -#define AWFORMATTERCONFIG_H +#pragma once #include "awabstractpairconfig.h" @@ -30,6 +28,3 @@ public: explicit AWFormatterConfig(QWidget *_parent = nullptr, const QStringList &_keys = QStringList()); ~AWFormatterConfig() override; }; - - -#endif /* AWFORMATTERCONFIG_H */ diff --git a/sources/awesome-widget/plugin/awformatterhelper.h b/sources/awesome-widget/plugin/awformatterhelper.h index f5b7a9b..cf8523c 100644 --- a/sources/awesome-widget/plugin/awformatterhelper.h +++ b/sources/awesome-widget/plugin/awformatterhelper.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWFORMATTERHELPER_H -#define AWFORMATTERHELPER_H +#pragma once #include "abstractextitemaggregator.h" #include "awabstractformatter.h" @@ -56,6 +54,3 @@ private: QHash m_formatters; QHash m_formattersClasses; }; - - -#endif /* AWFORMATTERHELPER_H */ diff --git a/sources/awesome-widget/plugin/awkeycache.h b/sources/awesome-widget/plugin/awkeycache.h index a982c82..bd32388 100644 --- a/sources/awesome-widget/plugin/awkeycache.h +++ b/sources/awesome-widget/plugin/awkeycache.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWKEYCACHE_H -#define AWKEYCACHE_H +#pragma once #include #include @@ -31,6 +29,3 @@ QStringList getRequiredKeys(const QStringList &_keys, const QStringList &_bars, const QStringList &_userKeys, const QStringList &_allKeys); QHash loadKeysFromCache(); } // namespace AWKeyCache - - -#endif /* AWKEYCACHE_H */ diff --git a/sources/awesome-widget/plugin/awkeyoperations.h b/sources/awesome-widget/plugin/awkeyoperations.h index ee01197..eb0a40d 100644 --- a/sources/awesome-widget/plugin/awkeyoperations.h +++ b/sources/awesome-widget/plugin/awkeyoperations.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWKEYOPERATIONS_H -#define AWKEYOPERATIONS_H +#pragma once #include @@ -78,6 +76,3 @@ private: QHash m_devices; QString m_pattern; }; - - -#endif /* AWKEYOPERATIONS_H */ diff --git a/sources/awesome-widget/plugin/awkeys.h b/sources/awesome-widget/plugin/awkeys.h index 5673d78..98ce5ca 100644 --- a/sources/awesome-widget/plugin/awkeys.h +++ b/sources/awesome-widget/plugin/awkeys.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWKEYS_H -#define AWKEYS_H +#pragma once #include #include @@ -90,6 +88,3 @@ private: QThreadPool *m_threadPool = nullptr; QMutex m_mutex; }; - - -#endif /* AWKEYS_H */ diff --git a/sources/awesome-widget/plugin/awkeysaggregator.h b/sources/awesome-widget/plugin/awkeysaggregator.h index 9a6d462..bd7fc7d 100644 --- a/sources/awesome-widget/plugin/awkeysaggregator.h +++ b/sources/awesome-widget/plugin/awkeysaggregator.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWKEYSAGGREGATOR_H -#define AWKEYSAGGREGATOR_H +#pragma once #include @@ -103,6 +101,3 @@ private: QString m_tempUnits; bool m_translate = false; }; - - -#endif /* AWKEYSAGGREGATOR_H */ diff --git a/sources/awesome-widget/plugin/awpairconfigfactory.h b/sources/awesome-widget/plugin/awpairconfigfactory.h index 5ecb661..0969d68 100644 --- a/sources/awesome-widget/plugin/awpairconfigfactory.h +++ b/sources/awesome-widget/plugin/awpairconfigfactory.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWPAIRCONFIGFACTORY_H -#define AWPAIRCONFIGFACTORY_H +#pragma once #include @@ -34,6 +32,3 @@ public: private: }; - - -#endif /* AWPAIRCONFIGFACTORY_H */ diff --git a/sources/awesome-widget/plugin/awpatternfunctions.h b/sources/awesome-widget/plugin/awpatternfunctions.h index 5e89406..2d3f2a4 100644 --- a/sources/awesome-widget/plugin/awpatternfunctions.h +++ b/sources/awesome-widget/plugin/awpatternfunctions.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWPATTERNFUNCTIONS_H -#define AWPATTERNFUNCTIONS_H +#pragma once #include #include @@ -47,6 +45,3 @@ QString insertMacros(QString _code); QStringList findKeys(const QString &_code, const QStringList &_keys, bool _isBars); QStringList findLambdas(const QString &_code); } // namespace AWPatternFunctions - - -#endif /* AWPATTERNFUNCTIONS_H */ diff --git a/sources/awesome-widget/plugin/awtelemetryhandler.h b/sources/awesome-widget/plugin/awtelemetryhandler.h index cc41fa0..329110a 100644 --- a/sources/awesome-widget/plugin/awtelemetryhandler.h +++ b/sources/awesome-widget/plugin/awtelemetryhandler.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWTELEMETRYHANDLER_H -#define AWTELEMETRYHANDLER_H +#pragma once #include @@ -52,6 +50,3 @@ private: int m_storeCount = 0; bool m_uploadEnabled = false; }; - - -#endif /* AWTELEMETRYHANDLER_H */ diff --git a/sources/awesome-widget/plugin/awupdatehelper.h b/sources/awesome-widget/plugin/awupdatehelper.h index 5442ca8..017fa35 100644 --- a/sources/awesome-widget/plugin/awupdatehelper.h +++ b/sources/awesome-widget/plugin/awupdatehelper.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWUPDATEHELPER_H -#define AWUPDATEHELPER_H +#pragma once #include #include @@ -48,6 +46,3 @@ private: QVersionNumber m_foundVersion; QString m_genericConfig; }; - - -#endif /* AWUPDATEHELPER_H */ diff --git a/sources/awesomewidgets/abstractextitem.h b/sources/awesomewidgets/abstractextitem.h index d2f60f3..7eb3bbe 100644 --- a/sources/awesomewidgets/abstractextitem.h +++ b/sources/awesomewidgets/abstractextitem.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef ABSTRACTEXTITEM_H -#define ABSTRACTEXTITEM_H +#pragma once #include @@ -102,6 +101,3 @@ private: QLocalServer *m_socket = nullptr; QString m_socketFile = ""; }; - - -#endif /* ABSTRACTEXTITEM_H */ diff --git a/sources/awesomewidgets/abstractextitemaggregator.h b/sources/awesomewidgets/abstractextitemaggregator.h index d984a97..fd395c1 100644 --- a/sources/awesomewidgets/abstractextitemaggregator.h +++ b/sources/awesomewidgets/abstractextitemaggregator.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef ABSTRACTEXTITEMAGGREGATOR_H -#define ABSTRACTEXTITEMAGGREGATOR_H +#pragma once #include @@ -80,6 +79,3 @@ private: // ui methods virtual void doCreateItem(QListWidget *_widget) = 0; }; - - -#endif /* ABSTRACTEXTITEMAGGREGATOR_H */ diff --git a/sources/awesomewidgets/abstractquotesprovider.h b/sources/awesomewidgets/abstractquotesprovider.h index 2de5455..409051f 100644 --- a/sources/awesomewidgets/abstractquotesprovider.h +++ b/sources/awesomewidgets/abstractquotesprovider.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef ABSTRACTQUOTESPROVIDER_H -#define ABSTRACTQUOTESPROVIDER_H +#pragma once #include #include @@ -40,6 +39,3 @@ public: }; [[nodiscard]] virtual QUrl url() const = 0; }; - - -#endif /* ABSTRACTQUOTESPROVIDER_H */ diff --git a/sources/awesomewidgets/abstractweatherprovider.h b/sources/awesomewidgets/abstractweatherprovider.h index f0b9ec1..817c711 100644 --- a/sources/awesomewidgets/abstractweatherprovider.h +++ b/sources/awesomewidgets/abstractweatherprovider.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef ABSTRACTWEATHERPROVIDER_H -#define ABSTRACTWEATHERPROVIDER_H +#pragma once #include #include @@ -40,6 +39,3 @@ public: }; [[nodiscard]] virtual QUrl url() const = 0; }; - - -#endif /* ABSTRACTWEATHERPROVIDER_H */ diff --git a/sources/awesomewidgets/awabstractformatter.h b/sources/awesomewidgets/awabstractformatter.h index 95004ec..c1612d3 100644 --- a/sources/awesomewidgets/awabstractformatter.h +++ b/sources/awesomewidgets/awabstractformatter.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef AWABSTRACTFORMATTER_H -#define AWABSTRACTFORMATTER_H +#pragma once #include @@ -52,6 +51,3 @@ private: // properties FormatterClass m_type = FormatterClass::NoFormat; }; - - -#endif /* AWABSTRACTFORMATTER_H */ diff --git a/sources/awesomewidgets/awdatetimeformatter.h b/sources/awesomewidgets/awdatetimeformatter.h index 3120204..d1676b4 100644 --- a/sources/awesomewidgets/awdatetimeformatter.h +++ b/sources/awesomewidgets/awdatetimeformatter.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef AWDATETIMEFORMATTER_H -#define AWDATETIMEFORMATTER_H +#pragma once #include @@ -52,6 +51,3 @@ private: QString m_format = ""; bool m_translate = true; }; - - -#endif /* AWDATETIMEFORMATTER_H */ diff --git a/sources/awesomewidgets/awfloatformatter.h b/sources/awesomewidgets/awfloatformatter.h index f339970..f1e3bc8 100644 --- a/sources/awesomewidgets/awfloatformatter.h +++ b/sources/awesomewidgets/awfloatformatter.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef AWFLOATFORMATTER_H -#define AWFLOATFORMATTER_H +#pragma once #include "awabstractformatter.h" @@ -68,6 +67,3 @@ private: int m_precision = -1; double m_summand = 0.0; }; - - -#endif /* AWFLOATFORMATTER_H */ diff --git a/sources/awesomewidgets/awjsonformatter.h b/sources/awesomewidgets/awjsonformatter.h index d521ad6..d99f315 100644 --- a/sources/awesomewidgets/awjsonformatter.h +++ b/sources/awesomewidgets/awjsonformatter.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef AWJSONFORMATTER_H -#define AWJSONFORMATTER_H +#pragma once #include "awabstractformatter.h" @@ -49,6 +48,3 @@ private: QString m_path; QVariantList m_splittedPath; }; - - -#endif /* AWJSONFORMATTER_H */ diff --git a/sources/awesomewidgets/awlistformatter.h b/sources/awesomewidgets/awlistformatter.h index 8ba78eb..a13a777 100644 --- a/sources/awesomewidgets/awlistformatter.h +++ b/sources/awesomewidgets/awlistformatter.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef AWLISTFORMATTER_H -#define AWLISTFORMATTER_H +#pragma once #include "awabstractformatter.h" @@ -53,6 +52,3 @@ private: bool m_sorted = false; QRegularExpression m_regex; }; - - -#endif /* AWLISTFORMATTER_H */ diff --git a/sources/awesomewidgets/awnoformatter.h b/sources/awesomewidgets/awnoformatter.h index 78ae248..e9fc529 100644 --- a/sources/awesomewidgets/awnoformatter.h +++ b/sources/awesomewidgets/awnoformatter.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef AWNOFORMATTER_H -#define AWNOFORMATTER_H +#pragma once #include "awabstractformatter.h" @@ -37,6 +36,3 @@ private: void translate(void *_ui) override; // properties }; - - -#endif /* AWNOFORMATTER_H */ diff --git a/sources/awesomewidgets/awscriptformatter.h b/sources/awesomewidgets/awscriptformatter.h index 9e93a6d..af704a8 100644 --- a/sources/awesomewidgets/awscriptformatter.h +++ b/sources/awesomewidgets/awscriptformatter.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef AWSCRIPTFORMATTER_H -#define AWSCRIPTFORMATTER_H +#pragma once #include "awabstractformatter.h" @@ -56,6 +55,3 @@ private: bool m_hasReturn = false; QString m_program; }; - - -#endif /* AWSCRIPTFORMATTER_H */ diff --git a/sources/awesomewidgets/awstringformatter.h b/sources/awesomewidgets/awstringformatter.h index a39a814..139ccdc 100644 --- a/sources/awesomewidgets/awstringformatter.h +++ b/sources/awesomewidgets/awstringformatter.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef AWSTRINGFORMATTER_H -#define AWSTRINGFORMATTER_H +#pragma once #include "awabstractformatter.h" @@ -52,6 +51,3 @@ private: QChar m_fillChar = QChar(); bool m_forceWidth = false; }; - - -#endif /* AWSTRINGFORMATTER_H */ diff --git a/sources/awesomewidgets/extitemaggregator.h b/sources/awesomewidgets/extitemaggregator.h index 91532f7..9a59297 100644 --- a/sources/awesomewidgets/extitemaggregator.h +++ b/sources/awesomewidgets/extitemaggregator.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef EXTITEMAGGREGATOR_H -#define EXTITEMAGGREGATOR_H +#pragma once #include @@ -150,6 +149,3 @@ private: return items; }; }; - - -#endif /* EXTITEMAGGREGATOR_H */ diff --git a/sources/awesomewidgets/extnetworkrequest.h b/sources/awesomewidgets/extnetworkrequest.h index 3d92ab2..3afdb78 100644 --- a/sources/awesomewidgets/extnetworkrequest.h +++ b/sources/awesomewidgets/extnetworkrequest.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef EXTNETWORKREQUEST_H -#define EXTNETWORKREQUEST_H +#pragma once #include @@ -59,6 +58,3 @@ private: // values QVariantHash m_values; }; - - -#endif /* EXTNETWORKREQUEST_H */ diff --git a/sources/awesomewidgets/extquotes.h b/sources/awesomewidgets/extquotes.h index 68f5b6e..d6d7b02 100644 --- a/sources/awesomewidgets/extquotes.h +++ b/sources/awesomewidgets/extquotes.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef EXTQUOTES_H -#define EXTQUOTES_H +#pragma once #include @@ -61,6 +60,3 @@ private: // values QVariantHash m_values; }; - - -#endif /* EXTQUOTES_H */ diff --git a/sources/awesomewidgets/extscript.h b/sources/awesomewidgets/extscript.h index 2479367..81815af 100644 --- a/sources/awesomewidgets/extscript.h +++ b/sources/awesomewidgets/extscript.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef EXTSCRIPT_H -#define EXTSCRIPT_H +#pragma once #include @@ -76,6 +75,3 @@ private: QVariantMap m_jsonFilters; QVariantHash m_values; }; - - -#endif /* EXTSCRIPT_H */ diff --git a/sources/awesomewidgets/extupgrade.h b/sources/awesomewidgets/extupgrade.h index 30d72f3..0c9f649 100644 --- a/sources/awesomewidgets/extupgrade.h +++ b/sources/awesomewidgets/extupgrade.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef EXTUPGRADE_H -#define EXTUPGRADE_H +#pragma once #include @@ -64,6 +63,3 @@ private: // internal properties QVariantHash m_values; }; - - -#endif /* EXTUPGRADE_H */ diff --git a/sources/awesomewidgets/extweather.h b/sources/awesomewidgets/extweather.h index c3dda30..40574d4 100644 --- a/sources/awesomewidgets/extweather.h +++ b/sources/awesomewidgets/extweather.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef EXTWEATHER_H -#define EXTWEATHER_H +#pragma once #include @@ -90,6 +89,3 @@ private: // values QVariantHash m_values; }; - - -#endif /* EXTWEATHER_H */ diff --git a/sources/awesomewidgets/graphicalitem.h b/sources/awesomewidgets/graphicalitem.h index c92c9fd..1246503 100644 --- a/sources/awesomewidgets/graphicalitem.h +++ b/sources/awesomewidgets/graphicalitem.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef GRAPHICALITEM_H -#define GRAPHICALITEM_H +#pragma once #include @@ -118,6 +117,3 @@ private: QStringList m_usedKeys; int m_width = 100; }; - - -#endif /* GRAPHICALITEM_H */ diff --git a/sources/awesomewidgets/graphicalitemhelper.h b/sources/awesomewidgets/graphicalitemhelper.h index 1c0c27b..b08762e 100644 --- a/sources/awesomewidgets/graphicalitemhelper.h +++ b/sources/awesomewidgets/graphicalitemhelper.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef GRAPHICALITEMHELPER_H -#define GRAPHICALITEMHELPER_H +#pragma once #include #include @@ -56,6 +55,3 @@ private: // list of values which will be used to store data for graph type only QList m_values; }; - - -#endif /* GRAPHICALITEMHELPER_H */ diff --git a/sources/awesomewidgets/owmweatherprovider.h b/sources/awesomewidgets/owmweatherprovider.h index 44612cb..af49e63 100644 --- a/sources/awesomewidgets/owmweatherprovider.h +++ b/sources/awesomewidgets/owmweatherprovider.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef OWMWEATHERPROVIDER_H -#define OWMWEATHERPROVIDER_H +#pragma once #include "abstractweatherprovider.h" @@ -42,6 +41,3 @@ private: int m_ts = 0; QUrl m_url; }; - - -#endif /* OWMWEATHERPROVIDER_H */ diff --git a/sources/awesomewidgets/qcronscheduler.h b/sources/awesomewidgets/qcronscheduler.h index 94c1600..27d1413 100644 --- a/sources/awesomewidgets/qcronscheduler.h +++ b/sources/awesomewidgets/qcronscheduler.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef QCRONSCHEDULER_H -#define QCRONSCHEDULER_H +#pragma once #include "QObject" @@ -58,6 +57,3 @@ private: QTimer *m_timer = nullptr; static QList parseField(const QString &_value, int _min, int _max); }; - - -#endif /* QCRONSCHEDULER_H */ diff --git a/sources/awesomewidgets/stooqquotesprovider.h b/sources/awesomewidgets/stooqquotesprovider.h index 35e0434..19c1b81 100644 --- a/sources/awesomewidgets/stooqquotesprovider.h +++ b/sources/awesomewidgets/stooqquotesprovider.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef STOOQQUOTESPROVIDER_H -#define STOOQQUOTESPROVIDER_H +#pragma once #include "abstractquotesprovider.h" @@ -37,6 +36,3 @@ public: private: QUrl m_url; }; - - -#endif /* STOOQQUOTESPROVIDER_H */ diff --git a/sources/awesomewidgets/yahooquotesprovider.h b/sources/awesomewidgets/yahooquotesprovider.h index ad6c1a4..32bf518 100644 --- a/sources/awesomewidgets/yahooquotesprovider.h +++ b/sources/awesomewidgets/yahooquotesprovider.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef YAHOOQUOTESPROVIDER_H -#define YAHOOQUOTESPROVIDER_H +#pragma once #include "abstractquotesprovider.h" @@ -38,6 +37,3 @@ public: private: QUrl m_url; }; - - -#endif /* YAHOOQUOTESPROVIDER_H */ diff --git a/sources/awesomewidgets/yahooweatherprovider.h b/sources/awesomewidgets/yahooweatherprovider.h index c8d5bdc..0da4330 100644 --- a/sources/awesomewidgets/yahooweatherprovider.h +++ b/sources/awesomewidgets/yahooweatherprovider.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef YAHOOWEATHERPROVIDER_H -#define YAHOOWEATHERPROVIDER_H +#pragma once #include "abstractweatherprovider.h" @@ -43,6 +42,3 @@ private: int m_ts = 0; QUrl m_url; }; - - -#endif /* YAHOOWEATHERPROVIDER_H */ diff --git a/sources/desktop-panel/plugin/desktoppanel.h b/sources/desktop-panel/plugin/desktoppanel.h index 49d50db..e57d9b7 100644 --- a/sources/desktop-panel/plugin/desktoppanel.h +++ b/sources/desktop-panel/plugin/desktoppanel.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef DPPLUGIN_H -#define DPPLUGIN_H +#pragma once #include @@ -30,6 +28,3 @@ class DPPlugin : public QQmlExtensionPlugin public: void registerTypes(const char *uri) override; }; - - -#endif /* DPPLUGIN_H */ diff --git a/sources/desktop-panel/plugin/dpadds.h b/sources/desktop-panel/plugin/dpadds.h index c053d5a..4ce40e7 100644 --- a/sources/desktop-panel/plugin/dpadds.h +++ b/sources/desktop-panel/plugin/dpadds.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef DPADDS_H -#define DPADDS_H +#pragma once // ui library required by WId definition #include @@ -78,6 +76,3 @@ private: QString m_tooltipColor = "#000000"; QString m_tooltipType = "none"; }; - - -#endif /* DPADDS_H */ diff --git a/sources/extsysmon/extsysmon.h b/sources/extsysmon/extsysmon.h index 7112509..729ff56 100644 --- a/sources/extsysmon/extsysmon.h +++ b/sources/extsysmon/extsysmon.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef EXTSYSMON_H -#define EXTSYSMON_H +#pragma once #include @@ -36,6 +35,3 @@ private: void readConfiguration(); [[nodiscard]] static QHash updateConfiguration(QHash _rawConfig); }; - - -#endif /* EXTSYSMON_H */ diff --git a/sources/extsysmonsources/abstractextsysmonsource.h b/sources/extsysmonsources/abstractextsysmonsource.h index 4e6e2f9..005afe8 100644 --- a/sources/extsysmonsources/abstractextsysmonsource.h +++ b/sources/extsysmonsources/abstractextsysmonsource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef ABSTRACTEXTSYSMONSOURCE_H -#define ABSTRACTEXTSYSMONSOURCE_H +#pragma once #include #include @@ -50,6 +49,3 @@ public: signals: void dataReceived(const QVariantHash &); }; - - -#endif /* ABSTRACTEXTSYSMONSOURCE_H */ diff --git a/sources/extsysmonsources/batterysource.h b/sources/extsysmonsources/batterysource.h index 938ed6c..c2466f7 100644 --- a/sources/extsysmonsources/batterysource.h +++ b/sources/extsysmonsources/batterysource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef BATTERYSOURCE_H -#define BATTERYSOURCE_H +#pragma once #include #include @@ -50,6 +49,3 @@ private: QHash> m_trend; QVariantHash m_values; }; - - -#endif /* BATTERYSOURCE_H */ diff --git a/sources/extsysmonsources/customsource.h b/sources/extsysmonsources/customsource.h index 4e0142d..e24b4b5 100644 --- a/sources/extsysmonsources/customsource.h +++ b/sources/extsysmonsources/customsource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef CUSTOMSOURCE_H -#define CUSTOMSOURCE_H +#pragma once #include @@ -44,6 +43,3 @@ private: ExtItemAggregator *m_extScripts = nullptr; QStringList m_sources; }; - - -#endif /* CUSTOMSOURCE_H */ diff --git a/sources/extsysmonsources/desktopsource.h b/sources/extsysmonsources/desktopsource.h index 5867fa3..d7e36cf 100644 --- a/sources/extsysmonsources/desktopsource.h +++ b/sources/extsysmonsources/desktopsource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef DESKTOPSOURCE_H -#define DESKTOPSOURCE_H +#pragma once #include @@ -42,6 +41,3 @@ public: private: TaskManager::VirtualDesktopInfo *m_vdi = nullptr; }; - - -#endif /* DESKTOPSOURCE_H */ diff --git a/sources/extsysmonsources/extsysmonsensor.h b/sources/extsysmonsources/extsysmonsensor.h index 6105cf6..e7fcf23 100644 --- a/sources/extsysmonsources/extsysmonsensor.h +++ b/sources/extsysmonsources/extsysmonsensor.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef EXTSYSMONSENSOR_H -#define EXTSYSMONSENSOR_H +#pragma once #include @@ -40,6 +39,3 @@ private: AbstractExtSysMonSource *m_source = nullptr; QTimer *m_timer = nullptr; }; - - -#endif /* EXTSYSMONSENSOR_H */ diff --git a/sources/extsysmonsources/loadsource.h b/sources/extsysmonsources/loadsource.h index bbf1f34..6fdbb63 100644 --- a/sources/extsysmonsources/loadsource.h +++ b/sources/extsysmonsources/loadsource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef LOADSOURCE_H -#define LOADSOURCE_H +#pragma once #include @@ -35,6 +34,3 @@ public: void run() override{}; [[nodiscard]] QStringList sources() const override; }; - - -#endif /* LOADSOURCE_H */ diff --git a/sources/extsysmonsources/networksource.h b/sources/extsysmonsources/networksource.h index 1069199..60b42b9 100644 --- a/sources/extsysmonsources/networksource.h +++ b/sources/extsysmonsources/networksource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef NETWORKSOURCE_H -#define NETWORKSOURCE_H +#pragma once #include @@ -45,6 +44,3 @@ private: QProcess *m_process = nullptr; static QString getCurrentDevice(); }; - - -#endif /* NETWORKSOURCE_H */ diff --git a/sources/extsysmonsources/playersource.h b/sources/extsysmonsources/playersource.h index 6d0e8d1..52b13ef 100644 --- a/sources/extsysmonsources/playersource.h +++ b/sources/extsysmonsources/playersource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef PLAYERSOURCE_H -#define PLAYERSOURCE_H +#pragma once #include #include @@ -68,6 +67,3 @@ private: QStringList m_metadata = QStringList({"album", "artist", "title"}); QVariantHash m_values; }; - - -#endif /* PLAYERSOURCE_H */ diff --git a/sources/extsysmonsources/processessource.h b/sources/extsysmonsources/processessource.h index 1906768..45c97b9 100644 --- a/sources/extsysmonsources/processessource.h +++ b/sources/extsysmonsources/processessource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef PROCESSESSOURCE_H -#define PROCESSESSOURCE_H +#pragma once #include @@ -39,6 +38,3 @@ private: // configuration and values QVariantHash m_values; }; - - -#endif /* PROCESSESSOURCE_H */ diff --git a/sources/extsysmonsources/quotessource.h b/sources/extsysmonsources/quotessource.h index 79034c8..87ac633 100644 --- a/sources/extsysmonsources/quotessource.h +++ b/sources/extsysmonsources/quotessource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef QUOTESSOURCE_H -#define QUOTESSOURCE_H +#pragma once #include @@ -45,6 +44,3 @@ private: QStringList m_sources; QVariantHash m_values; }; - - -#endif /* QUOTESSOURCE_H */ diff --git a/sources/extsysmonsources/requestsource.h b/sources/extsysmonsources/requestsource.h index 6e36f50..c63e1ca 100644 --- a/sources/extsysmonsources/requestsource.h +++ b/sources/extsysmonsources/requestsource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef REQUESTSOURCE_H -#define REQUESTSOURCE_H +#pragma once #include @@ -45,6 +44,3 @@ private: QStringList m_sources; QVariantHash m_values; }; - - -#endif /* REQUESTSOURCE_H */ diff --git a/sources/extsysmonsources/systeminfosource.h b/sources/extsysmonsources/systeminfosource.h index 578e671..b34532a 100644 --- a/sources/extsysmonsources/systeminfosource.h +++ b/sources/extsysmonsources/systeminfosource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef SYSTEMINFOSOURCE_H -#define SYSTEMINFOSOURCE_H +#pragma once #include @@ -44,6 +43,3 @@ private: static QVariant sendDBusRequest(const QString &destination, const QString &path, const QString &interface, const QString &method, const QVariantList &args = QVariantList()); }; - - -#endif /* SYSTEMINFOSOURCE_H */ diff --git a/sources/extsysmonsources/timesource.h b/sources/extsysmonsources/timesource.h index bb780d8..18e51e9 100644 --- a/sources/extsysmonsources/timesource.h +++ b/sources/extsysmonsources/timesource.h @@ -20,7 +20,6 @@ #include #include "abstractextsysmonsource.h" -#include "extitemaggregator.h" class TimeSource : public AbstractExtSysMonSource diff --git a/sources/extsysmonsources/upgradesource.h b/sources/extsysmonsources/upgradesource.h index 1e42785..566056c 100644 --- a/sources/extsysmonsources/upgradesource.h +++ b/sources/extsysmonsources/upgradesource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef UPGRADESOURCE_H -#define UPGRADESOURCE_H +#pragma once #include @@ -44,6 +43,3 @@ private: ExtItemAggregator *m_extUpgrade = nullptr; QStringList m_sources; }; - - -#endif /* UPGRADESOURCE_H */ diff --git a/sources/extsysmonsources/weathersource.h b/sources/extsysmonsources/weathersource.h index e43cc8d..d704471 100644 --- a/sources/extsysmonsources/weathersource.h +++ b/sources/extsysmonsources/weathersource.h @@ -15,8 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ -#ifndef WEATHERSOURCE_H -#define WEATHERSOURCE_H +#pragma once #include @@ -45,6 +44,3 @@ private: QStringList m_sources; QVariantHash m_values; }; - - -#endif /* WEATHERSOURCE_H */ diff --git a/sources/test/awtestlibrary.h b/sources/test/awtestlibrary.h index 97b569f..4ae277f 100644 --- a/sources/test/awtestlibrary.h +++ b/sources/test/awtestlibrary.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef AWTESTLIBRARY_H -#define AWTESTLIBRARY_H +#pragma once #include #include @@ -34,6 +32,3 @@ QString randomString(const int _min = 1, const int _max = 100); QStringList randomStringList(const int _max = 100); QStringList randomSelect(const QStringList &_available); } // namespace AWTestLibrary - - -#endif /* AWTESTLIBRARY_H */ diff --git a/sources/test/testabstractextitem.h b/sources/test/testabstractextitem.h index a6be4a8..ba08150 100644 --- a/sources/test/testabstractextitem.h +++ b/sources/test/testabstractextitem.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTABSTRACTEXTITEM_H -#define TESTABSTRACTEXTITEM_H +#pragma once #include @@ -49,6 +47,3 @@ private: QString fileName; QString writeFileName; }; - - -#endif /* TESTABSTRACTEXTITEM_H */ diff --git a/sources/test/testabstractformatter.h b/sources/test/testabstractformatter.h index dca1933..8f1f99e 100644 --- a/sources/test/testabstractformatter.h +++ b/sources/test/testabstractformatter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTABSTRACTFORMATTER_H -#define TESTABSTRACTFORMATTER_H +#pragma once #include @@ -40,6 +38,3 @@ private slots: private: AWNoFormatter *formatter = nullptr; }; - - -#endif /* TESTABSTRACTFORMATTER_H */ diff --git a/sources/test/testawbugreporter.h b/sources/test/testawbugreporter.h index 4a02f98..a5839e7 100644 --- a/sources/test/testawbugreporter.h +++ b/sources/test/testawbugreporter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTAWBUGREPORTER_H -#define TESTAWBUGREPORTER_H +#pragma once #include @@ -40,6 +38,3 @@ private: AWBugReporter *plugin = nullptr; QStringList data; }; - - -#endif /* TESTAWBUGREPORTER_H */ diff --git a/sources/test/testawconfighelper.h b/sources/test/testawconfighelper.h index 8591015..9abfd4e 100644 --- a/sources/test/testawconfighelper.h +++ b/sources/test/testawconfighelper.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTAWCONFIGHELPER_H -#define TESTAWCONFIGHELPER_H +#pragma once #include #include @@ -47,6 +45,3 @@ private: QQmlPropertyMap map; QVariantMap deConfig; }; - - -#endif /* TESTAWCONFIGHELPER_H */ diff --git a/sources/test/testawkeycache.h b/sources/test/testawkeycache.h index cbeccde..27ffe94 100644 --- a/sources/test/testawkeycache.h +++ b/sources/test/testawkeycache.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTAWKEYCACHE_H -#define TESTAWKEYCACHE_H +#pragma once #include @@ -34,6 +32,3 @@ private slots: private: }; - - -#endif /* TESTAWKEYCACHE_H */ diff --git a/sources/test/testawkeys.h b/sources/test/testawkeys.h index 7a6c730..6ba97e8 100644 --- a/sources/test/testawkeys.h +++ b/sources/test/testawkeys.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTAWKEYS_H -#define TESTAWKEYS_H +#pragma once #include @@ -47,6 +45,3 @@ private: QString pattern; int interval = 1000; }; - - -#endif /* TESTAWKEYS_H */ diff --git a/sources/test/testawpatternfunctions.h b/sources/test/testawpatternfunctions.h index 2380e7e..a81d03c 100644 --- a/sources/test/testawpatternfunctions.h +++ b/sources/test/testawpatternfunctions.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTAWPATTERNFUNCTIONS_H -#define TESTAWPATTERNFUNCTIONS_H +#pragma once #include @@ -38,6 +36,3 @@ private slots: private: }; - - -#endif /* TESTAWPATTERNFUNCTIONS_H */ diff --git a/sources/test/testawtelemetryhandler.h b/sources/test/testawtelemetryhandler.h index cfbf89d..7e0f488 100644 --- a/sources/test/testawtelemetryhandler.h +++ b/sources/test/testawtelemetryhandler.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTAWTELEMETRYHANDLER_H -#define TESTAWTELEMETRYHANDLER_H +#pragma once #include @@ -46,6 +44,3 @@ private: QString telemetryStatus = "saved"; QString telemetryValidGroup = "awwidgetconfig"; }; - - -#endif /* TESTAWTELEMETRYHANDLER_H */ diff --git a/sources/test/testawupdatehelper.h b/sources/test/testawupdatehelper.h index 03db776..d89df94 100644 --- a/sources/test/testawupdatehelper.h +++ b/sources/test/testawupdatehelper.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTAWUPDATEHELPER_H -#define TESTAWUPDATEHELPER_H +#pragma once #include @@ -38,6 +36,3 @@ private slots: private: AWUpdateHelper *plugin = nullptr; }; - - -#endif /* TESTAWUPDATEHELPER_H */ diff --git a/sources/test/testbatterysource.h b/sources/test/testbatterysource.h index 7af3af1..4ad5b9b 100644 --- a/sources/test/testbatterysource.h +++ b/sources/test/testbatterysource.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTBATTERYSOURCE_H -#define TESTBATTERYSOURCE_H +#pragma once #include #include @@ -42,6 +40,3 @@ private: QString acpiPath = "/sys/class/power_supply/"; QPair battery = QPair(0, 100); }; - - -#endif /* TESTBATTERYSOURCE_H */ diff --git a/sources/test/testdatetimeformatter.h b/sources/test/testdatetimeformatter.h index 6386458..4d46688 100644 --- a/sources/test/testdatetimeformatter.h +++ b/sources/test/testdatetimeformatter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTDATETIMEFORMATTER_H -#define TESTDATETIMEFORMATTER_H +#pragma once #include @@ -41,6 +39,3 @@ private: AWDateTimeFormatter *formatter = nullptr; QString format; }; - - -#endif /* TESTDATETIMEFORMATTER_H */ diff --git a/sources/test/testdesktopsource.h b/sources/test/testdesktopsource.h index 7fd0a60..dc9454f 100644 --- a/sources/test/testdesktopsource.h +++ b/sources/test/testdesktopsource.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTDESKTOPSOURCE_H -#define TESTDESKTOPSOURCE_H +#pragma once #include @@ -39,6 +37,3 @@ private slots: private: DesktopSource *source = nullptr; }; - - -#endif /* TESTDESKTOPSOURCE_H */ diff --git a/sources/test/testdpplugin.h b/sources/test/testdpplugin.h index 4d4b0f7..afccd1a 100644 --- a/sources/test/testdpplugin.h +++ b/sources/test/testdpplugin.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTDPPLUGIN_H -#define TESTDPPLUGIN_H +#pragma once #include @@ -44,6 +42,3 @@ private: bool m_isKwinActive = false; QString pattern = "$"; }; - - -#endif /* TESTDPPLUGIN_H */ diff --git a/sources/test/testextitemaggregator.h b/sources/test/testextitemaggregator.h index c5237cd..4c6b4dd 100644 --- a/sources/test/testextitemaggregator.h +++ b/sources/test/testextitemaggregator.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTEXTITEMAGGREGATOR_H -#define TESTEXTITEMAGGREGATOR_H +#pragma once #include @@ -40,6 +38,3 @@ private: ExtItemAggregator *aggregator = nullptr; QString type = "tmp"; }; - - -#endif /* TESTEXTITEMAGGREGATOR_H */ diff --git a/sources/test/testextquotes.h b/sources/test/testextquotes.h index 5997d0d..d4556fd 100644 --- a/sources/test/testextquotes.h +++ b/sources/test/testextquotes.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTEXTQUOTES_H -#define TESTEXTQUOTES_H +#pragma once #include #include @@ -47,6 +45,3 @@ private: // we assume that price will not be differ more than in 2 times QPair price = QPair(0.0, 2.0); }; - - -#endif /* TESTEXTQUOTES_H */ diff --git a/sources/test/testextscript.h b/sources/test/testextscript.h index 4c1d195..20edc72 100644 --- a/sources/test/testextscript.h +++ b/sources/test/testextscript.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTEXTSCRIPT_H -#define TESTEXTSCRIPT_H +#pragma once #include @@ -42,6 +40,3 @@ private: ExtScript *extScript = nullptr; QString randomString; }; - - -#endif /* TESTEXTSCRIPT_H */ diff --git a/sources/test/testextupgrade.h b/sources/test/testextupgrade.h index 7db8bcb..5611c7a 100644 --- a/sources/test/testextupgrade.h +++ b/sources/test/testextupgrade.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTEXTUPGRADE_H -#define TESTEXTUPGRADE_H +#pragma once #include @@ -44,6 +42,3 @@ private: QString cmd; QStringList randomStrings; }; - - -#endif /* TESTEXTUPGRADE_H */ diff --git a/sources/test/testextweather.h b/sources/test/testextweather.h index fa6d07a..13fdc26 100644 --- a/sources/test/testextweather.h +++ b/sources/test/testextweather.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTEXTWEATHER_H -#define TESTEXTWEATHER_H +#pragma once #include #include @@ -52,6 +50,3 @@ private: // dont know about temperature, but I suppose it will be between -40 and 40 QPair temp = QPair(-40.0f, 40.0f); }; - - -#endif /* TESTEXTWEATHER_H */ diff --git a/sources/test/testfloatformatter.h b/sources/test/testfloatformatter.h index 89ba3e4..f7d173d 100644 --- a/sources/test/testfloatformatter.h +++ b/sources/test/testfloatformatter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTFLOATFORMATTER_H -#define TESTFLOATFORMATTER_H +#pragma once #include @@ -47,6 +45,3 @@ private: void doRandom(); AWFloatFormatter *formatter = nullptr; }; - - -#endif /* TESTFLOATFORMATTER_H */ diff --git a/sources/test/testjsonformatter.h b/sources/test/testjsonformatter.h index ab9b324..4c9694b 100644 --- a/sources/test/testjsonformatter.h +++ b/sources/test/testjsonformatter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTJSONFORMATTER_H -#define TESTJSONFORMATTER_H +#pragma once #include #include @@ -45,6 +43,3 @@ private: QString path; QString value; }; - - -#endif /* TESTJSONFORMATTER_H */ diff --git a/sources/test/testlistformatter.h b/sources/test/testlistformatter.h index 6f4e16e..2026c68 100644 --- a/sources/test/testlistformatter.h +++ b/sources/test/testlistformatter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTLISTFORMATTER_H -#define TESTLISTFORMATTER_H +#pragma once #include @@ -43,6 +41,3 @@ private: AWListFormatter *formatter = nullptr; QString separator; }; - - -#endif /* TESTLISTFORMATTER_H */ diff --git a/sources/test/testnetworksource.h b/sources/test/testnetworksource.h index 6f86fe1..a4ae1f4 100644 --- a/sources/test/testnetworksource.h +++ b/sources/test/testnetworksource.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTNETWORKSOURCE_H -#define TESTNETWORKSOURCE_H +#pragma once #include @@ -39,6 +37,3 @@ private slots: private: NetworkSource *source = nullptr; }; - - -#endif /* TESTNETWORKSOURCE_H */ diff --git a/sources/test/testnoformatter.h b/sources/test/testnoformatter.h index 6d52a54..c6a007b 100644 --- a/sources/test/testnoformatter.h +++ b/sources/test/testnoformatter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTNOFORMATTER_H -#define TESTNOFORMATTER_H +#pragma once #include @@ -40,6 +38,3 @@ private slots: private: AWNoFormatter *formatter = nullptr; }; - - -#endif /* TESTNOFORMATTER_H */ diff --git a/sources/test/testplayersource.h b/sources/test/testplayersource.h index 4a3768b..32ae820 100644 --- a/sources/test/testplayersource.h +++ b/sources/test/testplayersource.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTPLAYERSOURCE_H -#define TESTPLAYERSOURCE_H +#pragma once #include @@ -44,6 +42,3 @@ private: QString mpdAddress = "localhost"; int mpdPort = 6600; }; - - -#endif /* TESTPLAYERSOURCE_H */ diff --git a/sources/test/testprocessessource.h b/sources/test/testprocessessource.h index c81b871..0888672 100644 --- a/sources/test/testprocessessource.h +++ b/sources/test/testprocessessource.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTPROCESSESSOURCE_H -#define TESTPROCESSESSOURCE_H +#pragma once #include @@ -39,6 +37,3 @@ private slots: private: ProcessesSource *source = nullptr; }; - - -#endif /* TESTPROCESSESSOURCE_H */ diff --git a/sources/test/testscriptformatter.h b/sources/test/testscriptformatter.h index e99aa9c..73496cf 100644 --- a/sources/test/testscriptformatter.h +++ b/sources/test/testscriptformatter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTSCRIPTFORMATTER_H -#define TESTSCRIPTFORMATTER_H +#pragma once #include @@ -45,6 +43,3 @@ private: QString codeWithReturn = QString("%1; return output;").arg(code); QString fullCode = QString("(function(value) { %1 })").arg(codeWithReturn); }; - - -#endif /* TESTSCRIPTFORMATTER_H */ diff --git a/sources/test/teststringformatter.h b/sources/test/teststringformatter.h index a614aef..377cd5a 100644 --- a/sources/test/teststringformatter.h +++ b/sources/test/teststringformatter.h @@ -15,9 +15,7 @@ * along with awesome-widgets. If not, see http://www.gnu.org/licenses/ * ***************************************************************************/ - -#ifndef TESTSTRINGFORMATTER_H -#define TESTSTRINGFORMATTER_H +#pragma once #include @@ -43,6 +41,3 @@ private: void doRandom(); AWStringFormatter *formatter = nullptr; }; - - -#endif /* TESTSTRINGFORMATTER_H */ diff --git a/sources/version.h.in b/sources/version.h.in index 7416679..62bf4bd 100644 --- a/sources/version.h.in +++ b/sources/version.h.in @@ -1,5 +1,4 @@ -#ifndef VERSION_H -#define VERSION_H +#pragma once // information @@ -7,23 +6,28 @@ 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 " "wrapper,no,http://" "codereview.stackexchange.com/questions/30031/" "qnetworkreply-network-reply-timeout-helper"; -const char SPECIAL_THANKS[] = "Stooq,https://stooq.com/;Yahoo! " - "Weather,https://weather.yahoo.com/;JetBrains,https://" - "www.jetbrains.com/;OpenWeatherMap,http://openweathermap.org/"; +const char SPECIAL_THANKS[] = "Stooq,https://stooq.com/;" + "Yahoo! Weather,https://weather.yahoo.com/;" + "JetBrains,https://www.jetbrains.com/;" + "OpenWeatherMap,http://openweathermap.org/"; const char CHANGELOG[] = "@PROJECT_CHANGELOG@"; -// configuraion +// configuration // graphical items api version const int AW_GRAPHITEM_API = 6; // extquotes api version @@ -50,16 +54,80 @@ const int REQUEST_TIMEOUT = 3000; // available time keys const char TIME_KEYS[] = "d,dd,ddd,dddd,M,MM,MMM,MMMM,yy,yyyy,h,hh,H,HH,m,mm,s,ss,t,a,ap,A,AP"; // static keys -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," - "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_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," + "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 @@ -105,6 +173,3 @@ const char CPPCHECK_EXECUTABLE[] = "@CPPCHECK_EXECUTABLE@"; const char PROP_FUTURE[] = "@BUILD_FUTURE@"; const char PROP_LOAD[] = "@BUILD_LOAD@"; const char PROP_TEST[] = "@BUILD_TESTING@"; - - -#endif /* VERSION_H */