feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Adapt to upstream FileName changes

Browse Source 
Change-Id: I5b2a3ec17024fdc569df0c65f8d48564d5a3afea
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Orgad Shaneh <orgads@gmail.com>
This commit is contained in:
Eike Ziller
2019-05-29 10:04:47 +02:00
parent adf0b8f87f
commit 18841cc0f5
5 changed files with 20 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
plugins/fossil/fossilclient.cpp
View File

@@ -643,9 +643,9 @@ bool FossilClient::synchronousCreateRepository(const QString &workingDirectory,
// @TODO: handle spaces in the path
// @TODO: what about --template options?
const FileName fullRepoName = FileName::fromStringWithExtension(repoName, Constants::FOSSIL_FILE_SUFFIX);
const FileName repoFilePath = FileName::fromString(repoPath)
.appendPath(fullRepoName.toString());
const FilePath fullRepoName = FilePath::fromStringWithExtension(repoName, Constants::FOSSIL_FILE_SUFFIX);
const FilePath repoFilePath = FilePath::fromString(repoPath)
.pathAppended(fullRepoName.toString());
QStringList args(vcsCommandString(CreateRepositoryCommand));
if (!adminUser.isEmpty())
args << "--admin-user" << adminUser;
@@ -814,11 +814,11 @@ VcsBase::VcsBaseEditorWidget *FossilClient::annotate(
return fossilEditor;
}
bool FossilClient::isVcsFileOrDirectory(const FileName &fileName) const
bool FossilClient::isVcsFileOrDirectory(const FilePath &filePath) const
{
// false for any dir or file other than fossil checkout db-file
return fileName.toFileInfo().isFile()
&& !fileName.fileName().compare(Constants::FOSSILREPO,
return filePath.toFileInfo().isFile()
&& !filePath.fileName().compare(Constants::FOSSILREPO,
HostOsInfo::fileNameCaseSensitivity());
}