[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdepim] calendarsupport: calendarsupport: Use Q_DECL_OVERRIDE
From:       Sergio Martins <iamsergio () gmail ! com>
Date:       2015-07-31 22:12:30
Message-ID: E1ZLIXW-0006uV-TM () scm ! kde ! org
[Download RAW message or body]

Git commit a3b3fbddca72255aec301d5767e8a03a88e98013 by Sergio Martins.
Committed on 31/07/2015 at 22:12.
Pushed by smartins into branch 'master'.

calendarsupport: Use Q_DECL_OVERRIDE

M  +8    -8    calendarsupport/categoryhierarchyreader.h
M  +2    -2    calendarsupport/collectiongeneralpage.h
M  +1    -1    calendarsupport/identitymanager.h
M  +3    -3    calendarsupport/kcalprefs.h
M  +2    -2    calendarsupport/next/incidenceviewer.h
M  +1    -1    calendarsupport/next/incidenceviewer_p.h
M  +1    -1    calendarsupport/plugin.h
M  +2    -2    calendarsupport/printing/calprintpluginbase.cpp
M  +4    -4    calendarsupport/printing/calprintpluginbase.h

http://commits.kde.org/kdepim/a3b3fbddca72255aec301d5767e8a03a88e98013

diff --git a/calendarsupport/categoryhierarchyreader.h \
b/calendarsupport/categoryhierarchyreader.h index b7d66f1..eef7faa 100644
--- a/calendarsupport/categoryhierarchyreader.h
+++ b/calendarsupport/categoryhierarchyreader.h
@@ -53,10 +53,10 @@ public:
     virtual ~CategoryHierarchyReaderQComboBox() {}
 
 protected:
-    virtual void clear();
-    virtual void goUp();
-    virtual void addChild(const QString &label, const QVariant &userData = \
                QVariant());
-    virtual int depth() const;
+    void clear() Q_DECL_OVERRIDE;
+    void goUp() Q_DECL_OVERRIDE;
+    void addChild(const QString &label, const QVariant &userData = QVariant()) \
Q_DECL_OVERRIDE; +    int depth() const Q_DECL_OVERRIDE;
 
 private:
     KComboBox *mBox;
@@ -72,10 +72,10 @@ public:
     virtual ~CategoryHierarchyReaderQTreeWidget() {}
 
 protected:
-    virtual void clear();
-    virtual void goUp();
-    virtual void addChild(const QString &label, const QVariant &userData = \
                QVariant());
-    virtual int depth() const;
+    void clear() Q_DECL_OVERRIDE;
+    void goUp() Q_DECL_OVERRIDE;
+    void addChild(const QString &label, const QVariant &userData = QVariant()) \
Q_DECL_OVERRIDE; +    int depth() const Q_DECL_OVERRIDE;
 
 private:
     QTreeWidget *mTree;
diff --git a/calendarsupport/collectiongeneralpage.h \
b/calendarsupport/collectiongeneralpage.h index 8be4d24..354fd11 100644
--- a/calendarsupport/collectiongeneralpage.h
+++ b/calendarsupport/collectiongeneralpage.h
@@ -43,8 +43,8 @@ public:
     explicit CollectionGeneralPage(QWidget *parent = Q_NULLPTR);
     ~CollectionGeneralPage();
 
-    void load(const Akonadi::Collection &collection);
-    void save(Akonadi::Collection &collection);
+    void load(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;
+    void save(Akonadi::Collection &collection) Q_DECL_OVERRIDE;
 
 private:
     void init(const Akonadi::Collection &collection);
diff --git a/calendarsupport/identitymanager.h b/calendarsupport/identitymanager.h
index 0b16aa9..e86c0aa 100644
--- a/calendarsupport/identitymanager.h
+++ b/calendarsupport/identitymanager.h
@@ -36,7 +36,7 @@ public:
         : KIdentityManagement::IdentityManager(true/*readonly*/, parent, name) {}
 
 protected:
-    virtual void createDefaultIdentity(QString &fullName, QString &emailAddress);
+    void createDefaultIdentity(QString &fullName, QString &emailAddress) \
Q_DECL_OVERRIDE;  };
 
 KIdentityManagement::IdentityManager *identityManager();
diff --git a/calendarsupport/kcalprefs.h b/calendarsupport/kcalprefs.h
index 3788b9e..b550e32 100644
--- a/calendarsupport/kcalprefs.h
+++ b/calendarsupport/kcalprefs.h
@@ -45,13 +45,13 @@ public:
     static KCalPrefs *instance();
 
     /** Set preferences to default values */
-    void usrSetDefaults();
+    void usrSetDefaults() Q_DECL_OVERRIDE;
 
     /** Read preferences from config file */
-    void usrRead();
+    void usrRead() Q_DECL_OVERRIDE;
 
     /** Write preferences to config file */
-    bool usrSave();
+    bool usrSave() Q_DECL_OVERRIDE;
 
 protected:
     void setTimeZoneDefault();
diff --git a/calendarsupport/next/incidenceviewer.h \
b/calendarsupport/next/incidenceviewer.h index d3d38ec..d224dd3 100644
--- a/calendarsupport/next/incidenceviewer.h
+++ b/calendarsupport/next/incidenceviewer.h
@@ -144,13 +144,13 @@ private:
     /**
      * This method is called whenever the displayed contact @p group has been \
                changed.
      */
-    virtual void itemChanged(const Akonadi::Item &group);
+    void itemChanged(const Akonadi::Item &group) Q_DECL_OVERRIDE;
 
     /**
      * This method is called whenever the displayed contact group has been
      * removed from Akonadi.
      */
-    virtual void itemRemoved();
+    void itemRemoved() Q_DECL_OVERRIDE;
 
 private:
     //@cond PRIVATE
diff --git a/calendarsupport/next/incidenceviewer_p.h \
b/calendarsupport/next/incidenceviewer_p.h index 3b8356f..8f6ddfa 100644
--- a/calendarsupport/next/incidenceviewer_p.h
+++ b/calendarsupport/next/incidenceviewer_p.h
@@ -34,7 +34,7 @@ class TextBrowser : public QTextBrowser
 public:
     explicit TextBrowser(QWidget *parent = Q_NULLPTR);
 
-    void setSource(const QUrl &name);
+    void setSource(const QUrl &name) Q_DECL_OVERRIDE;
 
 Q_SIGNALS:
     void attachmentUrlClicked(const QString &uri);
diff --git a/calendarsupport/plugin.h b/calendarsupport/plugin.h
index 8d00f61..a98cf18 100644
--- a/calendarsupport/plugin.h
+++ b/calendarsupport/plugin.h
@@ -64,7 +64,7 @@ public:
     virtual Plugin *createPluginFactory() = 0;
 
 protected:
-    virtual QObject *createObject(QObject *, const char *, const QStringList &)
+    QObject *createObject(QObject *, const char *, const QStringList &) \
Q_DECL_OVERRIDE  {
         return 0;
     }
diff --git a/calendarsupport/printing/calprintpluginbase.cpp \
b/calendarsupport/printing/calprintpluginbase.cpp index d0802d0..85a0211 100644
--- a/calendarsupport/printing/calprintpluginbase.cpp
+++ b/calendarsupport/printing/calprintpluginbase.cpp
@@ -88,7 +88,7 @@ public:
         return mEvent;
     }
 
-    QString label() const
+    QString label() const Q_DECL_OVERRIDE
     {
         return mEvent->summary();
     }
@@ -104,7 +104,7 @@ public:
 
     /** Calculate the start and end date/time of the recurrence that
         happens on the given day */
-    bool overlaps(CellItem *o) const
+    bool overlaps(CellItem *o) const Q_DECL_OVERRIDE
     {
         PrintCellItem *other = static_cast<PrintCellItem *>(o);
         return !(other->start() >= end() || other->end() <= start());
diff --git a/calendarsupport/printing/calprintpluginbase.h \
b/calendarsupport/printing/calprintpluginbase.h index 520e3c6..e0cd73b 100644
--- a/calendarsupport/printing/calprintpluginbase.h
+++ b/calendarsupport/printing/calprintpluginbase.h
@@ -78,7 +78,7 @@ public:
     /**
       Returns widget for configuring the print format.
     */
-    virtual QWidget *createConfigWidget(QWidget *);
+    QWidget *createConfigWidget(QWidget *) Q_DECL_OVERRIDE;
 
     /**
       Actually do the printing.
@@ -91,7 +91,7 @@ public:
     /**
       Start printing.
     */
-    virtual void doPrint(QPrinter *printer);
+    void doPrint(QPrinter *printer) Q_DECL_OVERRIDE;
 
     /**
       Load print format configuration from config file.
@@ -105,11 +105,11 @@ public:
     /**
       Load complete config. This also calls loadConfig() of the derived class.
     */
-    void doLoadConfig();
+    void doLoadConfig() Q_DECL_OVERRIDE;
     /**
       Save complete config. This also calls saveConfig() of the derived class.
     */
-    void doSaveConfig();
+    void doSaveConfig() Q_DECL_OVERRIDE;
 
     /** HELPER FUNCTIONS */
 public:


[prev in list] [next in list] [prev in thread] [next in thread]