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

List:       kde-commits
Subject:    [kde-baseapps] kdialog: Fix parsing of some command line arguments.
From:       Jeremy Whiting <jpwhiting () kde ! org>
Date:       2016-08-09 22:24:25
Message-ID: E1bXFRh-0002Nr-Gv () code ! kde ! org
[Download RAW message or body]

Git commit b057e85e7ae31b38060cd2b709530e2fad9d37a6 by Jeremy Whiting.
Committed on 09/08/2016 at 22:23.
Pushed by whiting into branch 'master'.

Fix parsing of some command line arguments.

REVIEW:128639

M  +10   -23   kdialog/kdialog.cpp

http://commits.kde.org/kde-baseapps/b057e85e7ae31b38060cd2b709530e2fad9d37a6

diff --git a/kdialog/kdialog.cpp b/kdialog/kdialog.cpp
index af43609..6dd6696 100644
--- a/kdialog/kdialog.cpp
+++ b/kdialog/kdialog.cpp
@@ -650,13 +650,11 @@ int main(int argc, char *argv[])
 
     // getopenfilename [startDir] [filter]
     if (parser.isSet("getopenfilename")) {
-        QString startDir = parser.value("getopenfilename");
-        if (!startDir.startsWith(QStringLiteral("file://")))
-            startDir.prepend(QStringLiteral("file://"));
+        QString startDir = args.count() > 0 ? args.at(0) : QString();
         const QUrl startUrl = QUrl::fromUserInput(startDir);
         QString filter;
-        if (args.count() >= 1)  {
-            filter = Widgets::parseString(args.at(0));
+        if (args.count() > 1)  {
+            filter = Widgets::parseString(args.at(1));
         }
         KFileDialog dlg( startUrl, filter, 0 );
         dlg.setOperationMode( KFileDialog::Opening );
@@ -690,19 +688,12 @@ int main(int argc, char *argv[])
     // getsaveurl [startDir] [filter]
     // getsavefilename [startDir] [filter]
     if ( (parser.isSet("getsavefilename") ) || (parser.isSet("getsaveurl") ) ) {
-        QString startDir;
+        QString startDir = args.count() > 0 ? args.at(0) : QString();
         QString filter;
-        if ( parser.isSet("getsavefilename") ) {
-            startDir = parser.value("getsavefilename");
-        } else {
-            startDir = parser.value("getsaveurl");
-        }
-        if (!startDir.startsWith(QStringLiteral("file://")))
-            startDir.prepend(QStringLiteral("file://"));
         const QUrl startUrl = QUrl::fromUserInput(startDir);
 
-        if (args.count() >= 1)  {
-            filter = Widgets::parseString(args.at(0));
+        if (args.count() > 1)  {
+            filter = Widgets::parseString(args.at(1));
         }
         // copied from KFileDialog::getSaveFileName(), so we can add geometry
         bool specialDir = startDir.startsWith(QLatin1Char(':'));
@@ -737,9 +728,7 @@ int main(int argc, char *argv[])
 
     // getexistingdirectory [startDir]
     if (parser.isSet("getexistingdirectory")) {
-        QString startDir = parser.value("getexistingdirectory");
-        if (!startDir.startsWith(QStringLiteral("file://")))
-            startDir.prepend(QStringLiteral("file://"));
+        QString startDir = args.count() > 0 ? args.at(0) : QString();
         const QUrl startUrl = QUrl::fromUserInput(startDir);
         QString result;
 #ifdef Q_WS_WIN
@@ -770,14 +759,12 @@ int main(int argc, char *argv[])
 
     // getopenurl [startDir] [filter]
     if (parser.isSet("getopenurl")) {
-        QString startDir = parser.value("getopenurl");
-        if (!startDir.startsWith(QStringLiteral("file://")))
-            startDir.prepend(QStringLiteral("file://"));
+        QString startDir = args.count() > 0 ? args.at(0) : QString();
         const QUrl startUrl = QUrl::fromUserInput(startDir);
 
         QString filter;
-        if (args.count() >= 1)  {
-            filter = Widgets::parseString(args.at(0));
+        if (args.count() > 1)  {
+            filter = Widgets::parseString(args.at(1));
         }
         KFileDialog dlg( startUrl, filter, 0 );
         dlg.setOperationMode( KFileDialog::Opening );
[prev in list] [next in list] [prev in thread] [next in thread]