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

List:       kde-commits
Subject:    [kde-baseapps/frameworks] dolphin/src: Port KInputDialog to QInputDialog
From:       Emmanuel Pescosta <emmanuelpescosta099 () gmail ! com>
Date:       2014-12-14 20:32:57
Message-ID: E1Y0Fqb-0005WF-DY () scm ! kde ! org
[Download RAW message or body]

Git commit 127ae49d22a5d1d09257ae69f6a053176d46f663 by Emmanuel Pescosta.
Committed on 14/12/2014 at 18:05.
Pushed by emmanuelp into branch 'frameworks'.

Port KInputDialog to QInputDialog

M  +2    -3    dolphin/src/dolphinpart.cpp

http://commits.kde.org/kde-baseapps/127ae49d22a5d1d09257ae69f6a053176d46f663

diff --git a/dolphin/src/dolphinpart.cpp b/dolphin/src/dolphinpart.cpp
index ff1d471..e97799c 100644
--- a/dolphin/src/dolphinpart.cpp
+++ b/dolphin/src/dolphinpart.cpp
@@ -35,7 +35,6 @@
 #include <KToolInvocation>
 #include <kauthorized.h>
 #include <QMenu>
-#include <KInputDialog>
 #include <kdeversion.h>
 #include <KSharedConfig>
 #include <KConfigGroup>
@@ -57,7 +56,7 @@
 #include <QClipboard>
 #include <QDir>
 #include <QKeyEvent>
-
+#include <QInputDialog>
 
 K_PLUGIN_FACTORY(DolphinPartFactory, registerPlugin<DolphinPart>();)
 
@@ -507,7 +506,7 @@ void DolphinPart::slotUnselectItemsMatchingPattern()
 void DolphinPart::openSelectionDialog(const QString& title, const QString& text, bool selectItems)
 {
     bool okClicked;
-    QString pattern = KInputDialog::getText(title, text, "*", &okClicked, m_view);
+    const QString pattern = QInputDialog::getText(m_view, title, text, QLineEdit::Normal, "*", &okClicked);
 
     if (okClicked && !pattern.isEmpty()) {
         QRegExp patternRegExp(pattern, Qt::CaseSensitive, QRegExp::Wildcard);

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