summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRolf Eike Beer <eb@emlix.com>2016-06-06 14:12:09 (GMT)
committerRolf Eike Beer <kde@opensource.sf-tec.de>2016-06-06 16:53:07 (GMT)
commiteffc152bf737ff2a9aa47b5151b8c0c42d9aa218 (patch)
tree44d6222a4e49cdac593b10fdf505223ea7254f45
parentd4496b92f25889fd302066b19e76221295469fe8 (diff)
port away from KInputDialog
-rw-r--r--keysmanager.cpp7
-rw-r--r--kgpgoptions.cpp4
2 files changed, 5 insertions, 6 deletions
diff --git a/keysmanager.cpp b/keysmanager.cpp
index 6cc88c6..22e57c4 100644
--- a/keysmanager.cpp
+++ b/keysmanager.cpp
@@ -61,7 +61,6 @@
#include <akonadi/contact/contactsearchjob.h>
#include <KActionCollection>
#include <KDebug>
-#include <KInputDialog>
#include <KGlobal>
#include <KLocale>
#include <KMessageBox>
@@ -89,6 +88,7 @@
#include <QEvent>
#include <QFileDialog>
#include <QIcon>
+#include <QInputDialog>
#include <QKeySequence>
#include <QLabel>
#include <QLineEdit>
@@ -1738,9 +1738,8 @@ void KeysManager::createNewGroup()
}
}
- QString groupName(KInputDialog::getText(i18n("Create New Group"),
- i18nc("Enter the name of the group you are creating now", "Enter new group name:"),
- QString(), 0, this));
+ QString groupName(QInputDialog::getText(this, i18n("Create New Group"),
+ i18nc("Enter the name of the group you are creating now", "Enter new group name:")));
if (groupName.isEmpty())
return;
if (!keysList.isEmpty()) {
diff --git a/kgpgoptions.cpp b/kgpgoptions.cpp
index 2bc5659..cfd0dcd 100644
--- a/kgpgoptions.cpp
+++ b/kgpgoptions.cpp
@@ -26,7 +26,6 @@
#include <KDebug>
#include <KDesktopFile>
#include <KFontChooser>
-#include <KInputDialog>
#include <KLocale>
#include <KMessageBox>
#include <KProcess>
@@ -35,6 +34,7 @@
#include <QCheckBox>
#include <QFile>
#include <QFileDialog>
+#include <QInputDialog>
#include <QTextStream>
#include <QVBoxLayout>
#include <QStandardPaths>
@@ -216,7 +216,7 @@ bool kgpgOptions::isValidKeyserver(const QString &server)
void kgpgOptions::slotAddKeyServer()
{
- const QString newServer(KInputDialog::getText(i18n("Add New Key Server"), i18n("Server URL:")));
+ const QString newServer(QInputDialog::getText(this, i18n("Add New Key Server"), i18n("Server URL:")));
if (!isValidKeyserver(newServer))
return;