summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrius Štikonas <andrius@stikonas.eu>2016-06-04 00:12:40 (GMT)
committerAndrius Štikonas <andrius@stikonas.eu>2016-06-04 00:12:40 (GMT)
commit6d730b31c8f683fba0f705fc1c12f0a85e9296c0 (patch)
tree1b317b5921ccb5dae2fed9f4a493e3297d0541bb
parent13223a903db7f1a7277b4883535d787b553b536e (diff)
Remove some of the FIXME: KF5.
-rw-r--r--kgpg.cpp2
-rw-r--r--kgpgoptions.cpp1
-rw-r--r--transactions/kgpgtransaction.cpp4
3 files changed, 3 insertions, 4 deletions
diff --git a/kgpg.cpp b/kgpg.cpp
index bebf0dc..3428244 100644
--- a/kgpg.cpp
+++ b/kgpg.cpp
@@ -18,7 +18,7 @@
#include "gpgproc.h"
#include "kgpgsettings.h"
#include "keysmanager.h"
-// #include "kgpg_interface.h" FIXME: KF5
+#include "kgpg_interface.h"
#include "kgpgexternalactions.h"
#include "kgpginterface.h"
#include "core/images.h"
diff --git a/kgpgoptions.cpp b/kgpgoptions.cpp
index 50112bf..48f1627 100644
--- a/kgpgoptions.cpp
+++ b/kgpgoptions.cpp
@@ -95,7 +95,6 @@ kgpgOptions::kgpgOptions(QWidget *parent, KGpgItemModel *model)
m_mailUats = KGpgSettings::mailUats();
QVBoxLayout *fontlayout = new QVBoxLayout(m_page3->tabWidget3->widget(1));
-// fontlayout->setSpacing(spacingHint()); FIXME: KF5
m_fontchooser->setObjectName( QLatin1String("kcfg_Font" ));
fontlayout->addWidget(m_fontchooser);
diff --git a/transactions/kgpgtransaction.cpp b/transactions/kgpgtransaction.cpp
index 195cc14..b080ef6 100644
--- a/transactions/kgpgtransaction.cpp
+++ b/transactions/kgpgtransaction.cpp
@@ -349,7 +349,7 @@ KGpgTransaction::askNewPassphrase(const QString& text)
d->m_newPasswordDialog->setAllowEmptyPasswords(false);
connect(d->m_newPasswordDialog, SIGNAL(newPassword(QString)), SLOT(slotPassphraseEntered(QString)));
connect(d->m_newPasswordDialog, SIGNAL(rejected()), SLOT(slotPassphraseAborted()));
-// connect(d->m_process, SIGNAL(processExited()), d->m_newPasswordDialog->button(KDialog::Cancel), SLOT(click())); FIXME: KF5
+ connect(d->m_process, SIGNAL(processExited()), d->m_newPasswordDialog, SLOT(rejected()));
d->m_newPasswordDialog->show();
}
@@ -559,7 +559,7 @@ KGpgTransaction::askPassphrase(const QString &message)
connect(d->m_passwordDialog, SIGNAL(gotPassword(QString,bool)), SLOT(slotPassphraseEntered(QString)));
connect(d->m_passwordDialog, SIGNAL(rejected()), SLOT(slotPassphraseAborted()));
-// connect(d->m_process, SIGNAL(processExited()), d->m_passwordDialog->button(KDialog::Cancel), SLOT(click())); // FIXME: KF5
+ connect(d->m_process, SIGNAL(processExited()), d->m_passwordDialog, SLOT(rejected()));
} else {
// we already have a dialog, so this is a "bad passphrase" situation
--d->m_tries;