[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepim-runtime] /: Use Q_DECL_OVERRIDE
From: Sergio Martins <iamsergio () gmail ! com>
Date: 2015-07-31 22:46:18
Message-ID: E1ZLJ4E-0004LU-GP () scm ! kde ! org
[Download RAW message or body]
Git commit 3b95761d9e7ab7c268b7f39a54bf5c712ba70f80 by Sergio Martins.
Committed on 31/07/2015 at 22:45.
Pushed by smartins into branch 'master'.
Use Q_DECL_OVERRIDE
M +1 -1 migration/entitytreecreatejob.h
M +5 -5 migration/gid/gidmigrator.h
M +1 -1 resources/imap/imapresource.h
M +1 -1 resources/imap/replacemessagejob.h
M +2 -2 resources/imap/subscriptiondialog.h
M +4 -4 resources/imap/tracer.cpp
M +1 -1 resources/mixedmaildir/retrieveitemsjob.h
M +14 -14 resources/shared/filestore/abstractlocalstore.h
M +1 -1 resources/shared/filestore/sessionimpls.cpp
M +2 -2 resources/shared/singlefileresource/singlefileresource.h
http://commits.kde.org/kdepim-runtime/3b95761d9e7ab7c268b7f39a54bf5c712ba70f80
diff --git a/migration/entitytreecreatejob.h b/migration/entitytreecreatejob.h
index d5fdd45..8ec0f01 100644
--- a/migration/entitytreecreatejob.h
+++ b/migration/entitytreecreatejob.h
@@ -31,7 +31,7 @@ class EntityTreeCreateJob : public Akonadi::TransactionSequence
public:
explicit EntityTreeCreateJob(const QList<Akonadi::Collection::List> \
&collections, const Akonadi::Item::List &items, QObject *parent = Q_NULLPTR);
- /* reimp */ void doStart();
+ void doStart() Q_DECL_OVERRIDE;
private Q_SLOTS:
void collectionCreateJobDone(KJob *);
diff --git a/migration/gid/gidmigrator.h b/migration/gid/gidmigrator.h
index c5fb2ae..dadcb12 100644
--- a/migration/gid/gidmigrator.h
+++ b/migration/gid/gidmigrator.h
@@ -30,15 +30,15 @@ public:
GidMigrator(const QString &mimeType);
virtual ~GidMigrator();
- virtual QString displayName() const;
- virtual QString description() const;
+ QString displayName() const Q_DECL_OVERRIDE;
+ QString description() const Q_DECL_OVERRIDE;
- virtual bool canStart();
+ bool canStart() Q_DECL_OVERRIDE;
- virtual bool shouldAutostart() const;
+ bool shouldAutostart() const Q_DECL_OVERRIDE;
protected:
- virtual void startWork();
+ void startWork() Q_DECL_OVERRIDE;
private Q_SLOTS:
void migrationFinished(KJob *);
private:
diff --git a/resources/imap/imapresource.h b/resources/imap/imapresource.h
index 6e33705..47c0194 100644
--- a/resources/imap/imapresource.h
+++ b/resources/imap/imapresource.h
@@ -41,7 +41,7 @@ public:
void cleanup() Q_DECL_OVERRIDE;
protected:
- virtual QString defaultName() const Q_DECL_OVERRIDE;
+ QString defaultName() const Q_DECL_OVERRIDE;
private Q_SLOTS:
void onConfigurationDone(int result);
diff --git a/resources/imap/replacemessagejob.h b/resources/imap/replacemessagejob.h
index 364ea2c..9bd3bb4 100644
--- a/resources/imap/replacemessagejob.h
+++ b/resources/imap/replacemessagejob.h
@@ -36,7 +36,7 @@ public:
qint64 newUid() const;
- void start();
+ void start() Q_DECL_OVERRIDE;
private:
void triggerSearchJob();
diff --git a/resources/imap/subscriptiondialog.h \
b/resources/imap/subscriptiondialog.h index 5002d63..b950f30 100644
--- a/resources/imap/subscriptiondialog.h
+++ b/resources/imap/subscriptiondialog.h
@@ -52,7 +52,7 @@ public Q_SLOTS:
void setIncludeCheckedOnly(int checkedOnlyState);
protected:
- /*reimp*/ bool acceptRow(int sourceRow, const QModelIndex &sourceParent) const \
Q_DECL_OVERRIDE; + bool acceptRow(int sourceRow, const QModelIndex &sourceParent) \
const Q_DECL_OVERRIDE;
private:
QString m_pattern;
@@ -95,7 +95,7 @@ private Q_SLOTS:
void slotSearchPattern(const QString &pattern);
protected:
- /* reimp */ void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
+ void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE;
protected Q_SLOTS:
void slotAccepted();
diff --git a/resources/imap/tracer.cpp b/resources/imap/tracer.cpp
index 5280614..2ba1088 100644
--- a/resources/imap/tracer.cpp
+++ b/resources/imap/tracer.cpp
@@ -18,19 +18,19 @@ public:
}
virtual ~DebugStream() {};
- bool isSequential() const
+ bool isSequential() const Q_DECL_OVERRIDE
{
return true;
}
- qint64 readData(char *, qint64)
+ qint64 readData(char *, qint64) Q_DECL_OVERRIDE
{
return 0; /* eof */
}
- qint64 readLineData(char *, qint64)
+ qint64 readLineData(char *, qint64) Q_DECL_OVERRIDE
{
return 0; /* eof */
}
- qint64 writeData(const char *data, qint64 len)
+ qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE
{
const QByteArray buf = QByteArray::fromRawData(data, len);
if (!qgetenv("IMAP_TRACE").isEmpty()) {
diff --git a/resources/mixedmaildir/retrieveitemsjob.h \
b/resources/mixedmaildir/retrieveitemsjob.h index b3322dc..43d58a2 100644
--- a/resources/mixedmaildir/retrieveitemsjob.h
+++ b/resources/mixedmaildir/retrieveitemsjob.h
@@ -49,7 +49,7 @@ public:
Akonadi::Item::List itemsMarkedAsDeleted() const;
protected:
- void doStart();
+ void doStart() Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/resources/shared/filestore/abstractlocalstore.h \
b/resources/shared/filestore/abstractlocalstore.h index f6e5c10..63d13b3 100644
--- a/resources/shared/filestore/abstractlocalstore.h
+++ b/resources/shared/filestore/abstractlocalstore.h
@@ -49,31 +49,31 @@ public:
virtual void setPath(const QString &path);
QString path() const;
- Collection topLevelCollection() const;
+ Collection topLevelCollection() const Q_DECL_OVERRIDE;
- CollectionCreateJob *createCollection(const Collection &collection, const \
Collection &targetParent); + CollectionCreateJob *createCollection(const \
Collection &collection, const Collection &targetParent) Q_DECL_OVERRIDE;
- CollectionFetchJob *fetchCollections(const Collection &collection, \
CollectionFetchJob::Type type = CollectionFetchJob::FirstLevel) const; + \
CollectionFetchJob *fetchCollections(const Collection &collection, \
CollectionFetchJob::Type type = CollectionFetchJob::FirstLevel) const \
Q_DECL_OVERRIDE;
- CollectionDeleteJob *deleteCollection(const Collection &collection);
+ CollectionDeleteJob *deleteCollection(const Collection &collection) \
Q_DECL_OVERRIDE;
- CollectionModifyJob *modifyCollection(const Collection &collection);
+ CollectionModifyJob *modifyCollection(const Collection &collection) \
Q_DECL_OVERRIDE;
- CollectionMoveJob *moveCollection(const Collection &collection, const Collection \
&targetParent); + CollectionMoveJob *moveCollection(const Collection &collection, \
const Collection &targetParent) Q_DECL_OVERRIDE;
- ItemFetchJob *fetchItems(const Collection &collection) const;
+ ItemFetchJob *fetchItems(const Collection &collection) const Q_DECL_OVERRIDE;
- ItemFetchJob *fetchItem(const Item &item) const;
+ ItemFetchJob *fetchItem(const Item &item) const Q_DECL_OVERRIDE;
- ItemCreateJob *createItem(const Item &item, const Collection &collection);
+ ItemCreateJob *createItem(const Item &item, const Collection &collection) \
Q_DECL_OVERRIDE;
- ItemModifyJob *modifyItem(const Item &item);
+ ItemModifyJob *modifyItem(const Item &item) Q_DECL_OVERRIDE;
- ItemDeleteJob *deleteItem(const Item &item);
+ ItemDeleteJob *deleteItem(const Item &item) Q_DECL_OVERRIDE;
- ItemMoveJob *moveItem(const Item &item, const Collection &targetParent);
+ ItemMoveJob *moveItem(const Item &item, const Collection &targetParent) \
Q_DECL_OVERRIDE;
- StoreCompactJob *compactStore();
+ StoreCompactJob *compactStore() Q_DECL_OVERRIDE;
protected: // job processing
virtual void processJob(Job *job) = 0;
@@ -87,7 +87,7 @@ protected: // job processing
void notifyItemsProcessed(const Item::List &items) const;
protected: // template methods
- void setTopLevelCollection(const Collection &collection);
+ void setTopLevelCollection(const Collection &collection) Q_DECL_OVERRIDE;
virtual void checkCollectionCreate(CollectionCreateJob *job, int &errorCode, \
QString &errorText) const;
diff --git a/resources/shared/filestore/sessionimpls.cpp \
b/resources/shared/filestore/sessionimpls.cpp index 6842f88..470415b 100644
--- a/resources/shared/filestore/sessionimpls.cpp
+++ b/resources/shared/filestore/sessionimpls.cpp
@@ -152,7 +152,7 @@ public:
QTimer mJobRunTimer;
protected:
- virtual void enqueue(FileStore::Job *job, const char *className) Q_DECL_OVERRIDE \
{ + void enqueue(FileStore::Job *job, const char *className) Q_DECL_OVERRIDE {
Q_UNUSED(className);
mJobQueue.enqueue(job);
diff --git a/resources/shared/singlefileresource/singlefileresource.h \
b/resources/shared/singlefileresource/singlefileresource.h index 5da2368..dc285c4 \
100644
--- a/resources/shared/singlefileresource/singlefileresource.h
+++ b/resources/shared/singlefileresource/singlefileresource.h
@@ -284,7 +284,7 @@ public:
}
}
- virtual void collectionChanged(const Collection &collection) Q_DECL_OVERRIDE {
+ void collectionChanged(const Collection &collection) Q_DECL_OVERRIDE {
QString newName;
if (collection.hasAttribute<EntityDisplayAttribute>())
{
@@ -300,7 +300,7 @@ public:
SingleFileResourceBase::collectionChanged(collection);
}
- virtual Collection rootCollection() const Q_DECL_OVERRIDE
+ Collection rootCollection() const Q_DECL_OVERRIDE
{
Collection c;
c.setParentCollection(Collection::root());
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic