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

All: Use Utils::SkipEmptyParts

Browse Source 
Task-number: QTCREATORBUG-24098
Change-Id: Iab45de9a9c17ddc39a0e343b1175d4f6cb94b098
Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
hjk
2020-06-17 06:35:31 +02:00
parent 6e798401a0
commit 1c81a3b3e8
65 changed files with 236 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/libs/utils/environment.cpp
View File

@@ -27,6 +27,7 @@
#include "algorithm.h" #include "algorithm.h"
#include "qtcassert.h" #include "qtcassert.h"
#include "stringutils.h"
#include <QDebug> #include <QDebug>
#include <QDir> #include <QDir>
@@ -303,7 +304,7 @@ FilePaths Environment::path() const
FilePaths Environment::pathListValue(const QString &varName) const FilePaths Environment::pathListValue(const QString &varName) const
{ {
const QStringList pathComponents = expandedValueForKey(varName) const QStringList pathComponents = expandedValueForKey(varName)
.split(OsSpecificAspects::pathListSeparator(m_osType), QString::SkipEmptyParts); .split(OsSpecificAspects::pathListSeparator(m_osType), Utils::SkipEmptyParts);
return transform(pathComponents, &FilePath::fromUserInput); return transform(pathComponents, &FilePath::fromUserInput);
} }

5
src/libs/utils/fileinprojectfinder.cpp
View File

@@ -30,6 +30,7 @@
#include "hostosinfo.h" #include "hostosinfo.h"
#include "qrcparser.h" #include "qrcparser.h"
#include "qtcassert.h" #include "qtcassert.h"
#include "stringutils.h"
#include <QCursor> #include <QCursor>
#include <QDebug> #include <QDebug>
@@ -121,7 +122,7 @@ void FileInProjectFinder::setSysroot(const FilePath &sysroot)
void FileInProjectFinder::addMappedPath(const FilePath &localFilePath, const QString &remoteFilePath) void FileInProjectFinder::addMappedPath(const FilePath &localFilePath, const QString &remoteFilePath)
{ {
const QStringList segments = remoteFilePath.split('/', QString::SkipEmptyParts); const QStringList segments = remoteFilePath.split('/', Utils::SkipEmptyParts);
PathMappingNode *node = &m_pathMapRoot; PathMappingNode *node = &m_pathMapRoot;
for (const QString &segment : segments) { for (const QString &segment : segments) {
@@ -191,7 +192,7 @@ bool FileInProjectFinder::findFileOrDirectory(const QString &originalPath, FileH
return false; return false;
} }
const auto segments = originalPath.splitRef('/', QString::SkipEmptyParts); const auto segments = originalPath.splitRef('/', Utils::SkipEmptyParts);
const PathMappingNode *node = &m_pathMapRoot; const PathMappingNode *node = &m_pathMapRoot;
for (const auto &segment : segments) { for (const auto &segment : segments) {
auto it = node->children.find(segment.toString()); auto it = node->children.find(segment.toString());

20
src/libs/utils/pathlisteditor.cpp
View File

@@ -26,17 +26,17 @@
#include "pathlisteditor.h" #include "pathlisteditor.h"
#include "hostosinfo.h" #include "hostosinfo.h"
#include "stringutils.h"
#include <QVBoxLayout>
#include <QPlainTextEdit>
#include <QFileDialog>
#include <QTextBlock>
#include <QMenu>
#include <QMimeData>
#include <QSharedPointer>
#include <QDebug> #include <QDebug>
#include <QFileDialog>
#include <QMenu>
#include <QMimeData>
#include <QPlainTextEdit>
#include <QPushButton> #include <QPushButton>
#include <QSharedPointer>
#include <QTextBlock>
#include <QVBoxLayout>
/*! /*!
\class Utils::PathListEditor \class Utils::PathListEditor
@@ -166,7 +166,7 @@ QStringList PathListEditor::pathList() const
if (text.isEmpty()) if (text.isEmpty())
return QStringList(); return QStringList();
// trim each line // trim each line
QStringList rc = text.split(QLatin1Char('\n'), QString::SkipEmptyParts); QStringList rc = text.split('\n', Utils::SkipEmptyParts);
const QStringList::iterator end = rc.end(); const QStringList::iterator end = rc.end();
for (QStringList::iterator it = rc.begin(); it != end; ++it) for (QStringList::iterator it = rc.begin(); it != end; ++it)
*it = it->trimmed(); *it = it->trimmed();
@@ -184,7 +184,7 @@ void PathListEditor::setPathList(const QString &pathString)
clear(); clear();
} else { } else {
setPathList(pathString.split(HostOsInfo::pathListSeparator(), setPathList(pathString.split(HostOsInfo::pathListSeparator(),
QString::SkipEmptyParts)); Utils::SkipEmptyParts));
} }
} }

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

@@ -36,26 +36,31 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/devicesupport/devicemanager.h> #include <projectexplorer/devicesupport/devicemanager.h>
#include <projectexplorer/kitinformation.h>
#include <projectexplorer/kitmanager.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/toolchainmanager.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <projectexplorer/toolchainmanager.h>
#include <debugger/debuggeritemmanager.h> #include <debugger/debuggeritemmanager.h>
#include <debugger/debuggeritem.h> #include <debugger/debuggeritem.h>
#include <debugger/debuggerkitinformation.h> #include <debugger/debuggerkitinformation.h>
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <qtsupport/qtversionmanager.h> #include <qtsupport/qtversionmanager.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/environment.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/persistentsettings.h> #include <utils/persistentsettings.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/runextensions.h> #include <utils/runextensions.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/environment.h>
#include <QApplication> #include <QApplication>
#include <QDirIterator> #include <QDirIterator>
@@ -612,7 +617,7 @@ QVector<AndroidDeviceInfo> AndroidConfig::connectedDevices(const FilePath &adbTo
.arg(cmd.toUserOutput()); .arg(cmd.toUserOutput());
return devices; return devices;
} }
QStringList adbDevs = response.allOutput().split('\n', QString::SkipEmptyParts); QStringList adbDevs = response.allOutput().split('\n', Utils::SkipEmptyParts);
if (adbDevs.empty()) if (adbDevs.empty())
return devices; return devices;

3
src/plugins/android/androidmanager.cpp
View File

@@ -52,6 +52,7 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <QApplication> #include <QApplication>
@@ -145,7 +146,7 @@ bool AndroidManager::packageInstalled(const QString &deviceSerial,
QStringList args = AndroidDeviceInfo::adbSelector(deviceSerial); QStringList args = AndroidDeviceInfo::adbSelector(deviceSerial);
args << "shell" << "pm" << "list" << "packages"; args << "shell" << "pm" << "list" << "packages";
QStringList lines = runAdbCommand(args).stdOut().split(QRegularExpression("[\\n\\r]"), QStringList lines = runAdbCommand(args).stdOut().split(QRegularExpression("[\\n\\r]"),
QString::SkipEmptyParts); Utils::SkipEmptyParts);
for (const QString &line : lines) { for (const QString &line : lines) {
// Don't want to confuse com.abc.xyz with com.abc.xyz.def so check with // Don't want to confuse com.abc.xyz with com.abc.xyz.def so check with
// endsWith // endsWith

9
src/plugins/android/androidrunnerworker.cpp
View File

@@ -41,13 +41,14 @@
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcprocess.h>
#include <utils/runextensions.h> #include <utils/runextensions.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/temporaryfile.h> #include <utils/temporaryfile.h>
#include <utils/qtcprocess.h>
#include <utils/url.h> #include <utils/url.h>
#include <utils/fileutils.h>
#include <QDir> #include <QDir>
#include <QDirIterator> #include <QDirIterator>
@@ -509,7 +510,7 @@ void AndroidRunnerWorker::asyncStartHelper()
} }
for (const QString &entry : m_beforeStartAdbCommands) for (const QString &entry : m_beforeStartAdbCommands)
runAdb(entry.split(' ', QString::SkipEmptyParts)); runAdb(entry.split(' ', Utils::SkipEmptyParts));
QStringList args({"shell", "am", "start"}); QStringList args({"shell", "am", "start"});
args << m_amStartExtraArgs; args << m_amStartExtraArgs;
@@ -778,7 +779,7 @@ void AndroidRunnerWorker::onProcessIdChanged(qint64 pid)
// Run adb commands after application quit. // Run adb commands after application quit.
for (const QString &entry: m_afterFinishAdbCommands) for (const QString &entry: m_afterFinishAdbCommands)
runAdb(entry.split(' ', QString::SkipEmptyParts)); runAdb(entry.split(' ', Utils::SkipEmptyParts));
} else { } else {
// In debugging cases this will be funneled to the engine to actually start // In debugging cases this will be funneled to the engine to actually start
// and attach gdb. Afterwards this ends up in handleRemoteDebuggerRunning() below. // and attach gdb. Afterwards this ends up in handleRemoteDebuggerRunning() below.

8
src/plugins/android/androidsdkmanager.cpp
View File

@@ -22,6 +22,7 @@
** be met: https://www.gnu.org/licenses/gpl-3.0.html. ** be met: https://www.gnu.org/licenses/gpl-3.0.html.
** **
****************************************************************************/ ****************************************************************************/
#include "androidsdkmanager.h" #include "androidsdkmanager.h"
#include "androidconstants.h" #include "androidconstants.h"
@@ -30,9 +31,10 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/runextensions.h>
#include <utils/synchronousprocess.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/runextensions.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h>
#include <QFutureWatcher> #include <QFutureWatcher>
#include <QLoggingCategory> #include <QLoggingCategory>
@@ -107,7 +109,7 @@ int parseProgress(const QString &out, bool &foundAssertion)
if (out.isEmpty()) if (out.isEmpty())
return progress; return progress;
QRegularExpression reg("(?<progress>\\d*)%"); QRegularExpression reg("(?<progress>\\d*)%");
QStringList lines = out.split(QRegularExpression("[\\n\\r]"), QString::SkipEmptyParts); QStringList lines = out.split(QRegularExpression("[\\n\\r]"), Utils::SkipEmptyParts);
for (const QString &line : lines) { for (const QString &line : lines) {
QRegularExpressionMatch match = reg.match(line); QRegularExpressionMatch match = reg.match(line);
if (match.hasMatch()) { if (match.hasMatch()) {

4
src/plugins/autotest/boost/boosttestconfiguration.cpp
View File

@@ -32,6 +32,8 @@
#include "../itestframework.h" #include "../itestframework.h"
#include "../testsettings.h" #include "../testsettings.h"
#include <utils/stringutils.h>
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
@@ -126,7 +128,7 @@ QStringList BoostTestConfiguration::argumentsForTestRunner(QStringList *omitted)
if (AutotestPlugin::settings()->processArgs) { if (AutotestPlugin::settings()->processArgs) {
arguments << filterInterfering(runnable().commandLineArguments.split( arguments << filterInterfering(runnable().commandLineArguments.split(
' ', QString::SkipEmptyParts), omitted); ' ', Utils::SkipEmptyParts), omitted);
} }
return arguments; return arguments;
} }

4
src/plugins/autotest/catch/catchconfiguration.cpp
View File

@@ -30,6 +30,8 @@
#include "../itestframework.h" #include "../itestframework.h"
#include "../testsettings.h" #include "../testsettings.h"
#include <utils/stringutils.h>
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
@@ -99,7 +101,7 @@ QStringList CatchConfiguration::argumentsForTestRunner(QStringList *omitted) con
if (AutotestPlugin::settings()->processArgs) { if (AutotestPlugin::settings()->processArgs) {
arguments << filterInterfering(runnable().commandLineArguments.split( arguments << filterInterfering(runnable().commandLineArguments.split(
' ', QString::SkipEmptyParts), omitted); ' ', Utils::SkipEmptyParts), omitted);
} }
auto settings = dynamic_cast<CatchTestSettings *>(framework()->frameworkSettings()); auto settings = dynamic_cast<CatchTestSettings *>(framework()->frameworkSettings());

3
src/plugins/autotest/gtest/gtestconfiguration.cpp
View File

@@ -32,6 +32,7 @@
#include "../testsettings.h" #include "../testsettings.h"
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/stringutils.h>
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
@@ -76,7 +77,7 @@ QStringList GTestConfiguration::argumentsForTestRunner(QStringList *omitted) con
QStringList arguments; QStringList arguments;
if (AutotestPlugin::settings()->processArgs) { if (AutotestPlugin::settings()->processArgs) {
arguments << filterInterfering(runnable().commandLineArguments.split( arguments << filterInterfering(runnable().commandLineArguments.split(
' ', QString::SkipEmptyParts), omitted); ' ', Utils::SkipEmptyParts), omitted);
} }
const QStringList &testSets = testCases(); const QStringList &testSets = testCases();

8
src/plugins/autotest/gtest/gtesttreeitem.cpp
View File

@@ -32,9 +32,11 @@
#include <cpptools/cppmodelmanager.h> #include <cpptools/cppmodelmanager.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/icon.h> #include <utils/icon.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
#include <QRegularExpression> #include <QRegularExpression>
@@ -91,10 +93,10 @@ static bool matchesFilter(const QString &filter, const QString &fullTestName)
QStringList negative; QStringList negative;
int startOfNegative = filter.indexOf('-'); int startOfNegative = filter.indexOf('-');
if (startOfNegative == -1) { if (startOfNegative == -1) {
positive.append(filter.split(':', QString::SkipEmptyParts)); positive.append(filter.split(':', Utils::SkipEmptyParts));
} else { } else {
positive.append(filter.left(startOfNegative).split(':', QString::SkipEmptyParts)); positive.append(filter.left(startOfNegative).split(':', Utils::SkipEmptyParts));
negative.append(filter.mid(startOfNegative + 1).split(':', QString::SkipEmptyParts)); negative.append(filter.mid(startOfNegative + 1).split(':', Utils::SkipEmptyParts));
} }
QString testName = fullTestName; QString testName = fullTestName;

4
src/plugins/autotest/qtest/qttestconfiguration.cpp
View File

@@ -32,6 +32,8 @@
#include "../itestframework.h" #include "../itestframework.h"
#include "../testsettings.h" #include "../testsettings.h"
#include <utils/stringutils.h>
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
@@ -50,7 +52,7 @@ QStringList QtTestConfiguration::argumentsForTestRunner(QStringList *omitted) co
QStringList arguments; QStringList arguments;
if (AutotestPlugin::settings()->processArgs) { if (AutotestPlugin::settings()->processArgs) {
arguments.append(QTestUtils::filterInterfering( arguments.append(QTestUtils::filterInterfering(
runnable().commandLineArguments.split(' ', QString::SkipEmptyParts), runnable().commandLineArguments.split(' ', Utils::SkipEmptyParts),
omitted, false)); omitted, false));
} }
auto qtSettings = dynamic_cast<QtTestSettings *>(framework()->frameworkSettings()); auto qtSettings = dynamic_cast<QtTestSettings *>(framework()->frameworkSettings());

4
src/plugins/autotest/quick/quicktestconfiguration.cpp
View File

@@ -32,6 +32,8 @@
#include "../itestframework.h" #include "../itestframework.h"
#include "../testsettings.h" #include "../testsettings.h"
#include <utils/stringutils.h>
namespace Autotest { namespace Autotest {
namespace Internal { namespace Internal {
@@ -57,7 +59,7 @@ QStringList QuickTestConfiguration::argumentsForTestRunner(QStringList *omitted)
QStringList arguments; QStringList arguments;
if (AutotestPlugin::settings()->processArgs) { if (AutotestPlugin::settings()->processArgs) {
arguments.append(QTestUtils::filterInterfering arguments.append(QTestUtils::filterInterfering
(runnable().commandLineArguments.split(' ', QString::SkipEmptyParts), (runnable().commandLineArguments.split(' ', Utils::SkipEmptyParts),
omitted, true)); omitted, true));
} }

3
src/plugins/autotoolsprojectmanager/makefileparser.cpp
View File

@@ -29,6 +29,7 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/stringutils.h>
#include <QDir> #include <QDir>
#include <QFile> #include <QFile>
@@ -375,7 +376,7 @@ QStringList MakefileParser::targetValues(bool *hasVariables)
// Get all values of a line separated by spaces. // Get all values of a line separated by spaces.
// Values representing a variable like $(value) get // Values representing a variable like $(value) get
// removed currently. // removed currently.
QStringList lineValues = m_line.split(QLatin1Char(' '), QString::SkipEmptyParts); QStringList lineValues = m_line.split(QLatin1Char(' '), Utils::SkipEmptyParts);
QStringList::iterator it = lineValues.begin(); QStringList::iterator it = lineValues.begin();
while (it != lineValues.end()) { while (it != lineValues.end()) {
if ((*it).startsWith(QLatin1String("$("))) { if ((*it).startsWith(QLatin1String("$("))) {

3
src/plugins/bazaar/bazaarplugin.cpp
View File

@@ -54,6 +54,7 @@
#include <utils/parameteraction.h> #include <utils/parameteraction.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <vcsbase/basevcseditorfactory.h> #include <vcsbase/basevcseditorfactory.h>
#include <vcsbase/basevcssubmiteditorfactory.h> #include <vcsbase/basevcssubmiteditorfactory.h>
@@ -790,7 +791,7 @@ bool BazaarPluginPrivate::submitEditorAboutToClose()
//rewrite entries of the form 'file => newfile' to 'newfile' because //rewrite entries of the form 'file => newfile' to 'newfile' because
//this would mess the commit command //this would mess the commit command
for (QStringList::iterator iFile = files.begin(); iFile != files.end(); ++iFile) { for (QStringList::iterator iFile = files.begin(); iFile != files.end(); ++iFile) {
const QStringList parts = iFile->split(QLatin1String(" => "), QString::SkipEmptyParts); const QStringList parts = iFile->split(QLatin1String(" => "), Utils::SkipEmptyParts);
if (!parts.isEmpty()) if (!parts.isEmpty())
*iFile = parts.last(); *iFile = parts.last();
} }

4
src/plugins/beautifier/artisticstyle/artisticstyle.cpp
View File

@@ -40,12 +40,16 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/editormanager/ieditor.h> #include <coreplugin/editormanager/ieditor.h>
#include <coreplugin/idocument.h> #include <coreplugin/idocument.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectnodes.h> #include <projectexplorer/projectnodes.h>
#include <projectexplorer/projecttree.h> #include <projectexplorer/projecttree.h>
#include <texteditor/formattexteditor.h> #include <texteditor/formattexteditor.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/stringutils.h>
#include <QAction> #include <QAction>
#include <QMenu> #include <QMenu>

3
src/plugins/beautifier/artisticstyle/artisticstylesettings.cpp
View File

@@ -32,6 +32,7 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/runextensions.h> #include <utils/runextensions.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <QDateTime> #include <QDateTime>
@@ -206,7 +207,7 @@ void ArtisticStyleSettings::createDocumentationFile() const
for (QString line : lines) { for (QString line : lines) {
line = line.trimmed(); line = line.trimmed();
if ((line.startsWith("--") && !line.startsWith("---")) || line.startsWith("OR ")) { if ((line.startsWith("--") && !line.startsWith("---")) || line.startsWith("OR ")) {
const QStringList rawKeys = line.split(" OR ", QString::SkipEmptyParts); const QStringList rawKeys = line.split(" OR ", Utils::SkipEmptyParts);
for (QString k : rawKeys) { for (QString k : rawKeys) {
k = k.trimmed(); k = k.trimmed();
k.remove('#'); k.remove('#');

5
src/plugins/clangtools/diagnosticconfigswidget.cpp
View File

@@ -35,6 +35,7 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDesktopServices> #include <QDesktopServices>
#include <QDialogButtonBox> #include <QDialogButtonBox>
@@ -308,7 +309,7 @@ public:
propagateDown(index(0, 0, QModelIndex())); propagateDown(index(0, 0, QModelIndex()));
QStringList checksList = checks.simplified().remove(" ") QStringList checksList = checks.simplified().remove(" ")
.split(",", QString::SkipEmptyParts); .split(",", Utils::SkipEmptyParts);
for (QString &check : checksList) { for (QString &check : checksList) {
Qt::CheckState state; Qt::CheckState state;
@@ -857,7 +858,7 @@ void DiagnosticConfigsWidget::syncClazyWidgets(const ClangDiagnosticConfig &conf
const QStringList checkNames = config.clazyMode() const QStringList checkNames = config.clazyMode()
== ClangDiagnosticConfig::ClazyMode::UseDefaultChecks == ClangDiagnosticConfig::ClazyMode::UseDefaultChecks
? m_clazyInfo.defaultChecks ? m_clazyInfo.defaultChecks
: config.clazyChecks().split(',', QString::SkipEmptyParts); : config.clazyChecks().split(',', Utils::SkipEmptyParts);
m_clazyTreeModel->enableChecks(checkNames); m_clazyTreeModel->enableChecks(checkNames);
syncClazyChecksGroupBox(); syncClazyChecksGroupBox();

24
src/plugins/clearcase/clearcaseplugin.cpp
View File

@@ -45,21 +45,25 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/infobar.h> #include <coreplugin/infobar.h>
#include <coreplugin/locator/commandlocator.h>
#include <coreplugin/messagemanager.h> #include <coreplugin/messagemanager.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <coreplugin/locator/commandlocator.h>
#include <texteditor/textdocument.h> #include <texteditor/textdocument.h>
#include <projectexplorer/session.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/projectmanager.h> #include <projectexplorer/projectmanager.h>
#include <projectexplorer/session.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/synchronousprocess.h>
#include <utils/temporarydirectory.h>
#include <utils/parameteraction.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/parameteraction.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/runextensions.h> #include <utils/runextensions.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h>
#include <utils/temporarydirectory.h>
#include <vcsbase/basevcseditorfactory.h> #include <vcsbase/basevcseditorfactory.h>
#include <vcsbase/basevcssubmiteditorfactory.h> #include <vcsbase/basevcssubmiteditorfactory.h>
@@ -414,7 +418,7 @@ QStringList ClearCasePluginPrivate::getVobList() const
const ClearCaseResponse response = const ClearCaseResponse response =
runCleartool(currentState().topLevel(), args, m_settings.timeOutS, SilentRun); runCleartool(currentState().topLevel(), args, m_settings.timeOutS, SilentRun);
return response.stdOut.split(QLatin1Char('\n'), QString::SkipEmptyParts); return response.stdOut.split(QLatin1Char('\n'), Utils::SkipEmptyParts);
} }
/// Get the drive letter of a path /// Get the drive letter of a path
@@ -541,7 +545,7 @@ QString ClearCasePluginPrivate::ccManagesDirectory(const QString &directory) con
if (response.error) if (response.error)
return QString(); return QString();
const QStringList result = response.stdOut.split(QLatin1Char('\n'), QString::SkipEmptyParts); const QStringList result = response.stdOut.split(QLatin1Char('\n'), Utils::SkipEmptyParts);
if (result.size() != 2) if (result.size() != 2)
return QString(); return QString();
@@ -890,7 +894,7 @@ QStringList ClearCasePluginPrivate::ccGetActiveVobs() const
prefix += QLatin1Char('/'); prefix += QLatin1Char('/');
const QDir theViewRootDir(theViewRoot); const QDir theViewRootDir(theViewRoot);
foreach (const QString &line, response.stdOut.split(QLatin1Char('\n'), QString::SkipEmptyParts)) { foreach (const QString &line, response.stdOut.split(QLatin1Char('\n'), Utils::SkipEmptyParts)) {
const bool isActive = line.at(0) == QLatin1Char('*'); const bool isActive = line.at(0) == QLatin1Char('*');
if (!isActive) if (!isActive)
continue; continue;
@@ -2051,7 +2055,7 @@ QList<QStringPair> ClearCasePluginPrivate::ccGetActivities() const
QStringList args(QLatin1String("lsactivity")); QStringList args(QLatin1String("lsactivity"));
args << QLatin1String("-fmt") << QLatin1String("%n\\t%[headline]p\\n"); args << QLatin1String("-fmt") << QLatin1String("%n\\t%[headline]p\\n");
const QString response = runCleartoolSync(currentState().topLevel(), args); const QString response = runCleartoolSync(currentState().topLevel(), args);
QStringList acts = response.split(QLatin1Char('\n'), QString::SkipEmptyParts); QStringList acts = response.split(QLatin1Char('\n'), Utils::SkipEmptyParts);
foreach (const QString &activity, acts) { foreach (const QString &activity, acts) {
QStringList act = activity.split(QLatin1Char('\t')); QStringList act = activity.split(QLatin1Char('\t'));
if (act.size() >= 2) if (act.size() >= 2)
@@ -2342,7 +2346,7 @@ QString ClearCasePluginPrivate::runExtDiff(const QString &workingDir, const QStr
int timeOutS, QTextCodec *outputCodec) int timeOutS, QTextCodec *outputCodec)
{ {
CommandLine diff("diff"); CommandLine diff("diff");
diff.addArgs(m_settings.diffArgs.split(' ', QString::SkipEmptyParts)); diff.addArgs(m_settings.diffArgs.split(' ', Utils::SkipEmptyParts));
diff.addArgs(arguments); diff.addArgs(arguments);
SynchronousProcess process; SynchronousProcess process;

10
src/plugins/cmakeprojectmanager/cmakebuildconfiguration.cpp
View File

@@ -41,11 +41,13 @@
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projectmacroexpander.h> #include <projectexplorer/projectmacroexpander.h>
#include <projectexplorer/target.h> #include <projectexplorer/target.h>
#include <qtsupport/baseqtversion.h> #include <qtsupport/baseqtversion.h>
#include <qtsupport/qtbuildaspects.h> #include <qtsupport/qtbuildaspects.h>
#include <qtsupport/qtkitinformation.h> #include <qtsupport/qtkitinformation.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDir> #include <QDir>
#include <QLoggingCategory> #include <QLoggingCategory>
@@ -283,13 +285,7 @@ QStringList CMakeBuildConfiguration::extraCMakeArguments() const
QStringList CMakeBuildConfiguration::initialCMakeArguments() const QStringList CMakeBuildConfiguration::initialCMakeArguments() const
{ {
return aspect<InitialCMakeArgumentsAspect>()->value().split('\n', return aspect<InitialCMakeArgumentsAspect>()->value().split('\n', Utils::SkipEmptyParts);
#if QT_VERSION < QT_VERSION_CHECK(5, 14, 0)
QString::SkipEmptyParts
#else
Qt::SkipEmptyParts
#endif
);
} }
void CMakeBuildConfiguration::setExtraCMakeArguments(const QStringList &args) void CMakeBuildConfiguration::setExtraCMakeArguments(const QStringList &args)

4
src/plugins/coreplugin/locator/urllocatorfilter.cpp
View File

@@ -25,6 +25,8 @@
#include "urllocatorfilter.h" #include "urllocatorfilter.h"
#include <utils/stringutils.h>
#include <QDesktopServices> #include <QDesktopServices>
#include <QMutexLocker> #include <QMutexLocker>
#include <QUrl> #include <QUrl>
@@ -190,7 +192,7 @@ void UrlLocatorFilter::restoreState(const QByteArray &state)
QString value; QString value;
in >> value; in >> value;
m_remoteUrls = value.split('^', QString::SkipEmptyParts); m_remoteUrls = value.split('^', Utils::SkipEmptyParts);
QString shortcut; QString shortcut;
in >> shortcut; in >> shortcut;

2
src/plugins/coreplugin/menubarfilter.cpp
View File

@@ -187,7 +187,7 @@ void Core::Internal::MenuBarFilter::prepareSearch(const QString &entry)
static const QRegularExpression seperatorRegExp(QString("[%1]").arg(separators)); static const QRegularExpression seperatorRegExp(QString("[%1]").arg(separators));
QString normalized = entry; QString normalized = entry;
normalized.replace(seperatorRegExp, separators.at(0)); normalized.replace(seperatorRegExp, separators.at(0));
const QStringList entryPath = normalized.split(separators.at(0), QString::SkipEmptyParts); const QStringList entryPath = normalized.split(separators.at(0), Utils::SkipEmptyParts);
m_entries.clear(); m_entries.clear();
QVector<const QMenu *> processedMenus; QVector<const QMenu *> processedMenus;
for (QAction* action : menuBarActions()) for (QAction* action : menuBarActions())

5
src/plugins/coreplugin/mimetypesettings.cpp
View File

@@ -37,6 +37,7 @@
#include <utils/headerviewstretcher.h> #include <utils/headerviewstretcher.h>
#include <utils/mimetypes/mimedatabase.h> #include <utils/mimetypes/mimedatabase.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QAbstractTableModel> #include <QAbstractTableModel>
#include <QCoreApplication> #include <QCoreApplication>
@@ -381,7 +382,7 @@ void MimeTypeSettingsPrivate::handlePatternEdited()
const Utils::MimeType mt = m_model->m_mimeTypes.at(index); const Utils::MimeType mt = m_model->m_mimeTypes.at(index);
ensurePendingMimeType(mt); ensurePendingMimeType(mt);
m_pendingModifiedMimeTypes[mt.name()].globPatterns m_pendingModifiedMimeTypes[mt.name()].globPatterns
= m_ui.patternsLineEdit->text().split(kSemiColon, QString::SkipEmptyParts); = m_ui.patternsLineEdit->text().split(kSemiColon, Utils::SkipEmptyParts);
} }
void MimeTypeSettingsPrivate::addMagicHeaderRow(const MagicData &data) void MimeTypeSettingsPrivate::addMagicHeaderRow(const MagicData &data)
@@ -578,7 +579,7 @@ MimeTypeSettingsPrivate::UserMimeTypeHash MimeTypeSettingsPrivate::readUserModif
if (reader.name() == QLatin1String(mimeTypeTagC)) { if (reader.name() == QLatin1String(mimeTypeTagC)) {
mt.name = atts.value(QLatin1String(mimeTypeAttributeC)).toString(); mt.name = atts.value(QLatin1String(mimeTypeAttributeC)).toString();
mt.globPatterns = atts.value(QLatin1String(patternAttributeC)).toString() mt.globPatterns = atts.value(QLatin1String(patternAttributeC)).toString()
.split(kSemiColon, QString::SkipEmptyParts); .split(kSemiColon, Utils::SkipEmptyParts);
} else if (reader.name() == QLatin1String(matchTagC)) { } else if (reader.name() == QLatin1String(matchTagC)) {
QByteArray value = atts.value(QLatin1String(matchValueAttributeC)).toUtf8(); QByteArray value = atts.value(QLatin1String(matchValueAttributeC)).toUtf8();
QByteArray typeName = atts.value(QLatin1String(matchTypeAttributeC)).toUtf8(); QByteArray typeName = atts.value(QLatin1String(matchTypeAttributeC)).toUtf8();

2
src/plugins/cpptools/builtinindexingsupport.cpp
View File

@@ -312,7 +312,7 @@ public:
} }
Core::SearchResultItem item; Core::SearchResultItem item;
item.path = scope.split(QLatin1String("::"), QString::SkipEmptyParts); item.path = scope.split(QLatin1String("::"), Utils::SkipEmptyParts);
item.text = text; item.text = text;
item.icon = info->icon(); item.icon = info->icon();
item.userData = QVariant::fromValue(info); item.userData = QVariant::fromValue(info);

3
src/plugins/cpptools/clangdiagnosticconfigswidget.cpp
View File

@@ -30,6 +30,7 @@
#include "ui_clangbasechecks.h" #include "ui_clangbasechecks.h"
#include <utils/executeondestruction.h> #include <utils/executeondestruction.h>
#include <utils/stringutils.h>
#include <utils/treemodel.h> #include <utils/treemodel.h>
#include <QInputDialog> #include <QInputDialog>
@@ -254,7 +255,7 @@ static QString validateDiagnosticOptions(const QStringList &options)
static QStringList normalizeDiagnosticInputOptions(const QString &options) static QStringList normalizeDiagnosticInputOptions(const QString &options)
{ {
return options.simplified().split(QLatin1Char(' '), QString::SkipEmptyParts); return options.simplified().split(QLatin1Char(' '), Utils::SkipEmptyParts);
} }
void ClangDiagnosticConfigsWidget::onClangOnlyOptionsChanged() void ClangDiagnosticConfigsWidget::onClangOnlyOptionsChanged()

11
src/plugins/cpptools/cppfilesettingspage.cpp
View File

@@ -39,16 +39,17 @@
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/mimetypes/mimedatabase.h> #include <utils/mimetypes/mimedatabase.h>
#include <utils/stringutils.h>
#include <QSettings>
#include <QDebug>
#include <QFile>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDate> #include <QDate>
#include <QDebug>
#include <QFile>
#include <QFileDialog>
#include <QLocale> #include <QLocale>
#include <QSettings>
#include <QTextCodec> #include <QTextCodec>
#include <QTextStream> #include <QTextStream>
#include <QFileDialog>
namespace CppTools { namespace CppTools {
namespace Internal { namespace Internal {
@@ -308,7 +309,7 @@ void CppFileSettingsWidget::setLicenseTemplatePath(const QString &lp)
static QStringList trimmedPaths(const QString &paths) static QStringList trimmedPaths(const QString &paths)
{ {
QStringList res; QStringList res;
foreach (const QString &path, paths.split(QLatin1Char(','), QString::SkipEmptyParts)) foreach (const QString &path, paths.split(QLatin1Char(','), Utils::SkipEmptyParts))
res << path.trimmed(); res << path.trimmed();
return res; return res;
} }

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

@@ -46,6 +46,7 @@
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/parameteraction.h> #include <utils/parameteraction.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
@@ -183,8 +184,7 @@ public:
QStringList arguments() const override QStringList arguments() const override
{ {
QStringList args; QStringList args;
args = m_settings.stringValue(CvsSettings::diffOptionsKey).split(QLatin1Char(' '), args = m_settings.stringValue(CvsSettings::diffOptionsKey).split(' ', SkipEmptyParts);
QString::SkipEmptyParts);
args += VcsBaseEditorConfig::arguments(); args += VcsBaseEditorConfig::arguments();
return args; return args;
} }

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

@@ -25,6 +25,8 @@
#include "cvsutils.h" #include "cvsutils.h"
#include <utils/stringutils.h>
#include <QRegExp> #include <QRegExp>
#include <QStringList> #include <QStringList>
@@ -60,7 +62,7 @@ QList<CvsLogEntry> parseLogEntries(const QString &o,
enum ParseState { FileState, RevisionState, StatusLineState }; enum ParseState { FileState, RevisionState, StatusLineState };
QList<CvsLogEntry> rc; QList<CvsLogEntry> rc;
const QStringList lines = o.split(QString(QLatin1Char('\n')), QString::SkipEmptyParts); const QStringList lines = o.split('\n', Utils::SkipEmptyParts);
ParseState state = FileState; ParseState state = FileState;
const QString workingFilePrefix = QLatin1String("Working file: "); const QString workingFilePrefix = QLatin1String("Working file: ");
@@ -173,7 +175,7 @@ StateList parseStatusOutput(const QString &directory, const QString &output)
const QString dotDir = QString(QLatin1Char('.')); const QString dotDir = QString(QLatin1Char('.'));
const QChar slash = QLatin1Char('/'); const QChar slash = QLatin1Char('/');
const QStringList list = output.split(QLatin1Char('\n'), QString::SkipEmptyParts); const QStringList list = output.split('\n', Utils::SkipEmptyParts);
QString path = directory; QString path = directory;
if (!path.isEmpty()) if (!path.isEmpty())

3
src/plugins/debugger/breakpoint.cpp
View File

@@ -31,6 +31,7 @@
#include <projectexplorer/abi.h> #include <projectexplorer/abi.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDebug> #include <QDebug>
#include <QFileInfo> #include <QFileInfo>
@@ -155,7 +156,7 @@ bool BreakpointParameters::isQmlFileAndLineBreakpoint() const
if (qmlExtensionString.isEmpty()) if (qmlExtensionString.isEmpty())
qmlExtensionString = ".qml;.js"; qmlExtensionString = ".qml;.js";
const auto qmlFileExtensions = qmlExtensionString.splitRef(';', QString::SkipEmptyParts); const auto qmlFileExtensions = qmlExtensionString.splitRef(';', Utils::SkipEmptyParts);
const QString file = fileName.toString(); const QString file = fileName.toString();
for (const QStringRef &extension : qmlFileExtensions) { for (const QStringRef &extension : qmlFileExtensions) {
if (file.endsWith(extension, Qt::CaseInsensitive)) if (file.endsWith(extension, Qt::CaseInsensitive))

13
src/plugins/debugger/cdb/cdbengine.cpp
View File

@@ -58,14 +58,15 @@
#include <projectexplorer/taskhub.h> #include <projectexplorer/taskhub.h>
#include <texteditor/texteditor.h> #include <texteditor/texteditor.h>
#include <utils/synchronousprocess.h>
#include <utils/qtcprocess.h>
#include <utils/winutils.h>
#include <utils/qtcassert.h>
#include <utils/savedaction.h>
#include <utils/consoleprocess.h> #include <utils/consoleprocess.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h>
#include <utils/qtcprocess.h>
#include <utils/savedaction.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h>
#include <utils/winutils.h>
#include <cplusplus/findcdbbreakpoint.h> #include <cplusplus/findcdbbreakpoint.h>
#include <cpptools/cppmodelmanager.h> #include <cpptools/cppmodelmanager.h>
@@ -2760,7 +2761,7 @@ void CdbEngine::setupScripting(const DebuggerResponse &response)
} }
const QString commands = stringSetting(ExtraDumperCommands); const QString commands = stringSetting(ExtraDumperCommands);
if (!commands.isEmpty()) { if (!commands.isEmpty()) {
for (const auto &command : commands.split('\n', QString::SkipEmptyParts)) for (const auto &command : commands.split('\n', Utils::SkipEmptyParts))
runCommand({command, ScriptCommand}); runCommand({command, ScriptCommand});
} }

3
src/plugins/debugger/debuggeritem.cpp
View File

@@ -35,6 +35,7 @@
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/macroexpander.h> #include <utils/macroexpander.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
#include <utils/winutils.h> #include <utils/winutils.h>
@@ -79,7 +80,7 @@ static QString getConfigurationOfGdbCommand(const FilePath &command)
static QString extractGdbTargetAbiStringFromGdbOutput(const QString &gdbOutput) static QString extractGdbTargetAbiStringFromGdbOutput(const QString &gdbOutput)
{ {
const auto outputLines = gdbOutput.split('\n'); const auto outputLines = gdbOutput.split('\n');
const auto whitespaceSeparatedTokens = outputLines.join(' ').split(' ', QString::SkipEmptyParts); const auto whitespaceSeparatedTokens = outputLines.join(' ').split(' ', Utils::SkipEmptyParts);
const QString targetKey{"--target="}; const QString targetKey{"--target="};
const QString targetValue = Utils::findOrDefault(whitespaceSeparatedTokens, const QString targetValue = Utils::findOrDefault(whitespaceSeparatedTokens,

5
src/plugins/debugger/gdb/gdbengine.cpp
View File

@@ -64,6 +64,7 @@
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/savedaction.h> #include <utils/savedaction.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/temporaryfile.h> #include <utils/temporaryfile.h>
@@ -2699,7 +2700,7 @@ void GdbEngine::handleShowModuleSections(const DebuggerResponse &response,
active = true; active = true;
} else { } else {
if (active) { if (active) {
QStringList items = line.split(' ', QString::SkipEmptyParts); QStringList items = line.split(' ', Utils::SkipEmptyParts);
QString fromTo = items.value(0, QString()); QString fromTo = items.value(0, QString());
const int pos = fromTo.indexOf('-'); const int pos = fromTo.indexOf('-');
QTC_ASSERT(pos >= 0, continue); QTC_ASSERT(pos >= 0, continue);
@@ -3188,7 +3189,7 @@ void GdbEngine::handleRegisterListing(const DebuggerResponse &response)
m_registers.clear(); m_registers.clear();
QStringList lines = response.consoleStreamOutput.split('\n'); QStringList lines = response.consoleStreamOutput.split('\n');
for (int i = 1; i < lines.size(); ++i) { for (int i = 1; i < lines.size(); ++i) {
const QVector<QStringRef> parts = lines.at(i).splitRef(' ', QString::SkipEmptyParts); const QVector<QStringRef> parts = lines.at(i).splitRef(' ', Utils::SkipEmptyParts);
if (parts.size() < 7) if (parts.size() < 7)
continue; continue;
int gdbRegisterNumber = parts.at(1).toInt(); int gdbRegisterNumber = parts.at(1).toInt();

4
src/plugins/designer/qtcreatorintegration.cpp
View File

@@ -44,8 +44,10 @@
#include <projectexplorer/projectexplorer.h> #include <projectexplorer/projectexplorer.h>
#include <projectexplorer/projecttree.h> #include <projectexplorer/projecttree.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <utils/mimetypes/mimedatabase.h> #include <utils/mimetypes/mimedatabase.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDesignerFormWindowInterface> #include <QDesignerFormWindowInterface>
#include <QDesignerFormEditorInterface> #include <QDesignerFormEditorInterface>
@@ -382,7 +384,7 @@ static QString addParameterNames(const QString &functionSignature, const QString
const int lastParen = argumentsString.lastIndexOf(')'); const int lastParen = argumentsString.lastIndexOf(')');
if (lastParen != -1) if (lastParen != -1)
argumentsString.truncate(lastParen); argumentsString.truncate(lastParen);
const QStringList arguments = argumentsString.split(',', QString::SkipEmptyParts); const QStringList arguments = argumentsString.split(',', Utils::SkipEmptyParts);
const int pCount = parameterNames.count(); const int pCount = parameterNames.count();
const int aCount = arguments.count(); const int aCount = arguments.count();
for (int i = 0; i < aCount; ++i) { for (int i = 0; i < aCount; ++i) {

3
src/plugins/git/branchmodel.cpp
View File

@@ -32,6 +32,7 @@
#include <utils/filesystemwatcher.h> #include <utils/filesystemwatcher.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDateTime> #include <QDateTime>
#include <QFont> #include <QFont>
@@ -647,7 +648,7 @@ bool BranchModel::branchIsMerged(const QModelIndex &idx)
VcsOutputWindow::appendError(errorMessage); VcsOutputWindow::appendError(errorMessage);
} }
const QStringList lines = output.split('\n', QString::SkipEmptyParts); const QStringList lines = output.split('\n', Utils::SkipEmptyParts);
for (const QString &l : lines) { for (const QString &l : lines) {
QString currentBranch = l.mid(2); // remove first letters (those are either QString currentBranch = l.mid(2); // remove first letters (those are either
// " " or "* " depending on whether it is // " " or "* " depending on whether it is

3
src/plugins/git/gerrit/gerritpushdialog.cpp
View File

@@ -31,6 +31,7 @@
#include "../gitconstants.h" #include "../gitconstants.h"
#include <utils/icon.h> #include <utils/icon.h>
#include <utils/stringutils.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
#include <QApplication> #include <QApplication>
@@ -290,7 +291,7 @@ QString GerritPushDialog::pushTarget() const
if (!topic.isEmpty()) if (!topic.isEmpty())
target += '/' + topic; target += '/' + topic;
const QStringList reviewersInput = reviewers().split(',', QString::SkipEmptyParts); const QStringList reviewersInput = reviewers().split(',', Utils::SkipEmptyParts);
for (const QString &reviewer : reviewersInput) for (const QString &reviewer : reviewersInput)
options << "r=" + reviewer; options << "r=" + reviewer;

7
src/plugins/git/gitclient.cpp
View File

@@ -49,6 +49,7 @@
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/qtcprocess.h> #include <utils/qtcprocess.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/temporaryfile.h> #include <utils/temporaryfile.h>
#include <utils/theme/theme.h> #include <utils/theme/theme.h>
@@ -838,7 +839,7 @@ QStringList GitClient::unmanagedFiles(const QString &workingDirectory,
if (response.result != SynchronousProcessResponse::Finished) if (response.result != SynchronousProcessResponse::Finished)
return filePaths; return filePaths;
const QStringList managedFilePaths const QStringList managedFilePaths
= transform(response.stdOut().split('\0', QString::SkipEmptyParts), = transform(response.stdOut().split('\0', Utils::SkipEmptyParts),
[&wd](const QString &fp) { return wd.absoluteFilePath(fp); }); [&wd](const QString &fp) { return wd.absoluteFilePath(fp); });
return filtered(filePaths, [&managedFilePaths](const QString &fp) { return filtered(filePaths, [&managedFilePaths](const QString &fp) {
return !managedFilePaths.contains(fp); return !managedFilePaths.contains(fp);
@@ -3231,7 +3232,7 @@ void GitClient::push(const QString &workingDirectory, const QStringList &pushArg
command->setCookie(NoRemoteBranch); command->setCookie(NoRemoteBranch);
if (command->cookie().toInt() == NoRemoteBranch) { if (command->cookie().toInt() == NoRemoteBranch) {
const QStringList lines = text.split('\n', QString::SkipEmptyParts); const QStringList lines = text.split('\n', Utils::SkipEmptyParts);
for (const QString &line : lines) { for (const QString &line : lines) {
/* Extract the suggested command from the git output which /* Extract the suggested command from the git output which
* should be similar to the following: * should be similar to the following:
@@ -3281,7 +3282,7 @@ void GitClient::push(const QString &workingDirectory, const QStringList &pushArg
QMessageBox::No) == QMessageBox::Yes) { QMessageBox::No) == QMessageBox::Yes) {
const QStringList fallbackCommandParts = const QStringList fallbackCommandParts =
m_pushFallbackCommand.split(' ', QString::SkipEmptyParts); m_pushFallbackCommand.split(' ', Utils::SkipEmptyParts);
VcsCommand *rePushCommand = vcsExec(workingDirectory, VcsCommand *rePushCommand = vcsExec(workingDirectory,
fallbackCommandParts.mid(1), fallbackCommandParts.mid(1),
nullptr, true, VcsCommand::ShowSuccessMessage); nullptr, true, VcsCommand::ShowSuccessMessage);

9
src/plugins/help/localhelpmanager.cpp
View File

@@ -46,16 +46,17 @@
#include <app/app_version.h> #include <app/app_version.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/optional.h> #include <utils/optional.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDesktopServices> #include <QDesktopServices>
#include <QFontDatabase> #include <QFontDatabase>
#include <QMutexLocker>
#include <QHelpEngine> #include <QHelpEngine>
#include <QMutexLocker>
using namespace Help::Internal; using namespace Help::Internal;
@@ -269,7 +270,7 @@ void LocalHelpManager::setScrollWheelZoomingEnabled(bool enabled)
QStringList LocalHelpManager::lastShownPages() QStringList LocalHelpManager::lastShownPages()
{ {
const QVariant value = Core::ICore::settings()->value(kLastShownPagesKey, QVariant()); const QVariant value = Core::ICore::settings()->value(kLastShownPagesKey, QVariant());
return value.toString().split(Constants::ListSeparator, QString::SkipEmptyParts); return value.toString().split(Constants::ListSeparator, Utils::SkipEmptyParts);
} }
void LocalHelpManager::setLastShownPages(const QStringList &pages) void LocalHelpManager::setLastShownPages(const QStringList &pages)
@@ -281,7 +282,7 @@ QList<float> LocalHelpManager::lastShownPagesZoom()
{ {
const QVariant value = Core::ICore::settings()->value(kLastShownPagesZoomKey, QVariant()); const QVariant value = Core::ICore::settings()->value(kLastShownPagesZoomKey, QVariant());
const QStringList stringValues = value.toString().split(Constants::ListSeparator, const QStringList stringValues = value.toString().split(Constants::ListSeparator,
QString::SkipEmptyParts); Utils::SkipEmptyParts);
return Utils::transform(stringValues, [](const QString &str) { return str.toFloat(); }); return Utils::transform(stringValues, [](const QString &str) { return str.toFloat(); });
} }

13
src/plugins/help/openpagesmanager.cpp
View File

@@ -32,6 +32,13 @@
#include "openpagesswitcher.h" #include "openpagesswitcher.h"
#include "openpageswidget.h" #include "openpageswidget.h"
#include <coreplugin/coreconstants.h>
#include <coreplugin/modemanager.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/styledbar.h>
#include <QApplication> #include <QApplication>
#include <QClipboard> #include <QClipboard>
#include <QComboBox> #include <QComboBox>
@@ -39,10 +46,6 @@
#include <QHelpEngine> #include <QHelpEngine>
#include <coreplugin/coreconstants.h>
#include <coreplugin/modemanager.h>
#include <utils/qtcassert.h>
using namespace Core; using namespace Core;
using namespace Help::Internal; using namespace Help::Internal;
@@ -110,7 +113,7 @@ QComboBox *OpenPagesManager::openPagesComboBox() const
QStringList splitString(const QVariant &value) QStringList splitString(const QVariant &value)
{ {
using namespace Help::Constants; using namespace Help::Constants;
return value.toString().split(ListSeparator, QString::SkipEmptyParts); return value.toString().split(ListSeparator, Utils::SkipEmptyParts);
} }
void OpenPagesManager::setupInitialPages() void OpenPagesManager::setupInitialPages()

4
src/plugins/help/qlitehtml/container_qpainter.cpp
View File

@@ -25,6 +25,8 @@
#include "container_qpainter.h" #include "container_qpainter.h"
#include <utils/stringutils.h>
#include <QClipboard> #include <QClipboard>
#include <QCursor> #include <QCursor>
#include <QDebug> #include <QDebug>
@@ -446,7 +448,7 @@ litehtml::uint_ptr DocumentContainer::create_font(const litehtml::tchar_t *faceN
unsigned int decoration, unsigned int decoration,
litehtml::font_metrics *fm) litehtml::font_metrics *fm)
{ {
const QStringList splitNames = QString::fromUtf8(faceName).split(',', QString::SkipEmptyParts); const QStringList splitNames = QString::fromUtf8(faceName).split(',', Utils::SkipEmptyParts);
QStringList familyNames; QStringList familyNames;
std::transform(splitNames.cbegin(), std::transform(splitNames.cbegin(),
splitNames.cend(), splitNames.cend(),

4
src/plugins/help/searchwidget.cpp
View File

@@ -32,7 +32,9 @@
#include <coreplugin/coreconstants.h> #include <coreplugin/coreconstants.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/progressmanager/progressmanager.h> #include <coreplugin/progressmanager/progressmanager.h>
#include <utils/progressindicator.h> #include <utils/progressindicator.h>
#include <utils/stringutils.h>
#include <utils/styledbar.h> #include <utils/styledbar.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
@@ -261,7 +263,7 @@ void SearchWidget::contextMenuEvent(QContextMenuEvent *contextMenuEvent)
QStringList SearchWidget::currentSearchTerms() const QStringList SearchWidget::currentSearchTerms() const
{ {
return searchEngine->searchInput().split(QRegExp("\\W+"), QString::SkipEmptyParts); return searchEngine->searchInput().split(QRegExp("\\W+"), Utils::SkipEmptyParts);
} }
// #pragma mark -- SearchSideBarItem // #pragma mark -- SearchSideBarItem

21
src/plugins/imageviewer/multiexportdialog.cpp
View File

@@ -31,32 +31,31 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/stringutils.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
#include <QApplication> #include <QApplication>
#include <QDebug>
#include <QDesktopWidget> #include <QDesktopWidget>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QDir>
#include <QFileDialog> #include <QFileDialog>
#include <QFileInfo>
#include <QFormLayout> #include <QFormLayout>
#include <QHBoxLayout> #include <QHBoxLayout>
#include <QMessageBox> #include <QImageWriter>
#include <QMenu>
#include <QLabel> #include <QLabel>
#include <QLineEdit> #include <QLineEdit>
#include <QMenu>
#include <QMessageBox>
#include <QPushButton> #include <QPushButton>
#include <QSettings>
#include <QSpinBox> #include <QSpinBox>
#include <QTextStream>
#include <QToolButton> #include <QToolButton>
#include <QVBoxLayout> #include <QVBoxLayout>
#include <QWidgetAction> #include <QWidgetAction>
#include <QImageWriter>
#include <QDebug>
#include <QDir>
#include <QFileInfo>
#include <QSettings>
#include <QTextStream>
namespace ImageViewer { namespace ImageViewer {
namespace Internal { namespace Internal {
@@ -114,7 +113,7 @@ static QVector<QSize> stringToSizes(const QString &s)
{ {
QVector<QSize> result; QVector<QSize> result;
const QString trimmed = s.trimmed(); const QString trimmed = s.trimmed();
const QVector<QStringRef> &sizes = trimmed.splitRef(',', QString::SkipEmptyParts); const QVector<QStringRef> &sizes = trimmed.splitRef(',', Utils::SkipEmptyParts);
result.reserve(sizes.size()); result.reserve(sizes.size());
for (const QStringRef &sizeSpec : sizes) { for (const QStringRef &sizeSpec : sizes) {
const QSize size = sizeFromString(sizeSpec); const QSize size = sizeFromString(sizeSpec);

9
src/plugins/languageclient/languageclientsettings.cpp
View File

@@ -34,14 +34,17 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <coreplugin/idocument.h> #include <coreplugin/idocument.h>
#include <coreplugin/variablechooser.h> #include <coreplugin/variablechooser.h>
#include <projectexplorer/project.h> #include <projectexplorer/project.h>
#include <projectexplorer/session.h> #include <projectexplorer/session.h>
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/utilsicons.h> #include <utils/utilsicons.h>
#include <utils/delegates.h> #include <utils/delegates.h>
#include <utils/fancylineedit.h> #include <utils/fancylineedit.h>
#include <utils/mimetypes/mimedatabase.h> #include <utils/mimetypes/mimedatabase.h>
#include <utils/jsontreeitem.h> #include <utils/jsontreeitem.h>
#include <utils/stringutils.h>
#include <QBoxLayout> #include <QBoxLayout>
#include <QComboBox> #include <QComboBox>
@@ -810,8 +813,8 @@ QString BaseSettingsWidget::name() const
LanguageFilter BaseSettingsWidget::filter() const LanguageFilter BaseSettingsWidget::filter() const
{ {
return {m_mimeTypes->text().split(filterSeparator, QString::SkipEmptyParts), return {m_mimeTypes->text().split(filterSeparator, Utils::SkipEmptyParts),
m_filePattern->text().split(filterSeparator, QString::SkipEmptyParts)}; m_filePattern->text().split(filterSeparator, Utils::SkipEmptyParts)};
} }
BaseSettings::StartBehavior BaseSettingsWidget::startupBehavior() const BaseSettings::StartBehavior BaseSettingsWidget::startupBehavior() const
@@ -910,7 +913,7 @@ private:
void BaseSettingsWidget::showAddMimeTypeDialog() void BaseSettingsWidget::showAddMimeTypeDialog()
{ {
MimeTypeDialog dialog(m_mimeTypes->text().split(filterSeparator, QString::SkipEmptyParts), MimeTypeDialog dialog(m_mimeTypes->text().split(filterSeparator, Utils::SkipEmptyParts),
Core::ICore::dialogParent()); Core::ICore::dialogParent());
if (dialog.exec() == QDialog::Rejected) if (dialog.exec() == QDialog::Rejected)
return; return;

5
src/plugins/projectexplorer/customtoolchain.cpp
View File

@@ -40,6 +40,7 @@
#include <utils/environment.h> #include <utils/environment.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QComboBox> #include <QComboBox>
#include <QFormLayout> #include <QFormLayout>
@@ -428,7 +429,7 @@ public:
QStringList entries() const QStringList entries() const
{ {
return textEditWidget()->toPlainText().split(QLatin1Char('\n'), QString::SkipEmptyParts); return textEditWidget()->toPlainText().split(QLatin1Char('\n'), Utils::SkipEmptyParts);
} }
QString text() const QString text() const
@@ -547,7 +548,7 @@ void CustomToolChainConfigWidget::applyImpl()
tc->setMakeCommand(m_makeCommand->filePath()); tc->setMakeCommand(m_makeCommand->filePath());
tc->setTargetAbi(m_abiWidget->currentAbi()); tc->setTargetAbi(m_abiWidget->currentAbi());
Macros macros = Utils::transform<QVector>( Macros macros = Utils::transform<QVector>(
m_predefinedDetails->text().split('\n', QString::SkipEmptyParts), m_predefinedDetails->text().split('\n', Utils::SkipEmptyParts),
[](const QString &m) { [](const QString &m) {
return Macro::fromKeyValue(m); return Macro::fromKeyValue(m);
}); });

7
src/plugins/projectexplorer/customwizard/customwizardparameters.cpp
View File

@@ -29,12 +29,13 @@
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <cpptools/cpptoolsconstants.h> #include <cpptools/cpptoolsconstants.h>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/macroexpander.h> #include <utils/macroexpander.h>
#include <utils/mimetypes/mimedatabase.h>
#include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/templateengine.h> #include <utils/templateengine.h>
#include <utils/temporarydirectory.h> #include <utils/temporarydirectory.h>
#include <utils/temporaryfile.h> #include <utils/temporaryfile.h>
#include <utils/qtcassert.h>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDate> #include <QDate>
@@ -450,7 +451,7 @@ static inline IWizardFactory::WizardKind kindAttribute(const QXmlStreamReader &r
static inline QSet<Id> readRequiredFeatures(const QXmlStreamReader &reader) static inline QSet<Id> readRequiredFeatures(const QXmlStreamReader &reader)
{ {
QString value = reader.attributes().value(QLatin1String(featuresRequiredC)).toString(); QString value = reader.attributes().value(QLatin1String(featuresRequiredC)).toString();
QStringList stringList = value.split(QLatin1Char(','), QString::SkipEmptyParts); QStringList stringList = value.split(QLatin1Char(','), Utils::SkipEmptyParts);
QSet<Id> features; QSet<Id> features;
foreach (const QString &string, stringList) foreach (const QString &string, stringList)
features |= Id::fromString(string); features |= Id::fromString(string);

5
src/plugins/projectexplorer/environmentwidget.cpp
View File

@@ -37,6 +37,7 @@
#include <utils/itemviews.h> #include <utils/itemviews.h>
#include <utils/namevaluevalidator.h> #include <utils/namevaluevalidator.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/tooltip/tooltip.h> #include <utils/tooltip/tooltip.h>
#include <QDialogButtonBox> #include <QDialogButtonBox>
@@ -82,7 +83,7 @@ public:
m_view.setHeaderLabel(varName); m_view.setHeaderLabel(varName);
m_view.setDragDropMode(QAbstractItemView::InternalMove); m_view.setDragDropMode(QAbstractItemView::InternalMove);
const QStringList pathList = paths.split(Utils::HostOsInfo::pathListSeparator(), const QStringList pathList = paths.split(Utils::HostOsInfo::pathListSeparator(),
QString::SkipEmptyParts); Utils::SkipEmptyParts);
for (const QString &path : pathList) for (const QString &path : pathList)
addPath(path); addPath(path);
@@ -442,7 +443,7 @@ bool EnvironmentWidget::currentEntryIsPathList(const QModelIndex &current) const
if (valueIndex.column() == 0) if (valueIndex.column() == 0)
valueIndex = valueIndex.siblingAtColumn(1); valueIndex = valueIndex.siblingAtColumn(1);
const QStringList entries = d->m_model->data(valueIndex).toString() const QStringList entries = d->m_model->data(valueIndex).toString()
.split(Utils::HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); .split(Utils::HostOsInfo::pathListSeparator(), Utils::SkipEmptyParts);
if (entries.length() < 2) if (entries.length() < 2)
return false; return false;
for (const QString &potentialDir : entries) { for (const QString &potentialDir : entries) {

3
src/plugins/projectexplorer/jsonwizard/jsonsummarypage.cpp
View File

@@ -39,6 +39,7 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDir> #include <QDir>
#include <QMessageBox> #include <QMessageBox>
@@ -209,7 +210,7 @@ void JsonSummaryPage::addToProject(const JsonWizard::GeneratorFiles &files)
return; return;
} }
const QStringList dependencies = m_wizard->stringValue("Dependencies") const QStringList dependencies = m_wizard->stringValue("Dependencies")
.split(':', QString::SkipEmptyParts); .split(':', Utils::SkipEmptyParts);
if (!dependencies.isEmpty()) if (!dependencies.isEmpty())
folder->addDependencies(dependencies); folder->addDependencies(dependencies);
} }

2
src/plugins/projectexplorer/jsonwizard/jsonwizardfactory.cpp
View File

@@ -324,7 +324,7 @@ static QStringList environmentTemplatesPaths()
if (!envTempPath.isEmpty()) { if (!envTempPath.isEmpty()) {
for (const QString &path : envTempPath for (const QString &path : envTempPath
.split(Utils::HostOsInfo::pathListSeparator(), QString::SkipEmptyParts)) { .split(Utils::HostOsInfo::pathListSeparator(), Utils::SkipEmptyParts)) {
QString canonicalPath = QDir(path).canonicalPath(); QString canonicalPath = QDir(path).canonicalPath();
if (!canonicalPath.isEmpty() && !paths.contains(canonicalPath)) if (!canonicalPath.isEmpty() && !paths.contains(canonicalPath))
paths.append(canonicalPath); paths.append(canonicalPath);

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

@@ -2014,7 +2014,7 @@ void ProjectExplorerPlugin::extensionsInitialized()
const QString gitBinary = Core::ICore::settings()->value("Git/BinaryPath", "git") const QString gitBinary = Core::ICore::settings()->value("Git/BinaryPath", "git")
.toString(); .toString();
const QStringList rawGitSearchPaths = Core::ICore::settings()->value("Git/Path") const QStringList rawGitSearchPaths = Core::ICore::settings()->value("Git/Path")
.toString().split(':', QString::SkipEmptyParts); .toString().split(':', Utils::SkipEmptyParts);
const Utils::FilePaths gitSearchPaths = Utils::transform(rawGitSearchPaths, const Utils::FilePaths gitSearchPaths = Utils::transform(rawGitSearchPaths,
[](const QString &rawPath) { return Utils::FilePath::fromString(rawPath); }); [](const QString &rawPath) { return Utils::FilePath::fromString(rawPath); });
const Utils::FilePath fullGitPath = Utils::Environment::systemEnvironment() const Utils::FilePath fullGitPath = Utils::Environment::systemEnvironment()

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

@@ -79,7 +79,7 @@ static FolderNode *recursiveFindOrCreateFolderNode(FolderNode *folder,
directoryWithoutPrefix = directory; directoryWithoutPrefix = directory;
} }
} }
QStringList parts = directoryWithoutPrefix.toString().split('/', QString::SkipEmptyParts); QStringList parts = directoryWithoutPrefix.toString().split('/', Utils::SkipEmptyParts);
if (!Utils::HostOsInfo::isWindowsHost() && !isRelative && !parts.isEmpty()) if (!Utils::HostOsInfo::isWindowsHost() && !isRelative && !parts.isEmpty())
parts[0].prepend('/'); parts[0].prepend('/');

3
src/plugins/projectexplorer/selectablefilesmodel.cpp
View File

@@ -33,6 +33,7 @@
#include <utils/fancylineedit.h> #include <utils/fancylineedit.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/runextensions.h> #include <utils/runextensions.h>
#include <utils/stringutils.h>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QDir> #include <QDir>
@@ -349,7 +350,7 @@ void SelectableFilesModel::collectFiles(Tree *root, Utils::FilePaths *result) co
QList<Glob> SelectableFilesModel::parseFilter(const QString &filter) QList<Glob> SelectableFilesModel::parseFilter(const QString &filter)
{ {
QList<Glob> result; QList<Glob> result;
const QStringList list = filter.split(QLatin1Char(';'), QString::SkipEmptyParts); const QStringList list = filter.split(QLatin1Char(';'), Utils::SkipEmptyParts);
for (const QString &e : list) { for (const QString &e : list) {
QString entry = e.trimmed(); QString entry = e.trimmed();
Glob g; Glob g;

8
src/plugins/qmakeprojectmanager/addlibrarywizard.cpp
View File

@@ -29,14 +29,14 @@
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/stringutils.h>
#include <QFileInfo>
#include <QLabel> #include <QLabel>
#include <QRadioButton> #include <QRadioButton>
#include <QScrollArea> #include <QScrollArea>
#include <QVBoxLayout>
#include <QFileInfo>
#include <QTextStream> #include <QTextStream>
#include <QVBoxLayout>
using namespace QmakeProjectManager; using namespace QmakeProjectManager;
using namespace QmakeProjectManager::Internal; using namespace QmakeProjectManager::Internal;
@@ -52,7 +52,7 @@ QStringList qt_clean_filter_list(const QString &filter)
int i = regexp.indexIn(f); int i = regexp.indexIn(f);
if (i >= 0) if (i >= 0)
f = regexp.cap(2); f = regexp.cap(2);
return f.split(QLatin1Char(' '), QString::SkipEmptyParts); return f.split(QLatin1Char(' '), Utils::SkipEmptyParts);
} }
static bool validateLibraryPath(const Utils::FilePath &filePath, static bool validateLibraryPath(const Utils::FilePath &filePath,

3
src/plugins/qtsupport/baseqtversion.cpp
View File

@@ -54,6 +54,7 @@
#include <utils/macroexpander.h> #include <utils/macroexpander.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/runextensions.h> #include <utils/runextensions.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <utils/winutils.h> #include <utils/winutils.h>
@@ -2132,7 +2133,7 @@ static QStringList extractFieldsFromBuildString(const QByteArray &buildString)
result.append(match.captured(1)); // qtVersion result.append(match.captured(1)); // qtVersion
// Abi info string: // Abi info string:
QStringList abiInfo = match.captured(2).split('-', QString::SkipEmptyParts); QStringList abiInfo = match.captured(2).split('-', Utils::SkipEmptyParts);
result.append(abiInfo.takeFirst()); // cpu result.append(abiInfo.takeFirst()); // cpu

5
src/plugins/qtsupport/exampleslistmodel.cpp
View File

@@ -44,6 +44,7 @@
#include <utils/algorithm.h> #include <utils/algorithm.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/stylehelper.h> #include <utils/stylehelper.h>
#include <algorithm> #include <algorithm>
@@ -336,9 +337,9 @@ void ExamplesListModel::parseExamples(QXmlStreamReader *reader,
} else if (reader->name() == QLatin1String("dependency")) { } else if (reader->name() == QLatin1String("dependency")) {
item->dependencies.append(projectsOffset + slash + reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement)); item->dependencies.append(projectsOffset + slash + reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement));
} else if (reader->name() == QLatin1String("tags")) { } else if (reader->name() == QLatin1String("tags")) {
item->tags = trimStringList(reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement).split(QLatin1Char(','), QString::SkipEmptyParts)); item->tags = trimStringList(reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement).split(QLatin1Char(','), Utils::SkipEmptyParts));
} else if (reader->name() == QLatin1String("platforms")) { } else if (reader->name() == QLatin1String("platforms")) {
item->platforms = trimStringList(reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement).split(QLatin1Char(','), QString::SkipEmptyParts)); item->platforms = trimStringList(reader->readElementText(QXmlStreamReader::ErrorOnUnexpectedElement).split(QLatin1Char(','), Utils::SkipEmptyParts));
} }
break; break;
case QXmlStreamReader::EndElement: case QXmlStreamReader::EndElement:

3
src/plugins/remotelinux/linuxdevice.cpp
View File

@@ -48,6 +48,7 @@
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/port.h> #include <utils/port.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -88,7 +89,7 @@ private:
{ {
QList<DeviceProcessItem> processes; QList<DeviceProcessItem> processes;
const QStringList lines = listProcessesReply.split(QString::fromLatin1(Delimiter0) const QStringList lines = listProcessesReply.split(QString::fromLatin1(Delimiter0)
+ QString::fromLatin1(Delimiter1), QString::SkipEmptyParts); + QString::fromLatin1(Delimiter1), Utils::SkipEmptyParts);
foreach (const QString &line, lines) { foreach (const QString &line, lines) {
const QStringList elements = line.split(QLatin1Char('\n')); const QStringList elements = line.split(QLatin1Char('\n'));
if (elements.count() < 4) { if (elements.count() < 4) {

4
src/plugins/remotelinux/remotelinuxenvironmentreader.cpp
View File

@@ -29,6 +29,8 @@
#include <projectexplorer/devicesupport/idevice.h> #include <projectexplorer/devicesupport/idevice.h>
#include <projectexplorer/runcontrol.h> #include <projectexplorer/runcontrol.h>
#include <utils/stringutils.h>
using namespace ProjectExplorer; using namespace ProjectExplorer;
using namespace Utils; using namespace Utils;
@@ -106,7 +108,7 @@ void RemoteLinuxEnvironmentReader::remoteProcessFinished()
QString remoteOutput = QString::fromUtf8(m_deviceProcess->readAllStandardOutput()); QString remoteOutput = QString::fromUtf8(m_deviceProcess->readAllStandardOutput());
if (!remoteOutput.isEmpty()) { if (!remoteOutput.isEmpty()) {
m_env = Utils::Environment(remoteOutput.split(QLatin1Char('\n'), m_env = Utils::Environment(remoteOutput.split(QLatin1Char('\n'),
QString::SkipEmptyParts), Utils::OsTypeLinux); Utils::SkipEmptyParts), Utils::OsTypeLinux);
} }
} }
setFinished(); setFinished();

9
src/plugins/scxmleditor/common/colorthemes.cpp
View File

@@ -30,9 +30,10 @@
#include "scxmleditorconstants.h" #include "scxmleditorconstants.h"
#include "scxmltag.h" #include "scxmltag.h"
#include <QMenu>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/stringutils.h>
#include <QMenu>
using namespace ScxmlEditor::Common; using namespace ScxmlEditor::Common;
@@ -152,9 +153,9 @@ void ColorThemes::setDocument(ScxmlEditor::PluginInterface::ScxmlDocument *doc)
if (m_document) { if (m_document) {
PluginInterface::ScxmlTag *scxmlTag = m_document->scxmlRootTag(); PluginInterface::ScxmlTag *scxmlTag = m_document->scxmlRootTag();
if (scxmlTag && scxmlTag->hasEditorInfo(Constants::C_SCXML_EDITORINFO_COLORS)) { if (scxmlTag && scxmlTag->hasEditorInfo(Constants::C_SCXML_EDITORINFO_COLORS)) {
const QStringList colors = scxmlTag->editorInfo(Constants::C_SCXML_EDITORINFO_COLORS).split(";;", QString::SkipEmptyParts); const QStringList colors = scxmlTag->editorInfo(Constants::C_SCXML_EDITORINFO_COLORS).split(";;", Utils::SkipEmptyParts);
for (const QString &color : colors) { for (const QString &color : colors) {
const QStringList colorInfo = color.split("_", QString::SkipEmptyParts); const QStringList colorInfo = color.split("_", Utils::SkipEmptyParts);
if (colorInfo.count() == 2) if (colorInfo.count() == 2)
documentColors[colorInfo[0]] = colorInfo[1]; documentColors[colorInfo[0]] = colorInfo[1];
} }

3
src/plugins/scxmleditor/plugin_interface/graphicsscene.cpp
View File

@@ -41,6 +41,7 @@
#include "warningitem.h" #include "warningitem.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QAction> #include <QAction>
#include <QGuiApplication> #include <QGuiApplication>
@@ -286,7 +287,7 @@ void GraphicsScene::paste(const QPointF &targetPos)
QString strMinPos = QLatin1String(mimeData->data("StateChartEditor/CopiedMinPos")); QString strMinPos = QLatin1String(mimeData->data("StateChartEditor/CopiedMinPos"));
QPointF minPos(0, 0); QPointF minPos(0, 0);
if (!strMinPos.isEmpty()) { if (!strMinPos.isEmpty()) {
QStringList coords = strMinPos.split(":", QString::SkipEmptyParts); QStringList coords = strMinPos.split(":", Utils::SkipEmptyParts);
if (coords.count() == 2) if (coords.count() == 2)
minPos = QPointF(coords[0].toDouble(), coords[1].toDouble()); minPos = QPointF(coords[0].toDouble(), coords[1].toDouble());
} }

4
src/plugins/scxmleditor/plugin_interface/serializer.cpp
View File

@@ -25,6 +25,8 @@
#include "serializer.h" #include "serializer.h"
#include <utils/stringutils.h>
using namespace ScxmlEditor::PluginInterface; using namespace ScxmlEditor::PluginInterface;
Serializer::Serializer() Serializer::Serializer()
@@ -106,7 +108,7 @@ void Serializer::read(QPoint &d)
void Serializer::setData(const QString &d) void Serializer::setData(const QString &d)
{ {
m_data = d.split(m_separator, QString::SkipEmptyParts); m_data = d.split(m_separator, Utils::SkipEmptyParts);
m_index = 0; m_index = 0;
} }

4
src/plugins/scxmleditor/plugin_interface/stateitem.cpp
View File

@@ -40,6 +40,8 @@
#include "transitionitem.h" #include "transitionitem.h"
#include "utilsprovider.h" #include "utilsprovider.h"
#include <utils/stringutils.h>
#include <QBrush> #include <QBrush>
#include <QCoreApplication> #include <QCoreApplication>
#include <QDebug> #include <QDebug>
@@ -119,7 +121,7 @@ void StateItem::updateAttributes()
// Check initial attribute // Check initial attribute
QString strNewId = tagValue("id", true); QString strNewId = tagValue("id", true);
if (!m_parallelState) { if (!m_parallelState) {
QStringList NSIDs = strNewId.split(tag()->document()->nameSpaceDelimiter(), QString::SkipEmptyParts); QStringList NSIDs = strNewId.split(tag()->document()->nameSpaceDelimiter(), Utils::SkipEmptyParts);
if (!NSIDs.isEmpty()) { if (!NSIDs.isEmpty()) {
NSIDs[NSIDs.count() - 1] = m_stateNameItem->toPlainText(); NSIDs[NSIDs.count() - 1] = m_stateNameItem->toPlainText();
QString strOldId = NSIDs.join(tag()->document()->nameSpaceDelimiter()); QString strOldId = NSIDs.join(tag()->document()->nameSpaceDelimiter());

3
src/plugins/subversion/subversionplugin.cpp
View File

@@ -59,6 +59,7 @@
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/parameteraction.h> #include <utils/parameteraction.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <QDebug> #include <QDebug>
@@ -151,7 +152,7 @@ StatusList parseStatusOutput(const QString &output)
{ {
StatusList changeSet; StatusList changeSet;
const QString newLine = QString(QLatin1Char('\n')); const QString newLine = QString(QLatin1Char('\n'));
const QStringList list = output.split(newLine, QString::SkipEmptyParts); const QStringList list = output.split(newLine, Utils::SkipEmptyParts);
foreach (const QString &l, list) { foreach (const QString &l, list) {
const QString line =l.trimmed(); const QString line =l.trimmed();
if (line.size() > 8) { if (line.size() > 8) {

20
src/plugins/texteditor/findinfiles.cpp
View File

@@ -28,21 +28,23 @@
#include <coreplugin/editormanager/editormanager.h> #include <coreplugin/editormanager/editormanager.h>
#include <coreplugin/find/findplugin.h> #include <coreplugin/find/findplugin.h>
#include <coreplugin/icore.h> #include <coreplugin/icore.h>
#include <utils/filesearch.h> #include <utils/filesearch.h>
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/historycompleter.h> #include <utils/historycompleter.h>
#include <utils/pathchooser.h> #include <utils/pathchooser.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QDebug>
#include <QSettings>
#include <QDir>
#include <QPushButton>
#include <QFileDialog>
#include <QLabel>
#include <QHBoxLayout>
#include <QStackedWidget>
#include <QComboBox> #include <QComboBox>
#include <QDebug>
#include <QDir>
#include <QFileDialog>
#include <QHBoxLayout>
#include <QLabel>
#include <QPushButton>
#include <QSettings>
#include <QStackedWidget>
using namespace Core; using namespace Core;
using namespace TextEditor; using namespace TextEditor;
@@ -96,7 +98,7 @@ QString FindInFiles::label() const
const QChar slash = QLatin1Char('/'); const QChar slash = QLatin1Char('/');
const QStringList &nonEmptyComponents = path().toFileInfo().absoluteFilePath() const QStringList &nonEmptyComponents = path().toFileInfo().absoluteFilePath()
.split(slash, QString::SkipEmptyParts); .split(slash, Utils::SkipEmptyParts);
return tr("%1 \"%2\":") return tr("%1 \"%2\":")
.arg(title) .arg(title)
.arg(nonEmptyComponents.isEmpty() ? QString(slash) : nonEmptyComponents.last()); .arg(nonEmptyComponents.isEmpty() ? QString(slash) : nonEmptyComponents.last());

3
src/plugins/texteditor/highlightersettings.cpp
View File

@@ -31,6 +31,7 @@
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/stringutils.h>
#include <utils/synchronousprocess.h> #include <utils/synchronousprocess.h>
#include <QSettings> #include <QSettings>
@@ -141,7 +142,7 @@ void HighlighterSettings::fromSettings(const QString &category, QSettings *s)
void HighlighterSettings::setIgnoredFilesPatterns(const QString &patterns) void HighlighterSettings::setIgnoredFilesPatterns(const QString &patterns)
{ {
setExpressionsFromList(patterns.split(QLatin1Char(','), QString::SkipEmptyParts)); setExpressionsFromList(patterns.split(QLatin1Char(','), Utils::SkipEmptyParts));
} }
QString HighlighterSettings::ignoredFilesPatterns() const QString HighlighterSettings::ignoredFilesPatterns() const

4
src/plugins/todo/qmljstodoitemsscanner.cpp
View File

@@ -30,6 +30,8 @@
#include <qmljs/parser/qmljsengine_p.h> #include <qmljs/parser/qmljsengine_p.h>
#include <utils/stringutils.h>
namespace Todo { namespace Todo {
namespace Internal { namespace Internal {
@@ -83,7 +85,7 @@ void QmlJsTodoItemsScanner::processDocument(QmlJS::Document::Ptr doc)
// Process every line // Process every line
// TODO: Do not create QStringList, just iterate through a string tracking line endings. // TODO: Do not create QStringList, just iterate through a string tracking line endings.
QStringList commentLines = source.split('\n', QString::SkipEmptyParts); QStringList commentLines = source.split('\n', Utils::SkipEmptyParts);
quint32 startLine = sourceLocation.startLine; quint32 startLine = sourceLocation.startLine;
for (int j = 0; j < commentLines.count(); ++j) { for (int j = 0; j < commentLines.count(); ++j) {
const QString &commentLine = commentLines.at(j); const QString &commentLine = commentLines.at(j);

7
src/plugins/valgrind/callgrind/callgrindparser.cpp
View File

@@ -31,6 +31,7 @@
#include "callgrindfunction.h" #include "callgrindfunction.h"
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QFileDevice> #include <QFileDevice>
#include <QHash> #include <QHash>
@@ -293,11 +294,11 @@ void Parser::Private::parseHeader(QIODevice *device)
continue; continue;
} else if (line.startsWith("positions: ")) { } else if (line.startsWith("positions: ")) {
QString values = getValue(line, 11); QString values = getValue(line, 11);
data->setPositions(values.split(' ', QString::SkipEmptyParts)); data->setPositions(values.split(' ', Utils::SkipEmptyParts));
addressValuesCount = data->positions().count(); addressValuesCount = data->positions().count();
} else if (line.startsWith("events: ")) { } else if (line.startsWith("events: ")) {
QString values = getValue(line, 8); QString values = getValue(line, 8);
data->setEvents(values.split(' ', QString::SkipEmptyParts)); data->setEvents(values.split(' ', Utils::SkipEmptyParts));
costValuesCount = data->events().count(); costValuesCount = data->events().count();
} else if (line.startsWith("version: ")) { } else if (line.startsWith("version: ")) {
QString value = getValue(line, 9); QString value = getValue(line, 9);
@@ -320,7 +321,7 @@ void Parser::Private::parseHeader(QIODevice *device)
} else if (line.startsWith("summary: ")) { } else if (line.startsWith("summary: ")) {
QString values = getValue(line, 9); QString values = getValue(line, 9);
uint i = 0; uint i = 0;
foreach (const QStringRef &value, values.splitRef(' ', QString::SkipEmptyParts)) foreach (const QStringRef &value, values.splitRef(' ', Utils::SkipEmptyParts))
data->setTotalCost(i++, value.toULongLong()); data->setTotalCost(i++, value.toULongLong());
} else if (!line.trimmed().isEmpty()) { } else if (!line.trimmed().isEmpty()) {
// handle line and exit parseHeader // handle line and exit parseHeader

3
src/plugins/vcsbase/vcsbaseclientsettings.cpp
View File

@@ -30,6 +30,7 @@
#include <utils/fileutils.h> #include <utils/fileutils.h>
#include <utils/hostosinfo.h> #include <utils/hostosinfo.h>
#include <utils/qtcassert.h> #include <utils/qtcassert.h>
#include <utils/stringutils.h>
#include <QSettings> #include <QSettings>
#include <QVariant> #include <QVariant>
@@ -368,7 +369,7 @@ int VcsBaseClientSettings::vcsTimeoutS() const
QStringList VcsBaseClientSettings::searchPathList() const QStringList VcsBaseClientSettings::searchPathList() const
{ {
return stringValue(pathKey).split(HostOsInfo::pathListSeparator(), QString::SkipEmptyParts); return stringValue(pathKey).split(HostOsInfo::pathListSeparator(), Utils::SkipEmptyParts);
} }
QString VcsBaseClientSettings::settingsGroup() const QString VcsBaseClientSettings::settingsGroup() const