inline resoveDepends()

that's common practice for the expand functions, and that one isn't even
particularly big

Change-Id: I66c22e11edb66bd00d211fc1282eb75f5dd4832d
Reviewed-on: http://codereview.qt.nokia.com/1456
Reviewed-by: Marius Storm-Olsen <marius.storm-olsen@nokia.com>

diff --git a/qmake/project.cpp b/qmake/project.cpp
index 4a3d7b5..4a4b73f 100644 (file)
--- a/qmake/project.cpp
+++ b/qmake/project.cpp
@@ -1822,20 +1822,6 @@ void calculateDeps(QStringList &sortedList, const QString &item, const QString &
 }
 
 QStringList
-QMakeProject::resolveDepends(const QStringList &deps, const QString &prefix, bool resolve,
-                             QMap<QString, QStringList> &place)
-{
-    QStringList sortedList;
-    QStringList org = deps;
-    foreach(QString item, deps) {
-        calculateDeps(sortedList, item, prefix, org, resolve, place);
-        if (!resolve && org.isEmpty())
-            break;
-    }
-    return sortedList;
-}
-
-QStringList
 QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
                               QMap<QString, QStringList> &place)
 {
@@ -2287,10 +2273,15 @@ QMakeProject::doProjectExpand(QString func, QList<QStringList> args_list,
             fprintf(stderr, "%s:%d: %s(var, prefix) requires one or two arguments.\n",
                     parser.file.toLatin1().constData(), parser.line_no, func.toLatin1().constData());
         } else {
-            ret += resolveDepends(values(args[0], place),
-                                  (args.count() != 2 ? QString() : args[1]),
-                                  (func_t == E_RESOLVE_DEPENDS),
-                                  place);
+            bool resolve = (func_t == E_RESOLVE_DEPENDS);
+            QString prefix = (args.count() != 2 ? QString() : args[1]);
+            QStringList deps = values(args[0], place);
+            QStringList org = deps;
+            foreach(const QString &item, deps) {
+                calculateDeps(ret, item, prefix, org, resolve, place);
+                if (!resolve && org.isEmpty())
+                    break;
+            }
         }
         break; }
     default: {

diff --git a/qmake/project.h b/qmake/project.h
index 5581d1f..68110a8 100644 (file)
--- a/qmake/project.h
+++ b/qmake/project.h
@@ -107,8 +107,6 @@ class QMakeProject
     QStringList doVariableReplaceExpand(const QString &str, QMap<QString, QStringList> &place, bool *ok=0);
     void init(QMakeProperty *, const QMap<QString, QStringList> *);
     QStringList &values(const QString &v, QMap<QString, QStringList> &place);
-    QStringList resolveDepends(const QStringList &deps, const QString &prefix, bool resolve,
-                               QMap<QString, QStringList> &place);
     void validateModes();
 
 public: