5 files changed, 4 insertions, 22 deletions

diff --git a/src/core/kconfigini_p.h b/src/core/kconfigini_p.h
index d633c048..9b961826 100644
--- a/src/core/kconfigini_p.h
+++ b/src/core/kconfigini_p.h
@@ -39,7 +39,7 @@ public:
     class BufferFragment;
 
     KConfigIniBackend();
-    ~KConfigIniBackend();
+    ~KConfigIniBackend() Q_DECL_OVERRIDE;
 
     ParseInfo parseConfig(const QByteArray &locale,
                           KEntryMap &entryMap,
diff --git a/src/core/kcoreconfigskeleton.cpp b/src/core/kcoreconfigskeleton.cpp
index 293387bd..01f69cbe 100644
--- a/src/core/kcoreconfigskeleton.cpp
+++ b/src/core/kcoreconfigskeleton.cpp
@@ -480,7 +480,7 @@ void KCoreConfigSkeleton::ItemEnum::writeConfig(KConfig *config)
         KConfigGroup cg(config, mGroup);
         if ((mDefault == mReference) && !cg.hasDefault(mKey)) {
             cg.revertToDefault(mKey);
-        } else if ((mReference >= 0) && (mReference < (int) mChoices.count())) {
+        } else if ((mReference >= 0) && (mReference < mChoices.count())) {
             cg.writeEntry(mKey, mChoices[mReference].name);
         } else {
             cg.writeEntry(mKey, mReference);
diff --git a/src/core/kcoreconfigskeleton.h b/src/core/kcoreconfigskeleton.h
index fa1d8827..df550154 100644
--- a/src/core/kcoreconfigskeleton.h
+++ b/src/core/kcoreconfigskeleton.h
@@ -332,7 +332,7 @@ public:
     */
     KConfigCompilerSignallingItem(KConfigSkeletonItem *item, QObject* object,
             NotifyFunction targetFunction, quint64 userData);
-    virtual ~KConfigCompilerSignallingItem();
+    ~KConfigCompilerSignallingItem() Q_DECL_OVERRIDE;
 
     void readConfig(KConfig *) Q_DECL_OVERRIDE;
     void writeConfig(KConfig *) Q_DECL_OVERRIDE;
diff --git a/src/core/kemailsettings.cpp b/src/core/kemailsettings.cpp
index 64a060c5..a16e6839 100644
--- a/src/core/kemailsettings.cpp
+++ b/src/core/kemailsettings.cpp
@@ -53,75 +53,57 @@ QString KEMailSettings::getSetting(KEMailSettings::Setting s) const
     switch (s) {
     case ClientProgram: {
         return cg.readEntry("EmailClient");
-        break;
     }
     case ClientTerminal: {
         return cg.readEntry("TerminalClient", QVariant(false)).toString();
-        break;
     }
     case RealName: {
         return cg.readEntry("FullName");
-        break;
     }
     case EmailAddress: {
         return cg.readEntry("EmailAddress");
-        break;
     }
     case ReplyToAddress: {
         return cg.readEntry("ReplyAddr");
-        break;
     }
     case Organization: {
         return cg.readEntry("Organization");
-        break;
     }
     case OutServer: {
         return cg.readEntry("OutgoingServer");
-        break;
     }
     case OutServerLogin: {
         return cg.readEntry("OutgoingUserName");
-        break;
     }
     case OutServerPass: {
         return cg.readEntry("OutgoingPassword");
-        break;
     }
     case OutServerType: {
         return cg.readEntry("OutgoingServerType");
-        break;
     }
     case OutServerCommand: {
         return cg.readEntry("OutgoingCommand");
-        break;
     }
     case OutServerTLS: {
         return cg.readEntry("OutgoingServerTLS", QVariant(false)).toString();
-        break;
     }
     case InServer: {
         return cg.readEntry("IncomingServer");
-        break;
     }
     case InServerLogin: {
         return cg.readEntry("IncomingUserName");
-        break;
     }
     case InServerPass: {
         return cg.readEntry("IncomingPassword");
-        break;
     }
     case InServerType: {
         return cg.readEntry("IncomingServerType");
-        break;
     }
     case InServerMBXType: {
         return cg.readEntry("IncomingServerMBXType");
-        break;
     }
     case InServerTLS: {
         return cg.readEntry("IncomingServerTLS", QVariant(false)).toString();
-        break;
     }
     };
     return QString();
diff --git a/src/core/ksharedconfig.h b/src/core/ksharedconfig.h
index 96a54c82..83ec3b6e 100644
--- a/src/core/ksharedconfig.h
+++ b/src/core/ksharedconfig.h
@@ -75,7 +75,7 @@ public:
                                          OpenFlags mode = FullConfig,
                                          QStandardPaths::StandardLocation type = QStandardPaths::GenericConfigLocation);
 
-    virtual ~KSharedConfig();
+    ~KSharedConfig() Q_DECL_OVERRIDE;
 
 private:
     Q_DISABLE_COPY(KSharedConfig)