Commit 6d730b31 authored by Andrius Štikonas's avatar Andrius Štikonas
Browse files

Remove some of the FIXME: KF5.

parent 13223a90
......@@ -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"
......
......@@ -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);
......
......@@ -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;
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment