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

FileUtils: Add static method to construct FileNames from Latin1

Browse Source 
Change-Id: Ida513eb0537e2ef0c55887d0df21de956e85e983
Reviewed-by: Daniel Teske <daniel.teske@digia.com>
This commit is contained in:
Tobias Hunger
2014-02-07 15:46:36 +01:00
parent a19353674c
commit a8ea31bf09
14 changed files with 54 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/libs/utils/fileutils.cpp
View File

@@ -533,6 +533,13 @@ FileName FileName::fromString(const QString &filename)
return FileName(filename); return FileName(filename);
} }
/// Constructs a FileName from \a fileName
/// \a fileName is not checked for validity.
FileName FileName::fromLatin1(const QByteArray &filename)
{
return FileName(QString::fromLatin1(filename));
}
/// Constructs a FileName from \a fileName /// Constructs a FileName from \a fileName
/// \a fileName is only passed through QDir::cleanPath /// \a fileName is only passed through QDir::cleanPath
FileName FileName::fromUserInput(const QString &filename) FileName FileName::fromUserInput(const QString &filename)

1
src/libs/utils/fileutils.h
View File

@@ -56,6 +56,7 @@ public:
explicit FileName(const QFileInfo &info); explicit FileName(const QFileInfo &info);
QFileInfo toFileInfo() const; QFileInfo toFileInfo() const;
static FileName fromString(const QString &filename); static FileName fromString(const QString &filename);
static FileName fromLatin1(const QByteArray &filename);
static FileName fromUserInput(const QString &filename); static FileName fromUserInput(const QString &filename);
QString toString() const; QString toString() const;
QString toUserOutput() const; QString toUserOutput() const;

2
src/plugins/android/androidconfigurations.cpp
View File

@@ -334,7 +334,7 @@ FileName AndroidConfig::antToolPath() const
if (!m_antLocation.isEmpty()) if (!m_antLocation.isEmpty())
return m_antLocation; return m_antLocation;
else else
return FileName::fromString(QLatin1String("ant")); return FileName::fromLatin1("ant");
} }
FileName AndroidConfig::emulatorToolPath() const FileName AndroidConfig::emulatorToolPath() const

2
src/plugins/android/androidtoolchain.cpp
View File

@@ -210,7 +210,7 @@ bool AndroidToolChain::fromMap(const QVariantMap &data)
QList<FileName> AndroidToolChain::suggestedMkspecList() const QList<FileName> AndroidToolChain::suggestedMkspecList() const
{ {
return QList<FileName>()<< FileName::fromString(QLatin1String("android-g++")); return QList<FileName>()<< FileName::fromLatin1("android-g++");
} }
QString AndroidToolChain::makeCommand(const Utils::Environment &env) const QString AndroidToolChain::makeCommand(const Utils::Environment &env) const

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

@@ -350,7 +350,7 @@ void IosConfigurations::updateAutomaticKitList()
SysRootKitInformation::setSysRoot(kitAtt, p.sdkPath); SysRootKitInformation::setSysRoot(kitAtt, p.sdkPath);
// QmakeProjectManager::QmakeKitInformation::setMkspec(newKit, // QmakeProjectManager::QmakeKitInformation::setMkspec(newKit,
// Utils::FileName::fromString(QLatin1String("macx-ios-clang"))); // Utils::FileName::fromLatin1("macx-ios-clang")));
if (kitExists) { if (kitExists) {
kitAtt->unblockNotification(); kitAtt->unblockNotification();
} else { } else {

32
src/plugins/projectexplorer/gcctoolchain.cpp
View File

@@ -567,10 +567,10 @@ QList<FileName> GccToolChain::suggestedMkspecList() const
QString v = version(); QString v = version();
// prefer versioned g++ on mac. This is required to enable building for older Mac OS versions // prefer versioned g++ on mac. This is required to enable building for older Mac OS versions
if (v.startsWith(QLatin1String("4.0")) && m_compilerCommand.endsWith(QLatin1String("-4.0"))) if (v.startsWith(QLatin1String("4.0")) && m_compilerCommand.endsWith(QLatin1String("-4.0")))
return QList<FileName>() << FileName::fromString(QLatin1String("macx-g++40")); return QList<FileName>() << FileName::fromLatin1("macx-g++40");
if (v.startsWith(QLatin1String("4.2")) && m_compilerCommand.endsWith(QLatin1String("-4.2"))) if (v.startsWith(QLatin1String("4.2")) && m_compilerCommand.endsWith(QLatin1String("-4.2")))
return QList<FileName>() << FileName::fromString(QLatin1String("macx-g++42")); return QList<FileName>() << FileName::fromLatin1("macx-g++42");
return QList<FileName>() << FileName::fromString(QLatin1String("macx-g++")); return QList<FileName>() << FileName::fromLatin1("macx-g++");
} }
if (abi.os() == Abi::LinuxOS) { if (abi.os() == Abi::LinuxOS) {
@@ -579,14 +579,14 @@ QList<FileName> GccToolChain::suggestedMkspecList() const
if (abi.wordWidth() == host.wordWidth()) { if (abi.wordWidth() == host.wordWidth()) {
// no need to explicitly set the word width, but provide that mkspec anyway to make sure // no need to explicitly set the word width, but provide that mkspec anyway to make sure
// that the correct compiler is picked if a mkspec with a wordwidth is given. // that the correct compiler is picked if a mkspec with a wordwidth is given.
return QList<FileName>() << FileName::fromString(QLatin1String("linux-g++")) return QList<FileName>() << FileName::fromLatin1("linux-g++")
<< FileName::fromString(QLatin1String("linux-g++-") + QString::number(m_targetAbi.wordWidth())); << FileName::fromString(QLatin1String("linux-g++-") + QString::number(m_targetAbi.wordWidth()));
} }
return QList<FileName>() << FileName::fromString(QLatin1String("linux-g++-") + QString::number(m_targetAbi.wordWidth())); return QList<FileName>() << FileName::fromString(QLatin1String("linux-g++-") + QString::number(m_targetAbi.wordWidth()));
} }
if (abi.os() == Abi::BsdOS && abi.osFlavor() == Abi::FreeBsdFlavor) if (abi.os() == Abi::BsdOS && abi.osFlavor() == Abi::FreeBsdFlavor)
return QList<FileName>() << FileName::fromString(QLatin1String("freebsd-g++")); return QList<FileName>() << FileName::fromLatin1("freebsd-g++");
return QList<FileName>(); return QList<FileName>();
} }
@@ -1059,14 +1059,14 @@ QList<FileName> ClangToolChain::suggestedMkspecList() const
Abi abi = targetAbi(); Abi abi = targetAbi();
if (abi.os() == Abi::MacOS) if (abi.os() == Abi::MacOS)
return QList<FileName>() return QList<FileName>()
<< FileName::fromString(QLatin1String("macx-clang")) << FileName::fromLatin1("macx-clang")
<< FileName::fromString(QLatin1String("macx-clang-32")) << FileName::fromLatin1("macx-clang-32")
<< FileName::fromString(QLatin1String("unsupported/macx-clang")) << FileName::fromLatin1("unsupported/macx-clang")
<< FileName::fromString(QLatin1String("macx-ios-clang")); << FileName::fromLatin1("macx-ios-clang");
else if (abi.os() == Abi::LinuxOS) else if (abi.os() == Abi::LinuxOS)
return QList<FileName>() return QList<FileName>()
<< FileName::fromString(QLatin1String("linux-clang")) << FileName::fromLatin1("linux-clang")
<< FileName::fromString(QLatin1String("unsupported/linux-clang")); << FileName::fromLatin1("unsupported/linux-clang");
return QList<FileName>(); // Note: Not supported by Qt yet, so default to the mkspec the Qt was build with return QList<FileName>(); // Note: Not supported by Qt yet, so default to the mkspec the Qt was build with
} }
@@ -1162,16 +1162,16 @@ QString MingwToolChain::typeDisplayName() const
QList<FileName> MingwToolChain::suggestedMkspecList() const QList<FileName> MingwToolChain::suggestedMkspecList() const
{ {
if (Utils::HostOsInfo::isWindowsHost()) if (Utils::HostOsInfo::isWindowsHost())
return QList<FileName>() << FileName::fromString(QLatin1String("win32-g++")); return QList<FileName>() << FileName::fromLatin1("win32-g++");
if (Utils::HostOsInfo::isLinuxHost()) { if (Utils::HostOsInfo::isLinuxHost()) {
if (version().startsWith(QLatin1String("4.6."))) if (version().startsWith(QLatin1String("4.6.")))
return QList<FileName>() return QList<FileName>()
<< FileName::fromString(QLatin1String("win32-g++-4.6-cross")) << FileName::fromLatin1("win32-g++-4.6-cross")
<< FileName::fromString(QLatin1String("unsupported/win32-g++-4.6-cross")); << FileName::fromLatin1("unsupported/win32-g++-4.6-cross");
else else
return QList<FileName>() return QList<FileName>()
<< FileName::fromString(QLatin1String("win32-g++-cross")) << FileName::fromLatin1("win32-g++-cross")
<< FileName::fromString(QLatin1String("unsupported/win32-g++-cross")); << FileName::fromLatin1("unsupported/win32-g++-cross");
} }
return QList<FileName>(); return QList<FileName>();
} }

4
src/plugins/projectexplorer/kit.cpp
View File

@@ -84,7 +84,7 @@ public:
m_id = Id::fromString(QUuid::createUuid().toString()); m_id = Id::fromString(QUuid::createUuid().toString());
m_displayName = QCoreApplication::translate("ProjectExplorer::Kit", "Unnamed"); m_displayName = QCoreApplication::translate("ProjectExplorer::Kit", "Unnamed");
m_iconPath = Utils::FileName::fromString(QLatin1String(":///DESKTOP///")); m_iconPath = Utils::FileName::fromLatin1(":///DESKTOP///");
} }
QString m_displayName; QString m_displayName;
@@ -350,7 +350,7 @@ QIcon Kit::icon(const Utils::FileName &path)
{ {
if (path.isEmpty()) if (path.isEmpty())
return QIcon(); return QIcon();
if (path == Utils::FileName::fromString(QLatin1String(":///DESKTOP///"))) if (path == Utils::FileName::fromLatin1(":///DESKTOP///"))
return qApp->style()->standardIcon(QStyle::SP_ComputerIcon); return qApp->style()->standardIcon(QStyle::SP_ComputerIcon);
QFileInfo fi(path.toString()); QFileInfo fi(path.toString());

2
src/plugins/projectexplorer/kitmanager.cpp
View File

@@ -244,7 +244,7 @@ void KitManager::restoreKits()
defaultKit->setDisplayName(tr("Desktop")); defaultKit->setDisplayName(tr("Desktop"));
defaultKit->setSdkProvided(false); defaultKit->setSdkProvided(false);
defaultKit->setAutoDetected(false); defaultKit->setAutoDetected(false);
defaultKit->setIconPath(Utils::FileName::fromString(QLatin1String(":///DESKTOP///"))); defaultKit->setIconPath(Utils::FileName::fromLatin1(":///DESKTOP///"));
defaultKit->setup(); defaultKit->setup();

16
src/plugins/projectexplorer/msvctoolchain.cpp
View File

@@ -351,21 +351,21 @@ QList<Utils::FileName> MsvcToolChain::suggestedMkspecList() const
{ {
switch (m_abi.osFlavor()) { switch (m_abi.osFlavor()) {
case ProjectExplorer::Abi::WindowsMsvc2005Flavor: case ProjectExplorer::Abi::WindowsMsvc2005Flavor:
return QList<Utils::FileName>() << Utils::FileName::fromString(QLatin1String("win32-msvc2005")); return QList<Utils::FileName>() << Utils::FileName::fromLatin1("win32-msvc2005");
case ProjectExplorer::Abi::WindowsMsvc2008Flavor: case ProjectExplorer::Abi::WindowsMsvc2008Flavor:
return QList<Utils::FileName>() << Utils::FileName::fromString(QLatin1String("win32-msvc2008")); return QList<Utils::FileName>() << Utils::FileName::fromLatin1("win32-msvc2008");
case ProjectExplorer::Abi::WindowsMsvc2010Flavor: case ProjectExplorer::Abi::WindowsMsvc2010Flavor:
return QList<Utils::FileName>() << Utils::FileName::fromString(QLatin1String("win32-msvc2010")); return QList<Utils::FileName>() << Utils::FileName::fromLatin1("win32-msvc2010");
case ProjectExplorer::Abi::WindowsMsvc2012Flavor: case ProjectExplorer::Abi::WindowsMsvc2012Flavor:
QList<Utils::FileName>() QList<Utils::FileName>()
<< Utils::FileName::fromString(QLatin1String("win32-msvc2012")) << Utils::FileName::fromLatin1("win32-msvc2012")
<< Utils::FileName::fromString(QLatin1String("win32-msvc2010")); << Utils::FileName::fromLatin1("win32-msvc2010");
break; break;
case ProjectExplorer::Abi::WindowsMsvc2013Flavor: case ProjectExplorer::Abi::WindowsMsvc2013Flavor:
QList<Utils::FileName>() QList<Utils::FileName>()
<< Utils::FileName::fromString(QLatin1String("win32-msvc2013")) << Utils::FileName::fromLatin1("win32-msvc2013")
<< Utils::FileName::fromString(QLatin1String("win32-msvc2012")) << Utils::FileName::fromLatin1("win32-msvc2012")
<< Utils::FileName::fromString(QLatin1String("win32-msvc2010")); << Utils::FileName::fromLatin1("win32-msvc2010");
break; break;
default: default:
break; break;

16
src/plugins/projectexplorer/settingsaccessor.cpp
View File

@@ -2411,35 +2411,35 @@ QVariantMap Version11Handler::update(Project *project, const QVariantMap &map)
Kit *tmpKit = rawKit; Kit *tmpKit = rawKit;
if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.AndroidDeviceTarget")) { if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.AndroidDeviceTarget")) {
tmpKit->setIconPath(FileName::fromString(QLatin1String(":/android/images/QtAndroid.png"))); tmpKit->setIconPath(FileName::fromLatin1(":/android/images/QtAndroid.png"));
tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Desktop")); tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Desktop"));
tmpKit->setValue("PE.Profile.Device", QString()); tmpKit->setValue("PE.Profile.Device", QString());
} else if (oldTargetId == QLatin1String("RemoteLinux.EmbeddedLinuxTarget")) { } else if (oldTargetId == QLatin1String("RemoteLinux.EmbeddedLinuxTarget")) {
tmpKit->setIconPath(FileName::fromString(QLatin1String(":///DESKTOP///"))); tmpKit->setIconPath(FileName::fromLatin1(":///DESKTOP///"));
tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("GenericLinuxOsType")); tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("GenericLinuxOsType"));
tmpKit->setValue("PE.Profile.Device", QString()); tmpKit->setValue("PE.Profile.Device", QString());
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.HarmattanDeviceTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.HarmattanDeviceTarget")) {
tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/MaemoDevice.png"))); tmpKit->setIconPath(FileName::fromLatin1(":/projectexplorer/images/MaemoDevice.png"));
tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("HarmattanOsType")); tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("HarmattanOsType"));
tmpKit->setValue("PE.Profile.Device", QString()); tmpKit->setValue("PE.Profile.Device", QString());
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MaemoDeviceTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MaemoDeviceTarget")) {
tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/MaemoDevice.png"))); tmpKit->setIconPath(FileName::fromLatin1(":/projectexplorer/images/MaemoDevice.png"));
tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Maemo5OsType")); tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Maemo5OsType"));
tmpKit->setValue("PE.Profile.Device", QString()); tmpKit->setValue("PE.Profile.Device", QString());
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MeegoDeviceTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.MeegoDeviceTarget")) {
tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/MaemoDevice.png"))); tmpKit->setIconPath(FileName::fromLatin1(":/projectexplorer/images/MaemoDevice.png"));
tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("MeegoOsType")); tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("MeegoOsType"));
tmpKit->setValue("PE.Profile.Device", QString()); tmpKit->setValue("PE.Profile.Device", QString());
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.S60DeviceTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.S60DeviceTarget")) {
tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/SymbianDevice.png"))); tmpKit->setIconPath(FileName::fromLatin1(":/projectexplorer/images/SymbianDevice.png"));
tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Qt4ProjectManager.SymbianDevice")); tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Qt4ProjectManager.SymbianDevice"));
tmpKit->setValue("PE.Profile.Device", QString::fromLatin1("Symbian Device")); tmpKit->setValue("PE.Profile.Device", QString::fromLatin1("Symbian Device"));
} else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.QtSimulatorTarget")) { } else if (oldTargetId == QLatin1String("Qt4ProjectManager.Target.QtSimulatorTarget")) {
tmpKit->setIconPath(FileName::fromString(QLatin1String(":/projectexplorer/images/Simulator.png"))); tmpKit->setIconPath(FileName::fromLatin1(":/projectexplorer/images/Simulator.png"));
tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Desktop")); tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Desktop"));
tmpKit->setValue("PE.Profile.Device", QString::fromLatin1("Desktop Device")); tmpKit->setValue("PE.Profile.Device", QString::fromLatin1("Desktop Device"));
} else { } else {
tmpKit->setIconPath(FileName::fromString(QLatin1String(":///DESKTOP///"))); tmpKit->setIconPath(FileName::fromLatin1(":///DESKTOP///"));
tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Desktop")); tmpKit->setValue("PE.Profile.DeviceType", QString::fromLatin1("Desktop"));
tmpKit->setValue("PE.Profile.Device", QString::fromLatin1("Desktop Device")); tmpKit->setValue("PE.Profile.Device", QString::fromLatin1("Desktop Device"));
} }

4
src/plugins/qmakeprojectmanager/qmakebuildconfiguration.cpp
View File

@@ -400,8 +400,8 @@ QmakeBuildConfiguration::MakefileState QmakeBuildConfiguration::compareToImportF
return MakefileMatches; return MakefileMatches;
// Actual spec is the default one // Actual spec is the default one
// qDebug() << "AS vs VS" << actualSpec << version->mkspec(); // qDebug() << "AS vs VS" << actualSpec << version->mkspec();
if ((actualSpec == version->mkspec() || actualSpec == FileName::fromString(QLatin1String("default"))) if ((actualSpec == version->mkspec() || actualSpec == FileName::fromLatin1("default"))
&& (parsedSpec == version->mkspec() || parsedSpec == FileName::fromString(QLatin1String("default")) || parsedSpec.isEmpty())) && (parsedSpec == version->mkspec() || parsedSpec == FileName::fromLatin1("default") || parsedSpec.isEmpty()))
return MakefileMatches; return MakefileMatches;
} }
return MakefileIncompatible; return MakefileIncompatible;

2
src/plugins/qmakeprojectmanager/qmakeprojectimporter.cpp
View File

@@ -114,7 +114,7 @@ QList<ProjectExplorer::BuildInfo *> QmakeProjectImporter::import(const Utils::Fi
Utils::FileName parsedSpec = Utils::FileName parsedSpec =
QmakeBuildConfiguration::extractSpecFromArguments(&additionalArguments, importPath.toString(), version); QmakeBuildConfiguration::extractSpecFromArguments(&additionalArguments, importPath.toString(), version);
Utils::FileName versionSpec = version->mkspec(); Utils::FileName versionSpec = version->mkspec();
if (parsedSpec.isEmpty() || parsedSpec == Utils::FileName::fromString(QLatin1String("default"))) if (parsedSpec.isEmpty() || parsedSpec == Utils::FileName::fromLatin1("default"))
parsedSpec = versionSpec; parsedSpec = versionSpec;
QString specArgument; QString specArgument;

2
src/plugins/qnx/blackberryconfiguration.cpp
View File

@@ -335,7 +335,7 @@ Kit *BlackBerryConfiguration::createKit(
if (isSimulator) if (isSimulator)
QmakeProjectManager::QmakeKitInformation::setMkspec( QmakeProjectManager::QmakeKitInformation::setMkspec(
kit, FileName::fromString(QLatin1String("blackberry-x86-qcc"))); kit, FileName::fromLatin1("blackberry-x86-qcc"));
DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE); DeviceTypeKitInformation::setDeviceTypeId(kit, Constants::QNX_BB_OS_TYPE);
SysRootKitInformation::setSysRoot(kit, m_sysRoot); SysRootKitInformation::setSysRoot(kit, m_sysRoot);

8
src/plugins/qnx/qnxtoolchain.cpp
View File

@@ -104,10 +104,10 @@ void QnxToolChain::addToEnvironment(Utils::Environment &env) const
QList<Utils::FileName> QnxToolChain::suggestedMkspecList() const QList<Utils::FileName> QnxToolChain::suggestedMkspecList() const
{ {
QList<Utils::FileName> mkspecList; QList<Utils::FileName> mkspecList;
mkspecList << Utils::FileName::fromString(QLatin1String("qnx-armv7le-qcc")); mkspecList << Utils::FileName::fromLatin1("qnx-armv7le-qcc");
mkspecList << Utils::FileName::fromString(QLatin1String("qnx-x86-qcc")); mkspecList << Utils::FileName::fromLatin1("qnx-x86-qcc");
mkspecList << Utils::FileName::fromString(QLatin1String("blackberry-armv7le-qcc")); mkspecList << Utils::FileName::fromLatin1("blackberry-armv7le-qcc");
mkspecList << Utils::FileName::fromString(QLatin1String("blackberry-x86-qcc")); mkspecList << Utils::FileName::fromLatin1("blackberry-x86-qcc");
return mkspecList; return mkspecList;
} }