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

List:       kde-commits
Subject:    [kdepim-runtime] /: Remove virtual when not necessary
From:       Montel Laurent <montel () kde ! org>
Date:       2014-12-15 20:15:22
Message-ID: E1Y0c38-0001OC-Ii () scm ! kde ! org
[Download RAW message or body]

Git commit 278909d26f23ec8233576ee1440729bc388f2a53 by Montel Laurent.
Committed on 15/12/2014 at 20:15.
Pushed by mlaurent into branch 'master'.

Remove virtual when not necessary

M  +1    -1    agents/migration/migrationagent.h
M  +1    -1    resources/google/common/googleresource.h
M  +9    -9    resources/maildir/maildirresource.h
M  +1    -1    resources/nntp/nntpresource.h
M  +8    -8    resources/openxchange/openxchangeresource.h

http://commits.kde.org/kdepim-runtime/278909d26f23ec8233576ee1440729bc388f2a53

diff --git a/agents/migration/migrationagent.h b/agents/migration/migrationagent.h
index 8a9310e..690cdab 100644
--- a/agents/migration/migrationagent.h
+++ b/agents/migration/migrationagent.h
@@ -33,7 +33,7 @@ class MigrationAgent : public AgentBase, public \
AgentBase::ObserverV2  Q_OBJECT
 public:
     explicit MigrationAgent(const QString &id);
-    virtual void configure(WId windowId) Q_DECL_OVERRIDE;
+    void configure(WId windowId) Q_DECL_OVERRIDE;
 private:
     MigrationScheduler mScheduler;
 };
diff --git a/resources/google/common/googleresource.h \
b/resources/google/common/googleresource.h index bc3dc68..4467f63 100644
--- a/resources/google/common/googleresource.h
+++ b/resources/google/common/googleresource.h
@@ -56,7 +56,7 @@ public:
     void cleanup();
 
 public Q_SLOTS:
-    virtual void configure(WId windowId) Q_DECL_OVERRIDE;
+    void configure(WId windowId) Q_DECL_OVERRIDE;
 
     void reloadConfig();
 
diff --git a/resources/maildir/maildirresource.h \
b/resources/maildir/maildirresource.h index 2598ba7..820f812 100644
--- a/resources/maildir/maildirresource.h
+++ b/resources/maildir/maildirresource.h
@@ -45,7 +45,7 @@ public:
 
     virtual QString defaultResourceType();
 public Q_SLOTS:
-    virtual void configure(WId windowId) Q_DECL_OVERRIDE;
+    void configure(WId windowId) Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
     void retrieveCollections() Q_DECL_OVERRIDE;
@@ -57,18 +57,18 @@ protected:
 
     virtual void aboutToQuit();
 
-    virtual void itemAdded(const Akonadi::Item &item, const Akonadi::Collection \
                &collection) Q_DECL_OVERRIDE;
-    virtual void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> \
                &parts) Q_DECL_OVERRIDE;
-    virtual void itemMoved(const Akonadi::Item &item, const Akonadi::Collection \
                &source, const Akonadi::Collection &dest) Q_DECL_OVERRIDE;
-    virtual void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+    void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) \
Q_DECL_OVERRIDE; +    void itemChanged(const Akonadi::Item &item, const \
QSet<QByteArray> &parts) Q_DECL_OVERRIDE; +    void itemMoved(const Akonadi::Item \
&item, const Akonadi::Collection &source, const Akonadi::Collection &dest) \
Q_DECL_OVERRIDE; +    void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
 
-    virtual void collectionAdded(const Akonadi::Collection &collection, const \
                Akonadi::Collection &parent) Q_DECL_OVERRIDE;
-    virtual void collectionChanged(const Akonadi::Collection &collection) \
Q_DECL_OVERRIDE; +    void collectionAdded(const Akonadi::Collection &collection, \
const Akonadi::Collection &parent) Q_DECL_OVERRIDE; +    void collectionChanged(const \
Akonadi::Collection &collection) Q_DECL_OVERRIDE;  // do not hide the other variant, \
use implementation from base class  // which just forwards to the one above
     using Akonadi::AgentBase::ObserverV2::collectionChanged;
-    virtual void collectionMoved(const Akonadi::Collection &collection, const \
                Akonadi::Collection &source, const Akonadi::Collection &dest) \
                Q_DECL_OVERRIDE;
-    virtual void collectionRemoved(const Akonadi::Collection &collection) \
Q_DECL_OVERRIDE; +    void collectionMoved(const Akonadi::Collection &collection, \
const Akonadi::Collection &source, const Akonadi::Collection &dest) Q_DECL_OVERRIDE; \
+    void collectionRemoved(const Akonadi::Collection &collection) Q_DECL_OVERRIDE;  
 private slots:
     void configurationChanged();
diff --git a/resources/nntp/nntpresource.h b/resources/nntp/nntpresource.h
index 79be234..843c281 100644
--- a/resources/nntp/nntpresource.h
+++ b/resources/nntp/nntpresource.h
@@ -34,7 +34,7 @@ public:
     ~NntpResource();
 
 public Q_SLOTS:
-    virtual void configure(WId windowId) Q_DECL_OVERRIDE;
+    void configure(WId windowId) Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
     void retrieveCollections() Q_DECL_OVERRIDE;
diff --git a/resources/openxchange/openxchangeresource.h \
b/resources/openxchange/openxchangeresource.h index c13305b..271db68 100644
--- a/resources/openxchange/openxchangeresource.h
+++ b/resources/openxchange/openxchangeresource.h
@@ -33,8 +33,8 @@ public:
     virtual void cleanup();
 
 public Q_SLOTS:
-    virtual void configure(WId windowId) Q_DECL_OVERRIDE;
-    virtual void aboutToQuit() Q_DECL_OVERRIDE;
+    void configure(WId windowId) Q_DECL_OVERRIDE;
+    void aboutToQuit() Q_DECL_OVERRIDE;
 
 protected Q_SLOTS:
     void retrieveCollections() Q_DECL_OVERRIDE;
@@ -42,18 +42,18 @@ protected Q_SLOTS:
     bool retrieveItem(const Akonadi::Item &item, const QSet<QByteArray> &parts) \
Q_DECL_OVERRIDE;  
 protected:
-    virtual void itemAdded(const Akonadi::Item &item, const Akonadi::Collection \
                &collection) Q_DECL_OVERRIDE;
-    virtual void itemChanged(const Akonadi::Item &item, const QSet<QByteArray> \
                &parts) Q_DECL_OVERRIDE;
-    virtual void itemRemoved(const Akonadi::Item &item) Q_DECL_OVERRIDE;
+    void itemAdded(const Akonadi::Item &item, const Akonadi::Collection &collection) \
Q_DECL_OVERRIDE; +    void itemChanged(const Akonadi::Item &item, const \
QSet<QByteArray> &parts) Q_DECL_OVERRIDE; +    void itemRemoved(const Akonadi::Item \
                &item) Q_DECL_OVERRIDE;
     virtual void itemMoved(const Akonadi::Item &item, const Akonadi::Collection \
                &collectionSource,
                            const Akonadi::Collection &collectionDestination) \
Q_DECL_OVERRIDE;  
-    virtual void collectionAdded(const Akonadi::Collection &collection, const \
                Akonadi::Collection &parent) Q_DECL_OVERRIDE;
-    virtual void collectionChanged(const Akonadi::Collection &collection) \
Q_DECL_OVERRIDE; +    void collectionAdded(const Akonadi::Collection &collection, \
const Akonadi::Collection &parent) Q_DECL_OVERRIDE; +    void collectionChanged(const \
Akonadi::Collection &collection) Q_DECL_OVERRIDE;  // do not hide the other variant, \
use implementation from base class  // which just forwards to the one above
     using Akonadi::AgentBase::ObserverV2::collectionChanged;
-    virtual void collectionRemoved(const Akonadi::Collection &collection) \
Q_DECL_OVERRIDE; +    void collectionRemoved(const Akonadi::Collection &collection) \
                Q_DECL_OVERRIDE;
     virtual void collectionMoved(const Akonadi::Collection &collection, const \
                Akonadi::Collection &collectionSource,
                                  const Akonadi::Collection &collectionDestination) \
Q_DECL_OVERRIDE;  


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