walkero
/
cppcheck
1
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

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.)
This commit is contained in:
Kimmo Varis 2011-06-07 14:29:59 +03:00
parent 5a27552669
commit faa1354445
1 changed files with 21 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
gui/mainwindow.cpp
View File

@ -796,16 +796,25 @@ void MainWindow::LoadProjectFile(const QString &filePath)
mProject->Open(); mProject->Open();
QString rootpath = mProject->GetProjectFile()->GetRootPath(); QString rootpath = mProject->GetProjectFile()->GetRootPath();
// If root path not give or "current dir" then use project file's directory // If the root path is not given or is not "current dir", use project
// as check path // file's location directory as root path
if (rootpath.isEmpty() || rootpath == ".") if (rootpath.isEmpty() || rootpath == ".")
mCurrentDirectory = inf.canonicalPath(); mCurrentDirectory = inf.canonicalPath();
else else
mCurrentDirectory = rootpath; mCurrentDirectory = rootpath;
QStringList paths = mProject->GetProjectFile()->GetCheckPaths(); 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())
{ {
paths << mCurrentDirectory;
}
// Convert relative paths to absolute paths
for (int i = 0; i < paths.size(); i++) for (int i = 0; i < paths.size(); i++)
{ {
if (!QDir::isAbsolutePath(paths[i])) if (!QDir::isAbsolutePath(paths[i]))
@ -816,7 +825,6 @@ void MainWindow::LoadProjectFile(const QString &filePath)
} }
} }
DoCheckFiles(paths); DoCheckFiles(paths);
}
} }
void MainWindow::NewProjectFile() void MainWindow::NewProjectFile()