ui: implemented prefilling indexed header paths for compilation database projects
* fixed header path detection in CompilationDatabase class
This commit is contained in:
@@ -124,7 +124,7 @@ std::string ProjectSettings::getProjectName() const
|
||||
return getFilePath().withoutExtension().fileName();
|
||||
}
|
||||
|
||||
FilePath ProjectSettings::getProjectFileLocation() const
|
||||
FilePath ProjectSettings::getProjectDirectoryPath() const
|
||||
{
|
||||
return getFilePath().parentDirectory();
|
||||
}
|
||||
@@ -204,7 +204,7 @@ std::vector<FilePath> ProjectSettings::makePathsExpandedAndAbsolute(const std::v
|
||||
std::vector<FilePath> p = expandPaths(paths);
|
||||
|
||||
std::vector<FilePath> absPaths;
|
||||
FilePath basePath = getProjectFileLocation();
|
||||
FilePath basePath = getProjectDirectoryPath();
|
||||
for (const FilePath& path : p)
|
||||
{
|
||||
if (path.isAbsolute())
|
||||
@@ -229,7 +229,7 @@ FilePath ProjectSettings::makePathExpandedAndAbsolute(const FilePath& path) cons
|
||||
return p;
|
||||
}
|
||||
|
||||
return getProjectFileLocation().concat(p).canonical();
|
||||
return getProjectDirectoryPath().concat(p).canonical();
|
||||
}
|
||||
|
||||
SettingsMigrator ProjectSettings::getMigrations() const
|
||||
|
||||
@@ -33,7 +33,7 @@ public:
|
||||
void setProjectFilePath(std::string projectName, const FilePath& projectFileLocation);
|
||||
|
||||
std::string getProjectName() const;
|
||||
FilePath getProjectFileLocation() const;
|
||||
FilePath getProjectDirectoryPath() const;
|
||||
|
||||
std::string getDescription() const;
|
||||
|
||||
|
||||
@@ -80,9 +80,9 @@ void SourceGroupSettings::setName(const std::string& name)
|
||||
m_name = name;
|
||||
}
|
||||
|
||||
FilePath SourceGroupSettings::getProjectFileLocation() const
|
||||
FilePath SourceGroupSettings::getProjectDirectoryPath() const
|
||||
{
|
||||
return m_projectSettings->getProjectFileLocation();
|
||||
return m_projectSettings->getProjectDirectoryPath();
|
||||
}
|
||||
|
||||
FilePath SourceGroupSettings::makePathExpandedAndAbsolute(const FilePath& path) const
|
||||
|
||||
@@ -28,7 +28,7 @@ public:
|
||||
std::string getName() const;
|
||||
void setName(const std::string& name);
|
||||
|
||||
FilePath getProjectFileLocation() const;
|
||||
FilePath getProjectDirectoryPath() const;
|
||||
FilePath makePathExpandedAndAbsolute(const FilePath& path) const;
|
||||
std::vector<FilePath> makePathsExpandedAndAbsolute(const std::vector<FilePath>& paths) const;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user