[utilities/kdebugsettings] src: coding style
Laurent Montel <[email protected]>
| Newsgroups | gmane.comp.kde.cvs |
|---|---|
| Message-ID | <[email protected]> |
Git commit 1365eb25925f3975924f50f383a44897b2a5e459 by Laurent Montel.
Committed on 21/07/2026 at 05:58.
Pushed by mlaurent into branch 'master'.
coding style
M +1 -1 src/core/autotests/changedebugmodejobtest.cpp
M +1 -1 src/core/autotests/kdebugsettingutiltest.cpp
M +3 -3 src/core/autotests/loadcategoriesjobtest.cpp
M +3 -3 src/core/autotests/loggingcategorytest.cpp
M +3 -3 src/core/autotests/renamecategorytest.cpp
M +1 -1 src/core/autotests/saverulesjobtest.cpp
M +1 -1 src/core/jobs/changedebugmodejob.cpp
M +1 -1 src/core/jobs/loadcategoriesjob.cpp
M +1 -1 src/core/jobs/saverulesjob.cpp
M +1 -1 src/core/kdebugsettingsloadingcategories.cpp
M +1 -1 src/core/kdebugsettingsutil.cpp
M +1 -1 src/core/loggingcategory.cpp
M +3 -3 src/widgets/autotests/categorytypecomboboxtest.cpp
M +4 -3 src/widgets/autotests/configurecustomsettingdialogtest.cpp
M +3 -3 src/widgets/autotests/configurecustomsettingwidgettest.cpp
M +3 -3 src/widgets/autotests/customdebugsettingspagetest.cpp
M +3 -3 src/widgets/autotests/environmentsettingsrulespagetest.cpp
M +1 -1 src/widgets/autotests/groupmanagementdialogtest.cpp
M +1 -1 src/widgets/autotests/groupmanagementwidgettest.cpp
M +1 -1 src/widgets/autotests/kdeapplicationdebugsettingpagetest.cpp
M +3 -3 src/widgets/autotests/kdebugsettingsdialogtest.cpp
M +1 -1 src/widgets/autotests/savetoolbuttontest.cpp
M +1 -1 src/widgets/tests/customdebuglistviewgui.cpp
M +1 -1 src/widgets/tests/kdeapplicationtreeviewgui.cpp
https://invent.kde.org/utilities/kdebugsettings/-/commit/1365eb25925f3975924f50f383a44897b2a5e459
diff --git a/src/core/autotests/changedebugmodejobtest.cpp b/src/core/autotests/changedebugmodejobtest.cpp
index 015851b6..950f948d 100644
--- a/src/core/autotests/changedebugmodejobtest.cpp
+++ b/src/core/autotests/changedebugmodejobtest.cpp
@@ -6,12 +6,12 @@
*/
#include "changedebugmodejobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "jobs/changedebugmodejob.h"
#include <QTest>
QTEST_GUILESS_MAIN(ChangeDebugModeJobTest)
+using namespace Qt::Literals::StringLiterals;
ChangeDebugModeJobTest::ChangeDebugModeJobTest(QObject *parent)
: QObject(parent)
{
diff --git a/src/core/autotests/kdebugsettingutiltest.cpp b/src/core/autotests/kdebugsettingutiltest.cpp
index 605ab0a9..76616e2f 100644
--- a/src/core/autotests/kdebugsettingutiltest.cpp
+++ b/src/core/autotests/kdebugsettingutiltest.cpp
@@ -6,7 +6,6 @@
*/
#include "kdebugsettingutiltest.h"
-using namespace Qt::Literals::StringLiterals;
#include "kdebugsettingsutil.h"
#include <QDebug>
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
QTEST_GUILESS_MAIN(KDebugSettingUtilTest)
+using namespace Qt::Literals::StringLiterals;
KDebugSettingUtilTest::KDebugSettingUtilTest(QObject *parent)
: QObject(parent)
{
diff --git a/src/core/autotests/loadcategoriesjobtest.cpp b/src/core/autotests/loadcategoriesjobtest.cpp
index dac22aea..613681c6 100644
--- a/src/core/autotests/loadcategoriesjobtest.cpp
+++ b/src/core/autotests/loadcategoriesjobtest.cpp
@@ -6,7 +6,6 @@
*/
#include "loadcategoriesjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "jobs/loadcategoriesjob.h"
#include "kdebugsettingsutil.h"
@@ -15,6 +14,9 @@ using namespace Qt::Literals::StringLiterals;
#include <QFile>
#include <QTest>
+QTEST_MAIN(LoadCategoriesJobTest)
+
+using namespace Qt::Literals::StringLiterals;
LoadCategoriesJobTest::LoadCategoriesJobTest(QObject *parent)
: QObject(parent)
{
@@ -206,6 +208,4 @@ void LoadCategoriesJobTest::shouldReadRules()
QCOMPARE(job.qtKdeCategories(), qtkdecategories);
}
-QTEST_MAIN(LoadCategoriesJobTest)
-
#include "moc_loadcategoriesjobtest.cpp"
diff --git a/src/core/autotests/loggingcategorytest.cpp b/src/core/autotests/loggingcategorytest.cpp
index f5f07072..6ac45631 100644
--- a/src/core/autotests/loggingcategorytest.cpp
+++ b/src/core/autotests/loggingcategorytest.cpp
@@ -6,11 +6,13 @@
*/
#include "loggingcategorytest.h"
-using namespace Qt::Literals::StringLiterals;
#include "loggingcategory.h"
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
+QTEST_MAIN(LoggingCategoryTest)
+
LoggingCategoryTest::LoggingCategoryTest(QObject *parent)
: QObject(parent)
{
@@ -68,6 +70,4 @@ void LoggingCategoryTest::shouldCreateRules()
QVERIFY(log.isValid());
}
-QTEST_MAIN(LoggingCategoryTest)
-
#include "moc_loggingcategorytest.cpp"
diff --git a/src/core/autotests/renamecategorytest.cpp b/src/core/autotests/renamecategorytest.cpp
index e62cff10..a22050af 100644
--- a/src/core/autotests/renamecategorytest.cpp
+++ b/src/core/autotests/renamecategorytest.cpp
@@ -5,12 +5,14 @@
*/
#include "renamecategorytest.h"
-using namespace Qt::Literals::StringLiterals;
#include "kdebugsettingsutil.h"
#include "renamecategory.h"
#include <QTest>
+QTEST_MAIN(RenameCategoryTest)
+
+using namespace Qt::Literals::StringLiterals;
RenameCategoryTest::RenameCategoryTest(QObject *parent)
: QObject(parent)
{
@@ -49,6 +51,4 @@ void RenameCategoryTest::shouldParseRenameLine()
QCOMPARE(cat.isValid(), valid);
}
-QTEST_MAIN(RenameCategoryTest)
-
#include "moc_renamecategorytest.cpp"
diff --git a/src/core/autotests/saverulesjobtest.cpp b/src/core/autotests/saverulesjobtest.cpp
index d9961217..766398d6 100644
--- a/src/core/autotests/saverulesjobtest.cpp
+++ b/src/core/autotests/saverulesjobtest.cpp
@@ -6,7 +6,6 @@
*/
#include "saverulesjobtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "jobs/loadcategoriesjob.h"
#include "jobs/saverulesjob.h"
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
QTEST_GUILESS_MAIN(SaveRulesJobTest)
+using namespace Qt::Literals::StringLiterals;
static void compareFile(const QString &name)
{
const QString refFile = QLatin1StringView(KDEBUGSETTINGS_DATA_DIR) + u'/' + name + u".ref"_s;
diff --git a/src/core/jobs/changedebugmodejob.cpp b/src/core/jobs/changedebugmodejob.cpp
index 15660b46..c8c12f78 100644
--- a/src/core/jobs/changedebugmodejob.cpp
+++ b/src/core/jobs/changedebugmodejob.cpp
@@ -6,13 +6,13 @@
*/
#include "changedebugmodejob.h"
-using namespace Qt::Literals::StringLiterals;
#include "kdebugsettingscore_debug.h"
#include "kdebugsettingsloadingcategories.h"
#include "kdebugsettingsutil.h"
#include "saverulesjob.h"
+using namespace Qt::Literals::StringLiterals;
ChangeDebugModeJob::ChangeDebugModeJob() = default;
ChangeDebugModeJob::~ChangeDebugModeJob() = default;
diff --git a/src/core/jobs/loadcategoriesjob.cpp b/src/core/jobs/loadcategoriesjob.cpp
index da54915f..64b250a5 100644
--- a/src/core/jobs/loadcategoriesjob.cpp
+++ b/src/core/jobs/loadcategoriesjob.cpp
@@ -6,10 +6,10 @@
*/
#include "loadcategoriesjob.h"
-using namespace Qt::Literals::StringLiterals;
#include "kdebugsettingsutil.h"
+using namespace Qt::Literals::StringLiterals;
LoadCategoriesJob::LoadCategoriesJob() = default;
void LoadCategoriesJob::setFileName(const QString &filename)
diff --git a/src/core/jobs/saverulesjob.cpp b/src/core/jobs/saverulesjob.cpp
index f4638513..30c998d7 100644
--- a/src/core/jobs/saverulesjob.cpp
+++ b/src/core/jobs/saverulesjob.cpp
@@ -6,11 +6,11 @@
*/
#include "saverulesjob.h"
-using namespace Qt::Literals::StringLiterals;
#include <QFile>
#include <QTextStream>
+using namespace Qt::Literals::StringLiterals;
SaveRulesJob::SaveRulesJob() = default;
void SaveRulesJob::setListKde(const LoggingCategory::List &listKde)
diff --git a/src/core/kdebugsettingsloadingcategories.cpp b/src/core/kdebugsettingsloadingcategories.cpp
index cd991c2e..fa23102d 100644
--- a/src/core/kdebugsettingsloadingcategories.cpp
+++ b/src/core/kdebugsettingsloadingcategories.cpp
@@ -6,7 +6,6 @@
*/
#include "kdebugsettingsloadingcategories.h"
-using namespace Qt::Literals::StringLiterals;
#include "jobs/loadcategoriesjob.h"
#include "kdebugsettingsutil.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QLibraryInfo>
#include <QStandardPaths>
+using namespace Qt::Literals::StringLiterals;
KDebugSettingsLoadingCategories::KDebugSettingsLoadingCategories() = default;
KDebugSettingsLoadingCategories::~KDebugSettingsLoadingCategories() = default;
diff --git a/src/core/kdebugsettingsutil.cpp b/src/core/kdebugsettingsutil.cpp
index c33c4c53..dd3f908f 100644
--- a/src/core/kdebugsettingsutil.cpp
+++ b/src/core/kdebugsettingsutil.cpp
@@ -6,7 +6,6 @@
*/
#include "kdebugsettingsutil.h"
-using namespace Qt::Literals::StringLiterals;
#include "kdebugsettingscore_debug.h"
#include <KLocalizedString>
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QRegularExpression>
#include <QStandardPaths>
+using namespace Qt::Literals::StringLiterals;
RenameCategory KDebugSettingsUtil::parseRenameCategory(QString line, const QString &filename)
{
RenameCategory category;
diff --git a/src/core/loggingcategory.cpp b/src/core/loggingcategory.cpp
index b063e535..54dd6384 100644
--- a/src/core/loggingcategory.cpp
+++ b/src/core/loggingcategory.cpp
@@ -6,11 +6,11 @@
*/
#include "loggingcategory.h"
-using namespace Qt::Literals::StringLiterals;
#include "kdebugsettingsutil.h"
#include <KLocalizedString>
+using namespace Qt::Literals::StringLiterals;
LoggingCategory::LoggingCategory() = default;
bool LoggingCategory::operator==(const LoggingCategory &other) const
diff --git a/src/widgets/autotests/categorytypecomboboxtest.cpp b/src/widgets/autotests/categorytypecomboboxtest.cpp
index b40e8028..4553212c 100644
--- a/src/widgets/autotests/categorytypecomboboxtest.cpp
+++ b/src/widgets/autotests/categorytypecomboboxtest.cpp
@@ -6,11 +6,13 @@
*/
#include "categorytypecomboboxtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "categorytypecombobox.h"
#include <QTest>
+QTEST_MAIN(CategoryTypeComboBoxTest)
+
+using namespace Qt::Literals::StringLiterals;
CategoryTypeComboBoxTest::CategoryTypeComboBoxTest(QObject *parent)
: QObject(parent)
{
@@ -98,6 +100,4 @@ void CategoryTypeComboBoxTest::shouldVerifyThatDefaultCategoryIsCorrect()
QCOMPARE(w.defaultCategories(), LoggingCategory::Debug);
}
-QTEST_MAIN(CategoryTypeComboBoxTest)
-
#include "moc_categorytypecomboboxtest.cpp"
diff --git a/src/widgets/autotests/configurecustomsettingdialogtest.cpp b/src/widgets/autotests/configurecustomsettingdialogtest.cpp
index 41608a22..e5be1649 100644
--- a/src/widgets/autotests/configurecustomsettingdialogtest.cpp
+++ b/src/widgets/autotests/configurecustomsettingdialogtest.cpp
@@ -6,13 +6,16 @@
*/
#include "configurecustomsettingdialogtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "configurecustomsettingdialog.h"
#include "configurecustomsettingwidget.h"
#include <QDialogButtonBox>
#include <QPushButton>
#include <QTest>
+
+QTEST_MAIN(ConfigureCustomSettingDialogTest)
+
+using namespace Qt::Literals::StringLiterals;
ConfigureCustomSettingDialogTest::ConfigureCustomSettingDialogTest(QObject *parent)
: QObject(parent)
{
@@ -30,6 +33,4 @@ void ConfigureCustomSettingDialogTest::shouldHaveDefaultValue()
QVERIFY(widget);
}
-QTEST_MAIN(ConfigureCustomSettingDialogTest)
-
#include "moc_configurecustomsettingdialogtest.cpp"
diff --git a/src/widgets/autotests/configurecustomsettingwidgettest.cpp b/src/widgets/autotests/configurecustomsettingwidgettest.cpp
index 20d8f47f..10b41181 100644
--- a/src/widgets/autotests/configurecustomsettingwidgettest.cpp
+++ b/src/widgets/autotests/configurecustomsettingwidgettest.cpp
@@ -6,7 +6,6 @@
*/
#include "configurecustomsettingwidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "configurecustomsettingwidget.h"
#include <KLineEdit>
@@ -16,6 +15,9 @@ using namespace Qt::Literals::StringLiterals;
#include <QSignalSpy>
#include <QTest>
+QTEST_MAIN(ConfigureCustomSettingWidgetTest)
+
+using namespace Qt::Literals::StringLiterals;
ConfigureCustomSettingWidgetTest::ConfigureCustomSettingWidgetTest(QObject *parent)
: QObject(parent)
{
@@ -81,6 +83,4 @@ void ConfigureCustomSettingWidgetTest::shouldEmitSignalWhenWeChangeLogName()
QCOMPARE(spy.at(2).at(0).toBool(), false);
}
-QTEST_MAIN(ConfigureCustomSettingWidgetTest)
-
#include "moc_configurecustomsettingwidgettest.cpp"
diff --git a/src/widgets/autotests/customdebugsettingspagetest.cpp b/src/widgets/autotests/customdebugsettingspagetest.cpp
index ec2f1837..b5dfb059 100644
--- a/src/widgets/autotests/customdebugsettingspagetest.cpp
+++ b/src/widgets/autotests/customdebugsettingspagetest.cpp
@@ -6,7 +6,6 @@
*/
#include "customdebugsettingspagetest.h"
-using namespace Qt::Literals::StringLiterals;
#include "customdebuglistview.h"
#include "customdebugsettingspage.h"
@@ -14,6 +13,9 @@ using namespace Qt::Literals::StringLiterals;
#include <QPushButton>
#include <QTest>
+QTEST_MAIN(CustomDebugSettingsPageTest)
+
+using namespace Qt::Literals::StringLiterals;
CustomDebugSettingsPageTest::CustomDebugSettingsPageTest(QObject *parent)
: QObject(parent)
{
@@ -45,6 +47,4 @@ void CustomDebugSettingsPageTest::shouldHaveDefaultValue()
QVERIFY(!removeButton->isEnabled());
}
-QTEST_MAIN(CustomDebugSettingsPageTest)
-
#include "moc_customdebugsettingspagetest.cpp"
diff --git a/src/widgets/autotests/environmentsettingsrulespagetest.cpp b/src/widgets/autotests/environmentsettingsrulespagetest.cpp
index 70a2554d..7f39d0f3 100644
--- a/src/widgets/autotests/environmentsettingsrulespagetest.cpp
+++ b/src/widgets/autotests/environmentsettingsrulespagetest.cpp
@@ -6,11 +6,13 @@
*/
#include "environmentsettingsrulespagetest.h"
-using namespace Qt::Literals::StringLiterals;
#include "environmentplaintextedit.h"
#include "environmentsettingsrulespage.h"
#include <QTest>
+QTEST_MAIN(EnvironmentSettingsRulesPageTest)
+
+using namespace Qt::Literals::StringLiterals;
EnvironmentSettingsRulesPageTest::EnvironmentSettingsRulesPageTest(QObject *parent)
: QObject(parent)
{
@@ -37,6 +39,4 @@ void EnvironmentSettingsRulesPageTest::shouldSetRules()
QVERIFY(plainText->toPlainText().endsWith(rules));
}
-QTEST_MAIN(EnvironmentSettingsRulesPageTest)
-
#include "moc_environmentsettingsrulespagetest.cpp"
diff --git a/src/widgets/autotests/groupmanagementdialogtest.cpp b/src/widgets/autotests/groupmanagementdialogtest.cpp
index e2184e85..6d2a0fa5 100644
--- a/src/widgets/autotests/groupmanagementdialogtest.cpp
+++ b/src/widgets/autotests/groupmanagementdialogtest.cpp
@@ -6,7 +6,6 @@
*/
#include "groupmanagementdialogtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "groupmanagementdialog.h"
#include "groupmanagementwidget.h"
@@ -14,6 +13,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTest>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(GroupManagementDialogTest)
GroupManagementDialogTest::GroupManagementDialogTest(QObject *parent)
: QObject(parent)
diff --git a/src/widgets/autotests/groupmanagementwidgettest.cpp b/src/widgets/autotests/groupmanagementwidgettest.cpp
index 66885974..d13d7922 100644
--- a/src/widgets/autotests/groupmanagementwidgettest.cpp
+++ b/src/widgets/autotests/groupmanagementwidgettest.cpp
@@ -6,13 +6,13 @@
*/
#include "groupmanagementwidgettest.h"
-using namespace Qt::Literals::StringLiterals;
#include "groupmanagementwidget.h"
#include <QListWidget>
#include <QTest>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(GroupManagementWidgetTest)
GroupManagementWidgetTest::GroupManagementWidgetTest(QObject *parent)
: QObject(parent)
diff --git a/src/widgets/autotests/kdeapplicationdebugsettingpagetest.cpp b/src/widgets/autotests/kdeapplicationdebugsettingpagetest.cpp
index c7be6b09..c3c9709e 100644
--- a/src/widgets/autotests/kdeapplicationdebugsettingpagetest.cpp
+++ b/src/widgets/autotests/kdeapplicationdebugsettingpagetest.cpp
@@ -6,7 +6,6 @@
*/
#include "kdeapplicationdebugsettingpagetest.h"
-using namespace Qt::Literals::StringLiterals;
#include "kdeapplicationdebugsettingpage.h"
#include "kdeapplicationtreeview.h"
@@ -16,6 +15,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QTest>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(KDEApplicationDebugSettingPageTest)
KDEApplicationDebugSettingPageTest::KDEApplicationDebugSettingPageTest(QObject *parent)
diff --git a/src/widgets/autotests/kdebugsettingsdialogtest.cpp b/src/widgets/autotests/kdebugsettingsdialogtest.cpp
index 75289fc3..cf3e16fe 100644
--- a/src/widgets/autotests/kdebugsettingsdialogtest.cpp
+++ b/src/widgets/autotests/kdebugsettingsdialogtest.cpp
@@ -6,7 +6,6 @@
*/
#include "kdebugsettingsdialogtest.h"
-using namespace Qt::Literals::StringLiterals;
#include "categorywarning.h"
#include "kdebugsettingsdialog.h"
@@ -17,6 +16,9 @@ using namespace Qt::Literals::StringLiterals;
#include <QStandardPaths>
#include <QTabWidget>
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
+
+QTEST_MAIN(KDebugSettingsDialogTest)
KDebugSettingsDialogTest::KDebugSettingsDialogTest(QObject *parent)
: QObject(parent)
@@ -53,6 +55,4 @@ void KDebugSettingsDialogTest::shouldHaveDefaultValue()
QVERIFY(!categoryWarning->isVisible());
}
-QTEST_MAIN(KDebugSettingsDialogTest)
-
#include "moc_kdebugsettingsdialogtest.cpp"
diff --git a/src/widgets/autotests/savetoolbuttontest.cpp b/src/widgets/autotests/savetoolbuttontest.cpp
index c96f7a3a..6fdab915 100644
--- a/src/widgets/autotests/savetoolbuttontest.cpp
+++ b/src/widgets/autotests/savetoolbuttontest.cpp
@@ -6,10 +6,10 @@
*/
#include "savetoolbuttontest.h"
-using namespace Qt::Literals::StringLiterals;
#include "savetoolbutton.h"
#include <QTest>
+using namespace Qt::Literals::StringLiterals;
QTEST_MAIN(SaveToolButtonTest)
SaveToolButtonTest::SaveToolButtonTest(QObject *parent)
: QObject(parent)
diff --git a/src/widgets/tests/customdebuglistviewgui.cpp b/src/widgets/tests/customdebuglistviewgui.cpp
index 5ed1354b..588a424c 100644
--- a/src/widgets/tests/customdebuglistviewgui.cpp
+++ b/src/widgets/tests/customdebuglistviewgui.cpp
@@ -7,7 +7,6 @@
#include "customdebuglistviewgui.h"
#include "model/customloggingcategoryproxymodel.h"
-using namespace Qt::Literals::StringLiterals;
#include "customdebuglistview.h"
#include "model/customloggingcategorymodel.h"
@@ -15,6 +14,7 @@ using namespace Qt::Literals::StringLiterals;
#include <QApplication>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
CustomDebugListViewGui::CustomDebugListViewGui(QWidget *parent)
: QWidget{parent}
{
diff --git a/src/widgets/tests/kdeapplicationtreeviewgui.cpp b/src/widgets/tests/kdeapplicationtreeviewgui.cpp
index d47d0a33..7b84346d 100644
--- a/src/widgets/tests/kdeapplicationtreeviewgui.cpp
+++ b/src/widgets/tests/kdeapplicationtreeviewgui.cpp
@@ -7,13 +7,13 @@
#include "kdeapplicationtreeviewgui.h"
#include "model/kdeapplicationloggingcategoryproxymodel.h"
-using namespace Qt::Literals::StringLiterals;
#include "kdeapplicationtreeview.h"
#include "model/kdeapplicationloggingcategorymodel.h"
#include <QApplication>
#include <QVBoxLayout>
+using namespace Qt::Literals::StringLiterals;
KDEApplicationTreeViewGui::KDEApplicationTreeViewGui(QWidget *parent)
: QWidget{parent}