Move concatAll function to ModUtils; it's not specific to probes.

Change-Id: I731ffa8865afd99e32c199dd38f532e671d7544a
Reviewed-by: Joerg Bornemann <joerg.bornemann@digia.com>

4 files changed, 19 insertions, 23 deletions

diff --git a/share/qbs/imports/qbs/ModUtils/utils.js b/share/qbs/imports/qbs/ModUtils/utils.js
index 506ee6354..cbfcd8cc6 100644
--- a/share/qbs/imports/qbs/ModUtils/utils.js
+++ b/share/qbs/imports/qbs/ModUtils/utils.js
@@ -124,6 +124,20 @@ function dumpObject(obj, description) {
     traverseObject(obj, dumpProperty);
 }
 
+function concatAll() {
+    var result = [];
+    for (var i = 0; i < arguments.length; ++i) {
+        var arg = arguments[i];
+        if (arg === undefined)
+            continue;
+        else if (arg instanceof Array)
+            result = result.concat(arg);
+        else
+            result.push(arg);
+    }
+    return result;
+}
+
 var EnvironmentVariable = (function () {
     function EnvironmentVariable(name, separator, convertPathSeparators) {
         if (!name)
diff --git a/share/qbs/imports/qbs/Probes/PathProbe.qbs b/share/qbs/imports/qbs/Probes/PathProbe.qbs
index 26871dc22..943007792 100644
--- a/share/qbs/imports/qbs/Probes/PathProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/PathProbe.qbs
@@ -1,7 +1,7 @@
 import qbs 1.0
 import qbs.File
 import qbs.FileInfo
-import "utils.js" as Utils
+import qbs.ModUtils
 
 Probe {
     // Inputs
@@ -21,19 +21,19 @@ Probe {
     configure: {
         if (!names)
             throw '"names" must be specified';
-        var _names = Utils.concatAll(names);
+        var _names = ModUtils.concatAll(names);
         if (nameFilter)
             _names = _names.map(nameFilter);
         // FIXME: Suggest how to obtain paths from system
-        var _paths = Utils.concatAll(pathPrefixes, platformPaths);
+        var _paths = ModUtils.concatAll(pathPrefixes, platformPaths);
         // FIXME: Add getenv support
-        var envs = Utils.concatAll(platformEnvironmentPaths, environmentPaths);
+        var envs = ModUtils.concatAll(platformEnvironmentPaths, environmentPaths);
         for (var i = 0; i < envs.length; ++i) {
             var value = qbs.getEnv(envs[i]) || '';
             if (value.length > 0)
                 _paths = _paths.concat(value.split(qbs.pathListSeparator));
         }
-        var _suffixes = Utils.concatAll('', pathSuffixes);
+        var _suffixes = ModUtils.concatAll('', pathSuffixes);
         for (i = 0; i < _names.length; ++i) {
             for (var j = 0; j < _paths.length; ++j) {
                 for (var k = 0; k < _suffixes.length; ++k) {
diff --git a/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs b/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
index 07509034d..7eafc355c 100644
--- a/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
+++ b/share/qbs/imports/qbs/Probes/PkgConfigProbe.qbs
@@ -1,7 +1,6 @@
 import qbs 1.0
 import qbs.Process
 import qbs.FileInfo
-import "utils.js" as Utils
 
 Probe {
     // Inputs
diff --git a/share/qbs/imports/qbs/Probes/utils.js b/share/qbs/imports/qbs/Probes/utils.js
deleted file mode 100644
index 395f5fa67..000000000
--- a/share/qbs/imports/qbs/Probes/utils.js
+++ /dev/null
@@ -1,17 +0,0 @@
-//
-// utility functions for probes
-//
-
-function concatAll() {
-    var result = [];
-    for (var i = 0; i < arguments.length; ++i) {
-        var arg = arguments[i];
-        if (arg === undefined)
-            continue;
-        else if (arg instanceof Array)
-            result = result.concat(arg);
-        else
-            result.push(arg);
-    }
-    return result;
-}