[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kgpg] /: Use KDEFrameworkCompilerSettings + add explicit + fix extra "; " + use
From: Laurent Montel <null () kde ! org>
Date: 2018-09-20 12:02:48
Message-ID: E1g2xfU-0005Qm-3k () code ! kde ! org
[Download RAW message or body]
Git commit 4a17316104ef1bcca41bfbaa9fb1a6516d8652a5 by Laurent Montel.
Committed on 20/09/2018 at 12:02.
Pushed by mlaurent into branch 'master'.
Use KDEFrameworkCompilerSettings + add explicit + fix extra ";" + use
nullptr
M +1 -4 CMakeLists.txt
M +2 -2 caff.h
M +4 -4 core/KGpgGroupNode.h
M +16 -16 core/KGpgKeyNode.h
M +4 -4 core/KGpgRefNode.h
M +2 -2 editor/kgpgeditor.cpp
M +4 -4 editor/kgpgeditor.h
M +1 -1 editor/kgpgmd5widget.h
M +6 -6 editor/kgpgtextedit.h
M +3 -3 foldercompressjob.h
M +1 -1 gpgproc.h
M +1 -1 keyexport.h
M +2 -2 keyinfodialog.h
M +3 -3 keyservers.h
M +5 -5 keysmanager.h
M +6 -6 keytreeview.h
M +10 -10 kgpg.cpp
M +2 -2 kgpg.h
M +2 -2 kgpgchangekey.h
M +2 -2 kgpgexternalactions.cpp
M +2 -2 kgpgexternalactions.h
M +1 -1 kgpgfirstassistant.cpp
M +1 -1 kgpgfirstassistant.h
M +1 -1 kgpginterface.h
M +1 -1 kgpgkeygenerate.h
M +8 -8 kgpgoptions.h
M +1 -1 kgpgrevokewidget.h
M +1 -1 kgpgtextinterface.h
M +1 -1 klinebufferedprocess.h
M +1 -1 model/gpgservermodel.h
M +1 -1 model/keylistproxymodel.h
M +2 -2 model/kgpgsearchresultmodel.h
M +1 -1 newkey.h
M +1 -1 selectexpirydate.h
M +1 -1 selectpublickeydialog.h
M +1 -1 sourceselect.h
M +1 -1 tests/kgpgaddphoto.h
M +1 -1 tests/kgpgadduid.h
M +1 -1 tests/kgpgchangedisable.h
M +1 -1 tests/kgpgchangetrust.h
M +1 -1 tests/kgpgdecrypt.h
M +1 -1 tests/kgpgdelkey.h
M +1 -1 tests/kgpgencrypt.h
M +1 -1 tests/kgpgexport.h
M +1 -1 tests/kgpgimport.h
M +1 -1 tests/kgpginterface.h
M +1 -1 tests/kgpgverify.h
M +2 -2 transactions/kgpgencrypt.h
M +1 -1 transactions/kgpggeneraterevoke.h
M +1 -1 transactions/kgpgkeyserversearchtransaction.h
M +1 -1 transactions/kgpgkeyservertransaction.h
M +2 -2 transactions/kgpgsigntext.h
M +1 -1 transactions/kgpgtextorfiletransaction.h
M +1 -1 transactions/kgpgtransaction.h
M +1 -1 transactions/kgpgtransactionjob.h
https://commits.kde.org/kgpg/4a17316104ef1bcca41bfbaa9fb1a6516d8652a5
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 1dcbef6..5e5e546 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -16,7 +16,7 @@ include(ECMAddAppIcon)
include(ECMInstallIcons)
include(KDEInstallDirs)
include(KDECMakeSettings)
-include(KDECompilerSettings NO_POLICY_SCOPE)
+include(KDEFrameworkCompilerSettings NO_POLICY_SCOPE)
include(FeatureSummary)
include(ECMSetupVersion)
include(CMakeFindDependencyMacro)
@@ -59,10 +59,7 @@ find_package(KF5 REQUIRED
find_package(Gpgme REQUIRED)
add_definitions(-DQT_NO_URL_CAST_FROM_STRING)
-add_definitions(-DQT_NO_CAST_FROM_ASCII)
-add_definitions(-DQT_NO_CAST_TO_ASCII)
add_definitions(-DQT_NO_NARROWING_CONVERSIONS_IN_CONNECT)
-add_definitions(-DQT_USE_QSTRINGBUILDER)
#add_definitions(-DQT_DISABLE_DEPRECATED_BEFORE=0x060000)
add_subdirectory( icons )
diff --git a/caff.h b/caff.h
index 6ff1a5f..c0a5ed1 100644
--- a/caff.h
+++ b/caff.h
@@ -45,10 +45,10 @@ public:
KGpgCaff(QObject *parent, const KGpgSignableNode::List &ids, const QStringList &signids,
const int checklevel = 0, const OperationFlags flags = DefaultMode);
-public slots:
+public Q_SLOTS:
void run();
-signals:
+Q_SIGNALS:
void done();
void aborted();
};
diff --git a/core/KGpgGroupNode.h b/core/KGpgGroupNode.h
index 99f55ee..2167859 100644
--- a/core/KGpgGroupNode.h
+++ b/core/KGpgGroupNode.h
@@ -38,21 +38,21 @@ private:
Q_DISABLE_COPY(KGpgGroupNode)
protected:
- virtual void readChildren();
+ void readChildren() override;
public:
KGpgGroupNode(KGpgRootNode *parent, const QString &name, const QStringList &members);
KGpgGroupNode(KGpgRootNode *parent, const QString &name, const KGpgKeyNode::List &members);
virtual ~KGpgGroupNode();
- virtual KgpgCore::KgpgItemType getType() const;
+ KgpgCore::KgpgItemType getType() const override;
/**
* Return size of group
*
* @return the number of keys in this group
*/
- virtual QString getSize() const;
- virtual QString getName() const;
+ QString getSize() const override;
+ QString getName() const override;
/**
* Rename this group node
diff --git a/core/KGpgKeyNode.h b/core/KGpgKeyNode.h
index 5bf51c1..55114c2 100644
--- a/core/KGpgKeyNode.h
+++ b/core/KGpgKeyNode.h
@@ -40,7 +40,7 @@ private:
int m_signs;
protected:
- virtual void readChildren();
+ void readChildren() override;
QList<KGpgRefNode *> m_refs;
QList<KGpgRefNode *> getRefsOfType(const KgpgCore::KgpgItemType &type) const;
@@ -50,23 +50,23 @@ public:
typedef QList<const KGpgKeyNode *> ConstList;
explicit KGpgKeyNode(KGpgRootNode *parent, const KgpgCore::KgpgKey &k);
- virtual ~KGpgKeyNode();
+ ~KGpgKeyNode() override;
- virtual bool hasChildren() const;
+ bool hasChildren() const override;
static KgpgCore::KgpgItemType getType(const KgpgCore::KgpgKey *k);
- virtual KgpgCore::KgpgItemType getType() const;
- virtual KgpgCore::KgpgKeyTrust getTrust() const;
+ KgpgCore::KgpgItemType getType() const override;
+ KgpgCore::KgpgKeyTrust getTrust() const override;
const QString &getFingerprint() const;
- virtual QString getSize() const;
- virtual QString getName() const;
- virtual QString getEmail() const;
- virtual QDateTime getExpiration() const;
- virtual QDateTime getCreation() const;
- virtual QString getId() const;
- virtual KGpgKeyNode *getKeyNode(void);
- virtual const KGpgKeyNode *getKeyNode(void) const;
+ QString getSize() const override;
+ QString getName() const override;
+ QString getEmail() const override;
+ QDateTime getExpiration() const override;
+ QDateTime getCreation() const override;
+ QString getId() const override;
+ KGpgKeyNode *getKeyNode(void) override;
+ const KGpgKeyNode *getKeyNode(void) const override;
/**
* @brief Return if this key has a private key
*/
@@ -83,7 +83,7 @@ public:
* @return the full fingerprint with spaces inserted
*/
QString getBeautifiedFingerprint() const;
- virtual QString getComment() const;
+ QString getComment() const override;
/**
* @brief Return the number of signatures of the primary user id
*
@@ -94,7 +94,7 @@ public:
*
* @return the number of signatures to the primary user id
*/
- virtual QString getSignCount() const;
+ QString getSignCount() const override;
/**
* @brief Creates a copy of the KgpgKey that belongs to this class
*/
@@ -179,7 +179,7 @@ public:
Q_SIGNALS:
void expanded();
-public slots:
+public Q_SLOTS:
/**
* @brief read all subitems
*
diff --git a/core/KGpgRefNode.h b/core/KGpgRefNode.h
index d3579cf..fc8dc3c 100644
--- a/core/KGpgRefNode.h
+++ b/core/KGpgRefNode.h
@@ -54,11 +54,11 @@ protected:
KGpgRootNode *getRootNode() const;
public:
- virtual ~KGpgRefNode();
+ ~KGpgRefNode() override;
- virtual QString getId() const;
- virtual QString getName() const;
- virtual QString getEmail() const;
+ QString getId() const override;
+ QString getName() const override;
+ QString getEmail() const override;
/**
* Get the node of the primary key this node references to
*
diff --git a/editor/kgpgeditor.cpp b/editor/kgpgeditor.cpp
index 013bfa3..9270a30 100644
--- a/editor/kgpgeditor.cpp
+++ b/editor/kgpgeditor.cpp
@@ -122,7 +122,7 @@ void KgpgEditor::openDocumentFile(const QUrl &url, const QString &encoding)
if(!downloadJob->error())
{
QTextStream t(downloadJob->data());
- t.setCodec(encoding.toLatin1());
+ t.setCodec(encoding.toLatin1().constData());
m_editor->setPlainText(t.readAll());
m_docname = url;
m_textchanged = false;
@@ -707,7 +707,7 @@ void KgpgEditor::importSignatureKey(const QString &id, const QString &fileName)
{
sender()->deleteLater();
- if (KMessageBox::questionYesNo(0,
+ if (KMessageBox::questionYesNo(nullptr,
i18n("<qt><b>Missing signature:</b><br />Key id: %1<br /><br />Do you want to import this key from a \
keyserver?</qt>", id), fileName, KGuiItem(i18n("Import")), KGuiItem(i18n("Do Not Import"))) != \
KMessageBox::Yes) return;
diff --git a/editor/kgpgeditor.h b/editor/kgpgeditor.h
index 1b8a3ff..b169d23 100644
--- a/editor/kgpgeditor.h
+++ b/editor/kgpgeditor.h
@@ -45,11 +45,11 @@ public:
KgpgTextEdit * const m_editor;
KRecentFilesAction *m_recentfiles;
-signals:
+Q_SIGNALS:
void openChangeFont();
void openConfigDialog();
-public slots:
+public Q_SLOTS:
void openDocumentFile(const QUrl &url, const QString &encoding = QString());
void slotSetFont(QFont myFont);
void closeWindow();
@@ -57,10 +57,10 @@ public slots:
protected:
void saveOptions();
void initActions();
- bool queryClose();
+ bool queryClose() override;
bool saveBeforeClear();
-private slots:
+private Q_SLOTS:
// File menu
void slotFileNew();
void slotFileOpen();
diff --git a/editor/kgpgmd5widget.h b/editor/kgpgmd5widget.h
index a99bd1e..80045a8 100644
--- a/editor/kgpgmd5widget.h
+++ b/editor/kgpgmd5widget.h
@@ -24,7 +24,7 @@ class Md5Widget : public QDialog
public:
explicit Md5Widget(QWidget *parent = nullptr, const QUrl &url = QUrl());
-public slots:
+public Q_SLOTS:
void slotApply();
private:
diff --git a/editor/kgpgtextedit.h b/editor/kgpgtextedit.h
index 26cfed1..9c917c5 100644
--- a/editor/kgpgtextedit.h
+++ b/editor/kgpgtextedit.h
@@ -32,17 +32,17 @@ class KgpgTextEdit : public KTextEdit
public:
explicit KgpgTextEdit(QWidget *parent, KGpgItemModel *model, KeysManager *manager);
- ~KgpgTextEdit();
+ ~KgpgTextEdit() override;
void signVerifyText(const QString &message);
void openDroppedFile(const QUrl &url, const bool probe);
-signals:
+Q_SIGNALS:
void newText();
void resetEncoding(bool);
void verifyFinished();
-public slots:
+public Q_SLOTS:
void slotDroppedFile(const QUrl &url);
void slotEncode();
void slotDecode();
@@ -53,13 +53,13 @@ public slots:
void slotVerifyDone(int result);
protected:
- void dragEnterEvent(QDragEnterEvent *e);
- void dropEvent(QDropEvent *e);
+ void dragEnterEvent(QDragEnterEvent *e) override;
+ void dropEvent(QDropEvent *e) override;
private:
void verifyKeyNeeded(const QString &id);
-private slots:
+private Q_SLOTS:
void slotEncodeUpdate(int result);
void slotSignUpdate(int result);
diff --git a/foldercompressjob.h b/foldercompressjob.h
index 8a0a8a4..6476f0d 100644
--- a/foldercompressjob.h
+++ b/foldercompressjob.h
@@ -56,12 +56,12 @@ public:
/**
* @brief FolderCompressJob destructor
*/
- virtual ~FolderCompressJob();
+ ~FolderCompressJob() override;
/**
* @brief shows the progress indicator
*/
- virtual void start();
+ void start() override;
/**
* @brief query extension for archive type
@@ -76,7 +76,7 @@ public:
*/
static const QStringList &archiveNames();
-private slots:
+private Q_SLOTS:
void doWork();
void slotEncryptionDone(int result);
};
diff --git a/gpgproc.h b/gpgproc.h
index 68ed6eb..c683e3e 100644
--- a/gpgproc.h
+++ b/gpgproc.h
@@ -166,7 +166,7 @@ public:
* returned lines.
*/
static QStringList getGgpParsedConfig(const QString &binary, const QByteArray &key = QByteArray());
-signals:
+Q_SIGNALS:
/**
* Emitted when the process is ready for reading.
* The signal is only emitted if at least one complete line of data is ready.
diff --git a/keyexport.h b/keyexport.h
index 1f3a52a..53f1564 100644
--- a/keyexport.h
+++ b/keyexport.h
@@ -30,7 +30,7 @@ public:
explicit KeyExport(QWidget *parent = nullptr, const QStringList &keyservers = QStringList());
protected:
- virtual void accept();
+ void accept() override;
};
#endif
diff --git a/keyinfodialog.h b/keyinfodialog.h
index 2140224..2ac3ba3 100644
--- a/keyinfodialog.h
+++ b/keyinfodialog.h
@@ -65,7 +65,7 @@ public:
KGpgChangeKey *keychange;
-signals:
+Q_SIGNALS:
void keyNeedsRefresh(KGpgKeyNode *node);
private:
@@ -77,7 +77,7 @@ private:
void applyButtonClicked();
void cancelButtonClicked();
-private slots:
+private Q_SLOTS:
void slotOpenUrl(const QString &url) const;
void slotChangeDate();
diff --git a/keyservers.h b/keyservers.h
index 44a0140..acc0f9d 100644
--- a/keyservers.h
+++ b/keyservers.h
@@ -74,7 +74,7 @@ public:
*/
void startImport(const QStringList &keys, QString server = QString(), const QString &proxy = \
QString());
-signals:
+Q_SIGNALS:
/**
* @brief emitted when importing keys succeeded
*
@@ -91,7 +91,7 @@ signals:
*/
void importFailed();
-public slots:
+public Q_SLOTS:
void slotImport();
void slotExport(const QStringList &keyIds);
@@ -110,7 +110,7 @@ public slots:
void slotOk();
void handleQuit();
-private slots:
+private Q_SLOTS:
void slotDownloadKeysFinished(int resultcode);
void slotUploadKeysFinished(int resultcode);
diff --git a/keysmanager.h b/keysmanager.h
index e5b514d..e93b8dd 100644
--- a/keysmanager.h
+++ b/keysmanager.h
@@ -67,7 +67,7 @@ class KeysManager : public KXmlGuiWindow
public:
explicit KeysManager(QWidget *parent = nullptr);
- ~KeysManager();
+ ~KeysManager() override;
KGpgItemModel *getModel();
@@ -91,13 +91,13 @@ private:
KSelectAction *photoProps;
KSelectAction *trustProps;
-signals:
+Q_SIGNALS:
void readAgainOptions();
void certificate(QString);
void closeAsked();
void fontChanged(QFont);
-public slots:
+public Q_SLOTS:
void slotGenerateKey();
void refreshkey();
void readAllOptions();
@@ -122,11 +122,11 @@ public slots:
void slotImportDone(int ret);
protected:
- bool eventFilter(QObject *, QEvent *e);
+ bool eventFilter(QObject *, QEvent *e) override;
void removeFromGroups(KGpgKeyNode *nd);
void setDefaultKeyNode(KGpgKeyNode *key);
-private slots:
+private Q_SLOTS:
void slotGenerateKeyDone(KJob *job);
void slotShowTrust();
diff --git a/keytreeview.h b/keytreeview.h
index be62705..d8b09f6 100644
--- a/keytreeview.h
+++ b/keytreeview.h
@@ -50,19 +50,19 @@ public:
bool isEditing() const;
-signals:
+Q_SIGNALS:
void importDrop(const QList<QUrl> &urls);
void returnPressed();
-public slots:
+public Q_SLOTS:
void selectNode(KGpgNode *nd);
void resizeColumnsToContents();
protected:
- virtual void contentsDragMoveEvent(QDragMoveEvent *e);
- virtual void contentsDropEvent(QDropEvent *e);
- virtual void startDrag(Qt::DropActions);
- virtual void keyPressEvent(QKeyEvent *event);
+ virtual void contentsDragMoveEvent(QDragMoveEvent *e);
+ virtual void contentsDropEvent(QDropEvent *e);
+ void startDrag(Qt::DropActions) override;
+ void keyPressEvent(QKeyEvent *event) override;
};
#endif
diff --git a/kgpg.cpp b/kgpg.cpp
index fc9f6a3..48056fb 100644
--- a/kgpg.cpp
+++ b/kgpg.cpp
@@ -69,7 +69,7 @@ bool KGpgApp::newInstance()
{
const QString gpgError = GPGProc::getGpgStartupError(KGpgSettings::gpgBinaryPath());
if (!gpgError.isEmpty()) {
- KMessageBox::detailedError(0, i18n("GnuPG failed to start.<br />You must fix the GnuPG error first \
before running KGpg."), gpgError, i18n("GnuPG error")); + \
KMessageBox::detailedError(nullptr, i18n("GnuPG failed to start.<br />You must fix the GnuPG error first \
before running KGpg."), gpgError, i18n("GnuPG error")); QApplication::quit();
return false;
}
@@ -92,7 +92,7 @@ bool KGpgApp::newInstance()
// any program part of GnuPG that needs it, so simply assume everything is fine.
if ((gpgver < 0x20100) && KgpgInterface::getGpgBoolSetting(QLatin1String("use-agent"), gpgPath) &&
qgetenv("GPG_AGENT_INFO").isEmpty())
- KMessageBox::sorry(0, i18n("<qt>The use of <b>GnuPG Agent</b> is enabled in GnuPG's configuration \
file (%1).<br />" + KMessageBox::sorry(nullptr, i18n("<qt>The use of <b>GnuPG \
Agent</b> is enabled in GnuPG's configuration file (%1).<br />"
"However, the agent does not seem to be running. This could result in problems with \
signing/decryption.<br />"
"Please disable GnuPG Agent from KGpg settings, or fix the agent.</qt>", gpgPath));
}
@@ -129,35 +129,35 @@ void KGpgApp::handleArguments(const QCommandLineParser &parser, const QDir &work
if (parser.isSet(QStringLiteral("e"))) {
if (urlList.isEmpty())
- KMessageBox::sorry(0, i18n("No files given."));
+ KMessageBox::sorry(nullptr, i18n("No files given."));
else if (!directoryInside)
KGpgExternalActions::encryptFiles(s_keyManager, urlList);
else
KGpgExternalActions::encryptFolders(s_keyManager, urlList);
} else if (parser.isSet(QStringLiteral("s"))) {
if (urlList.isEmpty())
- KMessageBox::sorry(0, i18n("No files given."));
+ KMessageBox::sorry(nullptr, i18n("No files given."));
else if (!directoryInside)
w->showDroppedFile(urlList.first());
else
- KMessageBox::sorry(0, i18n("Cannot decrypt and show folder."));
+ KMessageBox::sorry(nullptr, i18n("Cannot decrypt and show folder."));
} else if (parser.isSet(QStringLiteral("S"))) {
if (urlList.isEmpty())
- KMessageBox::sorry(0, i18n("No files given."));
+ KMessageBox::sorry(nullptr, i18n("No files given."));
else if (!directoryInside)
KGpgExternalActions::signFiles(s_keyManager, urlList);
else
- KMessageBox::sorry(0, i18n("Cannot sign folder."));
+ KMessageBox::sorry(nullptr, i18n("Cannot sign folder."));
} else if (parser.isSet(QStringLiteral("V")) != 0) {
if (urlList.isEmpty())
- KMessageBox::sorry(0, i18n("No files given."));
+ KMessageBox::sorry(nullptr, i18n("No files given."));
else if (!directoryInside)
w->verifyFile(urlList.first());
else
- KMessageBox::sorry(0, i18n("Cannot verify folder."));
+ KMessageBox::sorry(nullptr, i18n("Cannot verify folder."));
} else {
if (directoryInside && (urlList.count() > 1)) {
- KMessageBox::sorry(0, i18n("Unable to perform requested operation.\nPlease select only one folder, \
or several files, but do not mix files and folders.")); + \
KMessageBox::sorry(nullptr, i18n("Unable to perform requested operation.\nPlease select only one folder, \
or several files, but do not mix files and folders.")); return;
}
diff --git a/kgpg.h b/kgpg.h
index bb111dd..0ad8fd2 100644
--- a/kgpg.h
+++ b/kgpg.h
@@ -61,14 +61,14 @@ public:
*/
void handleArguments(const QCommandLineParser &parser, const QDir &workingDirectory);
-public slots:
+public Q_SLOTS:
void slotDBusActivation(const QStringList &arguments, const QString &workingDirectory);
private:
KGpgExternalActions *w;
KeysManager *s_keyManager;
-private slots:
+private Q_SLOTS:
void slotHandleQuit();
void assistantOver(const QString &defaultKeyId);
};
diff --git a/kgpgchangekey.h b/kgpgchangekey.h
index f2dad90..b2bc21a 100644
--- a/kgpgchangekey.h
+++ b/kgpgchangekey.h
@@ -136,7 +136,7 @@ public:
* @brief set a new parent widget for the transactions
*/
void setParentWidget(QWidget *widget);
-signals:
+Q_SIGNALS:
/**
* This signal gets emitted every time apply() has done all of it's work.
*
@@ -165,7 +165,7 @@ signals:
*/
void keyNeedsRefresh(KGpgKeyNode *node);
-private slots:
+private Q_SLOTS:
/**
* @internal
*/
diff --git a/kgpgexternalactions.cpp b/kgpgexternalactions.cpp
index e8f5ba3..f7211c2 100644
--- a/kgpgexternalactions.cpp
+++ b/kgpgexternalactions.cpp
@@ -417,7 +417,7 @@ void KGpgExternalActions::slotDecryptionDone(int status)
void KGpgExternalActions::showDroppedFile(const QUrl &file)
{
- KgpgEditor *kgpgtxtedit = new KgpgEditor(m_keysmanager, m_model, 0);
+ KgpgEditor *kgpgtxtedit = new KgpgEditor(m_keysmanager, m_model, {});
connect(m_keysmanager, &KeysManager::fontChanged, kgpgtxtedit, &KgpgEditor::slotSetFont);
kgpgtxtedit->m_editor->openDroppedFile(file, false);
@@ -430,7 +430,7 @@ void KGpgExternalActions::readOptions()
if (KGpgSettings::firstRun()) {
firstRun();
} else if (KGpgSettings::gpgConfigPath().isEmpty()) {
- if (KMessageBox::Yes == KMessageBox::questionYesNo(0,
+ if (KMessageBox::Yes == KMessageBox::questionYesNo(nullptr,
i18n("<qt>You have not set a path to your GnuPG config file.<br />This may cause some surprising \
results in KGpg's execution."
"<br />Would you like to start KGpg's assistant to fix this problem?</qt>"),
QString(), KGuiItem(i18n("Start Assistant")), KGuiItem(i18n("Do Not Start"))))
diff --git a/kgpgexternalactions.h b/kgpgexternalactions.h
index bb83b96..e2dd0ba 100644
--- a/kgpgexternalactions.h
+++ b/kgpgexternalactions.h
@@ -60,7 +60,7 @@ public:
static void encryptFiles(KeysManager* parent, const QList<QUrl>& urls);
void readOptions();
-signals:
+Q_SIGNALS:
void createNewKey();
void updateDefault(QString);
@@ -81,7 +81,7 @@ private:
QKeySequence goDefaultKey() const;
void decryptFile(QList<QUrl> urls);
-private slots:
+private Q_SLOTS:
void startFolderEncode();
void slotSaveOptionsPath();
void slotVerificationDone(int result);
diff --git a/kgpgfirstassistant.cpp b/kgpgfirstassistant.cpp
index 4428262..0cf68bb 100644
--- a/kgpgfirstassistant.cpp
+++ b/kgpgfirstassistant.cpp
@@ -251,7 +251,7 @@ KGpgFirstAssistant::findConfigPath(const QString &gpgBinary)
if (QFile(confPathOpt).exists()) {
confPath = confPathOpt;
} else {
- if (KMessageBox::questionYesNo(0, i18n("<qt><b>The GnuPG configuration file was not found</b>. Should \
KGpg try to create a config file ?</qt>"), QString(), KGuiItem(i18n("Create Config")), KGuiItem(i18n("Do \
Not Create"))) == KMessageBox::Yes) { + if (KMessageBox::questionYesNo(nullptr, \
i18n("<qt><b>The GnuPG configuration file was not found</b>. Should KGpg try to create a config file \
?</qt>"), QString(), KGuiItem(i18n("Create Config")), KGuiItem(i18n("Do Not Create"))) == \
KMessageBox::Yes) { QFile file(confPath);
if (file.open(QIODevice::WriteOnly)) {
QTextStream stream(&file);
diff --git a/kgpgfirstassistant.h b/kgpgfirstassistant.h
index c0e3481..e98b24f 100644
--- a/kgpgfirstassistant.h
+++ b/kgpgfirstassistant.h
@@ -88,7 +88,7 @@ public Q_SLOTS:
/**
* @brief called when "next" button is pressed
*/
- virtual void next();
+ void next() override;
private Q_SLOTS:
void slotBinaryChanged(const QString &binary);
diff --git a/kgpginterface.h b/kgpginterface.h
index af46922..59830ca 100644
--- a/kgpginterface.h
+++ b/kgpginterface.h
@@ -34,6 +34,6 @@ namespace KgpgInterface {
KgpgCore::KgpgKeyList readPublicKeys(const QStringList &ids = QStringList());
void readSignatures(KGpgKeyNode *node);
KgpgCore::KgpgKeyList readSecretKeys(const QStringList &ids = QStringList());
-};
+}
#endif // KGPGINTERFACE_H
diff --git a/kgpgkeygenerate.h b/kgpgkeygenerate.h
index 78d7039..7315173 100644
--- a/kgpgkeygenerate.h
+++ b/kgpgkeygenerate.h
@@ -46,7 +46,7 @@ public:
char expiration() const;
uint days() const;
-private slots:
+private Q_SLOTS:
void slotOk();
void slotUser1();
void slotEnableOk();
diff --git a/kgpgoptions.h b/kgpgoptions.h
index bddf176..911cfc3 100644
--- a/kgpgoptions.h
+++ b/kgpgoptions.h
@@ -95,16 +95,16 @@ class kgpgOptions : public KConfigDialog
public:
explicit kgpgOptions(QWidget *parent = nullptr, KGpgItemModel *model = nullptr);
- ~kgpgOptions();
+ ~kgpgOptions() override;
-signals:
+Q_SIGNALS:
void updateDisplay();
void settingsUpdated();
void changeFont(QFont);
void homeChanged();
void refreshTrust(KgpgCore::KgpgKeyTrust, QColor);
-private slots:
+private Q_SLOTS:
void slotChangeHome();
void slotAddKeyServer();
void slotChangeEncryptTo();
@@ -113,9 +113,9 @@ private slots:
void slotEditKeyServer(const QModelIndex &index);
void slotChangeKeyServerButtonEnable();
void slotDefaultKeyServer();
- void updateWidgets();
- void updateWidgetsDefault();
- void updateSettings();
+ void updateWidgets() override;
+ void updateWidgetsDefault() override;
+ void updateSettings() override;
void listKeys();
void slotInstallDecrypt(const QString &mimetype);
void slotInstallSign(const QString &mimetype);
@@ -123,8 +123,8 @@ private slots:
void slotSystrayEnable();
protected:
- virtual bool hasChanged();
- virtual bool isDefault();
+ bool hasChanged() override;
+ bool isDefault() override;
private:
QStringList names;
diff --git a/kgpgrevokewidget.h b/kgpgrevokewidget.h
index 70c1411..9b446d9 100644
--- a/kgpgrevokewidget.h
+++ b/kgpgrevokewidget.h
@@ -32,7 +32,7 @@ public:
explicit KgpgRevokeWidget(QWidget* parent = nullptr);
-public slots:
+public Q_SLOTS:
virtual void cbSave_toggled(bool isOn);
};
diff --git a/kgpgtextinterface.h b/kgpgtextinterface.h
index e5f6874..c3de0fb 100644
--- a/kgpgtextinterface.h
+++ b/kgpgtextinterface.h
@@ -36,7 +36,7 @@ public:
explicit KGpgTextInterface(QObject *parent, const QString &keyID, const QStringList &options);
~KGpgTextInterface();
-signals:
+Q_SIGNALS:
/**
* Emitted when all files passed to KgpgSignFile() where processed.
*/
diff --git a/klinebufferedprocess.h b/klinebufferedprocess.h
index 09d6584..4842ef3 100644
--- a/klinebufferedprocess.h
+++ b/klinebufferedprocess.h
@@ -112,7 +112,7 @@ public:
*/
bool hasLineStandardError() const;
-signals:
+Q_SIGNALS:
/**
* Emitted when there is a line of data available from stdout when there was
* previously none.
diff --git a/model/gpgservermodel.h b/model/gpgservermodel.h
index 4b560fa..9210300 100644
--- a/model/gpgservermodel.h
+++ b/model/gpgservermodel.h
@@ -46,7 +46,7 @@ public:
QVariant data(const QModelIndex &index, int role) const override;
-private slots:
+private Q_SLOTS:
void slotRowsRemoved(const QModelIndex &, int start, int end);
private:
diff --git a/model/keylistproxymodel.h b/model/keylistproxymodel.h
index de77bc9..41ae69a 100644
--- a/model/keylistproxymodel.h
+++ b/model/keylistproxymodel.h
@@ -71,7 +71,7 @@ public:
int idLength() const;
void setIdLength(const int length);
-public slots:
+public Q_SLOTS:
/**
* @brief set if only secret keys should be shown
* @param b new value
diff --git a/model/kgpgsearchresultmodel.h b/model/kgpgsearchresultmodel.h
index c903a9d..7dd96d1 100644
--- a/model/kgpgsearchresultmodel.h
+++ b/model/kgpgsearchresultmodel.h
@@ -83,7 +83,7 @@ public:
*/
SearchResult *resultForIndex(const QModelIndex &index) const;
-public slots:
+public Q_SLOTS:
void slotAddKey(const QStringList &lines);
private:
@@ -136,7 +136,7 @@ public:
*/
void setSourceModel(QAbstractItemModel *sourceModel) override;
-public slots:
+public Q_SLOTS:
/**
* @brief Control whether validity filtering of keys is enabled.
*
diff --git a/newkey.h b/newkey.h
index f72c884..93363a0 100644
--- a/newkey.h
+++ b/newkey.h
@@ -28,7 +28,7 @@ public:
explicit newKey(QWidget* parent = nullptr);
-public slots:
+public Q_SLOTS:
void CBsave_toggled(bool);
};
diff --git a/selectexpirydate.h b/selectexpirydate.h
index a2db68f..6f1c684 100644
--- a/selectexpirydate.h
+++ b/selectexpirydate.h
@@ -38,7 +38,7 @@ public:
QDateTime date() const;
-private slots:
+private Q_SLOTS:
void slotCheckDate(const QDate &date);
void slotEnableDate(const bool ison);
diff --git a/selectpublickeydialog.h b/selectpublickeydialog.h
index 26da9e0..1b7b07e 100644
--- a/selectpublickeydialog.h
+++ b/selectpublickeydialog.h
@@ -59,7 +59,7 @@ public:
QWidget *optionsbox;
-private slots:
+private Q_SLOTS:
void slotOk();
void slotSelectionChanged();
void slotSymmetric(const bool state);
diff --git a/sourceselect.h b/sourceselect.h
index bca310e..a239fb6 100644
--- a/sourceselect.h
+++ b/sourceselect.h
@@ -27,7 +27,7 @@ class SrcSelect : public QWidget, public Ui::SrcSelect
public:
explicit SrcSelect(QWidget *parent = nullptr);
-private slots:
+private Q_SLOTS:
void checkFile_toggled(bool isOn);
void checkServer_toggled(bool isOn);
};
diff --git a/tests/kgpgaddphoto.h b/tests/kgpgaddphoto.h
index 937756e..761e34f 100644
--- a/tests/kgpgaddphoto.h
+++ b/tests/kgpgaddphoto.h
@@ -6,7 +6,7 @@
class KGpgAddPhotoTest : public QObject {
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testAddPhoto();
diff --git a/tests/kgpgadduid.h b/tests/kgpgadduid.h
index f41a195..669e08e 100644
--- a/tests/kgpgadduid.h
+++ b/tests/kgpgadduid.h
@@ -6,7 +6,7 @@
class KGpgAddUidTest : public QObject {
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testAddUid();
void testAddUid_data();
diff --git a/tests/kgpgchangedisable.h b/tests/kgpgchangedisable.h
index 58534ba..0db7f8c 100644
--- a/tests/kgpgchangedisable.h
+++ b/tests/kgpgchangedisable.h
@@ -6,7 +6,7 @@
class KGpgChangeDisableTest : public QObject {
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testDisableKey();
void testEnableKey();
diff --git a/tests/kgpgchangetrust.h b/tests/kgpgchangetrust.h
index d9df55f..2be26bd 100644
--- a/tests/kgpgchangetrust.h
+++ b/tests/kgpgchangetrust.h
@@ -8,7 +8,7 @@
class KGpgChangeTrustTest : public QObject {
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testChangeTrust();
void testChangeTrust_data();
diff --git a/tests/kgpgdecrypt.h b/tests/kgpgdecrypt.h
index f9f89da..24fd28a 100644
--- a/tests/kgpgdecrypt.h
+++ b/tests/kgpgdecrypt.h
@@ -6,7 +6,7 @@
class KGpgDecryptTest : public QObject {
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testDecrypt();
void testDecrypt_data();
diff --git a/tests/kgpgdelkey.h b/tests/kgpgdelkey.h
index 4aebd15..ddc31f7 100644
--- a/tests/kgpgdelkey.h
+++ b/tests/kgpgdelkey.h
@@ -6,7 +6,7 @@
class KGpgDelKeyTest : public QObject {
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testDeleteKey();
void testDeleteKey_data();
diff --git a/tests/kgpgencrypt.h b/tests/kgpgencrypt.h
index a9e1279..9f08152 100644
--- a/tests/kgpgencrypt.h
+++ b/tests/kgpgencrypt.h
@@ -6,7 +6,7 @@
class KGpgEncryptTest : public QObject {
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testAsciiArmoredEncryption();
void testHideKeyIdEncryption();
diff --git a/tests/kgpgexport.h b/tests/kgpgexport.h
index 76f7870..c10cc20 100644
--- a/tests/kgpgexport.h
+++ b/tests/kgpgexport.h
@@ -6,7 +6,7 @@
class KGpgExportTest : public QObject {
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testExportPublicKeyToFile();
void testExportSecretKeyToFile();
diff --git a/tests/kgpgimport.h b/tests/kgpgimport.h
index 657e693..d3a1be8 100644
--- a/tests/kgpgimport.h
+++ b/tests/kgpgimport.h
@@ -7,7 +7,7 @@
class KGpgImportTest: public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testImportTextKey();
void testImportIdsAll();
diff --git a/tests/kgpginterface.h b/tests/kgpginterface.h
index 5503d96..5f58a04 100644
--- a/tests/kgpginterface.h
+++ b/tests/kgpginterface.h
@@ -7,7 +7,7 @@
class KGpgInterfaceTest: public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testReadPublicKeys();
void testReadSecretKeys();
diff --git a/tests/kgpgverify.h b/tests/kgpgverify.h
index a772dc7..2677ba1 100644
--- a/tests/kgpgverify.h
+++ b/tests/kgpgverify.h
@@ -7,7 +7,7 @@
class KGpgVerifyTest: public QObject
{
Q_OBJECT
-private slots:
+private Q_SLOTS:
void init();
void testVerifySignedText();
void testVerifySignedFile();
diff --git a/transactions/kgpgencrypt.h b/transactions/kgpgencrypt.h
index f3be133..e541329 100644
--- a/transactions/kgpgencrypt.h
+++ b/transactions/kgpgencrypt.h
@@ -37,7 +37,7 @@ public:
AllowUntrustedEncryption = 0x2, ///< allow encryption with untrusted keys, ignored for symmetric \
encryption HideKeyId = 0x4 ///< remove anything that shows which key ids this data is encrypted to, \
ignored for symmetric encryption };
- Q_DECLARE_FLAGS(EncryptOptions, EncryptOption);
+ Q_DECLARE_FLAGS(EncryptOptions, EncryptOption)
/**
* @brief encrypt given text
@@ -88,6 +88,6 @@ private:
QString m_currentFile;
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(KGpgEncrypt::EncryptOptions);
+Q_DECLARE_OPERATORS_FOR_FLAGS(KGpgEncrypt::EncryptOptions)
#endif // KGPGENCRYPT_H
diff --git a/transactions/kgpggeneraterevoke.h b/transactions/kgpggeneraterevoke.h
index 1e71640..3148d09 100644
--- a/transactions/kgpggeneraterevoke.h
+++ b/transactions/kgpggeneraterevoke.h
@@ -48,7 +48,7 @@ public:
*/
const QString &getOutput() const;
-signals:
+Q_SIGNALS:
void revokeCertificate(const QString &cert);
protected:
diff --git a/transactions/kgpgkeyserversearchtransaction.h \
b/transactions/kgpgkeyserversearchtransaction.h index 1a060aa..50f1fd4 100644
--- a/transactions/kgpgkeyserversearchtransaction.h
+++ b/transactions/kgpgkeyserversearchtransaction.h
@@ -49,7 +49,7 @@ public:
void setPattern(const QString &pattern);
-signals:
+Q_SIGNALS:
/**
* @brief emitted every time a new key is completed
* @param lines the lines that belong to that key
diff --git a/transactions/kgpgkeyservertransaction.h b/transactions/kgpgkeyservertransaction.h
index 512c74f..68aec8c 100644
--- a/transactions/kgpgkeyservertransaction.h
+++ b/transactions/kgpgkeyservertransaction.h
@@ -72,7 +72,7 @@ protected:
void finish() override;
bool preStart() override;
-private slots:
+private Q_SLOTS:
/**
* @brief abort the current operation
*/
diff --git a/transactions/kgpgsigntext.h b/transactions/kgpgsigntext.h
index 3d65f06..e140316 100644
--- a/transactions/kgpgsigntext.h
+++ b/transactions/kgpgsigntext.h
@@ -35,7 +35,7 @@ public:
AsciiArmored = 0x1, ///< output the data as printable ASCII as opposed to binary data
DetachedSignature = 0x2, ///< save the signature in a separate file
};
- Q_DECLARE_FLAGS(SignOptions, SignOption);
+ Q_DECLARE_FLAGS(SignOptions, SignOption)
/**
* @brief sign given text
@@ -79,6 +79,6 @@ private:
QStringList m_extraOptions;
};
-Q_DECLARE_OPERATORS_FOR_FLAGS(KGpgSignText::SignOptions);
+Q_DECLARE_OPERATORS_FOR_FLAGS(KGpgSignText::SignOptions)
#endif // KGPGSIGNTEXT_H
diff --git a/transactions/kgpgtextorfiletransaction.h b/transactions/kgpgtextorfiletransaction.h
index 1e52e07..e282198 100644
--- a/transactions/kgpgtextorfiletransaction.h
+++ b/transactions/kgpgtextorfiletransaction.h
@@ -101,7 +101,7 @@ private:
void cleanUrls();
-private slots:
+private Q_SLOTS:
void postStart() override;
};
diff --git a/transactions/kgpgtransaction.h b/transactions/kgpgtransaction.h
index 396f8a2..fa6a6db 100644
--- a/transactions/kgpgtransaction.h
+++ b/transactions/kgpgtransaction.h
@@ -182,7 +182,7 @@ public:
*/
void insertArguments(const int pos, const QStringList &args);
-signals:
+Q_SIGNALS:
/**
* @brief Emitted when the operation was completed.
* @param result return status of the transaction
diff --git a/transactions/kgpgtransactionjob.h b/transactions/kgpgtransactionjob.h
index 870f602..8f40396 100644
--- a/transactions/kgpgtransactionjob.h
+++ b/transactions/kgpgtransactionjob.h
@@ -63,7 +63,7 @@ public:
protected:
bool doKill() override;
-private slots:
+private Q_SLOTS:
void slotTransactionDone(int result);
void slotStatusMessage(const QString &plain);
void slotInfoProgress(qulonglong processedAmount, qulonglong totalAmount);
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic