From 3485e2d4ceda4153f22666d48190e7a344f26ee9 Mon Sep 17 00:00:00 2001 From: Laurent Montel Date: Fri, 16 Feb 2018 07:10:42 +0100 Subject: [PATCH] Warnings-- --- src/aboutdata.h | 6 +++--- src/editor/composer.h | 4 ++-- src/editor/kmcomposereditorng.h | 2 +- src/editor/kmcomposerwin.h | 2 +- src/editor/widgets/snippetwidget.h | 4 ++-- src/identity/identitydialog.h | 6 +++--- src/identity/identitylistview.h | 6 +++--- src/identity/xfaceconfigurator.h | 6 +++--- src/kmkernel.h | 2 +- src/plugininterface/kmailplugininterface.h | 2 +- src/searchdialog/kmsearchmessagemodel.h | 2 +- src/secondarywindow.h | 8 ++++---- src/sieveimapinterface/kmailsieveimapinstanceinterface.h | 2 +- src/widgets/statusbarlabeltoggledstate.h | 2 +- src/widgets/vacationscriptindicatorwidget.h | 4 ++-- 15 files changed, 29 insertions(+), 29 deletions(-) diff --git a/src/aboutdata.h b/src/aboutdata.h index 1e67c8e50..06fed0c11 100644 --- a/src/aboutdata.h +++ b/src/aboutdata.h @@ -29,8 +29,8 @@ your version. */ -#ifndef __KMAIL_ABOUTDATA_H__ -#define __KMAIL_ABOUTDATA_H__ +#ifndef KMAIL_ABOUTDATA_H +#define KMAIL_ABOUTDATA_H #include "kmail_export.h" #include @@ -44,4 +44,4 @@ public: }; } // namespace KMail -#endif // __KMAIL_ABOUTDATA_H__ +#endif // KMAIL_ABOUTDATA_H diff --git a/src/editor/composer.h b/src/editor/composer.h index 7ab0de50c..0918a3e10 100644 --- a/src/editor/composer.h +++ b/src/editor/composer.h @@ -17,8 +17,8 @@ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. */ -#ifndef __KMAIL_COMPOSER_H__ -#define __KMAIL_COMPOSER_H__ +#ifndef KMAIL_COMPOSER_H +#define KMAIL_COMPOSER_H #include "kmail_export.h" #include "secondarywindow.h" diff --git a/src/editor/kmcomposereditorng.h b/src/editor/kmcomposereditorng.h index c4616feac..215b05b3b 100644 --- a/src/editor/kmcomposereditorng.h +++ b/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; diff --git a/src/editor/kmcomposerwin.h b/src/editor/kmcomposerwin.h index 40772a51c..29053a295 100644 --- a/src/editor/kmcomposerwin.h +++ b/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, diff --git a/src/editor/widgets/snippetwidget.h b/src/editor/widgets/snippetwidget.h index 819b9c860..24e9ca1b8 100644 --- a/src/editor/widgets/snippetwidget.h +++ b/src/editor/widgets/snippetwidget.h @@ -11,8 +11,8 @@ * * ***************************************************************************/ -#ifndef __SNIPPETWIDGET_H__ -#define __SNIPPETWIDGET_H__ +#ifndef KMAIL_SNIPPETWIDGET_H +#define KMAIL_SNIPPETWIDGET_H #include diff --git a/src/identity/identitydialog.h b/src/identity/identitydialog.h index c17ebdd4e..63ba76923 100644 --- a/src/identity/identitydialog.h +++ b/src/identity/identitydialog.h @@ -29,8 +29,8 @@ your version. */ -#ifndef __KMAIL_IDENTITYDIALOG_H__ -#define __KMAIL_IDENTITYDIALOG_H__ +#ifndef KMAIL_IDENTITYDIALOG_H +#define KMAIL_IDENTITYDIALOG_H #include class QCheckBox; @@ -150,4 +150,4 @@ private: }; } // namespace KMail -#endif // __KMAIL_IDENTITYDIALOG_H__ +#endif // KMAIL_IDENTITYDIALOG_H diff --git a/src/identity/identitylistview.h b/src/identity/identitylistview.h index 00a8ee016..e734c3ca3 100644 --- a/src/identity/identitylistview.h +++ b/src/identity/identitylistview.h @@ -30,8 +30,8 @@ your version. */ -#ifndef __KMAIL_IDENTITYLISTVIEW_H__ -#define __KMAIL_IDENTITYLISTVIEW_H__ +#ifndef KMAIL_IDENTITYLISTVIEW_H +#define KMAIL_IDENTITYLISTVIEW_H #include #include @@ -99,4 +99,4 @@ private: }; } // namespace KMail -#endif // __KMAIL_IDENTITYLISTVIEW_H__ +#endif // KMAIL_IDENTITYLISTVIEW_H diff --git a/src/identity/xfaceconfigurator.h b/src/identity/xfaceconfigurator.h index cb9a13181..5371b68e1 100644 --- a/src/identity/xfaceconfigurator.h +++ b/src/identity/xfaceconfigurator.h @@ -14,8 +14,8 @@ Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, US */ -#ifndef __KMAIL_XFACECONFIGURATOR_H__ -#define __KMAIL_XFACECONFIGURATOR_H__ +#ifndef KMAIL_XFACECONFIGURATOR_H +#define KMAIL_XFACECONFIGURATOR_H #include @@ -55,4 +55,4 @@ private: }; } // namespace KMail -#endif // __KMAIL_XFACECONFIGURATOR_H__ +#endif // KMAIL_XFACECONFIGURATOR_H diff --git a/src/kmkernel.h b/src/kmkernel.h index 1d5ae0e74..e7fc07129 100644 --- a/src/kmkernel.h +++ b/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, diff --git a/src/plugininterface/kmailplugininterface.h b/src/plugininterface/kmailplugininterface.h index f5a612206..ae1ea5f45 100644 --- a/src/plugininterface/kmailplugininterface.h +++ b/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; diff --git a/src/searchdialog/kmsearchmessagemodel.h b/src/searchdialog/kmsearchmessagemodel.h index 0a51d6a1e..ae82bf69d 100644 --- a/src/searchdialog/kmsearchmessagemodel.h +++ b/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; diff --git a/src/secondarywindow.h b/src/secondarywindow.h index 042a51eee..486071ac1 100644 --- a/src/secondarywindow.h +++ b/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__ -#define __KMAIL_SECONDARYWINDOW_H__ +#ifndef KMAIL_SECONDARYWINDOW_H +#define KMAIL_SECONDARYWINDOW_H #include @@ -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 diff --git a/src/sieveimapinterface/kmailsieveimapinstanceinterface.h b/src/sieveimapinterface/kmailsieveimapinstanceinterface.h index 6b8ac7e50..07945fee5 100644 --- a/src/sieveimapinterface/kmailsieveimapinstanceinterface.h +++ b/src/sieveimapinterface/kmailsieveimapinstanceinterface.h @@ -26,7 +26,7 @@ class KMailSieveImapInstanceInterface : public KSieveUi::SieveImapInstanceInterf { public: KMailSieveImapInstanceInterface(); - ~KMailSieveImapInstanceInterface() = default; + ~KMailSieveImapInstanceInterface() override = default; QVector sieveImapInstances() override; }; diff --git a/src/widgets/statusbarlabeltoggledstate.h b/src/widgets/statusbarlabeltoggledstate.h index fde3c2eb3..0e212d8fa 100644 --- a/src/widgets/statusbarlabeltoggledstate.h +++ b/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); diff --git a/src/widgets/vacationscriptindicatorwidget.h b/src/widgets/vacationscriptindicatorwidget.h index 5edbf9f21..4ffbf0e06 100644 --- a/src/widgets/vacationscriptindicatorwidget.h +++ b/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();