diff options
| author | Sebastian Holtermann <sebholt@xwmw.org> | 2018-04-03 09:28:40 (GMT) |
|---|---|---|
| committer | Sebastian Holtermann <sebholt@xwmw.org> | 2018-04-03 15:20:29 (GMT) |
| commit | 14a86c9ea7efae1b3acb01bc79f2f1f5ef23c5f1 (patch) | |
| tree | 917b96ff693ca0b72e932f0f4bc11e70078d8bfe /Source/cmQtAutoGeneratorMocUic.cxx | |
| parent | 61fd4c742013a7f9139db190f936703b656540ff (diff) | |
| download | CMake-14a86c9ea7efae1b3acb01bc79f2f1f5ef23c5f1.zip CMake-14a86c9ea7efae1b3acb01bc79f2f1f5ef23c5f1.tar.gz CMake-14a86c9ea7efae1b3acb01bc79f2f1f5ef23c5f1.tar.bz2 | |
Autogen: Protected calls to cmSystemTools::CollapseCombinedPath
Diffstat (limited to 'Source/cmQtAutoGeneratorMocUic.cxx')
| -rw-r--r-- | Source/cmQtAutoGeneratorMocUic.cxx | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/Source/cmQtAutoGeneratorMocUic.cxx b/Source/cmQtAutoGeneratorMocUic.cxx index 6be65ee..b034ec7 100644 --- a/Source/cmQtAutoGeneratorMocUic.cxx +++ b/Source/cmQtAutoGeneratorMocUic.cxx @@ -26,7 +26,7 @@ std::string cmQtAutoGeneratorMocUic::BaseSettingsT::AbsoluteBuildPath( std::string const& relativePath) const { - return cmSystemTools::CollapseCombinedPath(AutogenBuildDir, relativePath); + return FileSys->CollapseCombinedPath(AutogenBuildDir, relativePath); } /** @@ -106,7 +106,7 @@ std::string cmQtAutoGeneratorMocUic::MocSettingsT::FindIncludedFile( std::string testPath = sourcePath; testPath += includeString; if (FileSys->FileExists(testPath)) { - return FileSys->RealPath(testPath); + return FileSys->GetRealPath(testPath); } } // Search in include directories @@ -115,7 +115,7 @@ std::string cmQtAutoGeneratorMocUic::MocSettingsT::FindIncludedFile( fullPath.push_back('/'); fullPath += includeString; if (FileSys->FileExists(fullPath)) { - return FileSys->RealPath(fullPath); + return FileSys->GetRealPath(fullPath); } } // Return empty string @@ -487,7 +487,7 @@ std::string cmQtAutoGeneratorMocUic::JobParseT::MocFindIncludedHeader( } // Sanitize if (!header.empty()) { - header = wrk.FileSys().RealPath(header); + header = wrk.FileSys().GetRealPath(header); } return header; } @@ -569,7 +569,7 @@ std::string cmQtAutoGeneratorMocUic::JobParseT::UicFindIncludedFile( // Search for the .ui file! for (std::string const& testFile : testFiles) { if (wrk.FileSys().FileExists(testFile)) { - res = wrk.FileSys().RealPath(testFile); + res = wrk.FileSys().GetRealPath(testFile); break; } } |