From 52336bae08dfbd6be0dd32fd080de73ae9e0f02f Mon Sep 17 00:00:00 2001
From: Denis Shienkov <denis.shienkov@gmail.com>
Date: Tue, 19 May 2020 14:06:08 +0300
Subject: [PATCH] Move splitString() method to base ToolChainConfigWidget

Change-Id: I382b5ad33e167356be19260454934940ae6d2d96
Reviewed-by: hjk <hjk@qt.io>
---
 src/plugins/baremetal/keiltoolchain.cpp         | 16 ----------------
 src/plugins/baremetal/keiltoolchain.h           |  1 -
 src/plugins/projectexplorer/gcctoolchain.cpp    | 16 ----------------
 .../projectexplorer/gcctoolchainfactories.h     |  1 -
 .../projectexplorer/toolchainconfigwidget.cpp   | 17 +++++++++++++++++
 .../projectexplorer/toolchainconfigwidget.h     |  1 +
 6 files changed, 18 insertions(+), 34 deletions(-)

diff --git a/src/plugins/baremetal/keiltoolchain.cpp b/src/plugins/baremetal/keiltoolchain.cpp
index 1a13d47fd4c..903118e7571 100644
--- a/src/plugins/baremetal/keiltoolchain.cpp
+++ b/src/plugins/baremetal/keiltoolchain.cpp
@@ -868,21 +868,5 @@ void KeilToolChainConfigWidget::handlePlatformCodeGenFlagsChange()
         handleCompilerCommandChange();
 }
 
-QStringList KeilToolChainConfigWidget::splitString(const QString &s) const
-{
-    QtcProcess::SplitError splitError;
-    const OsType osType = HostOsInfo::hostOs();
-    QStringList res = QtcProcess::splitArgs(s, osType, false, &splitError);
-    if (splitError != QtcProcess::SplitOk){
-        res = QtcProcess::splitArgs(s + '\\', osType, false, &splitError);
-        if (splitError != QtcProcess::SplitOk){
-            res = QtcProcess::splitArgs(s + '"', osType, false, &splitError);
-            if (splitError != QtcProcess::SplitOk)
-                res = QtcProcess::splitArgs(s + '\'', osType, false, &splitError);
-        }
-    }
-    return res;
-}
-
 } // namespace Internal
 } // namespace BareMetal
diff --git a/src/plugins/baremetal/keiltoolchain.h b/src/plugins/baremetal/keiltoolchain.h
index 1e7dc09da90..d9f85d33f60 100644
--- a/src/plugins/baremetal/keiltoolchain.h
+++ b/src/plugins/baremetal/keiltoolchain.h
@@ -133,7 +133,6 @@ private:
     void setFromToolChain();
     void handleCompilerCommandChange();
     void handlePlatformCodeGenFlagsChange();
-    QStringList splitString(const QString &s) const;
 
     Utils::PathChooser *m_compilerCommand = nullptr;
     ProjectExplorer::AbiWidget *m_abiWidget = nullptr;
diff --git a/src/plugins/projectexplorer/gcctoolchain.cpp b/src/plugins/projectexplorer/gcctoolchain.cpp
index 81a0b015b0f..e1dd253be68 100644
--- a/src/plugins/projectexplorer/gcctoolchain.cpp
+++ b/src/plugins/projectexplorer/gcctoolchain.cpp
@@ -1332,22 +1332,6 @@ void GccToolChainConfigWidget::makeReadOnlyImpl()
     m_isReadOnly = true;
 }
 
-QStringList GccToolChainConfigWidget::splitString(const QString &s)
-{
-    QtcProcess::SplitError splitError;
-    const OsType osType = HostOsInfo::hostOs();
-    QStringList res = QtcProcess::splitArgs(s, osType, false, &splitError);
-    if (splitError != QtcProcess::SplitOk){
-        res = QtcProcess::splitArgs(s + '\\', osType, false, &splitError);
-        if (splitError != QtcProcess::SplitOk){
-            res = QtcProcess::splitArgs(s + '"', osType, false, &splitError);
-            if (splitError != QtcProcess::SplitOk)
-                res = QtcProcess::splitArgs(s + '\'', osType, false, &splitError);
-        }
-    }
-    return res;
-}
-
 void GccToolChainConfigWidget::handleCompilerCommandChange()
 {
     if (!m_abiWidget)
diff --git a/src/plugins/projectexplorer/gcctoolchainfactories.h b/src/plugins/projectexplorer/gcctoolchainfactories.h
index 42e6c05c016..97085968349 100644
--- a/src/plugins/projectexplorer/gcctoolchainfactories.h
+++ b/src/plugins/projectexplorer/gcctoolchainfactories.h
@@ -77,7 +77,6 @@ class GccToolChainConfigWidget : public ToolChainConfigWidget
 
 public:
     explicit GccToolChainConfigWidget(GccToolChain *tc);
-    static QStringList splitString(const QString &s);
 
 protected:
     void handleCompilerCommandChange();
diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.cpp b/src/plugins/projectexplorer/toolchainconfigwidget.cpp
index 96e021a867b..d38c6ea3bf5 100644
--- a/src/plugins/projectexplorer/toolchainconfigwidget.cpp
+++ b/src/plugins/projectexplorer/toolchainconfigwidget.cpp
@@ -28,6 +28,7 @@
 
 #include <utils/detailswidget.h>
 #include <utils/qtcassert.h>
+#include <utils/qtcprocess.h>
 
 #include <QString>
 
@@ -125,4 +126,20 @@ void ToolChainConfigWidget::clearErrorMessage()
     m_errorLabel->setVisible(false);
 }
 
+QStringList ToolChainConfigWidget::splitString(const QString &s)
+{
+    Utils::QtcProcess::SplitError splitError;
+    const Utils::OsType osType = Utils::HostOsInfo::hostOs();
+    QStringList res = Utils::QtcProcess::splitArgs(s, osType, false, &splitError);
+    if (splitError != Utils::QtcProcess::SplitOk){
+        res = Utils::QtcProcess::splitArgs(s + '\\', osType, false, &splitError);
+        if (splitError != Utils::QtcProcess::SplitOk){
+            res = Utils::QtcProcess::splitArgs(s + '"', osType, false, &splitError);
+            if (splitError != Utils::QtcProcess::SplitOk)
+                res = Utils::QtcProcess::splitArgs(s + '\'', osType, false, &splitError);
+        }
+    }
+    return res;
+}
+
 } // namespace ProjectExplorer
diff --git a/src/plugins/projectexplorer/toolchainconfigwidget.h b/src/plugins/projectexplorer/toolchainconfigwidget.h
index e6b5764ca4f..8e48fc1ca96 100644
--- a/src/plugins/projectexplorer/toolchainconfigwidget.h
+++ b/src/plugins/projectexplorer/toolchainconfigwidget.h
@@ -71,6 +71,7 @@ protected:
     virtual void makeReadOnlyImpl() = 0;
 
     void addErrorLabel();
+    static QStringList splitString(const QString &s);
     QFormLayout *m_mainLayout;
     QLineEdit *m_nameLineEdit;