Warnings--

src/aboutdata.h

@@ -29,8 +29,8 @@
     your version.
 */
 
-#ifndef __KMAIL_ABOUTDATA_H__
+#ifndef KMAIL_ABOUTDATA_H
-#define __KMAIL_ABOUTDATA_H__
+#define KMAIL_ABOUTDATA_H
 
 #include "kmail_export.h"
 #include <KAboutData>
@@ -44,4 +44,4 @@ public:
 };
 } // namespace KMail
 
-#endif // __KMAIL_ABOUTDATA_H__
+#endif // KMAIL_ABOUTDATA_H

src/editor/composer.h

@@ -17,8 +17,8 @@
   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 */
 
-#ifndef __KMAIL_COMPOSER_H__
+#ifndef KMAIL_COMPOSER_H
-#define __KMAIL_COMPOSER_H__
+#define KMAIL_COMPOSER_H
 
 #include "kmail_export.h"
 #include "secondarywindow.h"

src/editor/kmcomposereditorng.h

@@ -28,7 +28,7 @@ class KMComposerEditorNg : public MessageComposer::RichTextComposerNg
     Q_OBJECT
 public:
     explicit KMComposerEditorNg(KMComposerWin *win, QWidget *parent);
-    ~KMComposerEditorNg();
+    ~KMComposerEditorNg() override;
 
     QString smartQuote(const QString &msg) override;
 

src/editor/kmcomposerwin.h

@@ -120,7 +120,7 @@ class KMComposerWin : public KMail::Composer
 private: // mailserviceimpl, kmkernel, kmcommands, callback, kmmainwidget
     explicit KMComposerWin(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, TemplateContext context = NoTemplate, uint identity = 0,
                            const QString &textSelection = QString(), const QString &customTemplate = QString());
-    ~KMComposerWin();
+    ~KMComposerWin() override;
 
 public:
     static Composer *create(const KMime::Message::Ptr &msg, bool lastSignState, bool lastEncryptState, TemplateContext context = NoTemplate, uint identity = 0,

src/editor/widgets/snippetwidget.h

@@ -11,8 +11,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef __SNIPPETWIDGET_H__
+#ifndef KMAIL_SNIPPETWIDGET_H
-#define __SNIPPETWIDGET_H__
+#define KMAIL_SNIPPETWIDGET_H
 
 #include <QTreeView>
 

src/identity/identitydialog.h

@@ -29,8 +29,8 @@
     your version.
 */
 
-#ifndef __KMAIL_IDENTITYDIALOG_H__
+#ifndef KMAIL_IDENTITYDIALOG_H
-#define __KMAIL_IDENTITYDIALOG_H__
+#define KMAIL_IDENTITYDIALOG_H
 
 #include <QDialog>
 class QCheckBox;
@@ -150,4 +150,4 @@ private:
 };
 } // namespace KMail
 
-#endif // __KMAIL_IDENTITYDIALOG_H__
+#endif // KMAIL_IDENTITYDIALOG_H

src/identity/identitylistview.h

@@ -30,8 +30,8 @@
     your version.
 */
 
-#ifndef __KMAIL_IDENTITYLISTVIEW_H__
+#ifndef KMAIL_IDENTITYLISTVIEW_H
-#define __KMAIL_IDENTITYLISTVIEW_H__
+#define KMAIL_IDENTITYLISTVIEW_H
 
 #include <QTreeWidget>
 #include <QTreeWidgetItem>
@@ -99,4 +99,4 @@ private:
 };
 } // namespace KMail
 
-#endif // __KMAIL_IDENTITYLISTVIEW_H__
+#endif // KMAIL_IDENTITYLISTVIEW_H

src/identity/xfaceconfigurator.h

@@ -14,8 +14,8 @@
     Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US
 */
 
-#ifndef __KMAIL_XFACECONFIGURATOR_H__
+#ifndef KMAIL_XFACECONFIGURATOR_H
-#define __KMAIL_XFACECONFIGURATOR_H__
+#define KMAIL_XFACECONFIGURATOR_H
 
 #include <QWidget>
 
@@ -55,4 +55,4 @@ private:
 };
 } // namespace KMail
 
-#endif // __KMAIL_XFACECONFIGURATOR_H__
+#endif // KMAIL_XFACECONFIGURATOR_H

src/kmkernel.h

@@ -109,7 +109,7 @@ class KMAIL_EXPORT KMKernel : public QObject, public MailCommon::IKernel, public
 
 public:
     explicit KMKernel(QObject *parent = nullptr);
-    ~KMKernel();
+    ~KMKernel() override;
 
     /**
     * Start of D-Bus callable stuff. The D-Bus methods need to be public slots,

src/plugininterface/kmailplugininterface.h

@@ -28,7 +28,7 @@ class KMailPluginInterface : public PimCommon::PluginInterface
     Q_OBJECT
 public:
     explicit KMailPluginInterface(QObject *parent = nullptr);
-    ~KMailPluginInterface();
+    ~KMailPluginInterface() override;
 
     void setMainWidget(KMMainWidget *mainwindow);
     void initializeInterfaceRequires(PimCommon::AbstractGenericPluginInterface *interface) override;

src/searchdialog/kmsearchmessagemodel.h

@@ -45,7 +45,7 @@ public:
         Size
     };
     explicit KMSearchMessageModel(QObject *parent = nullptr);
-    ~KMSearchMessageModel();
+    ~KMSearchMessageModel() override;
 
     int columnCount(const QModelIndex &parent = QModelIndex()) const override;
     QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override;

src/secondarywindow.h

@@ -28,8 +28,8 @@
     you do not wish to do so, delete this exception statement from
     your version.
 */
-#ifndef __KMAIL_SECONDARYWINDOW_H__
+#ifndef KMAIL_SECONDARYWINDOW_H
-#define __KMAIL_SECONDARYWINDOW_H__
+#define KMAIL_SECONDARYWINDOW_H
 
 #include <kxmlguiwindow.h>
 
@@ -46,7 +46,7 @@ class SecondaryWindow : public KXmlGuiWindow
 
 public:
     explicit SecondaryWindow(const QString &name = QString());
-    ~SecondaryWindow();
+    ~SecondaryWindow() override;
     using KMainWindow::setCaption;
 public Q_SLOTS:
     /**
@@ -66,4 +66,4 @@ protected:
 };
 } // namespace KMail
 
-#endif // __KMAIL_SECONDARYWINDOW_H__
+#endif // KMAIL_SECONDARYWINDOW_H

src/sieveimapinterface/kmailsieveimapinstanceinterface.h

@@ -26,7 +26,7 @@ class KMailSieveImapInstanceInterface : public KSieveUi::SieveImapInstanceInterf
 {
 public:
     KMailSieveImapInstanceInterface();
-    ~KMailSieveImapInstanceInterface() = default;
+    ~KMailSieveImapInstanceInterface() override = default;
 
     QVector<KSieveUi::SieveImapInstance> sieveImapInstances() override;
 };

src/widgets/statusbarlabeltoggledstate.h

@@ -27,7 +27,7 @@ class StatusBarLabelToggledState : public QLabel
     Q_OBJECT
 public:
     explicit StatusBarLabelToggledState(QWidget *parent = nullptr);
-    ~StatusBarLabelToggledState();
+    ~StatusBarLabelToggledState() override;
 
     void setToggleMode(bool state);
 

src/widgets/vacationscriptindicatorwidget.h

@@ -29,7 +29,7 @@ class ServerLabel : public QLabel
     Q_OBJECT
 public:
     explicit ServerLabel(const QString &toolTip, QWidget *parent = nullptr);
-    ~ServerLabel();
+    ~ServerLabel() override;
 
 Q_SIGNALS:
     void clicked(const QString &serverName);
@@ -46,7 +46,7 @@ class VacationLabel : public QLabel
     Q_OBJECT
 public:
     explicit VacationLabel(const QString &text, QWidget *parent = nullptr);
-    ~VacationLabel();
+    ~VacationLabel() override;
 
 Q_SIGNALS:
     void vacationLabelClicked();