From c73e58893ea98378b0b09dea505ead6a99a3200e Mon Sep 17 00:00:00 2001 From: Eberhard Graether Date: Wed, 25 Oct 2017 00:57:28 +0200 Subject: [PATCH] ui: Fixes in project setup * fixed include paths fetched from CDB not canonical * fixed content names --- src/lib/utility/utilityFile.cpp | 2 +- src/lib_cxx/utility/CompilationDatabase.cpp | 9 ++++----- .../project_wizzard/QtProjectWizzardContentCDBSource.cpp | 2 +- .../project_wizzard/QtProjectWizzardContentPaths.cpp | 8 ++++---- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/src/lib/utility/utilityFile.cpp b/src/lib/utility/utilityFile.cpp index e32bff5f..fd0eba30 100644 --- a/src/lib/utility/utilityFile.cpp +++ b/src/lib/utility/utilityFile.cpp @@ -13,7 +13,7 @@ std::vector utility::getTopLevelPaths(const std::vector& pat addPath = false; break; } - else if(path.contains(topLevelPaths[i])) + else if (path.contains(topLevelPaths[i])) { topLevelPaths.erase(topLevelPaths.begin() + i); break; diff --git a/src/lib_cxx/utility/CompilationDatabase.cpp b/src/lib_cxx/utility/CompilationDatabase.cpp index 4aa2511e..da28aa02 100644 --- a/src/lib_cxx/utility/CompilationDatabase.cpp +++ b/src/lib_cxx/utility/CompilationDatabase.cpp @@ -17,7 +17,6 @@ utility::CompilationDatabase::CompilationDatabase(const FilePath& filePath) std::vector utility::CompilationDatabase::getAllHeaderPaths() const { std::vector paths = utility::concat(m_headers, m_systemHeaders); - paths = utility::concat(paths, m_frameworkHeaders); paths = utility::unique(paths); return paths; } @@ -66,19 +65,19 @@ void utility::CompilationDatabase::init() if (utility::isPrefix(frameworkIncludeFlag, argument)) { - frameworkHeaders.insert(FilePath(utility::trim(argument.substr(frameworkIncludeFlag.size())), command.Directory)); + frameworkHeaders.insert(FilePath(utility::trim(argument.substr(frameworkIncludeFlag.size())), command.Directory).canonical()); } else if (utility::isPrefix(systemIncludeFlag, argument)) { - systemHeaders.insert(FilePath(utility::trim(argument.substr(systemIncludeFlag.size())), command.Directory)); + systemHeaders.insert(FilePath(utility::trim(argument.substr(systemIncludeFlag.size())), command.Directory).canonical()); } else if (utility::isPrefix(quoteFlag, argument)) { - headers.insert(FilePath(utility::trim(argument.substr(quoteFlag.size())), command.Directory)); + headers.insert(FilePath(utility::trim(argument.substr(quoteFlag.size())), command.Directory).canonical()); } else if (utility::isPrefix(includeFlag, argument)) { - headers.insert(FilePath(utility::trim(argument.substr(includeFlag.size())), command.Directory)); + headers.insert(FilePath(utility::trim(argument.substr(includeFlag.size())), command.Directory).canonical()); } } } diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp index 0f3d1d29..de91bca6 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentCDBSource.cpp @@ -15,7 +15,7 @@ QtProjectWizzardContentCDBSource::QtProjectWizzardContentCDBSource( void QtProjectWizzardContentCDBSource::populate(QGridLayout* layout, int& row) { - QLabel* title = createFormLabel("Source Files"); + QLabel* title = createFormLabel("Source Files to Index"); layout->addWidget(title, row, QtProjectWizzardWindow::FRONT_COL, Qt::AlignTop); layout->setRowStretch(row, 0); diff --git a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp index 376cd1cc..40d04227 100644 --- a/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp +++ b/src/lib_gui/qt/window/project_wizzard/QtProjectWizzardContentPaths.cpp @@ -276,7 +276,7 @@ void QtProjectWizzardContentPathsCDBHeader::load() } m_settings->setSourcePaths(sourcePaths); } - + QtProjectWizzardContentPathsSource::load(); } @@ -285,7 +285,7 @@ bool QtProjectWizzardContentPathsCDBHeader::check() if (!m_list->getList().size()) { QMessageBox msgBox; - msgBox.setText("You didn't specify any Indexed Header Paths."); + msgBox.setText("You didn't specify any Header Files & Directories to Index."); msgBox.setInformativeText( "Sourcetrail will only index the source files listed in the compilation database file and none of the included " "header files."); @@ -325,9 +325,9 @@ void QtProjectWizzardContentPathsCDBHeader::buttonClicked() connect(m_filesDialog.get(), &QtSelectPathsDialog::finished, this, &QtProjectWizzardContentPathsCDBHeader::savedFilesDialog); connect(m_filesDialog.get(), &QtSelectPathsDialog::canceled, this, &QtProjectWizzardContentPathsCDBHeader::closedFilesDialog); - + dynamic_cast(m_filesDialog.get())->setPathsList( - getTopLevelHeaderSearchPaths(std::dynamic_pointer_cast(m_settings)), + getTopLevelHeaderSearchPaths(std::dynamic_pointer_cast(m_settings)), m_settings->getSourcePaths() ); }