[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    [kdesvn/frameworks] src/svnfrontend: KInputDialog -> QInputDialog
From:       Christian Ehrlicher <Ch.Ehrlicher () gmx ! de>
Date:       2016-03-31 19:21:07
Message-ID: E1ali9T-0005rB-9B () scm ! kde ! org
[Download RAW message or body]

Git commit dd974021c077f1cef9f14568c5a3c442d6cf2ebc by Christian Ehrlicher.
Committed on 27/03/2016 at 16:20.
Pushed by chehrlic into branch 'frameworks'.

KInputDialog -> QInputDialog

M  +5    -5    src/svnfrontend/svnactions.cpp

http://commits.kde.org/kdesvn/dd974021c077f1cef9f14568c5a3c442d6cf2ebc

diff --git a/src/svnfrontend/svnactions.cpp b/src/svnfrontend/svnactions.cpp
index 09ecb2f..e28ef14 100644
--- a/src/svnfrontend/svnactions.cpp
+++ b/src/svnfrontend/svnactions.cpp
@@ -66,7 +66,6 @@
 
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <kinputdialog.h>
 #include <kconfig.h>
 #include <kmimetypetrader.h>
 #include <krun.h>
@@ -75,6 +74,7 @@
 #include <QDesktopServices>
 #include <QFileInfo>
 #include <QFontDatabase>
+#include <QInputDialog>
 #include <QMap>
 #include <QReadWriteLock>
 #include <QString>
@@ -656,8 +656,9 @@ QString SvnActions::makeMkdir(const QString &parentDir)
         return QString();
     }
     bool isOk = false;
-    QString ex = KInputDialog::getText(i18n("New folder"), i18n("Enter folder \
                name:"), QString(), &isOk);
-    if (!isOk) {
+    const QString ex = QInputDialog::getText(m_Data->m_ParentList->realWidget(), \
i18n("New folder"), i18n("Enter folder name:"), +                                     \
QLineEdit::Normal, QString(), &isOk); +    if (!isOk || ex.isEmpty()) {
         return QString();
     }
     svn::Path target(parentDir);
@@ -670,8 +671,7 @@ QString SvnActions::makeMkdir(const QString &parentDir)
         return QString();
     }
 
-    ex = target.path();
-    return ex;
+    return target.path();
 }
 
 QString SvnActions::getInfo(const SvnItemList &lst, const svn::Revision &rev, const \
svn::Revision &peg, bool recursive, bool all)


[prev in list] [next in list] [prev in thread] [next in thread]