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/perforce | |
| parent | 4704f49fbb1201ebf10ab9dbaed0275ff25faba8 (diff) | |
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/perforce')
| -rw-r--r-- | src/plugins/perforce/perforceplugin.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/perforce/perforceversioncontrol.cpp | 2 | ||||
| -rw-r--r-- | src/plugins/perforce/perforceversioncontrol.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/plugins/perforce/perforceplugin.cpp b/src/plugins/perforce/perforceplugin.cpp index e7325fc1fb0..580c52d78fb 100644 --- a/src/plugins/perforce/perforceplugin.cpp +++ b/src/plugins/perforce/perforceplugin.cpp @@ -1118,7 +1118,7 @@ PerforceResponse PerforcePlugin::runP4Cmd(const QString &workingDir, actualArgs.append(args); if (flags & CommandToWindow) - VcsOutputWindow::appendCommand(workingDir, FileName::fromString(settings().p4BinaryPath()), actualArgs); + VcsOutputWindow::appendCommand(workingDir, FilePath::fromString(settings().p4BinaryPath()), actualArgs); if (flags & ShowBusyCursor) QApplication::setOverrideCursor(QCursor(Qt::WaitCursor)); diff --git a/src/plugins/perforce/perforceversioncontrol.cpp b/src/plugins/perforce/perforceversioncontrol.cpp index e027a8ef26e..87d08806b57 100644 --- a/src/plugins/perforce/perforceversioncontrol.cpp +++ b/src/plugins/perforce/perforceversioncontrol.cpp @@ -49,7 +49,7 @@ Core::Id PerforceVersionControl::id() const return Core::Id(VcsBase::Constants::VCS_ID_PERFORCE); } -bool PerforceVersionControl::isVcsFileOrDirectory(const Utils::FileName &fileName) const +bool PerforceVersionControl::isVcsFileOrDirectory(const Utils::FilePath &fileName) const { Q_UNUSED(fileName); return false; // Perforce does not seem to litter its files into the source tree. diff --git a/src/plugins/perforce/perforceversioncontrol.h b/src/plugins/perforce/perforceversioncontrol.h index fa3b0c1d12e..410e9a749a1 100644 --- a/src/plugins/perforce/perforceversioncontrol.h +++ b/src/plugins/perforce/perforceversioncontrol.h @@ -41,7 +41,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 &directory, QString *topLevel = nullptr) const final; bool managesFile(const QString &workingDirectory, const QString &fileName) const final; |