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

Utils: Rename FileName to FilePath

Browse Source 
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>
This commit is contained in:
hjk
2019-05-28 13:49:26 +02:00
parent 4704f49fbb
commit 473a741c9f
688 changed files with 3487 additions and 3484 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/plugins/cvs/cvscontrol.cpp
View File

@@ -55,7 +55,7 @@ Core::Id CvsControl::id() const
return Core::Id(VcsBase::Constants::VCS_ID_CVS);
}
bool CvsControl::isVcsFileOrDirectory(const Utils::FileName &fileName) const
bool CvsControl::isVcsFileOrDirectory(const Utils::FilePath &fileName) const
{
return fileName.toFileInfo().isDir()
&& !fileName.fileName().compare("CVS", Utils::HostOsInfo::fileNameCaseSensitivity());
@@ -63,7 +63,7 @@ bool CvsControl::isVcsFileOrDirectory(const Utils::FileName &fileName) const
bool CvsControl::isConfigured() const
{
const Utils::FileName binary = m_plugin->client()->vcsBinary();
const Utils::FilePath binary = m_plugin->client()->vcsBinary();
if (binary.isEmpty())
return false;
QFileInfo fi = binary.toFileInfo();
@@ -137,7 +137,7 @@ QString CvsControl::vcsOpenText() const
}
Core::ShellCommand *CvsControl::createInitialCheckoutCommand(const QString &url,
const Utils::FileName &baseDirectory,
const Utils::FilePath &baseDirectory,
const QString &localName,
const QStringList &extraArgs)
{

4
src/plugins/cvs/cvscontrol.h
View File

@@ -42,7 +42,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;
@@ -60,7 +60,7 @@ public:
QString vcsOpenText() const final;
Core::ShellCommand *createInitialCheckoutCommand(const QString &url,
const Utils::FileName &baseDirectory,
const Utils::FilePath &baseDirectory,
const QString &localName,
const QStringList &extraArgs) final;

2
src/plugins/cvs/cvsplugin.cpp
View File

@@ -1100,7 +1100,7 @@ CvsResponse CvsPlugin::runCvs(const QString &workingDirectory,
unsigned flags,
QTextCodec *outputCodec) const
{
const FileName executable = client()->vcsBinary();
const FilePath executable = client()->vcsBinary();
CvsResponse response;
if (executable.isEmpty()) {
response.result = CvsResponse::OtherError;