aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDavid Faure <faure@kde.org>2021-04-04 13:52:53 +0200
committerMéven Car <meven29@gmail.com>2021-04-05 12:23:47 +0000
commit27f1d268d9f960b72081b74b0688fdc5fc212ff5 (patch)
tree7121a56b3228180cbe294b7ea1cf15230d7e77b7
parent05bf9bd074ab254e42400e7d42db6e06dd977953 (diff)
downloadkconfig-27f1d268d9f960b72081b74b0688fdc5fc212ff5.tar.gz
kconfig-27f1d268d9f960b72081b74b0688fdc5fc212ff5.tar.bz2
kconfig_compiler: add override to generated destructors
This fixes the clang warning globalsettings_kmail.h:58:5: warning: '~GlobalSettingsBase' overrides a destructor but is not marked 'override' [-Wsuggest-destructor-override]
-rw-r--r--autotests/kconfig_compiler/test1.h.ref2
-rw-r--r--autotests/kconfig_compiler/test10.h.ref2
-rw-r--r--autotests/kconfig_compiler/test11.h.ref2
-rw-r--r--autotests/kconfig_compiler/test11a.h.ref2
-rw-r--r--autotests/kconfig_compiler/test12.h.ref2
-rw-r--r--autotests/kconfig_compiler/test13.h.ref2
-rw-r--r--autotests/kconfig_compiler/test2.h.ref2
-rw-r--r--autotests/kconfig_compiler/test3.h.ref2
-rw-r--r--autotests/kconfig_compiler/test3a.h.ref2
-rw-r--r--autotests/kconfig_compiler/test4.h.ref2
-rw-r--r--autotests/kconfig_compiler/test5.h.ref2
-rw-r--r--autotests/kconfig_compiler/test6.h.ref2
-rw-r--r--autotests/kconfig_compiler/test7.h.ref2
-rw-r--r--autotests/kconfig_compiler/test8a.h.ref2
-rw-r--r--autotests/kconfig_compiler/test8b.h.ref2
-rw-r--r--autotests/kconfig_compiler/test8c.h.ref2
-rw-r--r--autotests/kconfig_compiler/test9.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_dpointer.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_emptyentries.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_notifiers.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_param_minmax.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_properties_minmax.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_qdebugcategory.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_signal.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_subgroups.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_translation_kde.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_translation_kde_domain.h.ref2
-rw-r--r--autotests/kconfig_compiler/test_translation_qt.h.ref2
-rw-r--r--src/kconfig_compiler/KConfigHeaderGenerator.cpp2
29 files changed, 29 insertions, 29 deletions
diff --git a/autotests/kconfig_compiler/test1.h.ref b/autotests/kconfig_compiler/test1.h.ref
index 24500176..b8c5df0d 100644
--- a/autotests/kconfig_compiler/test1.h.ref
+++ b/autotests/kconfig_compiler/test1.h.ref
@@ -19,7 +19,7 @@ class Test1 : public KConfigSkeleton
};
Test1( const QString & transport, const QString & folder, QObject *parent = nullptr );
- ~Test1();
+ ~Test1() override;
/**
Set One option
diff --git a/autotests/kconfig_compiler/test10.h.ref b/autotests/kconfig_compiler/test10.h.ref
index a06bd162..4a2c8f69 100644
--- a/autotests/kconfig_compiler/test10.h.ref
+++ b/autotests/kconfig_compiler/test10.h.ref
@@ -12,7 +12,7 @@ class Test10 : public KConfigSkeleton
public:
static Test10 *self();
- ~Test10();
+ ~Test10() override;
/**
Get foo bar
diff --git a/autotests/kconfig_compiler/test11.h.ref b/autotests/kconfig_compiler/test11.h.ref
index 786858dc..ab68dab6 100644
--- a/autotests/kconfig_compiler/test11.h.ref
+++ b/autotests/kconfig_compiler/test11.h.ref
@@ -23,7 +23,7 @@ class Test11 : public MyPrefs
enum MailClient { sendmail, kmail };
Test11( QObject *parent = nullptr );
- ~Test11();
+ ~Test11() override;
/**
Set Enable automatic saving of calendar
diff --git a/autotests/kconfig_compiler/test11a.h.ref b/autotests/kconfig_compiler/test11a.h.ref
index 014501cd..1f36c52d 100644
--- a/autotests/kconfig_compiler/test11a.h.ref
+++ b/autotests/kconfig_compiler/test11a.h.ref
@@ -23,7 +23,7 @@ class Test11a : public MyPrefs
enum MailClient { sendmail, kmail };
Test11a( );
- ~Test11a();
+ ~Test11a() override;
/**
Set Enable automatic saving of calendar
diff --git a/autotests/kconfig_compiler/test12.h.ref b/autotests/kconfig_compiler/test12.h.ref
index cd4c188e..16eba805 100644
--- a/autotests/kconfig_compiler/test12.h.ref
+++ b/autotests/kconfig_compiler/test12.h.ref
@@ -13,7 +13,7 @@ class Test12 : public KConfigSkeleton
public:
Test12( );
- ~Test12();
+ ~Test12() override;
/**
Get RnRSource
diff --git a/autotests/kconfig_compiler/test13.h.ref b/autotests/kconfig_compiler/test13.h.ref
index 45863900..34e97f7c 100644
--- a/autotests/kconfig_compiler/test13.h.ref
+++ b/autotests/kconfig_compiler/test13.h.ref
@@ -14,7 +14,7 @@ class Test13 : public KConfigSkeleton
public:
Test13( );
- ~Test13();
+ ~Test13() override;
Q_PROPERTY(QUrl picturesDir READ picturesDir CONSTANT)
Q_PROPERTY(bool isPicturesDirImmutable READ isPicturesDirImmutable CONSTANT)
diff --git a/autotests/kconfig_compiler/test2.h.ref b/autotests/kconfig_compiler/test2.h.ref
index 75d850d7..26b6568e 100644
--- a/autotests/kconfig_compiler/test2.h.ref
+++ b/autotests/kconfig_compiler/test2.h.ref
@@ -16,7 +16,7 @@ class Test2 : public MyPrefs
enum EnumDestination { standardDestination, askDestination, argl1, argl2, argl3 };
Test2( );
- ~Test2();
+ ~Test2() override;
/**
Set Enable automatic saving of calendar
diff --git a/autotests/kconfig_compiler/test3.h.ref b/autotests/kconfig_compiler/test3.h.ref
index 7dde3de0..ed449fdf 100644
--- a/autotests/kconfig_compiler/test3.h.ref
+++ b/autotests/kconfig_compiler/test3.h.ref
@@ -15,7 +15,7 @@ class Test3 : public KConfigSkeleton
public:
Test3( );
- ~Test3();
+ ~Test3() override;
/**
Set Enable automatic saving of calendar
diff --git a/autotests/kconfig_compiler/test3a.h.ref b/autotests/kconfig_compiler/test3a.h.ref
index 3cdf1677..ef0d1c78 100644
--- a/autotests/kconfig_compiler/test3a.h.ref
+++ b/autotests/kconfig_compiler/test3a.h.ref
@@ -16,7 +16,7 @@ class Test3a : public KConfigSkeleton
public:
Test3a( );
- ~Test3a();
+ ~Test3a() override;
/**
Set Enable automatic saving of calendar
diff --git a/autotests/kconfig_compiler/test4.h.ref b/autotests/kconfig_compiler/test4.h.ref
index 32e351ca..6439ac35 100644
--- a/autotests/kconfig_compiler/test4.h.ref
+++ b/autotests/kconfig_compiler/test4.h.ref
@@ -23,7 +23,7 @@ class Test4 : public KConfigSkeleton
};
static Test4 *self();
- ~Test4();
+ ~Test4() override;
/**
Set Block colors.
diff --git a/autotests/kconfig_compiler/test5.h.ref b/autotests/kconfig_compiler/test5.h.ref
index 96e5c143..a0938584 100644
--- a/autotests/kconfig_compiler/test5.h.ref
+++ b/autotests/kconfig_compiler/test5.h.ref
@@ -15,7 +15,7 @@ class Test5 : public KConfigSkeleton
static const char* const EnumButtonToString[];
static Test5 *self();
- ~Test5();
+ ~Test5() override;
/**
Set Block colors.
diff --git a/autotests/kconfig_compiler/test6.h.ref b/autotests/kconfig_compiler/test6.h.ref
index 6084e7dc..e21b33a9 100644
--- a/autotests/kconfig_compiler/test6.h.ref
+++ b/autotests/kconfig_compiler/test6.h.ref
@@ -12,7 +12,7 @@ class Test6 : public KConfigSkeleton
public:
Test6( const QString & Number );
- ~Test6();
+ ~Test6() override;
/**
Set Block colors.
diff --git a/autotests/kconfig_compiler/test7.h.ref b/autotests/kconfig_compiler/test7.h.ref
index c2dccf90..7b339b5c 100644
--- a/autotests/kconfig_compiler/test7.h.ref
+++ b/autotests/kconfig_compiler/test7.h.ref
@@ -12,7 +12,7 @@ class Test7 : public KConfigSkeleton
public:
Test7( int Number );
- ~Test7();
+ ~Test7() override;
/**
Set Block colors.
diff --git a/autotests/kconfig_compiler/test8a.h.ref b/autotests/kconfig_compiler/test8a.h.ref
index 9e9c0f4e..0334e8cd 100644
--- a/autotests/kconfig_compiler/test8a.h.ref
+++ b/autotests/kconfig_compiler/test8a.h.ref
@@ -13,7 +13,7 @@ class Test8a : public KConfigSkeleton
public:
Test8a( KSharedConfig::Ptr config = KSharedConfig::openConfig(), QObject *parent = nullptr );
- ~Test8a();
+ ~Test8a() override;
/**
Set Font
diff --git a/autotests/kconfig_compiler/test8b.h.ref b/autotests/kconfig_compiler/test8b.h.ref
index 793c6851..7c671be3 100644
--- a/autotests/kconfig_compiler/test8b.h.ref
+++ b/autotests/kconfig_compiler/test8b.h.ref
@@ -14,7 +14,7 @@ class Test8b : public Test8a
public:
static Test8b *self();
- ~Test8b();
+ ~Test8b() override;
/**
Set Something
diff --git a/autotests/kconfig_compiler/test8c.h.ref b/autotests/kconfig_compiler/test8c.h.ref
index 7e96da0b..44528747 100644
--- a/autotests/kconfig_compiler/test8c.h.ref
+++ b/autotests/kconfig_compiler/test8c.h.ref
@@ -14,7 +14,7 @@ class Test8c : public KConfigSkeleton
static Test8c *self();
static void instance(const QString& cfgfilename);
static void instance(KSharedConfig::Ptr config);
- ~Test8c();
+ ~Test8c() override;
/**
Set Font
diff --git a/autotests/kconfig_compiler/test9.h.ref b/autotests/kconfig_compiler/test9.h.ref
index 7c95b1d1..84fbbf30 100644
--- a/autotests/kconfig_compiler/test9.h.ref
+++ b/autotests/kconfig_compiler/test9.h.ref
@@ -14,7 +14,7 @@ class Test9 : public KConfigSkeleton
public:
Test9( const QString & transport, const QString & folder );
- ~Test9();
+ ~Test9() override;
/**
Set MyStringList
diff --git a/autotests/kconfig_compiler/test_dpointer.h.ref b/autotests/kconfig_compiler/test_dpointer.h.ref
index a0886a07..4b7c86ea 100644
--- a/autotests/kconfig_compiler/test_dpointer.h.ref
+++ b/autotests/kconfig_compiler/test_dpointer.h.ref
@@ -19,7 +19,7 @@ class TestDPointer : public KConfigSkeleton
};
static TestDPointer *self();
- ~TestDPointer();
+ ~TestDPointer() override;
/**
Set Enable automatic saving of calendar
diff --git a/autotests/kconfig_compiler/test_emptyentries.h.ref b/autotests/kconfig_compiler/test_emptyentries.h.ref
index c2481e2d..65d5c7da 100644
--- a/autotests/kconfig_compiler/test_emptyentries.h.ref
+++ b/autotests/kconfig_compiler/test_emptyentries.h.ref
@@ -15,7 +15,7 @@ class QMakeBuilderSettings : public KConfigSkeleton
static QMakeBuilderSettings *self();
static void instance(const QString& cfgfilename);
static void instance(KSharedConfig::Ptr config);
- ~QMakeBuilderSettings();
+ ~QMakeBuilderSettings() override;
protected:
QMakeBuilderSettings(KSharedConfig::Ptr config);
diff --git a/autotests/kconfig_compiler/test_notifiers.h.ref b/autotests/kconfig_compiler/test_notifiers.h.ref
index 6d73b7d0..8e059d94 100644
--- a/autotests/kconfig_compiler/test_notifiers.h.ref
+++ b/autotests/kconfig_compiler/test_notifiers.h.ref
@@ -12,7 +12,7 @@ class TestNotifiers : public KConfigSkeleton
public:
TestNotifiers( int Number );
- ~TestNotifiers();
+ ~TestNotifiers() override;
/**
Set Block colors.
diff --git a/autotests/kconfig_compiler/test_param_minmax.h.ref b/autotests/kconfig_compiler/test_param_minmax.h.ref
index 3cc8717c..a0f93ba7 100644
--- a/autotests/kconfig_compiler/test_param_minmax.h.ref
+++ b/autotests/kconfig_compiler/test_param_minmax.h.ref
@@ -13,7 +13,7 @@ class TestParamMinMax : public KConfigSkeleton
public:
TestParamMinMax( KSharedConfig::Ptr config = KSharedConfig::openConfig() );
- ~TestParamMinMax();
+ ~TestParamMinMax() override;
/**
Set foo_#$(myparam)
diff --git a/autotests/kconfig_compiler/test_properties_minmax.h.ref b/autotests/kconfig_compiler/test_properties_minmax.h.ref
index 5f222320..e8be4382 100644
--- a/autotests/kconfig_compiler/test_properties_minmax.h.ref
+++ b/autotests/kconfig_compiler/test_properties_minmax.h.ref
@@ -14,7 +14,7 @@ class TestPropertiesMinMax : public KConfigSkeleton
public:
TestPropertiesMinMax( KSharedConfig::Ptr config = KSharedConfig::openConfig() );
- ~TestPropertiesMinMax();
+ ~TestPropertiesMinMax() override;
/**
Set bar
diff --git a/autotests/kconfig_compiler/test_qdebugcategory.h.ref b/autotests/kconfig_compiler/test_qdebugcategory.h.ref
index cf7e3dbf..9a979fb9 100644
--- a/autotests/kconfig_compiler/test_qdebugcategory.h.ref
+++ b/autotests/kconfig_compiler/test_qdebugcategory.h.ref
@@ -14,7 +14,7 @@ class TestQCategory : public KConfigSkeleton
public:
TestQCategory( int Number );
- ~TestQCategory();
+ ~TestQCategory() override;
/**
Set Block colors.
diff --git a/autotests/kconfig_compiler/test_signal.h.ref b/autotests/kconfig_compiler/test_signal.h.ref
index ef106a8d..fe2e1732 100644
--- a/autotests/kconfig_compiler/test_signal.h.ref
+++ b/autotests/kconfig_compiler/test_signal.h.ref
@@ -13,7 +13,7 @@ class TestSignal : public KConfigSkeleton
public:
static TestSignal *self();
- ~TestSignal();
+ ~TestSignal() override;
/**
Set Current emoticon theme.
diff --git a/autotests/kconfig_compiler/test_subgroups.h.ref b/autotests/kconfig_compiler/test_subgroups.h.ref
index 11665710..c8a1c253 100644
--- a/autotests/kconfig_compiler/test_subgroups.h.ref
+++ b/autotests/kconfig_compiler/test_subgroups.h.ref
@@ -12,7 +12,7 @@ class TestSubgroups : public KConfigSkeleton
public:
TestSubgroups( const QString & GeneralGroup, const QString & SubGroup, const QString & AnotherSubGroup );
- ~TestSubgroups();
+ ~TestSubgroups() override;
/**
Get Foo
diff --git a/autotests/kconfig_compiler/test_translation_kde.h.ref b/autotests/kconfig_compiler/test_translation_kde.h.ref
index 781cdcea..623ba6a6 100644
--- a/autotests/kconfig_compiler/test_translation_kde.h.ref
+++ b/autotests/kconfig_compiler/test_translation_kde.h.ref
@@ -15,7 +15,7 @@ class TestTranslationKde : public KConfigSkeleton
public:
TestTranslationKde( );
- ~TestTranslationKde();
+ ~TestTranslationKde() override;
/**
Get Enable automatic saving of calendar
diff --git a/autotests/kconfig_compiler/test_translation_kde_domain.h.ref b/autotests/kconfig_compiler/test_translation_kde_domain.h.ref
index 38634817..dd98915b 100644
--- a/autotests/kconfig_compiler/test_translation_kde_domain.h.ref
+++ b/autotests/kconfig_compiler/test_translation_kde_domain.h.ref
@@ -15,7 +15,7 @@ class TestTranslationKdeDomain : public KConfigSkeleton
public:
TestTranslationKdeDomain( );
- ~TestTranslationKdeDomain();
+ ~TestTranslationKdeDomain() override;
/**
Get Enable automatic saving of calendar
diff --git a/autotests/kconfig_compiler/test_translation_qt.h.ref b/autotests/kconfig_compiler/test_translation_qt.h.ref
index 11590509..dd134537 100644
--- a/autotests/kconfig_compiler/test_translation_qt.h.ref
+++ b/autotests/kconfig_compiler/test_translation_qt.h.ref
@@ -15,7 +15,7 @@ class TestTranslationQt : public KConfigSkeleton
public:
TestTranslationQt( );
- ~TestTranslationQt();
+ ~TestTranslationQt() override;
/**
Get Enable automatic saving of calendar
diff --git a/src/kconfig_compiler/KConfigHeaderGenerator.cpp b/src/kconfig_compiler/KConfigHeaderGenerator.cpp
index 08d383d8..bf29da05 100644
--- a/src/kconfig_compiler/KConfigHeaderGenerator.cpp
+++ b/src/kconfig_compiler/KConfigHeaderGenerator.cpp
@@ -347,7 +347,7 @@ void KConfigHeaderGenerator::createConstructor()
void KConfigHeaderGenerator::createDestructor()
{
- stream() << whitespace() << "~" << cfg().className << "();\n\n";
+ stream() << whitespace() << "~" << cfg().className << "() override;\n\n";
}
void KConfigHeaderGenerator::createForwardDeclarations()