summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Heinecke <[email protected]>2016-04-25 14:23:28 +0200
committerAndre Heinecke <[email protected]>2016-04-25 14:23:28 +0200
commit4910efa760961cba65e503fed9ec66758e71aeed (patch)
tree303f18ac2aea032ef20b660e79c678360b4eb837
parent8281634b64ec2fc3f451038ada3a8b6cdb975044 (diff)
NewSignEncryptFilesWizard is not new anymore
Rename it to avoid confusion about the used code and bring it in line with the other wizard class names.
-rw-r--r--src/CMakeLists.txt2
-rw-r--r--src/crypto/gui/signencryptfileswizard.cpp (renamed from src/crypto/gui/newsignencryptfileswizard.cpp)68
-rw-r--r--src/crypto/gui/signencryptfileswizard.h (renamed from src/crypto/gui/newsignencryptfileswizard.h)8
-rw-r--r--src/crypto/signencryptfilescontroller.cpp6
4 files changed, 42 insertions, 42 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2968c0a..04761bf 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -146,7 +146,7 @@ set(_kleopatra_SRCS
crypto/gui/resultpage.cpp
crypto/gui/newresultpage.cpp
- crypto/gui/newsignencryptfileswizard.cpp
+ crypto/gui/signencryptfileswizard.cpp
crypto/gui/signencryptemailconflictdialog.cpp
diff --git a/src/crypto/gui/newsignencryptfileswizard.cpp b/src/crypto/gui/signencryptfileswizard.cpp
index 662385c..da4b026 100644
--- a/src/crypto/gui/newsignencryptfileswizard.cpp
+++ b/src/crypto/gui/signencryptfileswizard.cpp
@@ -1,5 +1,5 @@
/* -*- mode: c++; c-basic-offset:4 -*-
- crypto/gui/newsignencryptfileswizard.cpp
+ crypto/gui/signencryptfileswizard.cpp
This file is part of Kleopatra, the KDE keymanager
Copyright (c) 2009 Klarälvdalens Datakonsult AB
@@ -32,7 +32,7 @@
#include <config-kleopatra.h>
-#include "newsignencryptfileswizard.h"
+#include "signencryptfileswizard.h"
#include "newresultpage.h"
#include "signingcertificateselectionwidget.h"
@@ -151,7 +151,7 @@ public:
hlay.addWidget(&listWidget);
hlay.addWidget(&buttonBox);
- connect(&buttonBox, &QDialogButtonBox::rejected, this, &NewSignEncryptFilesWizard::reject);
+ connect(&buttonBox, &QDialogButtonBox::rejected, this, &SignEncryptFilesWizard::reject);
}
private:
@@ -920,9 +920,9 @@ public:
if (QWizard *wiz = wizard())
{
// need to do this here, since wizard() == 0 in the ctor
- const NewSignEncryptFilesWizard *filesWizard = qobject_cast<NewSignEncryptFilesWizard *>(wiz);
- disconnect(filesWizard, &NewSignEncryptFilesWizard::operationPrepared, this, &SignerPage::slotCommitSigningPreferences);
- connect(filesWizard, &NewSignEncryptFilesWizard::operationPrepared, this, &SignerPage::slotCommitSigningPreferences);
+ const SignEncryptFilesWizard *filesWizard = qobject_cast<SignEncryptFilesWizard *>(wiz);
+ disconnect(filesWizard, &SignEncryptFilesWizard::operationPrepared, this, &SignerPage::slotCommitSigningPreferences);
+ connect(filesWizard, &SignEncryptFilesWizard::operationPrepared, this, &SignerPage::slotCommitSigningPreferences);
}
bool pgp = effectiveProtocol() == OpenPGP;
@@ -979,8 +979,8 @@ private:
const std::vector<Key> &resolvedRecipients() const
{
assert(wizard());
- assert(qobject_cast<NewSignEncryptFilesWizard *>(wizard()) == static_cast<NewSignEncryptFilesWizard *>(wizard()));
- return static_cast<NewSignEncryptFilesWizard *>(wizard())->resolvedRecipients();
+ assert(qobject_cast<SignEncryptFilesWizard *>(wizard()) == static_cast<SignEncryptFilesWizard *>(wizard()));
+ return static_cast<SignEncryptFilesWizard *>(wizard())->resolvedRecipients();
}
private Q_SLOTS:
@@ -1021,12 +1021,12 @@ public:
}
-class NewSignEncryptFilesWizard::Private
+class SignEncryptFilesWizard::Private
{
- friend class ::Kleo::Crypto::Gui::NewSignEncryptFilesWizard;
- NewSignEncryptFilesWizard *const q;
+ friend class ::Kleo::Crypto::Gui::SignEncryptFilesWizard;
+ SignEncryptFilesWizard *const q;
public:
- explicit Private(NewSignEncryptFilesWizard *qq)
+ explicit Private(SignEncryptFilesWizard *qq)
: q(qq),
operationPage(new OperationPage(q)),
recipientsPage(new RecipientsPage(q)),
@@ -1099,25 +1099,25 @@ private:
bool encryptionUserMutable : 1;
};
-NewSignEncryptFilesWizard::NewSignEncryptFilesWizard(QWidget *parent, Qt::WindowFlags f)
+SignEncryptFilesWizard::SignEncryptFilesWizard(QWidget *parent, Qt::WindowFlags f)
: QWizard(parent, f), d(new Private(this))
{
}
-NewSignEncryptFilesWizard::~NewSignEncryptFilesWizard()
+SignEncryptFilesWizard::~SignEncryptFilesWizard()
{
qCDebug(KLEOPATRA_LOG);
}
-void NewSignEncryptFilesWizard::setPresetProtocol(Protocol proto)
+void SignEncryptFilesWizard::setPresetProtocol(Protocol proto)
{
d->operationPage->setPresetProtocol(proto);
d->recipientsPage->setPresetProtocol(proto);
d->signerPage->setPresetProtocol(proto);
}
-void NewSignEncryptFilesWizard::setCreateArchivePreset(bool preset)
+void SignEncryptFilesWizard::setCreateArchivePreset(bool preset)
{
if (preset == d->createArchivePreset && preset == isCreateArchiveSelected()) {
return;
@@ -1127,7 +1127,7 @@ void NewSignEncryptFilesWizard::setCreateArchivePreset(bool preset)
d->updateStartId();
}
-void NewSignEncryptFilesWizard::setCreateArchiveUserMutable(bool mut)
+void SignEncryptFilesWizard::setCreateArchiveUserMutable(bool mut)
{
if (mut == d->createArchiveUserMutable) {
return;
@@ -1137,12 +1137,12 @@ void NewSignEncryptFilesWizard::setCreateArchiveUserMutable(bool mut)
d->updateStartId();
}
-void NewSignEncryptFilesWizard::setArchiveDefinitionId(const QString &id)
+void SignEncryptFilesWizard::setArchiveDefinitionId(const QString &id)
{
d->operationPage->setArchiveDefinition(id);
}
-void NewSignEncryptFilesWizard::setSigningPreset(bool preset)
+void SignEncryptFilesWizard::setSigningPreset(bool preset)
{
if (preset == d->signingPreset) {
return;
@@ -1152,7 +1152,7 @@ void NewSignEncryptFilesWizard::setSigningPreset(bool preset)
d->updateStartId();
}
-void NewSignEncryptFilesWizard::setSigningUserMutable(bool mut)
+void SignEncryptFilesWizard::setSigningUserMutable(bool mut)
{
if (mut == d->signingUserMutable) {
return;
@@ -1162,7 +1162,7 @@ void NewSignEncryptFilesWizard::setSigningUserMutable(bool mut)
d->updateStartId();
}
-void NewSignEncryptFilesWizard::setEncryptionPreset(bool preset)
+void SignEncryptFilesWizard::setEncryptionPreset(bool preset)
{
if (preset == d->encryptionPreset) {
return;
@@ -1172,7 +1172,7 @@ void NewSignEncryptFilesWizard::setEncryptionPreset(bool preset)
d->updateStartId();
}
-void NewSignEncryptFilesWizard::setEncryptionUserMutable(bool mut)
+void SignEncryptFilesWizard::setEncryptionUserMutable(bool mut)
{
if (mut == d->encryptionUserMutable) {
return;
@@ -1182,55 +1182,55 @@ void NewSignEncryptFilesWizard::setEncryptionUserMutable(bool mut)
d->updateStartId();
}
-void NewSignEncryptFilesWizard::setFiles(const QStringList &files)
+void SignEncryptFilesWizard::setFiles(const QStringList &files)
{
setField(QStringLiteral("files"), files);
}
-bool NewSignEncryptFilesWizard::isSigningSelected() const
+bool SignEncryptFilesWizard::isSigningSelected() const
{
return field(QStringLiteral("sign")).toBool() || field(QStringLiteral("signencrypt")).toBool();
}
-bool NewSignEncryptFilesWizard::isEncryptionSelected() const
+bool SignEncryptFilesWizard::isEncryptionSelected() const
{
return field(QStringLiteral("encrypt")).toBool() || field(QStringLiteral("signencrypt")).toBool();
}
-bool NewSignEncryptFilesWizard::isAsciiArmorEnabled() const
+bool SignEncryptFilesWizard::isAsciiArmorEnabled() const
{
return field(QStringLiteral("armor")).toBool();
}
-bool NewSignEncryptFilesWizard::isCreateArchiveSelected() const
+bool SignEncryptFilesWizard::isCreateArchiveSelected() const
{
return field(QStringLiteral("archive")).toBool();
}
-shared_ptr<ArchiveDefinition> NewSignEncryptFilesWizard::selectedArchiveDefinition() const
+shared_ptr<ArchiveDefinition> SignEncryptFilesWizard::selectedArchiveDefinition() const
{
return d->operationPage->archiveDefinition();
}
-QString NewSignEncryptFilesWizard::archiveFileName(Protocol p) const
+QString SignEncryptFilesWizard::archiveFileName(Protocol p) const
{
return d->/*any page*/operationPage->archiveName(p);
}
-const std::vector<Key> &NewSignEncryptFilesWizard::resolvedRecipients() const
+const std::vector<Key> &SignEncryptFilesWizard::resolvedRecipients() const
{
return d->recipientsPage->keys();
}
-std::vector<Key> NewSignEncryptFilesWizard::resolvedSigners() const
+std::vector<Key> SignEncryptFilesWizard::resolvedSigners() const
{
return d->signerPage->keys();
}
-void NewSignEncryptFilesWizard::setTaskCollection(const shared_ptr<TaskCollection> &coll)
+void SignEncryptFilesWizard::setTaskCollection(const shared_ptr<TaskCollection> &coll)
{
d->resultPage->setTaskCollection(coll);
}
-#include "moc_newsignencryptfileswizard.cpp"
-#include "newsignencryptfileswizard.moc"
+#include "moc_signencryptfileswizard.cpp"
+#include "signencryptfileswizard.moc"
diff --git a/src/crypto/gui/newsignencryptfileswizard.h b/src/crypto/gui/signencryptfileswizard.h
index 33fa4f7..c694b43 100644
--- a/src/crypto/gui/newsignencryptfileswizard.h
+++ b/src/crypto/gui/signencryptfileswizard.h
@@ -1,5 +1,5 @@
/* -*- mode: c++; c-basic-offset:4 -*-
- crypto/gui/newsignencryptfileswizard.h
+ crypto/gui/signencryptfileswizard.h
This file is part of Kleopatra, the KDE keymanager
Copyright (c) 2009 Klarälvdalens Datakonsult AB
@@ -74,12 +74,12 @@ namespace Crypto
namespace Gui
{
-class NewSignEncryptFilesWizard : public QWizard
+class SignEncryptFilesWizard : public QWizard
{
Q_OBJECT
public:
- explicit NewSignEncryptFilesWizard(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = 0);
- ~NewSignEncryptFilesWizard();
+ explicit SignEncryptFilesWizard(QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = 0);
+ ~SignEncryptFilesWizard();
// Inputs
diff --git a/src/crypto/signencryptfilescontroller.cpp b/src/crypto/signencryptfilescontroller.cpp
index 6091040..66932d7 100644
--- a/src/crypto/signencryptfilescontroller.cpp
+++ b/src/crypto/signencryptfilescontroller.cpp
@@ -37,7 +37,7 @@
#include "signencryptfilestask.h"
#include "certificateresolver.h"
-#include <crypto/gui/newsignencryptfileswizard.h>
+#include <crypto/gui/signencryptfileswizard.h>
#include <crypto/taskcollection.h>
#include <utils/input.h>
@@ -115,7 +115,7 @@ private:
private:
std::vector< shared_ptr<SignEncryptFilesTask> > runnable, completed;
shared_ptr<SignEncryptFilesTask> cms, openpgp;
- QPointer<NewSignEncryptFilesWizard> wizard;
+ QPointer<SignEncryptFilesWizard> wizard;
QStringList files;
unsigned int operation;
Protocol protocol;
@@ -609,7 +609,7 @@ void SignEncryptFilesController::Private::ensureWizardCreated()
return;
}
- std::unique_ptr<NewSignEncryptFilesWizard> w(new NewSignEncryptFilesWizard);
+ std::unique_ptr<SignEncryptFilesWizard> w(new SignEncryptFilesWizard);
w->setAttribute(Qt::WA_DeleteOnClose);
connect(w.get(), SIGNAL(operationPrepared()), q, SLOT(slotWizardOperationPrepared()), Qt::QueuedConnection);