From faa135444521189cad566b1a1314cbf0ca2de8c6 Mon Sep 17 00:00:00 2001
From: Kimmo Varis <kimmov@gmail.com>
Date: Tue, 7 Jun 2011 14:29:59 +0300
Subject: [PATCH] GUI: Handle missing checked paths in project file.

If the project file does not define paths to check then check the
project root directory (which likely is the directory where the
project file is located).

Ticket #2816 (GUI regression: Interrupted checking because of too many #ifdef configurations.)
---
 gui/mainwindow.cpp | 34 +++++++++++++++++++++-------------
 1 file changed, 21 insertions(+), 13 deletions(-)

diff --git a/gui/mainwindow.cpp b/gui/mainwindow.cpp
index 77214019a..843b34a3d 100644
--- a/gui/mainwindow.cpp
+++ b/gui/mainwindow.cpp
@@ -796,27 +796,35 @@ void MainWindow::LoadProjectFile(const QString &filePath)
     mProject->Open();
     QString rootpath = mProject->GetProjectFile()->GetRootPath();
 
-    // If root path not give or "current dir" then use project file's directory
-    // as check path
+    // If the root path is not given or is not "current dir", use project
+    // file's location directory as root path
     if (rootpath.isEmpty() || rootpath == ".")
         mCurrentDirectory = inf.canonicalPath();
     else
         mCurrentDirectory = rootpath;
 
     QStringList paths = mProject->GetProjectFile()->GetCheckPaths();
-    if (!paths.isEmpty())
+
+    // If paths not given then check the root path (which may be the project
+    // file's location, see above). This is to keep the compatibility with
+    // old "silent" project file loading when we checked the director where the
+    // project file was located.
+    if (paths.isEmpty())
     {
-        for (int i = 0; i < paths.size(); i++)
-        {
-            if (!QDir::isAbsolutePath(paths[i]))
-            {
-                QString path = mCurrentDirectory + "/";
-                path += paths[i];
-                paths[i] = QDir::cleanPath(path);
-            }
-        }
-        DoCheckFiles(paths);
+        paths << mCurrentDirectory;
     }
+
+    // Convert relative paths to absolute paths
+    for (int i = 0; i < paths.size(); i++)
+    {
+        if (!QDir::isAbsolutePath(paths[i]))
+        {
+            QString path = mCurrentDirectory + "/";
+            path += paths[i];
+            paths[i] = QDir::cleanPath(path);
+        }
+    }
+    DoCheckFiles(paths);
 }
 
 void MainWindow::NewProjectFile()