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

20
src/plugins/ios/iosconfigurations.cpp
View File

@@ -136,7 +136,7 @@ static ToolChainPair findToolChainForPlatform(const XcodePlatform &platform,
const QList<ClangToolChain *> &toolChains)
{
ToolChainPair platformToolChains;
auto toolchainMatch = [](ClangToolChain *toolChain, const Utils::FileName &compilerPath, const QStringList &flags) {
auto toolchainMatch = [](ClangToolChain *toolChain, const Utils::FilePath &compilerPath, const QStringList &flags) {
return compilerPath == toolChain->compilerCommand()
&& flags == toolChain->platformCodeGenFlags()
&& flags == toolChain->platformLinkerFlags();
@@ -181,7 +181,7 @@ static void printKits(const QSet<Kit *> &kits)
}
static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolChains,
const QVariant &debuggerId, const Utils::FileName &sdkPath, BaseQtVersion *qtVersion)
const QVariant &debuggerId, const Utils::FilePath &sdkPath, BaseQtVersion *qtVersion)
{
DeviceTypeKitAspect::setDeviceTypeId(kit, pDeviceType);
if (toolChains.first)
@@ -212,9 +212,9 @@ static void setupKit(Kit *kit, Core::Id pDeviceType, const ToolChainPair& toolCh
SysRootKitAspect::setSysRoot(kit, sdkPath);
}
static QVersionNumber findXcodeVersion(const Utils::FileName &developerPath)
static QVersionNumber findXcodeVersion(const Utils::FilePath &developerPath)
{
const FileName xcodeInfo = developerPath.parentDir().pathAppended("Info.plist");
const FilePath xcodeInfo = developerPath.parentDir().pathAppended("Info.plist");
if (xcodeInfo.exists()) {
QSettings settings(xcodeInfo.toString(), QSettings::NativeFormat);
return QVersionNumber::fromString(settings.value("CFBundleShortVersionString").toString());
@@ -357,7 +357,7 @@ void IosConfigurations::setIgnoreAllDevices(bool ignoreDevices)
}
}
void IosConfigurations::setScreenshotDir(const FileName &path)
void IosConfigurations::setScreenshotDir(const FilePath &path)
{
if (m_instance->m_screenshotDir != path) {
m_instance->m_screenshotDir = path;
@@ -365,12 +365,12 @@ void IosConfigurations::setScreenshotDir(const FileName &path)
}
}
FileName IosConfigurations::screenshotDir()
FilePath IosConfigurations::screenshotDir()
{
return m_instance->m_screenshotDir;
}
FileName IosConfigurations::developerPath()
FilePath IosConfigurations::developerPath()
{
return m_instance->m_developerPath;
}
@@ -402,11 +402,11 @@ void IosConfigurations::load()
QSettings *settings = Core::ICore::settings();
settings->beginGroup(SettingsGroup);
m_ignoreAllDevices = settings->value(ignoreAllDevicesKey, false).toBool();
m_screenshotDir = FileName::fromString(settings->value(screenshotDirPathKey).toString());
m_screenshotDir = FilePath::fromString(settings->value(screenshotDirPathKey).toString());
if (!m_screenshotDir.exists()) {
QString defaultDir =
QStandardPaths::standardLocations(QStandardPaths::PicturesLocation).constFirst();
m_screenshotDir = FileName::fromString(defaultDir);
m_screenshotDir = FilePath::fromString(defaultDir);
}
settings->endGroup();
@@ -425,7 +425,7 @@ void IosConfigurations::updateSimulators()
SimulatorControl::updateAvailableSimulators();
}
void IosConfigurations::setDeveloperPath(const FileName &devPath)
void IosConfigurations::setDeveloperPath(const FilePath &devPath)
{
static bool hasDevPath = false;
if (devPath != m_instance->m_developerPath) {