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

List:       kde-commits
Subject:    [kdevelop] projectmanagers/cmake: Code cleanup after parent commit
From:       Kevin Funk <kevin () kfunk ! org>
Date:       2014-02-04 14:32:46
Message-ID: E1WAh3O-0000No-C5 () scm ! kde ! org
[Download RAW message or body]

Git commit 8f8a9606881a0c6bbfce2d0bc78b02d4ba3dc19b by Kevin Funk.
Committed on 04/02/2014 at 14:31.
Pushed by kfunk into branch 'master'.

Code cleanup after parent commit

M  +27   -17   projectmanagers/cmake/cmakebuilddirchooser.cpp

http://commits.kde.org/kdevelop/8f8a9606881a0c6bbfce2d0bc78b02d4ba3dc19b

diff --git a/projectmanagers/cmake/cmakebuilddirchooser.cpp \
b/projectmanagers/cmake/cmakebuilddirchooser.cpp index 5e39e52..1ca3e4a 100644
--- a/projectmanagers/cmake/cmakebuilddirchooser.cpp
+++ b/projectmanagers/cmake/cmakebuilddirchooser.cpp
@@ -28,7 +28,32 @@
 
 #include <KColorScheme>
 
-static const int maxExtraArgumentsInHistory = 15;
+namespace {
+
+const int maxExtraArgumentsInHistory = 15;
+
+/// Return the proposed build folder URL for given @p srcFolder
+KUrl proposedBuildUrl(const KUrl& srcFolder)
+{
+    KUrl proposedBuildUrl;
+    if (srcFolder.path().contains("/src/"))
+    {
+        const QString srcBuildPath = srcFolder.path().replace("/src/", "/build/");
+        if (QDir(srcBuildPath).exists())
+        {
+            proposedBuildUrl = KUrl(srcBuildPath);
+        }
+    }
+    if (proposedBuildUrl.isEmpty())
+    {
+        proposedBuildUrl = KUrl( srcFolder.toLocalFile() + "/build" );
+    }
+
+    proposedBuildUrl.cleanPath();
+    return proposedBuildUrl;
+}
+
+}
 
 CMakeBuildDirChooser::CMakeBuildDirChooser(QWidget* parent)
     : KDialog(parent)
@@ -74,22 +99,7 @@ void CMakeBuildDirChooser::setSourceFolder( const KUrl& srcFolder \
)  {
     m_srcFolder = srcFolder;
 
-    KUrl proposedBuildUrl;
-    if (srcFolder.path().contains("/src/"))
-    {
-        const QString srcBuildPath = srcFolder.path().replace("/src/", "/build/");
-        if (QDir(srcBuildPath).exists())
-        {
-            proposedBuildUrl = KUrl(srcBuildPath);
-        }
-    }
-    if (proposedBuildUrl.isEmpty())
-    {
-        proposedBuildUrl = KUrl( srcFolder.toLocalFile() + "/build" );
-    }
-
-    proposedBuildUrl.cleanPath();
-    m_chooserUi->buildFolder->setUrl(proposedBuildUrl);
+    m_chooserUi->buildFolder->setUrl(proposedBuildUrl(srcFolder));
     setCaption(i18n("Configure a build directory for %1", srcFolder.toLocalFile()));
     update();
 }


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