1 files changed, 6 insertions, 14 deletions
diff --git a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
index 132f805937..92603861af 100644
--- a/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
+++ b/src/plugins/autotoolsprojectmanager/autotoolsproject.cpp
@@ -48,7 +48,7 @@
 #include <projectexplorer/buildsteplist.h>
 #include <projectexplorer/projectexplorerconstants.h>
 #include <extensionsystem/pluginmanager.h>
-#include <cplusplus/ModelManagerInterface.h>
+#include <cpptools/ModelManagerInterface.h>
 #include <coreplugin/icore.h>
 #include <utils/qtcassert.h>
 
@@ -148,11 +148,6 @@ AutotoolsTarget *AutotoolsProject::activeTarget() const
     return static_cast<AutotoolsTarget *>(Project::activeTarget());
 }
 
-QList<Project *> AutotoolsProject::dependsOn()
-{
-    return QList<Project *>();
-}
-
 QString AutotoolsProject::defaultBuildDirectory() const
 {
     return projectDirectory();
@@ -317,7 +312,7 @@ void AutotoolsProject::makefileParsingFinished()
 
     // Add configure.ac file to project and watch for changes.
     const QLatin1String configureAc(QLatin1String("configure.ac"));
-    const QFile configureAcFile(fileInfo.absolutePath() + QChar('/') + configureAc);
+    const QFile configureAcFile(fileInfo.absolutePath() + QLatin1Char('/') + configureAc);
     if (configureAcFile.exists()) {
         files.append(configureAc);
         const QString configureAcFilePath = dir.absoluteFilePath(configureAc);
@@ -368,13 +363,10 @@ void AutotoolsProject::buildFileNodeTree(const QDir &directory,
         if (file.contains(QLatin1String(".moc")))
             continue;
 
-        QString subDir = baseDir + QChar('/') + file;
-        for (int i = subDir.length() - 1; i >= 0; --i) {
-            if (subDir.at(i) == QChar('/')) {
-                subDir = subDir.left(i);
-                break;
-            }
-        }
+        QString subDir = baseDir + QLatin1Char('/') + file;
+        const int lastSlashPos = subDir.lastIndexOf(QLatin1Char('/'));
+        if (lastSlashPos != -1)
+            subDir.truncate(lastSlashPos);
 
         // Add folder nodes, that are not already available
         oldParentFolder = parentFolder;