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

Utils: Remove QLatin1{Char|String} in string utils

Browse Source 
Not needed anymore. Easier to read without it.

Change-Id: I08c10e9da9b105cecc66bad876dd5e8862f821fa
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>
Reviewed-by: hjk <hjk@qt.io>
Reviewed-by: Tobias Hunger <tobias.hunger@qt.io>
This commit is contained in:
Orgad Shaneh
2016-07-05 23:44:01 +03:00
committed by Orgad Shaneh
parent 546df37c98
commit 2b08faab83
1 changed files with 11 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
src/libs/utils/stringutils.cpp
View File

@@ -38,9 +38,9 @@ namespace Utils {
QTCREATOR_UTILS_EXPORT QString settingsKey(const QString &category)
{
QString rc(category);
const QChar underscore = QLatin1Char('_');
const QChar underscore = '_';
// Remove the sort category "X.Category" -> "Category"
if (rc.size() > 2 && rc.at(0).isLetter() && rc.at(1) == QLatin1Char('.'))
if (rc.size() > 2 && rc.at(0).isLetter() && rc.at(1) == '.')
rc.remove(0, 2);
// Replace special characters
const int size = rc.size();
@@ -85,15 +85,15 @@ QTCREATOR_UTILS_EXPORT QString commonPrefix(const QStringList &strings)
QTCREATOR_UTILS_EXPORT QString commonPath(const QStringList &files)
{
QStringList appendedSlashes = Utils::transform(files, [](const QString &file) -> QString {
if (!file.endsWith(QLatin1Char('/')))
return QString(file + QLatin1Char('/'));
if (!file.endsWith('/'))
return QString(file + '/');
return file;
});
QString common = commonPrefix(appendedSlashes);
// Find common directory part: "C:\foo\bar" -> "C:\foo"
int lastSeparatorPos = common.lastIndexOf(QLatin1Char('/'));
int lastSeparatorPos = common.lastIndexOf('/');
if (lastSeparatorPos == -1)
lastSeparatorPos = common.lastIndexOf(QLatin1Char('\\'));
lastSeparatorPos = common.lastIndexOf('\\');
if (lastSeparatorPos == -1)
return QString();
if (HostOsInfo::isAnyUnixHost() && lastSeparatorPos == 0) // Unix: "/a", "/b" -> '/'
@@ -112,7 +112,7 @@ QTCREATOR_UTILS_EXPORT QString withTildeHomePath(const QString &path)
QFileInfo fi(QDir::cleanPath(path));
QString outPath = fi.absoluteFilePath();
if (outPath.startsWith(homePath))
outPath = QLatin1Char('~') + outPath.mid(homePath.size());
outPath = '~' + outPath.mid(homePath.size());
else
outPath = path;
return outPath;
@@ -129,9 +129,9 @@ bool AbstractMacroExpander::expandNestedMacros(const QString &str, int *pos, QSt
varName.reserve(strLen - i);
for (; i < strLen; prev = c) {
c = str.at(i++);
if (c == QLatin1Char('}')) {
if (c == '}') {
if (varName.isEmpty()) { // replace "%{}" with "%"
*ret = QString(QLatin1Char('%'));
*ret = QString('%');
*pos = i;
return true;
}
@@ -140,7 +140,7 @@ bool AbstractMacroExpander::expandNestedMacros(const QString &str, int *pos, QSt
return true;
}
return false;
} else if (c == QLatin1Char('{') && prev == QLatin1Char('%')) {
} else if (c == '{' && prev == '%') {
if (!expandNestedMacros(str, &i, ret))
return false;
varName.chop(1);
@@ -155,7 +155,7 @@ bool AbstractMacroExpander::expandNestedMacros(const QString &str, int *pos, QSt
int AbstractMacroExpander::findMacro(const QString &str, int *pos, QString *ret)
{
forever {
int openPos = str.indexOf(QLatin1String("%{"), *pos);
int openPos = str.indexOf("%{", *pos);
if (openPos < 0)
return 0;
int varPos = openPos + 2;