summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius Štikonas <andrius@stikonas.eu>2016-10-14 20:02:04 (GMT)
committerAndrius Štikonas <andrius@stikonas.eu>2016-10-14 20:02:04 (GMT)
commitba212ed86d563c900bb77c4fe39839ae04afebab (patch)
tree507bd92250aeb706b5172535abd97e3f838103f3
parent0a18c579b5f5a6af916f1db332ccd5fb894da996 (diff)
Add missing Q_DECL_OVERRIDE keywords.
REVIEW: 129175
-rw-r--r--core/KGpgExpandableNode.h8
-rw-r--r--core/KGpgGroupMemberNode.h10
-rw-r--r--core/KGpgOrphanNode.h16
-rw-r--r--core/KGpgRootNode.h4
-rw-r--r--core/KGpgSignNode.h8
-rw-r--r--core/KGpgSubkeyNode.h20
-rw-r--r--core/KGpgUatNode.h18
-rw-r--r--core/KGpgUidNode.h18
-rw-r--r--model/kgpgsearchresultmodel.h12
-rw-r--r--transactions/kgpgaddphoto.h2
-rw-r--r--transactions/kgpgadduid.h4
-rw-r--r--transactions/kgpgchangedisable.h4
-rw-r--r--transactions/kgpgchangeexpire.h2
-rw-r--r--transactions/kgpgchangepass.h8
-rw-r--r--transactions/kgpgchangetrust.h6
-rw-r--r--transactions/kgpgdecrypt.h4
-rw-r--r--transactions/kgpgdelkey.h6
-rw-r--r--transactions/kgpgdelsign.h4
-rw-r--r--transactions/kgpgdeluid.h8
-rw-r--r--transactions/kgpgeditkeytransaction.h6
-rw-r--r--transactions/kgpgencrypt.h6
-rw-r--r--transactions/kgpgexport.h4
-rw-r--r--transactions/kgpggeneratekey.h10
-rw-r--r--transactions/kgpggeneraterevoke.h12
-rw-r--r--transactions/kgpgimport.h2
-rw-r--r--transactions/kgpgkeyservergettransaction.h8
-rw-r--r--transactions/kgpgkeyserversearchtransaction.h6
-rw-r--r--transactions/kgpgkeyservertransaction.h4
-rw-r--r--transactions/kgpgprimaryuid.h4
-rw-r--r--transactions/kgpgsendkeys.h4
-rw-r--r--transactions/kgpgsignkey.h10
-rw-r--r--transactions/kgpgsigntext.h2
-rw-r--r--transactions/kgpgsignuid.h12
-rw-r--r--transactions/kgpgtextorfiletransaction.h8
-rw-r--r--transactions/kgpgtransactionjob.h4
-rw-r--r--transactions/kgpguidtransaction.h2
-rw-r--r--transactions/kgpgverify.h6
37 files changed, 136 insertions, 136 deletions
diff --git a/core/KGpgExpandableNode.h b/core/KGpgExpandableNode.h
index 4f77ba5..4b279ac 100644
--- a/core/KGpgExpandableNode.h
+++ b/core/KGpgExpandableNode.h
@@ -62,7 +62,7 @@ public:
* In contrast wasExpanded() will only return true if the child nodes
* are actually present in memory.
*/
- virtual bool hasChildren() const Q_DECL_OVERRIDE;
+ bool hasChildren() const Q_DECL_OVERRIDE;
/**
* check if there are any child nodes present in memory
*
@@ -73,10 +73,10 @@ public:
* objects are not present in memory.
*/
virtual bool wasExpanded() const;
- virtual int getChildCount() Q_DECL_OVERRIDE;
+ int getChildCount() Q_DECL_OVERRIDE;
virtual const KGpgNode::List &getChildren() const;
- virtual KGpgNode *getChild(const int index) const Q_DECL_OVERRIDE;
- virtual int getChildIndex(KGpgNode *node) const Q_DECL_OVERRIDE;
+ KGpgNode *getChild(const int index) const Q_DECL_OVERRIDE;
+ int getChildIndex(KGpgNode *node) const Q_DECL_OVERRIDE;
virtual void deleteChild(KGpgNode *child);
};
diff --git a/core/KGpgGroupMemberNode.h b/core/KGpgGroupMemberNode.h
index 259a750..675dffd 100644
--- a/core/KGpgGroupMemberNode.h
+++ b/core/KGpgGroupMemberNode.h
@@ -38,11 +38,11 @@ public:
explicit KGpgGroupMemberNode(KGpgGroupNode *parent, KGpgKeyNode *k);
virtual ~KGpgGroupMemberNode();
- virtual KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
- virtual KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
- virtual QString getSize() const Q_DECL_OVERRIDE;
- virtual QDateTime getExpiration() const Q_DECL_OVERRIDE;
- virtual QDateTime getCreation() const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
+ QString getSize() const Q_DECL_OVERRIDE;
+ QDateTime getExpiration() const Q_DECL_OVERRIDE;
+ QDateTime getCreation() const Q_DECL_OVERRIDE;
virtual KGpgGroupNode *getParentKeyNode() const;
/**
diff --git a/core/KGpgOrphanNode.h b/core/KGpgOrphanNode.h
index f9e80d7..2933e97 100644
--- a/core/KGpgOrphanNode.h
+++ b/core/KGpgOrphanNode.h
@@ -39,15 +39,15 @@ public:
explicit KGpgOrphanNode(KGpgExpandableNode *parent, const KgpgKey &k);
virtual ~KGpgOrphanNode();
- virtual KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
- virtual KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
const QString &getFingerprint() const;
- virtual QString getSize() const Q_DECL_OVERRIDE;
- virtual QString getName() const Q_DECL_OVERRIDE;
- virtual QString getEmail() const Q_DECL_OVERRIDE;
- virtual QDateTime getExpiration() const Q_DECL_OVERRIDE;
- virtual QDateTime getCreation() const Q_DECL_OVERRIDE;
- virtual QString getId() const Q_DECL_OVERRIDE;
+ QString getSize() const Q_DECL_OVERRIDE;
+ QString getName() const Q_DECL_OVERRIDE;
+ QString getEmail() const Q_DECL_OVERRIDE;
+ QDateTime getExpiration() const Q_DECL_OVERRIDE;
+ QDateTime getCreation() const Q_DECL_OVERRIDE;
+ QString getId() const Q_DECL_OVERRIDE;
};
#endif /* KGPGORPHANNODE_H */
diff --git a/core/KGpgRootNode.h b/core/KGpgRootNode.h
index 698b59a..1d67237 100644
--- a/core/KGpgRootNode.h
+++ b/core/KGpgRootNode.h
@@ -46,13 +46,13 @@ private:
int m_groups;
protected:
- virtual void readChildren() Q_DECL_OVERRIDE;
+ void readChildren() Q_DECL_OVERRIDE;
public:
explicit KGpgRootNode(KGpgItemModel *model);
virtual ~KGpgRootNode();
- virtual KgpgCore::KgpgItemType getType() const;
+ KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
/**
* Create new group nodes
diff --git a/core/KGpgSignNode.h b/core/KGpgSignNode.h
index 52bf558..c1aea2d 100644
--- a/core/KGpgSignNode.h
+++ b/core/KGpgSignNode.h
@@ -45,10 +45,10 @@ public:
explicit KGpgSignNode(KGpgSignableNode *parent, const QStringList &s);
virtual ~KGpgSignNode();
- virtual KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
- virtual QDateTime getExpiration() const Q_DECL_OVERRIDE;
- virtual QString getName() const Q_DECL_OVERRIDE;
- virtual QDateTime getCreation() const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
+ QDateTime getExpiration() const Q_DECL_OVERRIDE;
+ QString getName() const Q_DECL_OVERRIDE;
+ QDateTime getCreation() const Q_DECL_OVERRIDE;
};
#endif /* KGPGSIGNNODE_H */
diff --git a/core/KGpgSubkeyNode.h b/core/KGpgSubkeyNode.h
index 4a9511b..e7c3d00 100644
--- a/core/KGpgSubkeyNode.h
+++ b/core/KGpgSubkeyNode.h
@@ -35,21 +35,21 @@ private:
QString m_fingerprint;
protected:
- virtual void readChildren();
+ void readChildren() Q_DECL_OVERRIDE;
public:
explicit KGpgSubkeyNode(KGpgKeyNode *parent, const KgpgCore::KgpgKeySub &k);
virtual ~KGpgSubkeyNode();
- virtual KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
- virtual KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
- virtual QString getSize() const Q_DECL_OVERRIDE;
- virtual QString getName() const Q_DECL_OVERRIDE;
- virtual QDateTime getExpiration() const Q_DECL_OVERRIDE;
- virtual QDateTime getCreation() const Q_DECL_OVERRIDE;
- virtual QString getId() const Q_DECL_OVERRIDE;
- virtual KGpgKeyNode *getKeyNode(void) Q_DECL_OVERRIDE;
- virtual const KGpgKeyNode *getKeyNode(void) const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
+ QString getSize() const Q_DECL_OVERRIDE;
+ QString getName() const Q_DECL_OVERRIDE;
+ QDateTime getExpiration() const Q_DECL_OVERRIDE;
+ QDateTime getCreation() const Q_DECL_OVERRIDE;
+ QString getId() const Q_DECL_OVERRIDE;
+ KGpgKeyNode *getKeyNode(void) Q_DECL_OVERRIDE;
+ const KGpgKeyNode *getKeyNode(void) const Q_DECL_OVERRIDE;
virtual KGpgKeyNode *getParentKeyNode() const;
void setFingerprint(const QString &fpr);
diff --git a/core/KGpgUatNode.h b/core/KGpgUatNode.h
index 9baea50..36439e0 100644
--- a/core/KGpgUatNode.h
+++ b/core/KGpgUatNode.h
@@ -39,22 +39,22 @@ private:
Q_DECLARE_PRIVATE(KGpgUatNode)
protected:
- virtual void readChildren();
+ void readChildren() Q_DECL_OVERRIDE;
public:
explicit KGpgUatNode(KGpgKeyNode *parent, const unsigned int index, const QStringList &sl);
virtual ~KGpgUatNode();
- virtual KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
- virtual KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
const QPixmap &getPixmap() const;
- virtual QString getId() const Q_DECL_OVERRIDE;
- virtual QString getSize() const Q_DECL_OVERRIDE;
- virtual QString getName() const Q_DECL_OVERRIDE;
- virtual QDateTime getCreation() const Q_DECL_OVERRIDE;
+ QString getId() const Q_DECL_OVERRIDE;
+ QString getSize() const Q_DECL_OVERRIDE;
+ QString getName() const Q_DECL_OVERRIDE;
+ QDateTime getCreation() const Q_DECL_OVERRIDE;
virtual KGpgKeyNode *getParentKeyNode() const;
- virtual KGpgKeyNode *getKeyNode(void) Q_DECL_OVERRIDE;
- virtual const KGpgKeyNode *getKeyNode(void) const Q_DECL_OVERRIDE;
+ KGpgKeyNode *getKeyNode(void) Q_DECL_OVERRIDE;
+ const KGpgKeyNode *getKeyNode(void) const Q_DECL_OVERRIDE;
};
#endif /* KGPGUATNODE_H */
diff --git a/core/KGpgUidNode.h b/core/KGpgUidNode.h
index 0b98992..f5d34de 100644
--- a/core/KGpgUidNode.h
+++ b/core/KGpgUidNode.h
@@ -37,21 +37,21 @@ private:
Q_DECLARE_PRIVATE(KGpgUidNode)
protected:
- virtual void readChildren();
+ void readChildren() Q_DECL_OVERRIDE;
public:
explicit KGpgUidNode(KGpgKeyNode *parent, const unsigned int index, const QStringList &sl);
virtual ~KGpgUidNode();
- virtual KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
- virtual KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
- virtual QString getName() const Q_DECL_OVERRIDE;
- virtual QString getEmail() const Q_DECL_OVERRIDE;
- virtual QString getId() const Q_DECL_OVERRIDE;
- virtual KGpgKeyNode *getKeyNode(void) Q_DECL_OVERRIDE;
- virtual const KGpgKeyNode *getKeyNode(void) const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgItemType getType() const Q_DECL_OVERRIDE;
+ KgpgCore::KgpgKeyTrust getTrust() const Q_DECL_OVERRIDE;
+ QString getName() const Q_DECL_OVERRIDE;
+ QString getEmail() const Q_DECL_OVERRIDE;
+ QString getId() const Q_DECL_OVERRIDE;
+ KGpgKeyNode *getKeyNode(void) Q_DECL_OVERRIDE;
+ const KGpgKeyNode *getKeyNode(void) const Q_DECL_OVERRIDE;
virtual KGpgKeyNode *getParentKeyNode() const;
- virtual QString getComment() const Q_DECL_OVERRIDE;
+ QString getComment() const Q_DECL_OVERRIDE;
};
#endif /* KGPGUIDNODE_H */
diff --git a/model/kgpgsearchresultmodel.h b/model/kgpgsearchresultmodel.h
index 4e4b15d..9bfd673 100644
--- a/model/kgpgsearchresultmodel.h
+++ b/model/kgpgsearchresultmodel.h
@@ -43,11 +43,11 @@ public:
explicit KGpgSearchResultBackingModel(QObject *parent = Q_NULLPTR);
~KGpgSearchResultBackingModel();
- virtual int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
- virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
- virtual QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
- virtual QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
- virtual int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
+ QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
+ QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
+ int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
/**
@@ -134,7 +134,7 @@ public:
* internally. Use `resetSourceModel()` if you want to clear the
* source model, and `slotAddKey()` to populate it.
*/
- virtual void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE;
+ void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE;
public slots:
/**
diff --git a/transactions/kgpgaddphoto.h b/transactions/kgpgaddphoto.h
index 90a4536..98db295 100644
--- a/transactions/kgpgaddphoto.h
+++ b/transactions/kgpgaddphoto.h
@@ -31,7 +31,7 @@ public:
void setImagePath(const QString &imagepath);
protected:
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
private:
QString m_photourl;
diff --git a/transactions/kgpgadduid.h b/transactions/kgpgadduid.h
index c8cae39..60a51fc 100644
--- a/transactions/kgpgadduid.h
+++ b/transactions/kgpgadduid.h
@@ -36,8 +36,8 @@ public:
void setComment(const QString &comment);
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
private:
QString m_name;
diff --git a/transactions/kgpgchangedisable.h b/transactions/kgpgchangedisable.h
index b279839..9b45cf4 100644
--- a/transactions/kgpgchangedisable.h
+++ b/transactions/kgpgchangedisable.h
@@ -32,8 +32,8 @@ public:
void setDisable(bool disable);
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
};
#endif // KGPGCHANGEDISABLE_H
diff --git a/transactions/kgpgchangeexpire.h b/transactions/kgpgchangeexpire.h
index d6240f5..187ba75 100644
--- a/transactions/kgpgchangeexpire.h
+++ b/transactions/kgpgchangeexpire.h
@@ -33,7 +33,7 @@ public:
void setDate(const QDateTime &date);
protected:
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
private:
QDateTime m_date;
diff --git a/transactions/kgpgchangepass.h b/transactions/kgpgchangepass.h
index 35daf2d..b88056b 100644
--- a/transactions/kgpgchangepass.h
+++ b/transactions/kgpgchangepass.h
@@ -30,10 +30,10 @@ public:
virtual ~KGpgChangePass();
protected:
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool passphraseRequested() Q_DECL_OVERRIDE;
- virtual bool passphraseReceived() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool passphraseRequested() Q_DECL_OVERRIDE;
+ bool passphraseReceived() Q_DECL_OVERRIDE;
private:
bool m_seenold; ///< old password correctly entered
diff --git a/transactions/kgpgchangetrust.h b/transactions/kgpgchangetrust.h
index d3d83c2..0dd329c 100644
--- a/transactions/kgpgchangetrust.h
+++ b/transactions/kgpgchangetrust.h
@@ -35,9 +35,9 @@ public:
void setTrust(const gpgme_validity_t trust);
protected:
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
- virtual bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
private:
gpgme_validity_t m_trust;
diff --git a/transactions/kgpgdecrypt.h b/transactions/kgpgdecrypt.h
index 62b97b1..9b76824 100644
--- a/transactions/kgpgdecrypt.h
+++ b/transactions/kgpgdecrypt.h
@@ -73,8 +73,8 @@ public:
static bool isEncryptedText(const QString &text, int *startPos = Q_NULLPTR, int *endPos = Q_NULLPTR);
protected:
- virtual QStringList command() const Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ QStringList command() const Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
private:
int m_fileIndex;
diff --git a/transactions/kgpgdelkey.h b/transactions/kgpgdelkey.h
index 6f14918..7a94234 100644
--- a/transactions/kgpgdelkey.h
+++ b/transactions/kgpgdelkey.h
@@ -40,9 +40,9 @@ public:
KGpgKeyNode::List keys() const;
protected:
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
- virtual bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
private:
KGpgKeyNode::List m_keys;
diff --git a/transactions/kgpgdelsign.h b/transactions/kgpgdelsign.h
index 5287713..caf96cd 100644
--- a/transactions/kgpgdelsign.h
+++ b/transactions/kgpgdelsign.h
@@ -69,8 +69,8 @@ public:
KGpgSignNode::List getSignIds(void) const;
protected:
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
private:
KGpgSignNode::List m_signids; ///< the list of ids to delete
diff --git a/transactions/kgpgdeluid.h b/transactions/kgpgdeluid.h
index 69a0dfb..a9dd755 100644
--- a/transactions/kgpgdeluid.h
+++ b/transactions/kgpgdeluid.h
@@ -88,10 +88,10 @@ public:
void setUids(const KGpgSignableNode::const_List &uids);
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
- virtual void finish() Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
private:
int m_fixargs;
diff --git a/transactions/kgpgeditkeytransaction.h b/transactions/kgpgeditkeytransaction.h
index 24952ea..e51d5ba 100644
--- a/transactions/kgpgeditkeytransaction.h
+++ b/transactions/kgpgeditkeytransaction.h
@@ -56,7 +56,7 @@ protected:
* If you inherit from this class make sure this method is called
* from your inherited method before you do anything else there.
*/
- virtual bool preStart() Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
/**
* @brief handle standard GnuPG prompts
@@ -71,9 +71,9 @@ protected:
* Every line sent here by GnuPG not recognised as command handled
* here will set a sequence error so be sure to handle your stuff first!
*/
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
+ ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
/**
* @brief replace the argument of the edit command
diff --git a/transactions/kgpgencrypt.h b/transactions/kgpgencrypt.h
index 9bf7d08..69f85d9 100644
--- a/transactions/kgpgencrypt.h
+++ b/transactions/kgpgencrypt.h
@@ -76,9 +76,9 @@ public:
static QString encryptExtension(const bool ascii);
protected:
- virtual QStringList command() const Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual ts_boolanswer confirmOverwrite (QUrl &currentFile) Q_DECL_OVERRIDE;
+ QStringList command() const Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ ts_boolanswer confirmOverwrite (QUrl &currentFile) Q_DECL_OVERRIDE;
private:
int m_fileIndex;
diff --git a/transactions/kgpgexport.h b/transactions/kgpgexport.h
index 8e9378c..fd26e9e 100644
--- a/transactions/kgpgexport.h
+++ b/transactions/kgpgexport.h
@@ -122,8 +122,8 @@ public:
const QByteArray &getOutputData() const;
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
private:
QStringList m_keyids;
diff --git a/transactions/kgpggeneratekey.h b/transactions/kgpggeneratekey.h
index 9a56421..8768688 100644
--- a/transactions/kgpggeneratekey.h
+++ b/transactions/kgpggeneratekey.h
@@ -69,11 +69,11 @@ public:
QString gpgErrorMessage() const;
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual void postStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual void finish() Q_DECL_OVERRIDE;
- virtual void newPassphraseEntered() Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ void postStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
+ void newPassphraseEntered() Q_DECL_OVERRIDE;
private:
const QString m_name;
diff --git a/transactions/kgpggeneraterevoke.h b/transactions/kgpggeneraterevoke.h
index b322864..53c1c98 100644
--- a/transactions/kgpggeneraterevoke.h
+++ b/transactions/kgpggeneraterevoke.h
@@ -52,12 +52,12 @@ signals:
void revokeCertificate(const QString &cert);
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
- virtual void finish() Q_DECL_OVERRIDE;
- virtual bool passphraseReceived() Q_DECL_OVERRIDE;
- virtual ts_boolanswer confirmOverwrite (QUrl &currentFile) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
+ bool passphraseReceived() Q_DECL_OVERRIDE;
+ ts_boolanswer confirmOverwrite (QUrl &currentFile) Q_DECL_OVERRIDE;
private:
QString m_keyid;
diff --git a/transactions/kgpgimport.h b/transactions/kgpgimport.h
index adbdcd4..8ecdef9 100644
--- a/transactions/kgpgimport.h
+++ b/transactions/kgpgimport.h
@@ -122,7 +122,7 @@ public:
static int isKey(const QString &text, const bool incomplete = false);
protected:
- virtual QStringList command() const Q_DECL_OVERRIDE;
+ QStringList command() const Q_DECL_OVERRIDE;
};
#endif // KGPGIMPORT_H
diff --git a/transactions/kgpgkeyservergettransaction.h b/transactions/kgpgkeyservergettransaction.h
index c616aaf..1024e8a 100644
--- a/transactions/kgpgkeyservergettransaction.h
+++ b/transactions/kgpgkeyservergettransaction.h
@@ -53,8 +53,8 @@ public:
protected:
virtual QString getGpgCommand() const = 0;
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
private:
int m_cmdpos;
@@ -81,7 +81,7 @@ public:
virtual ~KGpgReceiveKeys();
protected:
- virtual QString getGpgCommand() const Q_DECL_OVERRIDE;
+ QString getGpgCommand() const Q_DECL_OVERRIDE;
};
/**
@@ -103,7 +103,7 @@ public:
virtual ~KGpgRefreshKeys();
protected:
- virtual QString getGpgCommand() const Q_DECL_OVERRIDE;
+ QString getGpgCommand() const Q_DECL_OVERRIDE;
};
#endif // KGPGUIDTRANSACTION_H
diff --git a/transactions/kgpgkeyserversearchtransaction.h b/transactions/kgpgkeyserversearchtransaction.h
index 088feac..b6649d2 100644
--- a/transactions/kgpgkeyserversearchtransaction.h
+++ b/transactions/kgpgkeyserversearchtransaction.h
@@ -57,12 +57,12 @@ signals:
void newKey(QStringList lines);
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
/**
* @brief needed to submit the last search result
*/
- virtual void finish() Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
private:
QStringList m_keyLines; ///< the lines belonging to one key
diff --git a/transactions/kgpgkeyservertransaction.h b/transactions/kgpgkeyservertransaction.h
index 87615c4..a02f478 100644
--- a/transactions/kgpgkeyservertransaction.h
+++ b/transactions/kgpgkeyservertransaction.h
@@ -69,8 +69,8 @@ public:
void setProgressEnable(const bool b);
protected:
- virtual void finish() Q_DECL_OVERRIDE;
- virtual bool preStart() Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
private slots:
/**
diff --git a/transactions/kgpgprimaryuid.h b/transactions/kgpgprimaryuid.h
index 3833d13..cbaf501 100644
--- a/transactions/kgpgprimaryuid.h
+++ b/transactions/kgpgprimaryuid.h
@@ -42,8 +42,8 @@ public:
virtual ~KGpgPrimaryUid();
protected:
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual bool passphraseReceived() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool passphraseReceived() Q_DECL_OVERRIDE;
private:
int m_fixargs;
diff --git a/transactions/kgpgsendkeys.h b/transactions/kgpgsendkeys.h
index a96447c..58b6ea0 100644
--- a/transactions/kgpgsendkeys.h
+++ b/transactions/kgpgsendkeys.h
@@ -59,8 +59,8 @@ public:
const QStringList &getLog() const;
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
private:
int m_attrpos;
diff --git a/transactions/kgpgsignkey.h b/transactions/kgpgsignkey.h
index 7150b70..f200b9f 100644
--- a/transactions/kgpgsignkey.h
+++ b/transactions/kgpgsignkey.h
@@ -48,12 +48,12 @@ public:
virtual ~KGpgSignKey();
protected:
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
- virtual bool passphraseReceived() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
+ bool passphraseReceived() Q_DECL_OVERRIDE;
- virtual KGpgTransaction *asTransaction() Q_DECL_OVERRIDE;
- virtual void replaceCmd(const QString &cmd) Q_DECL_OVERRIDE;
+ KGpgTransaction *asTransaction() Q_DECL_OVERRIDE;
+ void replaceCmd(const QString &cmd) Q_DECL_OVERRIDE;
};
#endif // KGPGSIGNKEY_H
diff --git a/transactions/kgpgsigntext.h b/transactions/kgpgsigntext.h
index e4b05b7..af83848 100644
--- a/transactions/kgpgsigntext.h
+++ b/transactions/kgpgsigntext.h
@@ -70,7 +70,7 @@ public:
QStringList signedText() const;
protected:
- virtual QStringList command() const Q_DECL_OVERRIDE;
+ QStringList command() const Q_DECL_OVERRIDE;
private:
int m_fileIndex;
diff --git a/transactions/kgpgsignuid.h b/transactions/kgpgsignuid.h
index 8dca344..a835c41 100644
--- a/transactions/kgpgsignuid.h
+++ b/transactions/kgpgsignuid.h
@@ -60,13 +60,13 @@ public:
void setUid(const KGpgSignableNode *uid);
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
- virtual bool passphraseReceived() Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ ts_boolanswer boolQuestion(const QString &line) Q_DECL_OVERRIDE;
+ bool passphraseReceived() Q_DECL_OVERRIDE;
- virtual KGpgTransaction *asTransaction() Q_DECL_OVERRIDE;
- virtual void replaceCmd(const QString &cmd) Q_DECL_OVERRIDE;
+ KGpgTransaction *asTransaction() Q_DECL_OVERRIDE;
+ void replaceCmd(const QString &cmd) Q_DECL_OVERRIDE;
private:
int m_cmdPos; ///< position of the command in GnuPG command line
diff --git a/transactions/kgpgtextorfiletransaction.h b/transactions/kgpgtextorfiletransaction.h
index 9a6a2b3..01bc46b 100644
--- a/transactions/kgpgtextorfiletransaction.h
+++ b/transactions/kgpgtextorfiletransaction.h
@@ -80,12 +80,12 @@ protected:
/**
* @brief construct the command line of the process
*/
- virtual bool preStart() Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
/**
* @brief implement special handling for GnuPG return codes
*/
- virtual void finish() Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
virtual QStringList command() const = 0;
@@ -102,7 +102,7 @@ private:
void cleanUrls();
private slots:
- void postStart();
+ void postStart() Q_DECL_OVERRIDE;
};
#endif // KGPGTEXTORFILETRANSACTION_H
diff --git a/transactions/kgpgtransactionjob.h b/transactions/kgpgtransactionjob.h
index 5f9545b..6dad76e 100644
--- a/transactions/kgpgtransactionjob.h
+++ b/transactions/kgpgtransactionjob.h
@@ -48,7 +48,7 @@ public:
/**
* @brief starts the transaction
*/
- virtual void start() Q_DECL_OVERRIDE;
+ void start() Q_DECL_OVERRIDE;
/**
* @brief get the transaction this job is handling
@@ -61,7 +61,7 @@ public:
int getResultCode() const;
protected:
- virtual bool doKill() Q_DECL_OVERRIDE;
+ bool doKill() Q_DECL_OVERRIDE;
private slots:
void slotTransactionDone(int result);
diff --git a/transactions/kgpguidtransaction.h b/transactions/kgpguidtransaction.h
index 941b59b..d9219c2 100644
--- a/transactions/kgpguidtransaction.h
+++ b/transactions/kgpguidtransaction.h
@@ -62,7 +62,7 @@ public:
void setUid(const unsigned int uid);
protected:
- virtual bool preStart() Q_DECL_OVERRIDE;
+ bool preStart() Q_DECL_OVERRIDE;
/**
* @brief handle common GnuPG messages for uid transactions
diff --git a/transactions/kgpgverify.h b/transactions/kgpgverify.h
index 806c46e..a5dc7ea 100644
--- a/transactions/kgpgverify.h
+++ b/transactions/kgpgverify.h
@@ -75,9 +75,9 @@ public:
QString missingId() const;
protected:
- virtual QStringList command() const Q_DECL_OVERRIDE;
- virtual bool nextLine(const QString &line) Q_DECL_OVERRIDE;
- virtual void finish() Q_DECL_OVERRIDE;
+ QStringList command() const Q_DECL_OVERRIDE;
+ bool nextLine(const QString &line) Q_DECL_OVERRIDE;
+ void finish() Q_DECL_OVERRIDE;
private:
int m_fileIndex;