diff options
author | hjk <hjk@qt.io> | 2019-05-28 13:49:26 +0200 |
---|---|---|
committer | hjk <hjk@qt.io> | 2019-05-28 12:23:26 +0000 |
commit | 473a741c9fcf09febba312464fab8385e2351181 (patch) | |
tree | 2d328a090993cb5c5fd34b43e9468bcbf7e4d4d0 /src/plugins/mercurial | |
parent | 4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff) | |
download | qt-creator-473a741c9fcf09febba312464fab8385e2351181.tar.gz |
Utils: Rename FileName to FilePath
More in line with QFileInfo terminonlogy which appears to be
best-of-breed within Qt.
Change-Id: I1d051ff1c8363ebd4ee56376451df45216c4c9ab
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'src/plugins/mercurial')
-rw-r--r-- | src/plugins/mercurial/mercurialclient.cpp | 2 | ||||
-rw-r--r-- | src/plugins/mercurial/mercurialclient.h | 2 | ||||
-rw-r--r-- | src/plugins/mercurial/mercurialcontrol.cpp | 6 | ||||
-rw-r--r-- | src/plugins/mercurial/mercurialcontrol.h | 4 |
4 files changed, 7 insertions, 7 deletions
diff --git a/src/plugins/mercurial/mercurialclient.cpp b/src/plugins/mercurial/mercurialclient.cpp index f311d824c3..7d9b8dd209 100644 --- a/src/plugins/mercurial/mercurialclient.cpp +++ b/src/plugins/mercurial/mercurialclient.cpp @@ -440,7 +440,7 @@ void MercurialClient::revertAll(const QString &workingDir, const QString &revisi QStringList(extraOptions) << QLatin1String("--all")); } -bool MercurialClient::isVcsDirectory(const FileName &fileName) const +bool MercurialClient::isVcsDirectory(const FilePath &fileName) const { return fileName.toFileInfo().isDir() && !fileName.fileName().compare(Constants::MERCURIALREPO, HostOsInfo::fileNameCaseSensitivity()); diff --git a/src/plugins/mercurial/mercurialclient.h b/src/plugins/mercurial/mercurialclient.h index 4c1ecc52df..ce317dcfa9 100644 --- a/src/plugins/mercurial/mercurialclient.h +++ b/src/plugins/mercurial/mercurialclient.h @@ -74,7 +74,7 @@ public: void revertAll(const QString &workingDir, const QString &revision = QString(), const QStringList &extraOptions = QStringList()) override; - bool isVcsDirectory(const Utils::FileName &fileName) const; + bool isVcsDirectory(const Utils::FilePath &fileName) const; QString findTopLevelForFile(const QFileInfo &file) const override; void view(const QString &source, const QString &id, diff --git a/src/plugins/mercurial/mercurialcontrol.cpp b/src/plugins/mercurial/mercurialcontrol.cpp index d244b8ff8f..48395ad488 100644 --- a/src/plugins/mercurial/mercurialcontrol.cpp +++ b/src/plugins/mercurial/mercurialcontrol.cpp @@ -78,7 +78,7 @@ Core::Id MercurialControl::id() const return {VcsBase::Constants::VCS_ID_MERCURIAL}; } -bool MercurialControl::isVcsFileOrDirectory(const Utils::FileName &fileName) const +bool MercurialControl::isVcsFileOrDirectory(const Utils::FilePath &fileName) const { return mercurialClient->isVcsDirectory(fileName); } @@ -99,7 +99,7 @@ bool MercurialControl::managesFile(const QString &workingDirectory, const QStrin bool MercurialControl::isConfigured() const { - const Utils::FileName binary = mercurialClient->vcsBinary(); + const Utils::FilePath binary = mercurialClient->vcsBinary(); if (binary.isEmpty()) return false; QFileInfo fi = binary.toFileInfo(); @@ -164,7 +164,7 @@ bool MercurialControl::vcsAnnotate(const QString &file, int line) } Core::ShellCommand *MercurialControl::createInitialCheckoutCommand(const QString &url, - const Utils::FileName &baseDirectory, + const Utils::FilePath &baseDirectory, const QString &localName, const QStringList &extraArgs) { diff --git a/src/plugins/mercurial/mercurialcontrol.h b/src/plugins/mercurial/mercurialcontrol.h index f96979e0c8..4d96a32a9a 100644 --- a/src/plugins/mercurial/mercurialcontrol.h +++ b/src/plugins/mercurial/mercurialcontrol.h @@ -47,7 +47,7 @@ public: QString displayName() const final; Core::Id id() const final; - bool isVcsFileOrDirectory(const Utils::FileName &fileName) const final; + bool isVcsFileOrDirectory(const Utils::FilePath &fileName) const final; bool managesDirectory(const QString &filename, QString *topLevel = nullptr) const final; bool managesFile(const QString &workingDirectory, const QString &fileName) const final; @@ -61,7 +61,7 @@ public: bool vcsAnnotate(const QString &file, int line) final; Core::ShellCommand *createInitialCheckoutCommand(const QString &url, - const Utils::FileName &baseDirectory, + const Utils::FilePath &baseDirectory, const QString &localName, const QStringList &extraArgs) final; |