summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Martins <[email protected]>2015-08-08 20:43:55 +0100
committerSergio Martins <[email protected]>2015-08-08 20:43:55 +0100
commit09eb63ee8bfda2aa4680dcf812762d86569b55d9 (patch)
tree14cc7c27c3df7f7801f96acd9408ab2e907d4964
parent5d248a744de92646b69ca17b25e59b5143073300 (diff)
kleo: Use Q_DECL_OVERRIDE
-rw-r--r--kleopatra/commands/changeroottrustcommand.cpp2
-rw-r--r--kleopatra/commands/clearcrlcachecommand.h12
-rw-r--r--kleopatra/commands/importcertificatescommand.cpp4
-rw-r--r--kleopatra/commands/refreshopenpgpcertscommand.h14
-rw-r--r--kleopatra/commands/refreshx509certscommand.h14
-rw-r--r--kleopatra/commands/reloadkeyscommand.h4
-rw-r--r--kleopatra/conf/smimevalidationconfigurationpage.h6
-rw-r--r--kleopatra/crypto/certificateresolver.h8
-rw-r--r--kleopatra/crypto/decryptverifyemailcontroller.cpp2
-rw-r--r--kleopatra/crypto/gui/decryptverifyfileswizard.cpp2
-rw-r--r--kleopatra/crypto/gui/newsignencryptfileswizard.cpp22
-rw-r--r--kleopatra/crypto/gui/signemailwizard.cpp6
-rw-r--r--kleopatra/crypto/gui/signencryptemailconflictdialog.cpp2
-rw-r--r--kleopatra/crypto/gui/signencryptfileswizard.cpp6
-rw-r--r--kleopatra/crypto/gui/signencryptwizard.h2
-rw-r--r--kleopatra/crypto/gui/signerresolvepage.cpp6
-rw-r--r--kleopatra/crypto/gui/signerresolvepage_p.h16
-rw-r--r--kleopatra/crypto/gui/verifychecksumsdialog.cpp2
-rw-r--r--kleopatra/crypto/signencryptfilestask.cpp12
-rw-r--r--kleopatra/crypto/task.cpp12
-rw-r--r--kleopatra/crypto/task_p.h10
-rw-r--r--kleopatra/dialogs/certifycertificatedialog_p.h8
-rw-r--r--kleopatra/dialogs/selftestdialog.cpp2
-rw-r--r--kleopatra/libkleopatraclient/core/command_p.h2
-rw-r--r--kleopatra/models/useridlistmodel.h2
-rw-r--r--kleopatra/newcertificatewizard/listwidget.cpp2
-rw-r--r--kleopatra/newcertificatewizard/newcertificatewizard.cpp22
-rw-r--r--kleopatra/selftest/implementation_p.h12
-rw-r--r--kleopatra/smartcard/readerstatus.cpp2
-rw-r--r--kleopatra/uiserver/assuancommand.h8
-rw-r--r--kleopatra/uiserver/decryptcommand.h2
-rw-r--r--kleopatra/uiserver/decryptfilescommand.h2
-rw-r--r--kleopatra/uiserver/decryptverifycommandemailbase.h2
-rw-r--r--kleopatra/uiserver/decryptverifyfilescommand.h2
-rw-r--r--kleopatra/uiserver/signencryptfilescommand.h4
-rw-r--r--kleopatra/uiserver/uiserver_p.h2
-rw-r--r--kleopatra/uiserver/verifycommand.h4
-rw-r--r--kleopatra/uiserver/verifyfilescommand.h2
-rw-r--r--kleopatra/utils/archivedefinition.cpp8
-rw-r--r--kleopatra/utils/dragqueen.cpp6
-rw-r--r--kleopatra/utils/kdpipeiodevice.cpp4
-rw-r--r--kleopatra/utils/output.cpp52
-rw-r--r--kleopatra/view/keytreeview.cpp2
-rw-r--r--kleopatra/view/tabwidget.cpp8
-rw-r--r--libkleo/backends/chiasmus/chiasmusbackend.cpp136
-rw-r--r--libkleo/backends/chiasmus/chiasmusbackend.h26
-rw-r--r--libkleo/backends/chiasmus/chiasmusjob.h8
-rw-r--r--libkleo/backends/chiasmus/obtainkeysjob.h8
-rw-r--r--libkleo/backends/qgpgme/qgpgmeadduseridjob.h2
-rw-r--r--libkleo/backends/qgpgme/qgpgmebackend.cpp50
-rw-r--r--libkleo/backends/qgpgme/qgpgmebackend.h26
-rw-r--r--libkleo/backends/qgpgme/qgpgmechangeexpiryjob.h2
-rw-r--r--libkleo/backends/qgpgme/qgpgmechangeownertrustjob.h2
-rw-r--r--libkleo/backends/qgpgme/qgpgmechangepasswdjob.h2
-rw-r--r--libkleo/backends/qgpgme/qgpgmecryptoconfig.h92
-rw-r--r--libkleo/backends/qgpgme/qgpgmedecryptjob.h8
-rw-r--r--libkleo/backends/qgpgme/qgpgmedecryptverifyjob.h8
-rw-r--r--libkleo/backends/qgpgme/qgpgmedeletejob.h2
-rw-r--r--libkleo/backends/qgpgme/qgpgmedownloadjob.h4
-rw-r--r--libkleo/backends/qgpgme/qgpgmeencryptjob.h12
-rw-r--r--libkleo/backends/qgpgme/qgpgmeexportjob.h2
-rw-r--r--libkleo/backends/qgpgme/qgpgmeimportfromkeyserverjob.h6
-rw-r--r--libkleo/backends/qgpgme/qgpgmeimportjob.h6
-rw-r--r--libkleo/backends/qgpgme/qgpgmekeygenerationjob.h2
-rw-r--r--libkleo/backends/qgpgme/qgpgmekeylistjob.h8
-rw-r--r--libkleo/backends/qgpgme/qgpgmelistallkeysjob.h8
-rw-r--r--libkleo/backends/qgpgme/qgpgmerefreshkeysjob.h4
-rw-r--r--libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.h4
-rw-r--r--libkleo/backends/qgpgme/qgpgmesignencryptjob.h12
-rw-r--r--libkleo/backends/qgpgme/qgpgmesignjob.h12
-rw-r--r--libkleo/backends/qgpgme/qgpgmesignkeyjob.h12
-rw-r--r--libkleo/backends/qgpgme/qgpgmeverifydetachedjob.h8
-rw-r--r--libkleo/backends/qgpgme/qgpgmeverifyopaquejob.h8
-rw-r--r--libkleo/kleo/hierarchicalkeylistjob.h6
-rw-r--r--libkleo/kleo/kconfigbasedkeyfilter.h18
-rw-r--r--libkleo/kleo/multideletejob.h2
-rw-r--r--libkleo/ui/directoryserviceswidget.cpp8
-rw-r--r--libkleo/ui/keylistview.h2
-rw-r--r--libkleo/ui/keyrequester.h4
-rw-r--r--libkleo/ui/keyselectiondialog.cpp10
80 files changed, 427 insertions, 427 deletions
diff --git a/kleopatra/commands/changeroottrustcommand.cpp b/kleopatra/commands/changeroottrustcommand.cpp
index db0667c..b6bc592 100644
--- a/kleopatra/commands/changeroottrustcommand.cpp
+++ b/kleopatra/commands/changeroottrustcommand.cpp
@@ -89,7 +89,7 @@ private:
connect(this, SIGNAL(finished()), q_func(), SLOT(slotOperationFinished()));
}
- /* reimp */ void run();
+ void run() Q_DECL_OVERRIDE;
private:
void slotOperationFinished()
diff --git a/kleopatra/commands/clearcrlcachecommand.h b/kleopatra/commands/clearcrlcachecommand.h
index 788c8b7..4db4c6e 100644
--- a/kleopatra/commands/clearcrlcachecommand.h
+++ b/kleopatra/commands/clearcrlcachecommand.h
@@ -49,14 +49,14 @@ public:
~ClearCrlCacheCommand();
private:
- /* reimp */ QStringList arguments() const;
+ QStringList arguments() const Q_DECL_OVERRIDE;
- /* reimp */ QString errorCaption() const;
- /* reimp */ QString successCaption() const;
+ QString errorCaption() const Q_DECL_OVERRIDE;
+ QString successCaption() const Q_DECL_OVERRIDE;
- /* reimp */ QString crashExitMessage(const QStringList &) const;
- /* reimp */ QString errorExitMessage(const QStringList &) const;
- /* reimp */ QString successMessage(const QStringList &) const;
+ QString crashExitMessage(const QStringList &) const Q_DECL_OVERRIDE;
+ QString errorExitMessage(const QStringList &) const Q_DECL_OVERRIDE;
+ QString successMessage(const QStringList &) const Q_DECL_OVERRIDE;
};
}
diff --git a/kleopatra/commands/importcertificatescommand.cpp b/kleopatra/commands/importcertificatescommand.cpp
index 380943b..d83ddf6 100644
--- a/kleopatra/commands/importcertificatescommand.cpp
+++ b/kleopatra/commands/importcertificatescommand.cpp
@@ -87,7 +87,7 @@ public:
~ImportResultProxyModel() {}
- /* reimp */ ImportResultProxyModel *clone() const
+ ImportResultProxyModel *clone() const Q_DECL_OVERRIDE
{
// compiler-generated copy ctor is fine!
return new ImportResultProxyModel(*this);
@@ -100,7 +100,7 @@ public:
}
protected:
- /* reimp */ QVariant data(const QModelIndex &index, int role) const
+ QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE
{
if (!index.isValid() || role != Qt::ToolTipRole) {
return AbstractKeyListSortFilterProxyModel::data(index, role);
diff --git a/kleopatra/commands/refreshopenpgpcertscommand.h b/kleopatra/commands/refreshopenpgpcertscommand.h
index 54230b2..6b8a897 100644
--- a/kleopatra/commands/refreshopenpgpcertscommand.h
+++ b/kleopatra/commands/refreshopenpgpcertscommand.h
@@ -49,16 +49,16 @@ public:
~RefreshOpenPGPCertsCommand();
private:
- /* reimp */ bool preStartHook(QWidget *) const;
+ bool preStartHook(QWidget *) const Q_DECL_OVERRIDE;
- /* reimp */ QStringList arguments() const;
+ QStringList arguments() const Q_DECL_OVERRIDE;
- /* reimp */ QString errorCaption() const;
- /* reimp */ QString successCaption() const;
+ QString errorCaption() const Q_DECL_OVERRIDE;
+ QString successCaption() const Q_DECL_OVERRIDE;
- /* reimp */ QString crashExitMessage(const QStringList &) const;
- /* reimp */ QString errorExitMessage(const QStringList &) const;
- /* reimp */ QString successMessage(const QStringList &) const;
+ QString crashExitMessage(const QStringList &) const Q_DECL_OVERRIDE;
+ QString errorExitMessage(const QStringList &) const Q_DECL_OVERRIDE;
+ QString successMessage(const QStringList &) const Q_DECL_OVERRIDE;
};
}
diff --git a/kleopatra/commands/refreshx509certscommand.h b/kleopatra/commands/refreshx509certscommand.h
index 46190f3..75a556e 100644
--- a/kleopatra/commands/refreshx509certscommand.h
+++ b/kleopatra/commands/refreshx509certscommand.h
@@ -49,16 +49,16 @@ public:
~RefreshX509CertsCommand();
private:
- /* reimp */ bool preStartHook(QWidget *) const;
+ bool preStartHook(QWidget *) const Q_DECL_OVERRIDE;
- /* reimp */ QStringList arguments() const;
+ QStringList arguments() const Q_DECL_OVERRIDE;
- /* reimp */ QString errorCaption() const;
- /* reimp */ QString successCaption() const;
+ QString errorCaption() const Q_DECL_OVERRIDE;
+ QString successCaption() const Q_DECL_OVERRIDE;
- /* reimp */ QString crashExitMessage(const QStringList &) const;
- /* reimp */ QString errorExitMessage(const QStringList &) const;
- /* reimp */ QString successMessage(const QStringList &) const;
+ QString crashExitMessage(const QStringList &) const Q_DECL_OVERRIDE;
+ QString errorExitMessage(const QStringList &) const Q_DECL_OVERRIDE;
+ QString successMessage(const QStringList &) const Q_DECL_OVERRIDE;
};
}
diff --git a/kleopatra/commands/reloadkeyscommand.h b/kleopatra/commands/reloadkeyscommand.h
index 53f96d6..1c4dee5 100644
--- a/kleopatra/commands/reloadkeyscommand.h
+++ b/kleopatra/commands/reloadkeyscommand.h
@@ -47,8 +47,8 @@ public:
~ReloadKeysCommand();
private:
- void doStart();
- void doCancel();
+ void doStart() Q_DECL_OVERRIDE;
+ void doCancel() Q_DECL_OVERRIDE;
private:
class Private;
diff --git a/kleopatra/conf/smimevalidationconfigurationpage.h b/kleopatra/conf/smimevalidationconfigurationpage.h
index 17f4950..9ce2ed7 100644
--- a/kleopatra/conf/smimevalidationconfigurationpage.h
+++ b/kleopatra/conf/smimevalidationconfigurationpage.h
@@ -46,9 +46,9 @@ class SMimeValidationConfigurationPage : public KCModule
public:
explicit SMimeValidationConfigurationPage(QWidget *parent = Q_NULLPTR, const QVariantList &args = QVariantList());
- /* reimp */ void load();
- /* reimp */ void save();
- /* reimp */ void defaults();
+ void load() Q_DECL_OVERRIDE;
+ void save() Q_DECL_OVERRIDE;
+ void defaults() Q_DECL_OVERRIDE;
private:
SMimeValidationConfigurationWidget *mWidget;
diff --git a/kleopatra/crypto/certificateresolver.h b/kleopatra/crypto/certificateresolver.h
index 9bc47f6..c230207 100644
--- a/kleopatra/crypto/certificateresolver.h
+++ b/kleopatra/crypto/certificateresolver.h
@@ -76,8 +76,8 @@ class KConfigBasedRecipientPreferences : public RecipientPreferences
public:
explicit KConfigBasedRecipientPreferences(KSharedConfigPtr config);
~KConfigBasedRecipientPreferences();
- GpgME::Key preferredCertificate(const KMime::Types::Mailbox &recipient, GpgME::Protocol protocol);
- void setPreferredCertificate(const KMime::Types::Mailbox &recipient, GpgME::Protocol protocol, const GpgME::Key &certificate);
+ GpgME::Key preferredCertificate(const KMime::Types::Mailbox &recipient, GpgME::Protocol protocol) Q_DECL_OVERRIDE;
+ void setPreferredCertificate(const KMime::Types::Mailbox &recipient, GpgME::Protocol protocol, const GpgME::Key &certificate) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(KConfigBasedRecipientPreferences)
class Private;
@@ -89,8 +89,8 @@ class KConfigBasedSigningPreferences : public SigningPreferences
public:
explicit KConfigBasedSigningPreferences(KSharedConfigPtr config);
~KConfigBasedSigningPreferences();
- GpgME::Key preferredCertificate(GpgME::Protocol protocol);
- void setPreferredCertificate(GpgME::Protocol protocol, const GpgME::Key &certificate);
+ GpgME::Key preferredCertificate(GpgME::Protocol protocol) Q_DECL_OVERRIDE;
+ void setPreferredCertificate(GpgME::Protocol protocol, const GpgME::Key &certificate) Q_DECL_OVERRIDE;
private:
Q_DISABLE_COPY(KConfigBasedSigningPreferences)
class Private;
diff --git a/kleopatra/crypto/decryptverifyemailcontroller.cpp b/kleopatra/crypto/decryptverifyemailcontroller.cpp
index e5cf6cd..f744485 100644
--- a/kleopatra/crypto/decryptverifyemailcontroller.cpp
+++ b/kleopatra/crypto/decryptverifyemailcontroller.cpp
@@ -95,7 +95,7 @@ public:
}
public Q_SLOTS:
- void accept()
+ void accept() Q_DECL_OVERRIDE
{
EMailOperationsPreferences prefs;
prefs.setDecryptVerifyPopupGeometry(geometry());
diff --git a/kleopatra/crypto/gui/decryptverifyfileswizard.cpp b/kleopatra/crypto/gui/decryptverifyfileswizard.cpp
index 691ce79..bc90912 100644
--- a/kleopatra/crypto/gui/decryptverifyfileswizard.cpp
+++ b/kleopatra/crypto/gui/decryptverifyfileswizard.cpp
@@ -110,7 +110,7 @@ public:
return m_widgets.at(idx);
}
- bool isComplete() const
+ bool isComplete() const Q_DECL_OVERRIDE
{
return true;
}
diff --git a/kleopatra/crypto/gui/newsignencryptfileswizard.cpp b/kleopatra/crypto/gui/newsignencryptfileswizard.cpp
index 1ca7ef5..d026ccf 100644
--- a/kleopatra/crypto/gui/newsignencryptfileswizard.cpp
+++ b/kleopatra/crypto/gui/newsignencryptfileswizard.cpp
@@ -585,13 +585,13 @@ public:
updateSignEncryptArchiveWidgetStates();
}
- /* reimp */ bool isComplete() const
+ bool isComplete() const Q_DECL_OVERRIDE
{
return (!isArchiveRequested() || !archiveName(OpenPGP).isEmpty() && !archiveName(CMS).isEmpty()) // ### make more permissive
&& (isSigningSelected() || isEncryptionSelected()) ;
}
- /* reimp */ bool validatePage()
+ bool validatePage() Q_DECL_OVERRIDE
{
if (isSignOnlySelected() && isArchiveRequested())
return KMessageBox::warningContinueCancel(this,
@@ -610,11 +610,11 @@ public:
}
}
- /* reimp */ int nextId() const
+ int nextId() const Q_DECL_OVERRIDE
{
return isEncryptionSelected() ? RecipientsPageId : SignerPageId ;
}
- /* reimp */ void doSetPresetProtocol()
+ void doSetPresetProtocol() Q_DECL_OVERRIDE
{
updateSignEncryptArchiveWidgetStates();
}
@@ -752,12 +752,12 @@ public:
connect(&m_unselectPB, SIGNAL(clicked()), this, SLOT(unselect()));
}
- /* reimp */ bool isComplete() const
+ bool isComplete() const Q_DECL_OVERRIDE
{
return !m_selectedKTV.keys().empty();
}
- /* reimp */ int nextId() const
+ int nextId() const Q_DECL_OVERRIDE
{
if (isSigningSelected()) {
return SignerPageId;
@@ -782,7 +782,7 @@ public:
return now != UnknownProtocol && then == UnknownProtocol ;
}
- /* reimp */ void initializePage()
+ void initializePage() Q_DECL_OVERRIDE
{
setCommitPage(!isSigningSelected());
@@ -804,7 +804,7 @@ public:
m_lastEffectiveProtocol = currentEffectiveProtocol;
}
- /* reimp */ bool validatePage()
+ bool validatePage() Q_DECL_OVERRIDE
{
const std::vector<Key> &r = keys();
if (_detail::none_of_secret(r)) {
@@ -928,17 +928,17 @@ public:
return result;
}
- /* reimp */ bool isComplete() const
+ bool isComplete() const Q_DECL_OVERRIDE
{
return !keys().empty();
}
- /* reimp */ int nextId() const
+ int nextId() const Q_DECL_OVERRIDE
{
return ResultPageId ;
}
- /* reimp */ void initializePage()
+ void initializePage() Q_DECL_OVERRIDE
{
if (QWizard *wiz = wizard()) {
diff --git a/kleopatra/crypto/gui/signemailwizard.cpp b/kleopatra/crypto/gui/signemailwizard.cpp
index 18cdbf3..c6be3a3 100644
--- a/kleopatra/crypto/gui/signemailwizard.cpp
+++ b/kleopatra/crypto/gui/signemailwizard.cpp
@@ -55,10 +55,10 @@ class SignerResolveValidator : public SignerResolvePage::Validator
{
public:
explicit SignerResolveValidator(SignerResolvePage *page);
- bool isComplete() const;
- QString explanation() const;
+ bool isComplete() const Q_DECL_OVERRIDE;
+ QString explanation() const Q_DECL_OVERRIDE;
void update() const;
- QString customWindowTitle() const
+ QString customWindowTitle() const Q_DECL_OVERRIDE
{
return QString();
}
diff --git a/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp b/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp
index 9b9246f..0be5d31 100644
--- a/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp
+++ b/kleopatra/crypto/gui/signencryptemailconflictdialog.cpp
@@ -153,7 +153,7 @@ public Q_SLOTS:
}
protected:
- void paintEvent(QPaintEvent *)
+ void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE
{
QStylePainter p(this);
p.setPen(palette().color(QPalette::Text));
diff --git a/kleopatra/crypto/gui/signencryptfileswizard.cpp b/kleopatra/crypto/gui/signencryptfileswizard.cpp
index 13114e6..e8d4e3d 100644
--- a/kleopatra/crypto/gui/signencryptfileswizard.cpp
+++ b/kleopatra/crypto/gui/signencryptfileswizard.cpp
@@ -52,10 +52,10 @@ class SignerResolveValidator : public SignerResolvePage::Validator
{
public:
explicit SignerResolveValidator(SignerResolvePage *page);
- bool isComplete() const;
- QString explanation() const;
+ bool isComplete() const Q_DECL_OVERRIDE;
+ QString explanation() const Q_DECL_OVERRIDE;
void update() const;
- QString customWindowTitle() const;
+ QString customWindowTitle() const Q_DECL_OVERRIDE;
private:
SignerResolvePage *const m_page;
diff --git a/kleopatra/crypto/gui/signencryptwizard.h b/kleopatra/crypto/gui/signencryptwizard.h
index 4a804e7..57e2659 100644
--- a/kleopatra/crypto/gui/signencryptwizard.h
+++ b/kleopatra/crypto/gui/signencryptwizard.h
@@ -139,7 +139,7 @@ public:
bool keepResultPageOpenWhenDone() const;
void setKeepResultPageOpenWhenDone(bool keep);
- /*reimp*/ void onNext(int currentId);
+ void onNext(int currentId) Q_DECL_OVERRIDE;
Q_SIGNALS:
void signersResolved();
diff --git a/kleopatra/crypto/gui/signerresolvepage.cpp b/kleopatra/crypto/gui/signerresolvepage.cpp
index fca06fc..951481c 100644
--- a/kleopatra/crypto/gui/signerresolvepage.cpp
+++ b/kleopatra/crypto/gui/signerresolvepage.cpp
@@ -235,15 +235,15 @@ namespace
class ValidatorImpl : public SignerResolvePage::Validator
{
public:
- QString explanation() const
+ QString explanation() const Q_DECL_OVERRIDE
{
return QString();
}
- bool isComplete() const
+ bool isComplete() const Q_DECL_OVERRIDE
{
return true;
}
- QString customWindowTitle() const
+ QString customWindowTitle() const Q_DECL_OVERRIDE
{
return QString();
}
diff --git a/kleopatra/crypto/gui/signerresolvepage_p.h b/kleopatra/crypto/gui/signerresolvepage_p.h
index bc8d88b..bd8d5a9 100644
--- a/kleopatra/crypto/gui/signerresolvepage_p.h
+++ b/kleopatra/crypto/gui/signerresolvepage_p.h
@@ -68,10 +68,10 @@ class SigningProtocolSelectionWidget : public AbstractSigningProtocolSelectionWi
Q_OBJECT
public:
explicit SigningProtocolSelectionWidget(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = 0);
- void setProtocolChecked(GpgME::Protocol protocol, bool checked);
- bool isProtocolChecked(GpgME::Protocol protocol) const;
- std::vector<GpgME::Protocol> checkedProtocols() const;
- void setCertificate(GpgME::Protocol protocol, const GpgME::Key &key);
+ void setProtocolChecked(GpgME::Protocol protocol, bool checked) Q_DECL_OVERRIDE;
+ bool isProtocolChecked(GpgME::Protocol protocol) const Q_DECL_OVERRIDE;
+ std::vector<GpgME::Protocol> checkedProtocols() const Q_DECL_OVERRIDE;
+ void setCertificate(GpgME::Protocol protocol, const GpgME::Key &key) Q_DECL_OVERRIDE;
void setExclusive(bool exclusive);
bool isExclusive() const;
@@ -87,10 +87,10 @@ class ReadOnlyProtocolSelectionWidget : public AbstractSigningProtocolSelectionW
Q_OBJECT
public:
explicit ReadOnlyProtocolSelectionWidget(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = 0);
- void setProtocolChecked(GpgME::Protocol protocol, bool checked);
- bool isProtocolChecked(GpgME::Protocol protocol) const;
- std::vector<GpgME::Protocol> checkedProtocols() const;
- void setCertificate(GpgME::Protocol protocol, const GpgME::Key &key);
+ void setProtocolChecked(GpgME::Protocol protocol, bool checked) Q_DECL_OVERRIDE;
+ bool isProtocolChecked(GpgME::Protocol protocol) const Q_DECL_OVERRIDE;
+ std::vector<GpgME::Protocol> checkedProtocols() const Q_DECL_OVERRIDE;
+ void setCertificate(GpgME::Protocol protocol, const GpgME::Key &key) Q_DECL_OVERRIDE;
private:
QLabel *label(GpgME::Protocol p) const;
diff --git a/kleopatra/crypto/gui/verifychecksumsdialog.cpp b/kleopatra/crypto/gui/verifychecksumsdialog.cpp
index 335765d..0359d96 100644
--- a/kleopatra/crypto/gui/verifychecksumsdialog.cpp
+++ b/kleopatra/crypto/gui/verifychecksumsdialog.cpp
@@ -84,7 +84,7 @@ public:
}
- /* reimp */ QVariant data(const QModelIndex &mi, int role = Qt::DisplayRole) const
+ QVariant data(const QModelIndex &mi, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE
{
if (mi.isValid() && role == Qt::BackgroundRole) {
const QHash<QString, VerifyChecksumsDialog::Status>::const_iterator
diff --git a/kleopatra/crypto/signencryptfilestask.cpp b/kleopatra/crypto/signencryptfilestask.cpp
index cc210c1..6a676ef 100644
--- a/kleopatra/crypto/signencryptfilestask.cpp
+++ b/kleopatra/crypto/signencryptfilestask.cpp
@@ -163,12 +163,12 @@ public:
assert(!m_sresult.isNull() || !m_eresult.isNull());
}
- /* reimp */ QString overview() const;
- /* reimp */ QString details() const;
- /* reimp */ int errorCode() const;
- /* reimp */ QString errorString() const;
- /* reimp */ VisualCode code() const;
- /* reimp */ AuditLog auditLog() const;
+ QString overview() const Q_DECL_OVERRIDE;
+ QString details() const Q_DECL_OVERRIDE;
+ int errorCode() const Q_DECL_OVERRIDE;
+ QString errorString() const Q_DECL_OVERRIDE;
+ VisualCode code() const Q_DECL_OVERRIDE;
+ AuditLog auditLog() const Q_DECL_OVERRIDE;
private:
const SigningResult m_sresult;
diff --git a/kleopatra/crypto/task.cpp b/kleopatra/crypto/task.cpp
index 20d6f83..5cfa4ba 100644
--- a/kleopatra/crypto/task.cpp
+++ b/kleopatra/crypto/task.cpp
@@ -65,27 +65,27 @@ public:
ErrorResult(int code, const QString &details)
: Task::Result(), m_code(code), m_details(details) {}
- /* reimp */ QString overview() const
+ QString overview() const Q_DECL_OVERRIDE
{
return makeOverview(m_details);
}
- /* reimp */ QString details() const
+ QString details() const Q_DECL_OVERRIDE
{
return QString();
}
- /* reimp */ int errorCode() const
+ int errorCode() const Q_DECL_OVERRIDE
{
return m_code;
}
- /* reimp */ QString errorString() const
+ QString errorString() const Q_DECL_OVERRIDE
{
return m_details;
}
- /* reimp */ VisualCode code() const
+ VisualCode code() const Q_DECL_OVERRIDE
{
return NeutralError;
}
- /* reimp */ AuditLog auditLog() const
+ AuditLog auditLog() const Q_DECL_OVERRIDE
{
return AuditLog();
}
diff --git a/kleopatra/crypto/task_p.h b/kleopatra/crypto/task_p.h
index 0be3b51..ee9d41d 100644
--- a/kleopatra/crypto/task_p.h
+++ b/kleopatra/crypto/task_p.h
@@ -53,21 +53,21 @@ public:
{
m_result = res;
}
- /*reimp*/ GpgME::Protocol protocol() const
+ GpgME::Protocol protocol() const Q_DECL_OVERRIDE
{
return GpgME::UnknownProtocol;
}
- /*reimp*/ QString label() const
+ QString label() const Q_DECL_OVERRIDE
{
return m_label;
}
- /*reimp*/ void cancel() {}
+ void cancel() Q_DECL_OVERRIDE {}
private:
- /*reimp*/ void doStart()
+ void doStart() Q_DECL_OVERRIDE
{
QTimer::singleShot(0, this, SLOT(slotEmitResult()));
}
- /*reimp*/ unsigned long long inputSize() const
+ unsigned long long inputSize() const Q_DECL_OVERRIDE
{
return 0;
}
diff --git a/kleopatra/dialogs/certifycertificatedialog_p.h b/kleopatra/dialogs/certifycertificatedialog_p.h
index 4c56105..81cc276 100644
--- a/kleopatra/dialogs/certifycertificatedialog_p.h
+++ b/kleopatra/dialogs/certifycertificatedialog_p.h
@@ -95,7 +95,7 @@ class SelectUserIDsPage : public QWizardPage
Q_OBJECT
public:
explicit SelectUserIDsPage(QWidget *parent = Q_NULLPTR);
- /* reimp */ bool isComplete() const;
+ bool isComplete() const Q_DECL_OVERRIDE;
void setSelectedUserIDs(const std::vector<unsigned int> &indexes);
std::vector<unsigned int> selectedUserIDs() const;
@@ -133,8 +133,8 @@ public:
GpgME::Key selectedSecretKey() const;
bool sendToServer() const;
- /* reimp */ bool validatePage();
- /* reimp */ bool isComplete() const;
+ bool validatePage() Q_DECL_OVERRIDE;
+ bool isComplete() const Q_DECL_OVERRIDE;
Q_SIGNALS:
void nextClicked();
@@ -149,7 +149,7 @@ class SummaryPage : public QWizardPage
Q_OBJECT
public:
explicit SummaryPage(QWidget *parent = Q_NULLPTR);
- /* reimp */ bool isComplete() const;
+ bool isComplete() const Q_DECL_OVERRIDE;
void setComplete(bool complete);
void setResult(const GpgME::Error &err);
diff --git a/kleopatra/dialogs/selftestdialog.cpp b/kleopatra/dialogs/selftestdialog.cpp
index d78355c..ae3d093 100644
--- a/kleopatra/dialogs/selftestdialog.cpp
+++ b/kleopatra/dialogs/selftestdialog.cpp
@@ -119,7 +119,7 @@ public:
return QVariant();
}
- /* reimp */ QVariant headerData(int section, Qt::Orientation o, int role) const
+ QVariant headerData(int section, Qt::Orientation o, int role) const Q_DECL_OVERRIDE
{
if (o == Qt::Horizontal &&
section >= 0 && section < NumColumns &&
diff --git a/kleopatra/libkleopatraclient/core/command_p.h b/kleopatra/libkleopatraclient/core/command_p.h
index 29537ff..c307c7c 100644
--- a/kleopatra/libkleopatraclient/core/command_p.h
+++ b/kleopatra/libkleopatraclient/core/command_p.h
@@ -56,7 +56,7 @@ private:
void init();
private:
- /* reimp */ void run();
+ void run() Q_DECL_OVERRIDE;
private:
QMutex mutex;
diff --git a/kleopatra/models/useridlistmodel.h b/kleopatra/models/useridlistmodel.h
index 37617b2..c63b1f3 100644
--- a/kleopatra/models/useridlistmodel.h
+++ b/kleopatra/models/useridlistmodel.h
@@ -86,7 +86,7 @@ public:
QVariant headerData(int section, Qt::Orientation o, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE;
- /* reimp */ QModelIndex index(int row, int col, const QModelIndex &parent = QModelIndex()) const;
+ QModelIndex index(int row, int col, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE;
QModelIndex parent(const QModelIndex &index) const Q_DECL_OVERRIDE;
private:
diff --git a/kleopatra/newcertificatewizard/listwidget.cpp b/kleopatra/newcertificatewizard/listwidget.cpp
index 906c2ee..825fba4 100644
--- a/kleopatra/newcertificatewizard/listwidget.cpp
+++ b/kleopatra/newcertificatewizard/listwidget.cpp
@@ -68,7 +68,7 @@ public:
return m_rx;
}
- /* reimp */ QWidget *createEditor(QWidget *p, const QStyleOptionViewItem &o, const QModelIndex &i) const
+ QWidget *createEditor(QWidget *p, const QStyleOptionViewItem &o, const QModelIndex &i) const Q_DECL_OVERRIDE
{
QWidget *w = QItemDelegate::createEditor(p, o, i);
if (!m_rx.isEmpty())
diff --git a/kleopatra/newcertificatewizard/newcertificatewizard.cpp b/kleopatra/newcertificatewizard/newcertificatewizard.cpp
index b57f2c4..b0f39b4 100644
--- a/kleopatra/newcertificatewizard/newcertificatewizard.cpp
+++ b/kleopatra/newcertificatewizard/newcertificatewizard.cpp
@@ -543,7 +543,7 @@ public:
ui.x509CLB->isChecked() ? CMS : UnknownProtocol ;
}
- /* reimp */ void initializePage()
+ void initializePage() Q_DECL_OVERRIDE
{
if (!initialized) {
connect(ui.pgpCLB, SIGNAL(clicked()), wizard(), SLOT(next()), Qt::QueuedConnection);
@@ -552,7 +552,7 @@ public:
initialized = true;
}
- /* reimp */ bool isComplete() const
+ bool isComplete() const Q_DECL_OVERRIDE
{
return protocol() != UnknownProtocol ;
}
@@ -598,13 +598,13 @@ public:
updateForm();
}
- /* reimp */ bool isComplete() const;
- /* reimp */ void initializePage()
+ bool isComplete() const Q_DECL_OVERRIDE;
+ void initializePage() Q_DECL_OVERRIDE
{
updateForm();
dialog.setProtocol(pgp() ? OpenPGP : CMS);
}
- /* reimp */ void cleanupPage()
+ void cleanupPage() Q_DECL_OVERRIDE
{
saveValues();
}
@@ -646,7 +646,7 @@ public:
setButtonText(QWizard::CommitButton, i18nc("@action", "Create Key"));
}
- /* reimp */ void initializePage()
+ void initializePage() Q_DECL_OVERRIDE
{
slotShowDetails();
}
@@ -678,12 +678,12 @@ public:
ui.setupUi(this);
}
- /* reimp */ bool isComplete() const
+ bool isComplete() const Q_DECL_OVERRIDE
{
return !job;
}
- /* reimp */ void initializePage()
+ void initializePage() Q_DECL_OVERRIDE
{
startJob();
}
@@ -776,7 +776,7 @@ public:
registerField(QStringLiteral("fingerprint"), le);
}
- /* reimp */ void initializePage()
+ void initializePage() Q_DECL_OVERRIDE
{
const bool error = isError();
@@ -822,7 +822,7 @@ public:
initialized = true;
}
- /* reimp */ void cleanupPage()
+ void cleanupPage() Q_DECL_OVERRIDE
{
setButtonVisible(QWizard::CancelButton, true);
}
@@ -832,7 +832,7 @@ public:
return !ui.errorTB->toPlainText().isEmpty();
}
- /* reimp */ bool isComplete() const
+ bool isComplete() const Q_DECL_OVERRIDE
{
return !isError();
}
diff --git a/kleopatra/selftest/implementation_p.h b/kleopatra/selftest/implementation_p.h
index 42118bb..f4f4330 100644
--- a/kleopatra/selftest/implementation_p.h
+++ b/kleopatra/selftest/implementation_p.h
@@ -50,28 +50,28 @@ public:
explicit SelfTestImplementation(const QString &name);
~SelfTestImplementation();
- /* reimp */ QString name() const
+ QString name() const Q_DECL_OVERRIDE
{
return m_name;
}
- /* reimp */ QString shortError() const
+ QString shortError() const Q_DECL_OVERRIDE
{
return m_error;
}
- /* reimp */ QString longError() const
+ QString longError() const Q_DECL_OVERRIDE
{
return m_explaination;
}
- /* reimp */ QString proposedFix() const
+ QString proposedFix() const Q_DECL_OVERRIDE
{
return m_proposedFix;
}
- /* reimp */ bool skipped() const
+ bool skipped() const Q_DECL_OVERRIDE
{
return m_skipped;
}
- /* reimp */ bool passed() const
+ bool passed() const Q_DECL_OVERRIDE
{
return m_passed;
}
diff --git a/kleopatra/smartcard/readerstatus.cpp b/kleopatra/smartcard/readerstatus.cpp
index 71f7b27..d350544 100644
--- a/kleopatra/smartcard/readerstatus.cpp
+++ b/kleopatra/smartcard/readerstatus.cpp
@@ -563,7 +563,7 @@ private Q_SLOTS:
}
private:
- /* reimp */ void run()
+ void run() Q_DECL_OVERRIDE
{
shared_ptr<Context> gpgAgent;
diff --git a/kleopatra/uiserver/assuancommand.h b/kleopatra/uiserver/assuancommand.h
index a8bb987..c0727bd 100644
--- a/kleopatra/uiserver/assuancommand.h
+++ b/kleopatra/uiserver/assuancommand.h
@@ -261,7 +261,7 @@ public:
GpgME::Protocol checkProtocol(Mode mode, int options = 0) const;
- /* reimp */ void applyWindowID(QWidget *w) const
+ void applyWindowID(QWidget *w) const Q_DECL_OVERRIDE
{
doApplyWindowID(w);
}
@@ -369,7 +369,7 @@ public:
template <typename Command>
class GenericAssuanCommandFactory : public AssuanCommandFactory
{
- /* reimp */ AssuanCommandFactory::_Handler _handler() const
+ AssuanCommandFactory::_Handler _handler() const Q_DECL_OVERRIDE
{
return &GenericAssuanCommandFactory::_handle;
}
@@ -382,11 +382,11 @@ class GenericAssuanCommandFactory : public AssuanCommandFactory
#endif
return AssuanCommandFactory::_handle(_ctx, _line, Command::staticName());
}
- /* reimp */ boost::shared_ptr<AssuanCommand> create() const
+ boost::shared_ptr<AssuanCommand> create() const Q_DECL_OVERRIDE
{
return make();
}
- /* reimp */ const char *name() const
+ const char *name() const Q_DECL_OVERRIDE
{
return Command::staticName();
}
diff --git a/kleopatra/uiserver/decryptcommand.h b/kleopatra/uiserver/decryptcommand.h
index 8d69e9b..436bf5d 100644
--- a/kleopatra/uiserver/decryptcommand.h
+++ b/kleopatra/uiserver/decryptcommand.h
@@ -45,7 +45,7 @@ public:
//~DecryptCommand();
private:
- /* reimp */ DecryptVerifyOperation operation() const
+ DecryptVerifyOperation operation() const Q_DECL_OVERRIDE
{
if (hasOption("no-verify")) {
return Decrypt;
diff --git a/kleopatra/uiserver/decryptfilescommand.h b/kleopatra/uiserver/decryptfilescommand.h
index dde43f7..9317659 100644
--- a/kleopatra/uiserver/decryptfilescommand.h
+++ b/kleopatra/uiserver/decryptfilescommand.h
@@ -45,7 +45,7 @@ public:
//~DecryptFilesCommand();
private:
- /* reimp */ DecryptVerifyOperation operation() const
+ DecryptVerifyOperation operation() const Q_DECL_OVERRIDE
{
return Decrypt;
}
diff --git a/kleopatra/uiserver/decryptverifycommandemailbase.h b/kleopatra/uiserver/decryptverifycommandemailbase.h
index 2863b7e..b065e79 100644
--- a/kleopatra/uiserver/decryptverifycommandemailbase.h
+++ b/kleopatra/uiserver/decryptverifycommandemailbase.h
@@ -73,7 +73,7 @@ class DecryptVerifyCommand : public AssuanCommandMixin<DecryptVerifyCommand, Dec
public:
private:
- DecryptVerifyOperation operation() const
+ DecryptVerifyOperation operation() const Q_DECL_OVERRIDE
{
return DecryptVerify;
}
diff --git a/kleopatra/uiserver/decryptverifyfilescommand.h b/kleopatra/uiserver/decryptverifyfilescommand.h
index d7f3517..74c1c6c 100644
--- a/kleopatra/uiserver/decryptverifyfilescommand.h
+++ b/kleopatra/uiserver/decryptverifyfilescommand.h
@@ -45,7 +45,7 @@ public:
//~DecryptVerifyFilesCommand();
private:
- DecryptVerifyOperation operation() const
+ DecryptVerifyOperation operation() const Q_DECL_OVERRIDE
{
return DecryptVerify;
}
diff --git a/kleopatra/uiserver/signencryptfilescommand.h b/kleopatra/uiserver/signencryptfilescommand.h
index 9e83f7b..5bc862e 100644
--- a/kleopatra/uiserver/signencryptfilescommand.h
+++ b/kleopatra/uiserver/signencryptfilescommand.h
@@ -96,7 +96,7 @@ public:
{
return "ENCRYPT_FILES";
}
- /* reimp */ unsigned int operation() const
+ unsigned int operation() const Q_DECL_OVERRIDE
{
return SignAllowed | EncryptForced;
}
@@ -109,7 +109,7 @@ public:
{
return "SIGN_FILES";
}
- /* reimp */ unsigned int operation() const
+ unsigned int operation() const Q_DECL_OVERRIDE
{
return SignForced | EncryptAllowed;
}
diff --git a/kleopatra/uiserver/uiserver_p.h b/kleopatra/uiserver/uiserver_p.h
index 50fe2f2..fbc3e44 100644
--- a/kleopatra/uiserver/uiserver_p.h
+++ b/kleopatra/uiserver/uiserver_p.h
@@ -79,7 +79,7 @@ private:
static QString systemErrorString();
protected:
- /* reimp */ void incomingConnection(qintptr fd);
+ void incomingConnection(qintptr fd) Q_DECL_OVERRIDE;
private Q_SLOTS:
void slotConnectionClosed(Kleo::AssuanServerConnection *conn);
diff --git a/kleopatra/uiserver/verifycommand.h b/kleopatra/uiserver/verifycommand.h
index aa26f99..0006280 100644
--- a/kleopatra/uiserver/verifycommand.h
+++ b/kleopatra/uiserver/verifycommand.h
@@ -46,11 +46,11 @@ public:
//~VerifyCommand();
private:
- /* reimp */ DecryptVerifyOperation operation() const
+ DecryptVerifyOperation operation() const Q_DECL_OVERRIDE
{
return Verify;
}
- /* reimp */ Mode mode() const
+ Mode mode() const Q_DECL_OVERRIDE
{
return EMail;
}
diff --git a/kleopatra/uiserver/verifyfilescommand.h b/kleopatra/uiserver/verifyfilescommand.h
index 8f1a911..eac2f22 100644
--- a/kleopatra/uiserver/verifyfilescommand.h
+++ b/kleopatra/uiserver/verifyfilescommand.h
@@ -45,7 +45,7 @@ public:
//~VerifyFilesCommand();
private:
- /* reimp */ DecryptVerifyOperation operation() const
+ DecryptVerifyOperation operation() const Q_DECL_OVERRIDE
{
return Verify;
}
diff --git a/kleopatra/utils/archivedefinition.cpp b/kleopatra/utils/archivedefinition.cpp
index 1036551..b10999f 100644
--- a/kleopatra/utils/archivedefinition.cpp
+++ b/kleopatra/utils/archivedefinition.cpp
@@ -299,19 +299,19 @@ public:
}
private:
- /* reimp */ QString doGetPackCommand(Protocol p) const
+ QString doGetPackCommand(Protocol p) const Q_DECL_OVERRIDE
{
return m_packCommand[p];
}
- /* reimp */ QString doGetUnpackCommand(Protocol p) const
+ QString doGetUnpackCommand(Protocol p) const Q_DECL_OVERRIDE
{
return m_unpackCommand[p];
}
- /* reimp */ QStringList doGetPackArguments(Protocol p, const QStringList &files) const
+ QStringList doGetPackArguments(Protocol p, const QStringList &files) const Q_DECL_OVERRIDE
{
return m_packPrefixArguments[p] + files + m_packPostfixArguments[p];
}
- /* reimp */ QStringList doGetUnpackArguments(Protocol p, const QString &file) const
+ QStringList doGetUnpackArguments(Protocol p, const QString &file) const Q_DECL_OVERRIDE
{
QStringList copy = m_unpackArguments[p];
copy.replaceInStrings(FILE_PLACEHOLDER, file);
diff --git a/kleopatra/utils/dragqueen.cpp b/kleopatra/utils/dragqueen.cpp
index 126931c..22aacc4 100644
--- a/kleopatra/utils/dragqueen.cpp
+++ b/kleopatra/utils/dragqueen.cpp
@@ -58,7 +58,7 @@ public:
}
- /* reimp */ QStringList formats() const
+ QStringList formats() const Q_DECL_OVERRIDE
{
if (m_source) {
return m_source->formats();
@@ -67,13 +67,13 @@ public:
}
}
- /* reimp */ bool hasFormat(const QString &format) const
+ bool hasFormat(const QString &format) const Q_DECL_OVERRIDE
{
return m_source && m_source->hasFormat(format);
}
protected:
- /* reimp */ QVariant retrieveData(const QString &format, QVariant::Type type) const
+ QVariant retrieveData(const QString &format, QVariant::Type type) const Q_DECL_OVERRIDE
{
if (!m_source) {
return QVariant();
diff --git a/kleopatra/utils/kdpipeiodevice.cpp b/kleopatra/utils/kdpipeiodevice.cpp
index 9366b72..6d0fe59 100644
--- a/kleopatra/utils/kdpipeiodevice.cpp
+++ b/kleopatra/utils/kdpipeiodevice.cpp
@@ -106,7 +106,7 @@ Q_SIGNALS:
void readyRead();
protected:
- /* reimp */ void run();
+ void run() Q_DECL_OVERRIDE;
private:
int fd;
@@ -182,7 +182,7 @@ Q_SIGNALS:
void bytesWritten(qint64);
protected:
- /* reimp */ void run();
+ void run() Q_DECL_OVERRIDE;
private:
int fd;
diff --git a/kleopatra/utils/output.cpp b/kleopatra/utils/output.cpp
index 62d364d..76a46a4 100644
--- a/kleopatra/utils/output.cpp
+++ b/kleopatra/utils/output.cpp
@@ -111,7 +111,7 @@ public:
explicit TemporaryFile(QObject *parent) : QTemporaryFile(parent) {}
explicit TemporaryFile(const QString &templateName, QObject *parent) : QTemporaryFile(templateName, parent) {}
- /* reimp */ void close()
+ void close() Q_DECL_OVERRIDE
{
if (isOpen()) {
m_oldFileName = fileName();
@@ -193,11 +193,11 @@ public:
}
- /* reimp */ QString label() const
+ QString label() const Q_DECL_OVERRIDE
{
return m_customLabel.isEmpty() ? m_defaultLabel : m_customLabel;
}
- /* reimp */ void setLabel(const QString &label)
+ void setLabel(const QString &label) Q_DECL_OVERRIDE
{
m_customLabel = label;
}
@@ -205,16 +205,16 @@ public:
{
m_defaultLabel = l;
}
- /* reimp */ void setBinaryOpt(bool value)
+ void setBinaryOpt(bool value) Q_DECL_OVERRIDE
{
m_binaryOpt = value;
}
- /* reimp */ bool binaryOpt() const
+ bool binaryOpt() const Q_DECL_OVERRIDE
{
return m_binaryOpt;
}
- /* reimp */ QString errorString() const
+ QString errorString() const Q_DECL_OVERRIDE
{
if (m_errorString.dirty()) {
m_errorString = doErrorString();
@@ -222,11 +222,11 @@ public:
return m_errorString;
}
- /* reimp */ bool isFinalized() const
+ bool isFinalized() const Q_DECL_OVERRIDE
{
return m_isFinalized;
}
- /* reimp */ void finalize()
+ void finalize() Q_DECL_OVERRIDE
{
qCDebug(KLEOPATRA_LOG) << this;
if (m_isFinalized || m_isFinalizing) {
@@ -246,7 +246,7 @@ public:
}
}
- /* reimp */ void cancel()
+ void cancel() Q_DECL_OVERRIDE
{
qCDebug(KLEOPATRA_LOG) << this;
if (m_isFinalizing) {
@@ -288,15 +288,15 @@ class PipeOutput : public OutputImplBase
public:
explicit PipeOutput(assuan_fd_t fd);
- /* reimp */ shared_ptr<QIODevice> ioDevice() const
+ shared_ptr<QIODevice> ioDevice() const Q_DECL_OVERRIDE
{
return m_io;
}
- /* reimp */ void doFinalize()
+ void doFinalize() Q_DECL_OVERRIDE
{
m_io->reallyClose();
}
- /* reimp */ void doCancel()
+ void doCancel() Q_DECL_OVERRIDE
{
doFinalize();
}
@@ -309,11 +309,11 @@ class ProcessStdInOutput : public OutputImplBase
public:
explicit ProcessStdInOutput(const QString &cmd, const QStringList &args, const QDir &wd);
- /* reimp */ shared_ptr<QIODevice> ioDevice() const
+ shared_ptr<QIODevice> ioDevice() const Q_DECL_OVERRIDE
{
return m_proc;
}
- /* reimp */ void doFinalize()
+ void doFinalize() Q_DECL_OVERRIDE
{
/*
Make sure the data is written in the output here. If this
@@ -332,15 +332,15 @@ public:
}
m_proc->waitForFinished(PROCESS_MAX_RUNTIME_TIMEOUT);
}
- /* reimp */ void doCancel()
+ void doCancel() Q_DECL_OVERRIDE
{
m_proc->terminate();
QTimer::singleShot(PROCESS_TERMINATE_TIMEOUT, m_proc.get(), SLOT(kill()));
}
- /* reimp */ QString label() const;
+ QString label() const Q_DECL_OVERRIDE;
private:
- /* reimp */ QString doErrorString() const;
+ QString doErrorString() const Q_DECL_OVERRIDE;
private:
const QString m_command;
@@ -357,16 +357,16 @@ public:
qCDebug(KLEOPATRA_LOG) << this;
}
- /* reimp */ QString label() const
+ QString label() const Q_DECL_OVERRIDE
{
return QFileInfo(m_fileName).fileName();
}
- /* reimp */ shared_ptr<QIODevice> ioDevice() const
+ shared_ptr<QIODevice> ioDevice() const Q_DECL_OVERRIDE
{
return m_tmpFile;
}
- /* reimp */ void doFinalize();
- /* reimp */ void doCancel()
+ void doFinalize() Q_DECL_OVERRIDE;
+ void doCancel() Q_DECL_OVERRIDE
{
qCDebug(KLEOPATRA_LOG) << this;
}
@@ -385,16 +385,16 @@ class ClipboardOutput : public OutputImplBase
public:
explicit ClipboardOutput(QClipboard::Mode mode);
- /* reimp */ QString label() const;
- /* reimp */ shared_ptr<QIODevice> ioDevice() const
+ QString label() const Q_DECL_OVERRIDE;
+ shared_ptr<QIODevice> ioDevice() const Q_DECL_OVERRIDE
{
return m_buffer;
}
- /* reimp */ void doFinalize();
- /* reimp */ void doCancel() {}
+ void doFinalize() Q_DECL_OVERRIDE;
+ void doCancel() Q_DECL_OVERRIDE {}
private:
- /* reimp */ QString doErrorString() const
+ QString doErrorString() const Q_DECL_OVERRIDE
{
return QString();
}
diff --git a/kleopatra/view/keytreeview.cpp b/kleopatra/view/keytreeview.cpp
index 29803d1..9358718 100644
--- a/kleopatra/view/keytreeview.cpp
+++ b/kleopatra/view/keytreeview.cpp
@@ -64,7 +64,7 @@ class TreeView : public QTreeView
public:
explicit TreeView(QWidget *parent = Q_NULLPTR) : QTreeView(parent) {}
- /* reimp */ QSize minimumSizeHint() const
+ QSize minimumSizeHint() const Q_DECL_OVERRIDE
{
const QSize min = QTreeView::minimumSizeHint();
return QSize(min.width(), min.height() + 5 * fontMetrics().height());
diff --git a/kleopatra/view/tabwidget.cpp b/kleopatra/view/tabwidget.cpp
index 0a6bd19..5542530 100644
--- a/kleopatra/view/tabwidget.cpp
+++ b/kleopatra/view/tabwidget.cpp
@@ -85,9 +85,9 @@ public:
return m_isTemporary;
}
- /* reimp */ void setHierarchicalView(bool hierarchical);
- /* reimp */ void setStringFilter(const QString &filter);
- /* reimp */ void setKeyFilter(const shared_ptr<KeyFilter> &filter);
+ void setHierarchicalView(bool hierarchical) Q_DECL_OVERRIDE;
+ void setStringFilter(const QString &filter) Q_DECL_OVERRIDE;
+ void setKeyFilter(const shared_ptr<KeyFilter> &filter) Q_DECL_OVERRIDE;
QString title() const
{
@@ -124,7 +124,7 @@ public:
void saveTo(KConfigGroup &group) const;
- /* reimp */ Page *clone() const
+ Page *clone() const Q_DECL_OVERRIDE
{
return new Page(*this);
}
diff --git a/libkleo/backends/chiasmus/chiasmusbackend.cpp b/libkleo/backends/chiasmus/chiasmusbackend.cpp
index c0d0ee5..2cd460f 100644
--- a/libkleo/backends/chiasmus/chiasmusbackend.cpp
+++ b/libkleo/backends/chiasmus/chiasmusbackend.cpp
@@ -204,86 +204,86 @@ public:
{
assert(i < kleo_chiasmus_config_entries_dim);
}
- QString name() const
+ QString name() const Q_DECL_OVERRIDE
{
return QLatin1String(kleo_chiasmus_config_entries[mIdx].name);
}
- QString description() const
+ QString description() const Q_DECL_OVERRIDE
{
return i18n(kleo_chiasmus_config_entries[mIdx].description);
}
- QString path() const
+ QString path() const Q_DECL_OVERRIDE
{
return name();
}
- bool isOptional() const
+ bool isOptional() const Q_DECL_OVERRIDE
{
return kleo_chiasmus_config_entries[mIdx].is_optional;
}
- bool isReadOnly() const
+ bool isReadOnly() const Q_DECL_OVERRIDE
{
return false;
}
- bool isList() const
+ bool isList() const Q_DECL_OVERRIDE
{
return kleo_chiasmus_config_entries[mIdx].is_list;
}
- bool isRuntime() const
+ bool isRuntime() const Q_DECL_OVERRIDE
{
return kleo_chiasmus_config_entries[mIdx].is_runtime;
}
- Level level() const
+ Level level() const Q_DECL_OVERRIDE
{
return static_cast<Level>(kleo_chiasmus_config_entries[mIdx].level);
}
- ArgType argType() const
+ ArgType argType() const Q_DECL_OVERRIDE
{
return static_cast<ArgType>(kleo_chiasmus_config_entries[mIdx].type);
}
- bool isSet() const
+ bool isSet() const Q_DECL_OVERRIDE
{
return mValue != defaultValue();
}
- bool boolValue() const
+ bool boolValue() const Q_DECL_OVERRIDE
{
return mValue.toBool();
}
- QString stringValue() const
+ QString stringValue() const Q_DECL_OVERRIDE
{
return mValue.toString();
}
- int intValue() const
+ int intValue() const Q_DECL_OVERRIDE
{
return mValue.toInt();
}
- unsigned int uintValue() const
+ unsigned int uintValue() const Q_DECL_OVERRIDE
{
return mValue.toUInt();
}
- KUrl urlValue() const
+ KUrl urlValue() const Q_DECL_OVERRIDE
{
if (argType() != ArgType_Path && argType() != ArgType_DirPath) {
return KUrl(mValue.toString());
}
KUrl u; u.setPath(mValue.toString()); return u;
}
- unsigned int numberOfTimesSet() const
+ unsigned int numberOfTimesSet() const Q_DECL_OVERRIDE
{
return 0;
}
- QStringList stringValueList() const
+ QStringList stringValueList() const Q_DECL_OVERRIDE
{
return mValue.toStringList();
}
- std::vector<int> intValueList() const
+ std::vector<int> intValueList() const Q_DECL_OVERRIDE
{
return to< std::vector<int> >(mValue);
}
- std::vector<unsigned int> uintValueList() const
+ std::vector<unsigned int> uintValueList() const Q_DECL_OVERRIDE
{
return to< std::vector<unsigned int> >(mValue);
}
- KUrl::List urlValueList() const
+ KUrl::List urlValueList() const Q_DECL_OVERRIDE
{
if (argType() != ArgType_Path && argType() != ArgType_DirPath) {
return mValue.toStringList();
@@ -291,28 +291,28 @@ public:
return to<KUrl::List>(mValue);
}
}
- void resetToDefault()
+ void resetToDefault() Q_DECL_OVERRIDE
{
mValue = defaultValue();
mDirty = false;
}
- void setBoolValue(bool value)
+ void setBoolValue(bool value) Q_DECL_OVERRIDE
{
setValue(QVariant(value));
}
- void setStringValue(const QString &value)
+ void setStringValue(const QString &value) Q_DECL_OVERRIDE
{
setValue(value);
}
- void setIntValue(int value)
+ void setIntValue(int value) Q_DECL_OVERRIDE
{
setValue(value);
}
- void setUIntValue(unsigned int value)
+ void setUIntValue(unsigned int value) Q_DECL_OVERRIDE
{
setValue(value);
}
- void setURLValue(const KUrl &value)
+ void setURLValue(const KUrl &value) Q_DECL_OVERRIDE
{
if (argType() != ArgType_Path && argType() != ArgType_DirPath) {
setValue(value.url());
@@ -320,24 +320,24 @@ public:
setValue(value.path());
}
}
- void setNumberOfTimesSet(unsigned int) {}
- void setStringValueList(const QStringList &value)
+ void setNumberOfTimesSet(unsigned int) Q_DECL_OVERRIDE {}
+ void setStringValueList(const QStringList &value) Q_DECL_OVERRIDE
{
setValue(value);
}
- void setIntValueList(const std::vector<int> &l)
+ void setIntValueList(const std::vector<int> &l) Q_DECL_OVERRIDE
{
setValue(from(l));
}
- void setUIntValueList(const std::vector<unsigned int> &l)
+ void setUIntValueList(const std::vector<unsigned int> &l) Q_DECL_OVERRIDE
{
setValue(from(l));
}
- void setURLValueList(const KUrl::List &l)
+ void setURLValueList(const KUrl::List &l) Q_DECL_OVERRIDE
{
setValue(from(l));
}
- bool isDirty() const
+ bool isDirty() const Q_DECL_OVERRIDE
{
return mDirty;
}
@@ -427,27 +427,27 @@ public:
clear();
delete mConfigObject;
}
- QString name() const
+ QString name() const Q_DECL_OVERRIDE
{
return QStringLiteral("General");
}
- QString iconName() const
+ QString iconName() const Q_DECL_OVERRIDE
{
return QStringLiteral("chiasmus_chi");
}
- QString path() const
+ QString path() const Q_DECL_OVERRIDE
{
return QString();
}
- QString description() const
+ QString description() const Q_DECL_OVERRIDE
{
return i18n("General");
}
- Kleo::CryptoConfigEntry::Level level() const
+ Kleo::CryptoConfigEntry::Level level() const Q_DECL_OVERRIDE
{
return Kleo::CryptoConfigEntry::Level_Basic;
}
- QStringList entryList() const
+ QStringList entryList() const Q_DECL_OVERRIDE
{
QStringList result;
for (unsigned int i = 0 ; i < kleo_chiasmus_config_entries_dim ; ++i) {
@@ -455,7 +455,7 @@ public:
}
return result;
}
- Kleo::CryptoConfigEntry *entry(const QString &name) const
+ Kleo::CryptoConfigEntry *entry(const QString &name) const Q_DECL_OVERRIDE
{
if (ChiasmusConfigEntry *entry = mCache[name]) {
return entry;
@@ -515,23 +515,23 @@ public:
}
}
- QString name() const
+ QString name() const Q_DECL_OVERRIDE
{
return QStringLiteral("Chiasmus");
}
- QString iconName() const
+ QString iconName() const Q_DECL_OVERRIDE
{
return QStringLiteral("chiasmus_chi");
}
- QString description() const
+ QString description() const Q_DECL_OVERRIDE
{
return i18n("Chiasmus");
}
- QStringList groupList() const
+ QStringList groupList() const Q_DECL_OVERRIDE
{
return QStringList() << QStringLiteral("General");
}
- Kleo::CryptoConfigGroup *group(const QString &name) const
+ Kleo::CryptoConfigGroup *group(const QString &name) const Q_DECL_OVERRIDE
{
if (name != QLatin1String("General")) {
return 0;
@@ -555,11 +555,11 @@ public:
delete mComponent;
}
- QStringList componentList() const
+ QStringList componentList() const Q_DECL_OVERRIDE
{
return QStringList() << QStringLiteral("Chiasmus") ;
}
- ChiasmusComponent *component(const QString &name) const
+ ChiasmusComponent *component(const QString &name) const Q_DECL_OVERRIDE
{
if (name != QLatin1String("Chiasmus")) {
return 0;
@@ -569,13 +569,13 @@ public:
}
return mComponent;
}
- void sync(bool)
+ void sync(bool) Q_DECL_OVERRIDE
{
if (mComponent) {
mComponent->sync();
}
}
- void clear()
+ void clear() Q_DECL_OVERRIDE
{
delete mComponent;
mComponent = 0;
@@ -593,84 +593,84 @@ public:
}
~Protocol() {}
- QString name() const
+ QString name() const Q_DECL_OVERRIDE
{
return QStringLiteral("Chiasmus");
}
- QString displayName() const
+ QString displayName() const Q_DECL_OVERRIDE
{
return i18n("Chiasmus command line tool");
}
- KeyListJob *keyListJob(bool, bool, bool) const
+ KeyListJob *keyListJob(bool, bool, bool) const Q_DECL_OVERRIDE
{
return 0;
}
- ListAllKeysJob *listAllKeysJob(bool, bool) const
+ ListAllKeysJob *listAllKeysJob(bool, bool) const Q_DECL_OVERRIDE
{
return 0;
}
- EncryptJob *encryptJob(bool, bool) const
+ EncryptJob *encryptJob(bool, bool) const Q_DECL_OVERRIDE
{
return 0;
}
- DecryptJob *decryptJob() const
+ DecryptJob *decryptJob() const Q_DECL_OVERRIDE
{
return 0;
}
- SignJob *signJob(bool, bool) const
+ SignJob *signJob(bool, bool) const Q_DECL_OVERRIDE
{
return 0;
}
- VerifyDetachedJob *verifyDetachedJob(bool) const
+ VerifyDetachedJob *verifyDetachedJob(bool) const Q_DECL_OVERRIDE
{
return 0;
}
- VerifyOpaqueJob *verifyOpaqueJob(bool) const
+ VerifyOpaqueJob *verifyOpaqueJob(bool) const Q_DECL_OVERRIDE
{
return 0;
}
- KeyGenerationJob *keyGenerationJob() const
+ KeyGenerationJob *keyGenerationJob() const Q_DECL_OVERRIDE
{
return 0;
}
- ImportFromKeyserverJob *importFromKeyserverJob() const
+ ImportFromKeyserverJob *importFromKeyserverJob() const Q_DECL_OVERRIDE
{
return 0;
}
- ImportJob *importJob() const
+ ImportJob *importJob() const Q_DECL_OVERRIDE
{
return 0;
}
- ExportJob *publicKeyExportJob(bool) const
+ ExportJob *publicKeyExportJob(bool) const Q_DECL_OVERRIDE
{
return 0;
}
- ExportJob *secretKeyExportJob(bool, const QString &) const
+ ExportJob *secretKeyExportJob(bool, const QString &) const Q_DECL_OVERRIDE
{
return 0;
}
- DownloadJob *downloadJob(bool) const
+ DownloadJob *downloadJob(bool) const Q_DECL_OVERRIDE
{
return 0;
}
- DeleteJob *deleteJob() const
+ DeleteJob *deleteJob() const Q_DECL_OVERRIDE
{
return 0;
}
- SignEncryptJob *signEncryptJob(bool, bool) const
+ SignEncryptJob *signEncryptJob(bool, bool) const Q_DECL_OVERRIDE
{
return 0;
}
- DecryptVerifyJob *decryptVerifyJob(bool) const
+ DecryptVerifyJob *decryptVerifyJob(bool) const Q_DECL_OVERRIDE
{
return 0;
}
- RefreshKeysJob *refreshKeysJob() const
+ RefreshKeysJob *refreshKeysJob() const Q_DECL_OVERRIDE
{
return 0;
}
- SpecialJob *specialJob(const char *type, const QMap<QString, QVariant> &args) const
+ SpecialJob *specialJob(const char *type, const QMap<QString, QVariant> &args) const Q_DECL_OVERRIDE
{
if (qstricmp(type, "x-obtain-keys") == 0 && args.size() == 0) {
return new ObtainKeysJob();
diff --git a/libkleo/backends/chiasmus/chiasmusbackend.h b/libkleo/backends/chiasmus/chiasmusbackend.h
index c9597a2..06fa38e 100644
--- a/libkleo/backends/chiasmus/chiasmusbackend.h
+++ b/libkleo/backends/chiasmus/chiasmusbackend.h
@@ -55,37 +55,37 @@ public:
return self;
}
- QString name() const;
- QString displayName() const;
+ QString name() const Q_DECL_OVERRIDE;
+ QString displayName() const Q_DECL_OVERRIDE;
- Kleo::CryptoConfig *config() const;
+ Kleo::CryptoConfig *config() const Q_DECL_OVERRIDE;
- Kleo::CryptoBackend::Protocol *openpgp() const
+ Kleo::CryptoBackend::Protocol *openpgp() const Q_DECL_OVERRIDE
{
return 0;
}
- Kleo::CryptoBackend::Protocol *smime() const
+ Kleo::CryptoBackend::Protocol *smime() const Q_DECL_OVERRIDE
{
return 0;
}
- Kleo::CryptoBackend::Protocol *protocol(const char *name) const;
+ Kleo::CryptoBackend::Protocol *protocol(const char *name) const Q_DECL_OVERRIDE;
- bool checkForOpenPGP(QString *reason = Q_NULLPTR) const;
- bool checkForSMIME(QString *reason = Q_NULLPTR) const;
+ bool checkForOpenPGP(QString *reason = Q_NULLPTR) const Q_DECL_OVERRIDE;
+ bool checkForSMIME(QString *reason = Q_NULLPTR) const Q_DECL_OVERRIDE;
bool checkForChiasmus(QString *reason = Q_NULLPTR) const;
- bool checkForProtocol(const char *name, QString *reason = Q_NULLPTR) const;
+ bool checkForProtocol(const char *name, QString *reason = Q_NULLPTR) const Q_DECL_OVERRIDE;
- bool supportsOpenPGP() const
+ bool supportsOpenPGP() const Q_DECL_OVERRIDE
{
return false;
}
- bool supportsSMIME() const
+ bool supportsSMIME() const Q_DECL_OVERRIDE
{
return false;
}
- bool supportsProtocol(const char *name) const;
+ bool supportsProtocol(const char *name) const Q_DECL_OVERRIDE;
- const char *enumerateProtocols(int i) const;
+ const char *enumerateProtocols(int i) const Q_DECL_OVERRIDE;
private:
class CryptoConfig;
diff --git a/libkleo/backends/chiasmus/chiasmusjob.h b/libkleo/backends/chiasmus/chiasmusjob.h
index 697acaa..5aa54ad 100644
--- a/libkleo/backends/chiasmus/chiasmusjob.h
+++ b/libkleo/backends/chiasmus/chiasmusjob.h
@@ -62,12 +62,12 @@ public:
~ChiasmusJob();
/*!\reimp SpecialJob */
- GpgME::Error start();
+ GpgME::Error start() Q_DECL_OVERRIDE;
/*!\reimp SpecialJob */
- GpgME::Error exec();
+ GpgME::Error exec() Q_DECL_OVERRIDE;
/*!\reimp Kleo::Job */
- void showErrorDialog(QWidget *, const QString &) const;
+ void showErrorDialog(QWidget *, const QString &) const Q_DECL_OVERRIDE;
Mode mode() const
{
@@ -108,7 +108,7 @@ public:
}
public Q_SLOTS:
- void slotCancel();
+ void slotCancel() Q_DECL_OVERRIDE;
private Q_SLOTS:
GpgME::Error finished();
diff --git a/libkleo/backends/chiasmus/obtainkeysjob.h b/libkleo/backends/chiasmus/obtainkeysjob.h
index 658919c..c31f73d 100644
--- a/libkleo/backends/chiasmus/obtainkeysjob.h
+++ b/libkleo/backends/chiasmus/obtainkeysjob.h
@@ -71,12 +71,12 @@ public:
~ObtainKeysJob();
/*!\reimp SpecialJob */
- GpgME::Error start();
+ GpgME::Error start() Q_DECL_OVERRIDE;
/*!\reimp SpecialJob */
- GpgME::Error exec();
+ GpgME::Error exec() Q_DECL_OVERRIDE;
/*!\reimp Kleo::Job */
- void showErrorDialog(QWidget *, const QString &) const;
+ void showErrorDialog(QWidget *, const QString &) const Q_DECL_OVERRIDE;
//using SpecialJob::result;
QStringList result() const
@@ -85,7 +85,7 @@ public:
}
public Q_SLOTS:
- void slotCancel();
+ void slotCancel() Q_DECL_OVERRIDE;
private Q_SLOTS:
void slotPerform();
diff --git a/libkleo/backends/qgpgme/qgpgmeadduseridjob.h b/libkleo/backends/qgpgme/qgpgmeadduseridjob.h
index 58e9e14..8068661 100644
--- a/libkleo/backends/qgpgme/qgpgmeadduseridjob.h
+++ b/libkleo/backends/qgpgme/qgpgmeadduseridjob.h
@@ -57,7 +57,7 @@ public:
~QGpgMEAddUserIDJob();
/*! \reimp from AddUserIDJob */
- GpgME::Error start(const GpgME::Key &key, const QString &name, const QString &email, const QString &comment);
+ GpgME::Error start(const GpgME::Key &key, const QString &name, const QString &email, const QString &comment) Q_DECL_OVERRIDE;
};
}
diff --git a/libkleo/backends/qgpgme/qgpgmebackend.cpp b/libkleo/backends/qgpgme/qgpgmebackend.cpp
index 88a0999..02d451b 100644
--- a/libkleo/backends/qgpgme/qgpgmebackend.cpp
+++ b/libkleo/backends/qgpgme/qgpgmebackend.cpp
@@ -75,7 +75,7 @@ class Protocol : public Kleo::CryptoBackend::Protocol
public:
explicit Protocol(GpgME::Protocol proto) : mProtocol(proto) {}
- QString name() const
+ QString name() const Q_DECL_OVERRIDE
{
switch (mProtocol) {
case GpgME::OpenPGP: return QStringLiteral("OpenPGP");
@@ -84,7 +84,7 @@ public:
}
}
- QString displayName() const
+ QString displayName() const Q_DECL_OVERRIDE
{
switch (mProtocol) {
case GpgME::OpenPGP: return QStringLiteral("gpg");
@@ -93,12 +93,12 @@ public:
}
}
- Kleo::SpecialJob *specialJob(const char *, const QMap<QString, QVariant> &) const
+ Kleo::SpecialJob *specialJob(const char *, const QMap<QString, QVariant> &) const Q_DECL_OVERRIDE
{
return 0;
}
- Kleo::KeyListJob *keyListJob(bool remote, bool includeSigs, bool validate) const
+ Kleo::KeyListJob *keyListJob(bool remote, bool includeSigs, bool validate) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -123,7 +123,7 @@ public:
return new Kleo::QGpgMEKeyListJob(context);
}
- Kleo::ListAllKeysJob *listAllKeysJob(bool includeSigs, bool validate) const
+ Kleo::ListAllKeysJob *listAllKeysJob(bool includeSigs, bool validate) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -143,7 +143,7 @@ public:
return new Kleo::QGpgMEListAllKeysJob(context);
}
- Kleo::EncryptJob *encryptJob(bool armor, bool textmode) const
+ Kleo::EncryptJob *encryptJob(bool armor, bool textmode) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -155,7 +155,7 @@ public:
return new Kleo::QGpgMEEncryptJob(context);
}
- Kleo::DecryptJob *decryptJob() const
+ Kleo::DecryptJob *decryptJob() const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -164,7 +164,7 @@ public:
return new Kleo::QGpgMEDecryptJob(context);
}
- Kleo::SignJob *signJob(bool armor, bool textMode) const
+ Kleo::SignJob *signJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -176,7 +176,7 @@ public:
return new Kleo::QGpgMESignJob(context);
}
- Kleo::VerifyDetachedJob *verifyDetachedJob(bool textMode) const
+ Kleo::VerifyDetachedJob *verifyDetachedJob(bool textMode) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -187,7 +187,7 @@ public:
return new Kleo::QGpgMEVerifyDetachedJob(context);
}
- Kleo::VerifyOpaqueJob *verifyOpaqueJob(bool textMode) const
+ Kleo::VerifyOpaqueJob *verifyOpaqueJob(bool textMode) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -198,7 +198,7 @@ public:
return new Kleo::QGpgMEVerifyOpaqueJob(context);
}
- Kleo::KeyGenerationJob *keyGenerationJob() const
+ Kleo::KeyGenerationJob *keyGenerationJob() const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -207,7 +207,7 @@ public:
return new Kleo::QGpgMEKeyGenerationJob(context);
}
- Kleo::ImportJob *importJob() const
+ Kleo::ImportJob *importJob() const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -216,7 +216,7 @@ public:
return new Kleo::QGpgMEImportJob(context);
}
- Kleo::ImportFromKeyserverJob *importFromKeyserverJob() const
+ Kleo::ImportFromKeyserverJob *importFromKeyserverJob() const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -225,7 +225,7 @@ public:
return new Kleo::QGpgMEImportFromKeyserverJob(context);
}
- Kleo::ExportJob *publicKeyExportJob(bool armor) const
+ Kleo::ExportJob *publicKeyExportJob(bool armor) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -236,7 +236,7 @@ public:
return new Kleo::QGpgMEExportJob(context);
}
- Kleo::ExportJob *secretKeyExportJob(bool armor, const QString &charset) const
+ Kleo::ExportJob *secretKeyExportJob(bool armor, const QString &charset) const Q_DECL_OVERRIDE
{
if (mProtocol != GpgME::CMS) { // fixme: add support for gpg, too
return 0;
@@ -246,7 +246,7 @@ public:
return new Kleo::QGpgMESecretKeyExportJob(armor, charset);
}
- Kleo::RefreshKeysJob *refreshKeysJob() const
+ Kleo::RefreshKeysJob *refreshKeysJob() const Q_DECL_OVERRIDE
{
if (mProtocol != GpgME::CMS) { // fixme: add support for gpg, too
return 0;
@@ -256,7 +256,7 @@ public:
return new Kleo::QGpgMERefreshKeysJob();
}
- Kleo::DownloadJob *downloadJob(bool armor) const
+ Kleo::DownloadJob *downloadJob(bool armor) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -269,7 +269,7 @@ public:
return new Kleo::QGpgMEDownloadJob(context);
}
- Kleo::DeleteJob *deleteJob() const
+ Kleo::DeleteJob *deleteJob() const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -278,7 +278,7 @@ public:
return new Kleo::QGpgMEDeleteJob(context);
}
- Kleo::SignEncryptJob *signEncryptJob(bool armor, bool textMode) const
+ Kleo::SignEncryptJob *signEncryptJob(bool armor, bool textMode) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -290,7 +290,7 @@ public:
return new Kleo::QGpgMESignEncryptJob(context);
}
- Kleo::DecryptVerifyJob *decryptVerifyJob(bool textMode) const
+ Kleo::DecryptVerifyJob *decryptVerifyJob(bool textMode) const Q_DECL_OVERRIDE
{
GpgME::Context *context = GpgME::Context::createForProtocol(mProtocol);
if (!context) {
@@ -301,7 +301,7 @@ public:
return new Kleo::QGpgMEDecryptVerifyJob(context);
}
- Kleo::ChangeExpiryJob *changeExpiryJob() const
+ Kleo::ChangeExpiryJob *changeExpiryJob() const Q_DECL_OVERRIDE
{
if (mProtocol != GpgME::OpenPGP) {
return 0; // only supported by gpg
@@ -314,7 +314,7 @@ public:
return new Kleo::QGpgMEChangeExpiryJob(context);
}
- Kleo::ChangePasswdJob *changePasswdJob() const
+ Kleo::ChangePasswdJob *changePasswdJob() const Q_DECL_OVERRIDE
{
if (!GpgME::hasFeature(GpgME::PasswdFeature, 0)) {
return 0;
@@ -326,7 +326,7 @@ public:
return new Kleo::QGpgMEChangePasswdJob(context);
}
- Kleo::SignKeyJob *signKeyJob() const
+ Kleo::SignKeyJob *signKeyJob() const Q_DECL_OVERRIDE
{
if (mProtocol != GpgME::OpenPGP) {
return 0; // only supported by gpg
@@ -339,7 +339,7 @@ public:
return new Kleo::QGpgMESignKeyJob(context);
}
- Kleo::ChangeOwnerTrustJob *changeOwnerTrustJob() const
+ Kleo::ChangeOwnerTrustJob *changeOwnerTrustJob() const Q_DECL_OVERRIDE
{
if (mProtocol != GpgME::OpenPGP) {
return 0; // only supported by gpg
@@ -352,7 +352,7 @@ public:
return new Kleo::QGpgMEChangeOwnerTrustJob(context);
}
- Kleo::AddUserIDJob *addUserIDJob() const
+ Kleo::AddUserIDJob *addUserIDJob() const Q_DECL_OVERRIDE
{
if (mProtocol != GpgME::OpenPGP) {
return 0; // only supported by gpg
diff --git a/libkleo/backends/qgpgme/qgpgmebackend.h b/libkleo/backends/qgpgme/qgpgmebackend.h
index 80e1171..f7639e1 100644
--- a/libkleo/backends/qgpgme/qgpgmebackend.h
+++ b/libkleo/backends/qgpgme/qgpgmebackend.h
@@ -50,30 +50,30 @@ public:
QGpgMEBackend();
~QGpgMEBackend();
- QString name() const;
- QString displayName() const;
+ QString name() const Q_DECL_OVERRIDE;
+ QString displayName() const Q_DECL_OVERRIDE;
- CryptoConfig *config() const;
+ CryptoConfig *config() const Q_DECL_OVERRIDE;
- Protocol *openpgp() const;
- Protocol *smime() const;
- Protocol *protocol(const char *name) const;
+ Protocol *openpgp() const Q_DECL_OVERRIDE;
+ Protocol *smime() const Q_DECL_OVERRIDE;
+ Protocol *protocol(const char *name) const Q_DECL_OVERRIDE;
- bool checkForOpenPGP(QString *reason = Q_NULLPTR) const;
- bool checkForSMIME(QString *reason = Q_NULLPTR) const;
- bool checkForProtocol(const char *name, QString *reason) const;
+ bool checkForOpenPGP(QString *reason = Q_NULLPTR) const Q_DECL_OVERRIDE;
+ bool checkForSMIME(QString *reason = Q_NULLPTR) const Q_DECL_OVERRIDE;
+ bool checkForProtocol(const char *name, QString *reason) const Q_DECL_OVERRIDE;
- bool supportsOpenPGP() const
+ bool supportsOpenPGP() const Q_DECL_OVERRIDE
{
return true;
}
- bool supportsSMIME() const
+ bool supportsSMIME() const Q_DECL_OVERRIDE
{
return true;
}
- bool supportsProtocol(const char *name) const;
+ bool supportsProtocol(const char *name) const Q_DECL_OVERRIDE;
- const char *enumerateProtocols(int i) const;
+ const char *enumerateProtocols(int i) const Q_DECL_OVERRIDE;
private:
mutable Kleo::CryptoConfig *mCryptoConfig;
diff --git a/libkleo/backends/qgpgme/qgpgmechangeexpiryjob.h b/libkleo/backends/qgpgme/qgpgmechangeexpiryjob.h
index cb877fc..e4d84c5 100644
--- a/libkleo/backends/qgpgme/qgpgmechangeexpiryjob.h
+++ b/libkleo/backends/qgpgme/qgpgmechangeexpiryjob.h
@@ -57,7 +57,7 @@ public:
~QGpgMEChangeExpiryJob();
/*! \reimp from ChangeExpiryJob */
- GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry);
+ GpgME::Error start(const GpgME::Key &key, const QDateTime &expiry) Q_DECL_OVERRIDE;
};
}
diff --git a/libkleo/backends/qgpgme/qgpgmechangeownertrustjob.h b/libkleo/backends/qgpgme/qgpgmechangeownertrustjob.h
index 7ffff48..a74f5e3 100644
--- a/libkleo/backends/qgpgme/qgpgmechangeownertrustjob.h
+++ b/libkleo/backends/qgpgme/qgpgmechangeownertrustjob.h
@@ -57,7 +57,7 @@ public:
~QGpgMEChangeOwnerTrustJob();
/*! \reimp from ChangeOwnerTrustJob */
- GpgME::Error start(const GpgME::Key &key, GpgME::Key::OwnerTrust trust);
+ GpgME::Error start(const GpgME::Key &key, GpgME::Key::OwnerTrust trust) Q_DECL_OVERRIDE;
};
}
diff --git a/libkleo/backends/qgpgme/qgpgmechangepasswdjob.h b/libkleo/backends/qgpgme/qgpgmechangepasswdjob.h
index fcd648d..ea1a357 100644
--- a/libkleo/backends/qgpgme/qgpgmechangepasswdjob.h
+++ b/libkleo/backends/qgpgme/qgpgmechangepasswdjob.h
@@ -57,7 +57,7 @@ public:
~QGpgMEChangePasswdJob();
/*! \reimp from ChangePasswdJob */
- GpgME::Error start(const GpgME::Key &key);
+ GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
};
}
diff --git a/libkleo/backends/qgpgme/qgpgmecryptoconfig.h b/libkleo/backends/qgpgme/qgpgmecryptoconfig.h
index 188ef0b..44fba35 100644
--- a/libkleo/backends/qgpgme/qgpgmecryptoconfig.h
+++ b/libkleo/backends/qgpgme/qgpgmecryptoconfig.h
@@ -64,9 +64,9 @@ public:
QGpgMECryptoConfig();
virtual ~QGpgMECryptoConfig();
- virtual QStringList componentList() const;
+ QStringList componentList() const Q_DECL_OVERRIDE;
- virtual Kleo::CryptoConfigComponent *component(const QString &name) const;
+ Kleo::CryptoConfigComponent *component(const QString &name) const Q_DECL_OVERRIDE;
void clear() Q_DECL_OVERRIDE;
void sync(bool runtime) Q_DECL_OVERRIDE;
@@ -94,20 +94,20 @@ public:
QGpgMECryptoConfigComponent(QGpgMECryptoConfig *, const QString &name, const QString &description);
~QGpgMECryptoConfigComponent();
- QString name() const
+ QString name() const Q_DECL_OVERRIDE
{
return mName;
}
- QString iconName() const
+ QString iconName() const Q_DECL_OVERRIDE
{
return mName;
}
- QString description() const
+ QString description() const Q_DECL_OVERRIDE
{
return mDescription;
}
- QStringList groupList() const;
- Kleo::CryptoConfigGroup *group(const QString &name) const;
+ QStringList groupList() const Q_DECL_OVERRIDE;
+ Kleo::CryptoConfigGroup *group(const QString &name) const Q_DECL_OVERRIDE;
void sync(bool runtime);
@@ -132,28 +132,28 @@ public:
QGpgMECryptoConfigGroup(QGpgMECryptoConfigComponent *comp, const QString &name, const QString &description, int level);
~QGpgMECryptoConfigGroup();
- QString name() const
+ QString name() const Q_DECL_OVERRIDE
{
return mName;
}
- QString iconName() const
+ QString iconName() const Q_DECL_OVERRIDE
{
return QString();
}
- QString description() const
+ QString description() const Q_DECL_OVERRIDE
{
return mDescription;
}
- QString path() const
+ QString path() const Q_DECL_OVERRIDE
{
return mComponent->name() + QLatin1Char('/') + mName ;
}
- Kleo::CryptoConfigEntry::Level level() const
+ Kleo::CryptoConfigEntry::Level level() const Q_DECL_OVERRIDE
{
return mLevel;
}
- QStringList entryList() const;
- Kleo::CryptoConfigEntry *entry(const QString &name) const;
+ QStringList entryList() const Q_DECL_OVERRIDE;
+ Kleo::CryptoConfigEntry *entry(const QString &name) const Q_DECL_OVERRIDE;
private:
friend class QGpgMECryptoConfigComponent; // it adds the entries
@@ -171,53 +171,53 @@ public:
QGpgMECryptoConfigEntry(QGpgMECryptoConfigGroup *group, const QStringList &parsedLine);
~QGpgMECryptoConfigEntry();
- QString name() const
+ QString name() const Q_DECL_OVERRIDE
{
return mName;
}
- QString description() const
+ QString description() const Q_DECL_OVERRIDE
{
return mDescription;
}
- QString path() const
+ QString path() const Q_DECL_OVERRIDE
{
return mGroup->path() + QLatin1Char('/') + mName ;
}
- bool isOptional() const;
- bool isReadOnly() const;
- bool isList() const;
- bool isRuntime() const;
- Level level() const
+ bool isOptional() const Q_DECL_OVERRIDE;
+ bool isReadOnly() const Q_DECL_OVERRIDE;
+ bool isList() const Q_DECL_OVERRIDE;
+ bool isRuntime() const Q_DECL_OVERRIDE;
+ Level level() const Q_DECL_OVERRIDE
{
return static_cast<Level>(mLevel);
}
- ArgType argType() const
+ ArgType argType() const Q_DECL_OVERRIDE
{
return static_cast<ArgType>(mArgType);
}
- bool isSet() const;
- bool boolValue() const;
- QString stringValue() const;
- int intValue() const;
- unsigned int uintValue() const;
- KUrl urlValue() const;
- unsigned int numberOfTimesSet() const;
- QStringList stringValueList() const;
- std::vector<int> intValueList() const;
- std::vector<unsigned int> uintValueList() const;
- KUrl::List urlValueList() const;
- void resetToDefault();
- void setBoolValue(bool);
- void setStringValue(const QString &);
- void setIntValue(int);
- void setUIntValue(unsigned int);
- void setURLValue(const KUrl &);
- void setNumberOfTimesSet(unsigned int);
- void setStringValueList(const QStringList &);
- void setIntValueList(const std::vector<int> &);
- void setUIntValueList(const std::vector<unsigned int> &);
- void setURLValueList(const KUrl::List &);
- bool isDirty() const
+ bool isSet() const Q_DECL_OVERRIDE;
+ bool boolValue() const Q_DECL_OVERRIDE;
+ QString stringValue() const Q_DECL_OVERRIDE;
+ int intValue() const Q_DECL_OVERRIDE;
+ unsigned int uintValue() const Q_DECL_OVERRIDE;
+ KUrl urlValue() const Q_DECL_OVERRIDE;
+ unsigned int numberOfTimesSet() const Q_DECL_OVERRIDE;
+ QStringList stringValueList() const Q_DECL_OVERRIDE;
+ std::vector<int> intValueList() const Q_DECL_OVERRIDE;
+ std::vector<unsigned int> uintValueList() const Q_DECL_OVERRIDE;
+ KUrl::List urlValueList() const Q_DECL_OVERRIDE;
+ void resetToDefault() Q_DECL_OVERRIDE;
+ void setBoolValue(bool) Q_DECL_OVERRIDE;
+ void setStringValue(const QString &) Q_DECL_OVERRIDE;
+ void setIntValue(int) Q_DECL_OVERRIDE;
+ void setUIntValue(unsigned int) Q_DECL_OVERRIDE;
+ void setURLValue(const KUrl &) Q_DECL_OVERRIDE;
+ void setNumberOfTimesSet(unsigned int) Q_DECL_OVERRIDE;
+ void setStringValueList(const QStringList &) Q_DECL_OVERRIDE;
+ void setIntValueList(const std::vector<int> &) Q_DECL_OVERRIDE;
+ void setUIntValueList(const std::vector<unsigned int> &) Q_DECL_OVERRIDE;
+ void setURLValueList(const KUrl::List &) Q_DECL_OVERRIDE;
+ bool isDirty() const Q_DECL_OVERRIDE
{
return mDirty;
}
diff --git a/libkleo/backends/qgpgme/qgpgmedecryptjob.h b/libkleo/backends/qgpgme/qgpgmedecryptjob.h
index 1e54efb..d796f3d 100644
--- a/libkleo/backends/qgpgme/qgpgmedecryptjob.h
+++ b/libkleo/backends/qgpgme/qgpgmedecryptjob.h
@@ -59,17 +59,17 @@ public:
~QGpgMEDecryptJob();
/*! \reimp from DecryptJob */
- GpgME::Error start(const QByteArray &cipherText);
+ GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
/*! \reimp from DecryptJob */
- void start(const boost::shared_ptr<QIODevice> &cipherText, const boost::shared_ptr<QIODevice> &plainText);
+ void start(const boost::shared_ptr<QIODevice> &cipherText, const boost::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
/*! \reimp from DecryptJob */
GpgME::DecryptionResult exec(const QByteArray &cipherText,
- QByteArray &plainText);
+ QByteArray &plainText) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &r);
+ void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
GpgME::DecryptionResult mResult;
diff --git a/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.h b/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.h
index 2350ad8..b7261d4 100644
--- a/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.h
+++ b/libkleo/backends/qgpgme/qgpgmedecryptverifyjob.h
@@ -60,17 +60,17 @@ public:
~QGpgMEDecryptVerifyJob();
/*! \reimp from DecryptVerifyJob */
- GpgME::Error start(const QByteArray &cipherText);
+ GpgME::Error start(const QByteArray &cipherText) Q_DECL_OVERRIDE;
/*! \reimp from DecryptVerifyJob */
- void start(const boost::shared_ptr<QIODevice> &cipherText, const boost::shared_ptr<QIODevice> &plainText);
+ void start(const boost::shared_ptr<QIODevice> &cipherText, const boost::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
/*! \reimp from DecryptVerifyJob */
std::pair<GpgME::DecryptionResult, GpgME::VerificationResult>
- exec(const QByteArray &cipherText, QByteArray &plainText);
+ exec(const QByteArray &cipherText, QByteArray &plainText) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &r);
+ void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
std::pair<GpgME::DecryptionResult, GpgME::VerificationResult> mResult;
diff --git a/libkleo/backends/qgpgme/qgpgmedeletejob.h b/libkleo/backends/qgpgme/qgpgmedeletejob.h
index 6611448..94db409 100644
--- a/libkleo/backends/qgpgme/qgpgmedeletejob.h
+++ b/libkleo/backends/qgpgme/qgpgmedeletejob.h
@@ -62,7 +62,7 @@ public:
~QGpgMEDeleteJob();
/*! \reimp from DeleteJob */
- GpgME::Error start(const GpgME::Key &key, bool allowSecretKeyDeletion);
+ GpgME::Error start(const GpgME::Key &key, bool allowSecretKeyDeletion) Q_DECL_OVERRIDE;
};
}
diff --git a/libkleo/backends/qgpgme/qgpgmedownloadjob.h b/libkleo/backends/qgpgme/qgpgmedownloadjob.h
index bf5eee3..2e7d971 100644
--- a/libkleo/backends/qgpgme/qgpgmedownloadjob.h
+++ b/libkleo/backends/qgpgme/qgpgmedownloadjob.h
@@ -57,10 +57,10 @@ public:
~QGpgMEDownloadJob();
/*! \reimp from DownloadJob */
- GpgME::Error start(const QStringList &fingerprints);
+ GpgME::Error start(const QStringList &fingerprints) Q_DECL_OVERRIDE;
/*! \reimp from DownloadJob */
- GpgME::Error start(const QByteArray &fingerprint, const boost::shared_ptr<QIODevice> &keyData);
+ GpgME::Error start(const QByteArray &fingerprint, const boost::shared_ptr<QIODevice> &keyData) Q_DECL_OVERRIDE;
};
}
diff --git a/libkleo/backends/qgpgme/qgpgmeencryptjob.h b/libkleo/backends/qgpgme/qgpgmeencryptjob.h
index b14efb1..d3da6d1 100644
--- a/libkleo/backends/qgpgme/qgpgmeencryptjob.h
+++ b/libkleo/backends/qgpgme/qgpgmeencryptjob.h
@@ -61,27 +61,27 @@ public:
/*! \reimp from EncryptJob */
GpgME::Error start(const std::vector<GpgME::Key> &recipients,
- const QByteArray &plainText, bool alwaysTrust);
+ const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
/*! \reimp from EncryptJob */
void start(const std::vector<GpgME::Key> &recipients,
const boost::shared_ptr<QIODevice> &plainText,
const boost::shared_ptr<QIODevice> &cipherText,
- bool alwaysTrust);
+ bool alwaysTrust) Q_DECL_OVERRIDE;
/*! \reimp from EncryptJob */
GpgME::EncryptionResult exec(const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust,
- QByteArray &cipherText);
+ QByteArray &cipherText) Q_DECL_OVERRIDE;
/*! \reimp from Job */
- void showErrorDialog(QWidget *parent, const QString &caption) const;
+ void showErrorDialog(QWidget *parent, const QString &caption) const Q_DECL_OVERRIDE;
/*! \reimp from EncryptJob */
- void setOutputIsBase64Encoded(bool on);
+ void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &r);
+ void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
bool mOutputIsBase64Encoded;
diff --git a/libkleo/backends/qgpgme/qgpgmeexportjob.h b/libkleo/backends/qgpgme/qgpgmeexportjob.h
index dbcb088..31b89e7 100644
--- a/libkleo/backends/qgpgme/qgpgmeexportjob.h
+++ b/libkleo/backends/qgpgme/qgpgmeexportjob.h
@@ -57,7 +57,7 @@ public:
~QGpgMEExportJob();
/*! \reimp from ExportJob */
- GpgME::Error start(const QStringList &patterns);
+ GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
};
}
diff --git a/libkleo/backends/qgpgme/qgpgmeimportfromkeyserverjob.h b/libkleo/backends/qgpgme/qgpgmeimportfromkeyserverjob.h
index 073092d..49d812e 100644
--- a/libkleo/backends/qgpgme/qgpgmeimportfromkeyserverjob.h
+++ b/libkleo/backends/qgpgme/qgpgmeimportfromkeyserverjob.h
@@ -59,13 +59,13 @@ public:
~QGpgMEImportFromKeyserverJob();
/*! \reimp from ImportFromKeyserverJob */
- GpgME::Error start(const std::vector<GpgME::Key> &keys);
+ GpgME::Error start(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
/*! \reimp from ImportFromKeyserverJob */
- GpgME::ImportResult exec(const std::vector<GpgME::Key> &keys);
+ GpgME::ImportResult exec(const std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &r);
+ void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
GpgME::ImportResult mResult;
diff --git a/libkleo/backends/qgpgme/qgpgmeimportjob.h b/libkleo/backends/qgpgme/qgpgmeimportjob.h
index 0ce467e..f6f3b05 100644
--- a/libkleo/backends/qgpgme/qgpgmeimportjob.h
+++ b/libkleo/backends/qgpgme/qgpgmeimportjob.h
@@ -59,13 +59,13 @@ public:
~QGpgMEImportJob();
/*! \reimp from ImportJob */
- GpgME::Error start(const QByteArray &keyData);
+ GpgME::Error start(const QByteArray &keyData) Q_DECL_OVERRIDE;
/*! \reimp from ImportJob */
- GpgME::ImportResult exec(const QByteArray &keyData);
+ GpgME::ImportResult exec(const QByteArray &keyData) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &r);
+ void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
GpgME::ImportResult mResult;
diff --git a/libkleo/backends/qgpgme/qgpgmekeygenerationjob.h b/libkleo/backends/qgpgme/qgpgmekeygenerationjob.h
index 115246d..987861b 100644
--- a/libkleo/backends/qgpgme/qgpgmekeygenerationjob.h
+++ b/libkleo/backends/qgpgme/qgpgmekeygenerationjob.h
@@ -59,7 +59,7 @@ public:
~QGpgMEKeyGenerationJob();
/*! \reimp from KeygenerationJob */
- GpgME::Error start(const QString &parameters);
+ GpgME::Error start(const QString &parameters) Q_DECL_OVERRIDE;
};
}
diff --git a/libkleo/backends/qgpgme/qgpgmekeylistjob.h b/libkleo/backends/qgpgme/qgpgmekeylistjob.h
index 61f00db..8e28859 100644
--- a/libkleo/backends/qgpgme/qgpgmekeylistjob.h
+++ b/libkleo/backends/qgpgme/qgpgmekeylistjob.h
@@ -60,16 +60,16 @@ public:
~QGpgMEKeyListJob();
/*! \reimp from KeyListJob */
- GpgME::Error start(const QStringList &patterns, bool secretOnly);
+ GpgME::Error start(const QStringList &patterns, bool secretOnly) Q_DECL_OVERRIDE;
/*! \reimp from KeyListJob */
- GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, std::vector<GpgME::Key> &keys);
+ GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly, std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
/*! \reimp from Job */
- void showErrorDialog(QWidget *parent, const QString &caption) const;
+ void showErrorDialog(QWidget *parent, const QString &caption) const Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &result);
+ void resultHook(const result_type &result) Q_DECL_OVERRIDE;
private:
GpgME::KeyListResult mResult;
diff --git a/libkleo/backends/qgpgme/qgpgmelistallkeysjob.h b/libkleo/backends/qgpgme/qgpgmelistallkeysjob.h
index b427a79..8efcecf 100644
--- a/libkleo/backends/qgpgme/qgpgmelistallkeysjob.h
+++ b/libkleo/backends/qgpgme/qgpgmelistallkeysjob.h
@@ -60,16 +60,16 @@ public:
~QGpgMEListAllKeysJob();
/*! \reimp from ListAllKeysJob */
- GpgME::Error start(bool mergeKeys);
+ GpgME::Error start(bool mergeKeys) Q_DECL_OVERRIDE;
/*! \reimp from ListAllKeysJob */
- GpgME::KeyListResult exec(std::vector<GpgME::Key> &pub, std::vector<GpgME::Key> &sec, bool mergeKeys);
+ GpgME::KeyListResult exec(std::vector<GpgME::Key> &pub, std::vector<GpgME::Key> &sec, bool mergeKeys) Q_DECL_OVERRIDE;
/*! \reimp from Job */
- void showErrorDialog(QWidget *parent, const QString &caption) const;
+ void showErrorDialog(QWidget *parent, const QString &caption) const Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &result);
+ void resultHook(const result_type &result) Q_DECL_OVERRIDE;
private:
GpgME::KeyListResult mResult;
diff --git a/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.h b/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.h
index 6551a93..8725346 100644
--- a/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.h
+++ b/libkleo/backends/qgpgme/qgpgmerefreshkeysjob.h
@@ -55,11 +55,11 @@ public:
~QGpgMERefreshKeysJob();
/*! \reimp from RefreshKeysJob */
- GpgME::Error start(const QStringList &patterns);
+ GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
private Q_SLOTS:
/*! \reimp from Job */
- void slotCancel();
+ void slotCancel() Q_DECL_OVERRIDE;
void slotStatus(Kleo::GnuPGProcessBase *, const QString &, const QStringList &);
void slotStderr();
diff --git a/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.h b/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.h
index f631232..e41a2bf 100644
--- a/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.h
+++ b/libkleo/backends/qgpgme/qgpgmesecretkeyexportjob.h
@@ -58,11 +58,11 @@ public:
~QGpgMESecretKeyExportJob();
/*! \reimp from ExportJob */
- GpgME::Error start(const QStringList &patterns);
+ GpgME::Error start(const QStringList &patterns) Q_DECL_OVERRIDE;
private Q_SLOTS:
/*! \reimp from Job */
- void slotCancel();
+ void slotCancel() Q_DECL_OVERRIDE;
void slotStatus(Kleo::GnuPGProcessBase *, const QString &, const QStringList &);
void slotStdout();
diff --git a/libkleo/backends/qgpgme/qgpgmesignencryptjob.h b/libkleo/backends/qgpgme/qgpgmesignencryptjob.h
index 640beb5..ff8ecf1 100644
--- a/libkleo/backends/qgpgme/qgpgmesignencryptjob.h
+++ b/libkleo/backends/qgpgme/qgpgmesignencryptjob.h
@@ -65,29 +65,29 @@ public:
/*! \reimp from SignEncryptJob */
GpgME::Error start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients,
- const QByteArray &plainText, bool alwaysTrust);
+ const QByteArray &plainText, bool alwaysTrust) Q_DECL_OVERRIDE;
/*! \reimp from SignEncryptJob */
void start(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients,
const boost::shared_ptr<QIODevice> &plainText,
const boost::shared_ptr<QIODevice> &cipherText,
- bool alwaysTrust);
+ bool alwaysTrust) Q_DECL_OVERRIDE;
std::pair<GpgME::SigningResult, GpgME::EncryptionResult>
exec(const std::vector<GpgME::Key> &signers,
const std::vector<GpgME::Key> &recipients,
const QByteArray &plainText, bool alwaysTrust,
- QByteArray &cipherText);
+ QByteArray &cipherText) Q_DECL_OVERRIDE;
/*! \reimp from Job */
- void showErrorDialog(QWidget *parent, const QString &caption) const;
+ void showErrorDialog(QWidget *parent, const QString &caption) const Q_DECL_OVERRIDE;
/*! \reimp from SignEncryptJob */
- void setOutputIsBase64Encoded(bool on);
+ void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &r);
+ void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
bool mOutputIsBase64Encoded;
diff --git a/libkleo/backends/qgpgme/qgpgmesignjob.h b/libkleo/backends/qgpgme/qgpgmesignjob.h
index 6a697ac..13bdd0f 100644
--- a/libkleo/backends/qgpgme/qgpgmesignjob.h
+++ b/libkleo/backends/qgpgme/qgpgmesignjob.h
@@ -62,28 +62,28 @@ public:
/*! \reimp from SignJob */
GpgME::Error start(const std::vector<GpgME::Key> &signers,
const QByteArray &plainText,
- GpgME::SignatureMode mode);
+ GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
/*! \reimp from SignJob */
void start(const std::vector<GpgME::Key> &signers,
const boost::shared_ptr<QIODevice> &plainText,
const boost::shared_ptr<QIODevice> &signature,
- GpgME::SignatureMode mode);
+ GpgME::SignatureMode mode) Q_DECL_OVERRIDE;
/*! \reimp from SignJob */
GpgME::SigningResult exec(const std::vector<GpgME::Key> &signers,
const QByteArray &plainText,
GpgME::SignatureMode mode,
- QByteArray &signature);
+ QByteArray &signature) Q_DECL_OVERRIDE;
/*! \reimp from Job */
- void showErrorDialog(QWidget *parent, const QString &caption) const;
+ void showErrorDialog(QWidget *parent, const QString &caption) const Q_DECL_OVERRIDE;
/*! \reimp from SignJob */
- void setOutputIsBase64Encoded(bool on);
+ void setOutputIsBase64Encoded(bool on) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &r);
+ void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
GpgME::SigningResult mResult;
diff --git a/libkleo/backends/qgpgme/qgpgmesignkeyjob.h b/libkleo/backends/qgpgme/qgpgmesignkeyjob.h
index b2714b6..61c957c 100644
--- a/libkleo/backends/qgpgme/qgpgmesignkeyjob.h
+++ b/libkleo/backends/qgpgme/qgpgmesignkeyjob.h
@@ -59,22 +59,22 @@ public:
~QGpgMESignKeyJob();
/*! \reimp from SignKeyJob */
- GpgME::Error start(const GpgME::Key &key);
+ GpgME::Error start(const GpgME::Key &key) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
- void setUserIDsToSign(const std::vector<unsigned int> &idsToSign);
+ void setUserIDsToSign(const std::vector<unsigned int> &idsToSign) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
- void setCheckLevel(unsigned int checkLevel);
+ void setCheckLevel(unsigned int checkLevel) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
- void setExportable(bool exportable);
+ void setExportable(bool exportable) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
- void setSigningKey(const GpgME::Key &key);
+ void setSigningKey(const GpgME::Key &key) Q_DECL_OVERRIDE;
/*! \reimp from SignKeyJob */
- void setNonRevocable(bool nonRevocable);
+ void setNonRevocable(bool nonRevocable) Q_DECL_OVERRIDE;
private:
std::vector<unsigned int> m_userIDsToSign;
diff --git a/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.h b/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.h
index 4ed4e3f..6ac8ba0 100644
--- a/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.h
+++ b/libkleo/backends/qgpgme/qgpgmeverifydetachedjob.h
@@ -59,17 +59,17 @@ public:
~QGpgMEVerifyDetachedJob();
/*! \reimp from VerifyDetachedJob */
- GpgME::Error start(const QByteArray &signature, const QByteArray &signedData);
+ GpgME::Error start(const QByteArray &signature, const QByteArray &signedData) Q_DECL_OVERRIDE;
/*! \reimp from VerifyDetachedJob */
- void start(const boost::shared_ptr<QIODevice> &signature, const boost::shared_ptr<QIODevice> &signedData);
+ void start(const boost::shared_ptr<QIODevice> &signature, const boost::shared_ptr<QIODevice> &signedData) Q_DECL_OVERRIDE;
/*! \reimp from VerifyDetachedJob */
GpgME::VerificationResult exec(const QByteArray &signature,
- const QByteArray &signedData);
+ const QByteArray &signedData) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &r);
+ void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
GpgME::VerificationResult mResult;
diff --git a/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.h b/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.h
index f11b169..3aa3aac 100644
--- a/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.h
+++ b/libkleo/backends/qgpgme/qgpgmeverifyopaquejob.h
@@ -59,16 +59,16 @@ public:
~QGpgMEVerifyOpaqueJob();
/*! \reimp from VerifyOpaqueJob */
- GpgME::Error start(const QByteArray &signedData);
+ GpgME::Error start(const QByteArray &signedData) Q_DECL_OVERRIDE;
/*! \reimp from VerifyOpaqueJob */
- void start(const boost::shared_ptr<QIODevice> &signedData, const boost::shared_ptr<QIODevice> &plainText);
+ void start(const boost::shared_ptr<QIODevice> &signedData, const boost::shared_ptr<QIODevice> &plainText) Q_DECL_OVERRIDE;
/*! \reimp form VerifyOpaqueJob */
- GpgME::VerificationResult exec(const QByteArray &signedData, QByteArray &plainData);
+ GpgME::VerificationResult exec(const QByteArray &signedData, QByteArray &plainData) Q_DECL_OVERRIDE;
/*! \reimp from ThreadedJobMixin */
- void resultHook(const result_type &r);
+ void resultHook(const result_type &r) Q_DECL_OVERRIDE;
private:
GpgME::VerificationResult mResult;
diff --git a/libkleo/kleo/hierarchicalkeylistjob.h b/libkleo/kleo/hierarchicalkeylistjob.h
index 711dfc1..1a33834 100644
--- a/libkleo/kleo/hierarchicalkeylistjob.h
+++ b/libkleo/kleo/hierarchicalkeylistjob.h
@@ -88,16 +88,16 @@ public:
The \a secretOnly parameter is ignored by
HierarchicalKeyListJob and must be set to false.
*/
- GpgME::Error start(const QStringList &patterns, bool secretOnly = false);
+ GpgME::Error start(const QStringList &patterns, bool secretOnly = false) Q_DECL_OVERRIDE;
GpgME::KeyListResult exec(const QStringList &patterns, bool secretOnly,
- std::vector<GpgME::Key> &keys);
+ std::vector<GpgME::Key> &keys) Q_DECL_OVERRIDE;
private Q_SLOTS:
void slotResult(const GpgME::KeyListResult &);
void slotNextKey(const GpgME::Key &key);
/*! \reimp from Job */
- void slotCancel();
+ void slotCancel() Q_DECL_OVERRIDE;
private:
GpgME::Error startAJob();
diff --git a/libkleo/kleo/kconfigbasedkeyfilter.h b/libkleo/kleo/kconfigbasedkeyfilter.h
index 020cd56..8e1e383 100644
--- a/libkleo/kleo/kconfigbasedkeyfilter.h
+++ b/libkleo/kleo/kconfigbasedkeyfilter.h
@@ -52,35 +52,35 @@ public:
KeyFilterImplBase();
~KeyFilterImplBase();
- bool matches(const GpgME::Key &key, MatchContexts ctx) const;
+ bool matches(const GpgME::Key &key, MatchContexts ctx) const Q_DECL_OVERRIDE;
- unsigned int specificity() const
+ unsigned int specificity() const Q_DECL_OVERRIDE
{
return mSpecificity;
}
- QString id() const
+ QString id() const Q_DECL_OVERRIDE
{
return mId;
}
- MatchContexts availableMatchContexts() const
+ MatchContexts availableMatchContexts() const Q_DECL_OVERRIDE
{
return mMatchContexts;
}
- QColor fgColor() const
+ QColor fgColor() const Q_DECL_OVERRIDE
{
return mFgColor;
}
- QColor bgColor() const
+ QColor bgColor() const Q_DECL_OVERRIDE
{
return mBgColor;
}
- FontDescription fontDesription() const;
- QString name() const
+ FontDescription fontDesription() const Q_DECL_OVERRIDE;
+ QString name() const Q_DECL_OVERRIDE
{
return mName;
}
- QString icon() const
+ QString icon() const Q_DECL_OVERRIDE
{
return mIcon;
}
diff --git a/libkleo/kleo/multideletejob.h b/libkleo/kleo/multideletejob.h
index 2506984..e8cbe4f2 100644
--- a/libkleo/kleo/multideletejob.h
+++ b/libkleo/kleo/multideletejob.h
@@ -82,7 +82,7 @@ public:
GpgME::Error start(const std::vector<GpgME::Key> &keys, bool allowSecretKeyDeletion = false);
/*! \reimp from Job */
- void slotCancel();
+ void slotCancel() Q_DECL_OVERRIDE;
Q_SIGNALS:
void result(const GpgME::Error &result, const GpgME::Key &errorKey);
diff --git a/libkleo/ui/directoryserviceswidget.cpp b/libkleo/ui/directoryserviceswidget.cpp
index 7290b1d..cb5da90 100644
--- a/libkleo/ui/directoryserviceswidget.cpp
+++ b/libkleo/ui/directoryserviceswidget.cpp
@@ -364,7 +364,7 @@ public:
}
/* reimp */
- QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &idx) const
+ QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, const QModelIndex &idx) const Q_DECL_OVERRIDE
{
switch (idx.column()) {
case Model::Scheme:
@@ -376,7 +376,7 @@ public:
}
/* reimp */
- void setEditorData(QWidget *editor, const QModelIndex &idx) const
+ void setEditorData(QWidget *editor, const QModelIndex &idx) const Q_DECL_OVERRIDE
{
switch (idx.column()) {
case Model::Scheme:
@@ -392,7 +392,7 @@ public:
}
/* reimp */
- void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &idx) const
+ void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &idx) const Q_DECL_OVERRIDE
{
switch (idx.column()) {
case Model::Scheme:
@@ -408,7 +408,7 @@ public:
}
/* reimp */
- void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const
+ void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE
{
if (index.column() == Model::Scheme || index.column() == Model::Port) {
editor->setGeometry(calculate_geometry(option.rect, editor->sizeHint()));
diff --git a/libkleo/ui/keylistview.h b/libkleo/ui/keylistview.h
index efb3344..5c4c6af 100644
--- a/libkleo/ui/keylistview.h
+++ b/libkleo/ui/keylistview.h
@@ -94,7 +94,7 @@ public:
/*! \reimp for covariant return */
KeyListViewItem *nextSibling() const;
/*! \reimp */
- bool operator<(const QTreeWidgetItem &other) const;
+ bool operator<(const QTreeWidgetItem &other) const Q_DECL_OVERRIDE;
/*! \reimp */
void takeItem(QTreeWidgetItem *item);
diff --git a/libkleo/ui/keyrequester.h b/libkleo/ui/keyrequester.h
index 835ebce..94337e9 100644
--- a/libkleo/ui/keyrequester.h
+++ b/libkleo/ui/keyrequester.h
@@ -187,7 +187,7 @@ private:
class Private;
Private *const d;
protected:
- virtual void virtual_hook(int, void *);
+ void virtual_hook(int, void *) Q_DECL_OVERRIDE;
};
class KLEO_EXPORT SigningKeyRequester : public KeyRequester
@@ -226,7 +226,7 @@ private:
class Private;
Private *const d;
protected:
- virtual void virtual_hook(int, void *);
+ void virtual_hook(int, void *) Q_DECL_OVERRIDE;
};
}
diff --git a/libkleo/ui/keyselectiondialog.cpp b/libkleo/ui/keyselectiondialog.cpp
index 77480a0..0a60d11 100644
--- a/libkleo/ui/keyselectiondialog.cpp
+++ b/libkleo/ui/keyselectiondialog.cpp
@@ -180,12 +180,12 @@ class ColumnStrategy : public Kleo::KeyListView::ColumnStrategy
public:
ColumnStrategy(unsigned int keyUsage);
- QString title(int col) const;
- int width(int col, const QFontMetrics &fm) const;
+ QString title(int col) const Q_DECL_OVERRIDE;
+ int width(int col, const QFontMetrics &fm) const Q_DECL_OVERRIDE;
- QString text(const GpgME::Key &key, int col) const;
- QString toolTip(const GpgME::Key &key, int col) const;
- QIcon icon(const GpgME::Key &key, int col) const;
+ QString text(const GpgME::Key &key, int col) const Q_DECL_OVERRIDE;
+ QString toolTip(const GpgME::Key &key, int col) const Q_DECL_OVERRIDE;
+ QIcon icon(const GpgME::Key &key, int col) const Q_DECL_OVERRIDE;
private:
const QIcon mKeyGoodPix, mKeyBadPix, mKeyUnknownPix, mKeyValidPix;