From 58014676adb14e7332c1a98fa5e28ed8bff1e5cb Mon Sep 17 00:00:00 2001
From: David Jarvie <djarvie@kde.org>
Date: Wed, 25 Apr 2012 22:30:49 +0100
Subject: [PATCH] Fix return values changed in
 d6ca392cbe2a728ed68df8ecccae8dc37290eb9b

---
 functions.cpp | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/functions.cpp b/functions.cpp
index 9846bd1b..b40df0ce 100644
--- a/functions.cpp
+++ b/functions.cpp
@@ -2130,10 +2130,10 @@ QString browseFile(const QString& caption, QString& defaultDir, const QString& i
     if (!initialFile.isEmpty())
         fileDlg->setSelection(initialFile);
     if (fileDlg->exec() != QDialog::Accepted)
-        return fileDlg ? QString() : QString();
+        return fileDlg ? QString("") : QString();  // return null only if dialog was deleted
     KUrl url = fileDlg->selectedUrl();
     if (url.isEmpty())
-        return QString();
+        return QString("");   // return empty, non-null string
     defaultDir = url.isLocalFile() ? url.upUrl().toLocalFile() : url.directory();
     return (mode & KFile::LocalOnly) ? url.pathOrUrl() : url.prettyUrl();
 }
-- 
GitLab