CppTools: Move some static functions into the *.cpp

...since they are not referenced.

Change-Id: Ibe5906de6a3dcb9d6d69cade948eba98964e9a66
Reviewed-by: Erik Verbruggen <erik.verbruggen@digia.com>

2 files changed, 38 insertions, 41 deletions

diff --git a/src/plugins/cpptools/includeutils.cpp b/src/plugins/cpptools/includeutils.cpp
index 17bbf5c319..e331b897f3 100644
--- a/src/plugins/cpptools/includeutils.cpp
+++ b/src/plugins/cpptools/includeutils.cpp
@@ -49,12 +49,41 @@ using namespace CppTools;
 using namespace CppTools::IncludeUtils;
 using namespace Utils;
 
-static bool includeLineLessThan(const Include &left, const Include &right)
+namespace {
+
+bool includeLineLessThan(const Include &left, const Include &right)
 { return left.line() < right.line(); }
 
-static bool includeFileNamelessThen(const Include & left, const Include & right)
+bool includeFileNamelessThen(const Include & left, const Include & right)
 { return left.unresolvedFileName() < right.unresolvedFileName(); }
 
+int lineForAppendedIncludeGroup(const QList<IncludeGroup> &groups,
+                                unsigned *newLinesToPrepend)
+{
+    if (newLinesToPrepend)
+        *newLinesToPrepend += 1;
+    return groups.last().last().line() + 1;
+}
+
+int lineForPrependedIncludeGroup(const QList<IncludeGroup> &groups,
+                                 unsigned *newLinesToAppend)
+{
+    if (newLinesToAppend)
+        *newLinesToAppend += 1;
+    return groups.first().first().line();
+}
+
+QString includeDir(const QString &include)
+{
+    QString dirPrefix = QFileInfo(include).dir().path();
+    if (dirPrefix == QLatin1String("."))
+        return QString();
+    dirPrefix.append(QLatin1Char('/'));
+    return dirPrefix;
+}
+
+} // anonymous namespace
+
 LineForNewIncludeDirective::LineForNewIncludeDirective(const QTextDocument *textDocument,
                                                        QList<Document::Include> includes,
                                                        MocIncludeMode mocIncludeMode,
@@ -178,8 +207,8 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName,
         // case: The new include goes into an own include group
         if (groupsMixedIncludeType.isEmpty()) {
             return includeAtTop
-                ? IncludeGroup::lineForPrependedIncludeGroup(groupsNewline, newLinesToAppend)
-                : IncludeGroup::lineForAppendedIncludeGroup(groupsNewline, newLinesToPrepend);
+                ? lineForPrependedIncludeGroup(groupsNewline, newLinesToAppend)
+                : lineForAppendedIncludeGroup(groupsNewline, newLinesToPrepend);
         // case: add to mixed group
         } else {
             const IncludeGroup bestMixedGroup = groupsMixedIncludeType.last(); // TODO: flaterize
@@ -203,7 +232,7 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName,
 
     IncludeGroups groupsMatchingIncludeDir;
     foreach (const IncludeGroup &group, groupsSameIncludeDir) {
-        if (group.commonIncludeDir() == IncludeGroup::includeDir(pureIncludeFileName))
+        if (group.commonIncludeDir() == includeDir(pureIncludeFileName))
             groupsMatchingIncludeDir << group;
     }
 
@@ -224,10 +253,10 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName,
         if (groupsMixedIncludeDirs.isEmpty()) {
             if (includeAtTop) {
                 return groupsSameIncludeDir.isEmpty()
-                    ? IncludeGroup::lineForPrependedIncludeGroup(groupsNewline, newLinesToAppend)
-                    : IncludeGroup::lineForAppendedIncludeGroup(groupsSameIncludeDir, newLinesToPrepend);
+                    ? lineForPrependedIncludeGroup(groupsNewline, newLinesToAppend)
+                    : lineForAppendedIncludeGroup(groupsSameIncludeDir, newLinesToPrepend);
             } else {
-                return IncludeGroup::lineForAppendedIncludeGroup(groupsNewline, newLinesToPrepend);
+                return lineForAppendedIncludeGroup(groupsNewline, newLinesToPrepend);
             }
         // case: The new include is inserted at the best position of the best
         //       group with mixed include dirs
@@ -239,7 +268,7 @@ int LineForNewIncludeDirective::operator()(const QString &newIncludeFileName,
             }
             IncludeGroup localBestIncludeGroup = IncludeGroup(QList<Include>());
             foreach (const IncludeGroup &group, groupsIncludeDir) {
-                if (group.commonIncludeDir() == IncludeGroup::includeDir(pureIncludeFileName))
+                if (group.commonIncludeDir() == includeDir(pureIncludeFileName))
                     localBestIncludeGroup = group;
             }
             if (!localBestIncludeGroup.isEmpty())
@@ -361,15 +390,6 @@ QList<IncludeGroup> IncludeGroup::detectIncludeGroupsByIncludeType(const QList<I
     return result;
 }
 
-QString IncludeGroup::includeDir(const QString &include)
-{
-    QString dirPrefix = QFileInfo(include).dir().path();
-    if (dirPrefix == QLatin1String("."))
-        return QString();
-    dirPrefix.append(QLatin1Char('/'));
-    return dirPrefix;
-}
-
 /// returns groups that solely contains includes of the given include type
 QList<IncludeGroup> IncludeGroup::filterIncludeGroups(const QList<IncludeGroup> &groups,
                                                       Client::IncludeType includeType)
@@ -472,19 +492,3 @@ bool IncludeGroup::hasCommonIncludeDir() const
     }
     return true;
 }
-
-int IncludeGroup::lineForAppendedIncludeGroup(const QList<IncludeGroup> &groups,
-                                              unsigned *newLinesToPrepend)
-{
-    if (newLinesToPrepend)
-        *newLinesToPrepend += 1;
-    return groups.last().last().line() + 1;
-}
-
-int IncludeGroup::lineForPrependedIncludeGroup(const QList<IncludeGroup> &groups,
-                                               unsigned *newLinesToAppend)
-{
-    if (newLinesToAppend)
-        *newLinesToAppend += 1;
-    return groups.first().first().line();
-}
diff --git a/src/plugins/cpptools/includeutils.h b/src/plugins/cpptools/includeutils.h
index 89fff5a3d1..980f40a4e6 100644
--- a/src/plugins/cpptools/includeutils.h
+++ b/src/plugins/cpptools/includeutils.h
@@ -55,17 +55,10 @@ public:
     static QList<IncludeGroup> detectIncludeGroupsByIncludeDir(const QList<Include> &includes);
     static QList<IncludeGroup> detectIncludeGroupsByIncludeType(const QList<Include> &includes);
 
-    static int lineForAppendedIncludeGroup(const QList<IncludeGroup> &groups,
-                                           unsigned *newLinesToPrepend);
-    static int lineForPrependedIncludeGroup(const QList<IncludeGroup> &groups,
-                                            unsigned *newLinesToAppend);
-
     static QList<IncludeGroup> filterMixedIncludeGroups(const QList<IncludeGroup> &groups);
     static QList<IncludeGroup> filterIncludeGroups(const QList<IncludeGroup> &groups,
                                                    CPlusPlus::Client::IncludeType includeType);
 
-    static QString includeDir(const QString &include);
-
 public:
     IncludeGroup(const QList<Include> &includes) : m_includes(includes) {}