forked from qt-creator/qt-creator
Utils: Drop Utils::SkipEmptyParts again
We require Qt 5.14 nowadays. Change-Id: Iff245257d3cb19207007c0445ee13814e66152dd Reviewed-by: Orgad Shaneh <orgads@gmail.com> Reviewed-by: Christian Stenger <christian.stenger@qt.io>
This commit is contained in:
@@ -418,7 +418,7 @@ QStringList ClearCasePluginPrivate::getVobList() const
|
||||
const ClearCaseResponse response =
|
||||
runCleartool(currentState().topLevel(), args, m_settings.timeOutS, SilentRun);
|
||||
|
||||
return response.stdOut.split(QLatin1Char('\n'), Utils::SkipEmptyParts);
|
||||
return response.stdOut.split(QLatin1Char('\n'), Qt::SkipEmptyParts);
|
||||
}
|
||||
|
||||
/// Get the drive letter of a path
|
||||
@@ -545,7 +545,7 @@ QString ClearCasePluginPrivate::ccManagesDirectory(const QString &directory) con
|
||||
if (response.error)
|
||||
return QString();
|
||||
|
||||
const QStringList result = response.stdOut.split(QLatin1Char('\n'), Utils::SkipEmptyParts);
|
||||
const QStringList result = response.stdOut.split(QLatin1Char('\n'), Qt::SkipEmptyParts);
|
||||
if (result.size() != 2)
|
||||
return QString();
|
||||
|
||||
@@ -894,7 +894,7 @@ QStringList ClearCasePluginPrivate::ccGetActiveVobs() const
|
||||
prefix += QLatin1Char('/');
|
||||
|
||||
const QDir theViewRootDir(theViewRoot);
|
||||
foreach (const QString &line, response.stdOut.split(QLatin1Char('\n'), Utils::SkipEmptyParts)) {
|
||||
foreach (const QString &line, response.stdOut.split(QLatin1Char('\n'), Qt::SkipEmptyParts)) {
|
||||
const bool isActive = line.at(0) == QLatin1Char('*');
|
||||
if (!isActive)
|
||||
continue;
|
||||
@@ -2057,7 +2057,7 @@ QList<QStringPair> ClearCasePluginPrivate::ccGetActivities() const
|
||||
QStringList args(QLatin1String("lsactivity"));
|
||||
args << QLatin1String("-fmt") << QLatin1String("%n\\t%[headline]p\\n");
|
||||
const QString response = runCleartoolSync(currentState().topLevel(), args);
|
||||
QStringList acts = response.split(QLatin1Char('\n'), Utils::SkipEmptyParts);
|
||||
QStringList acts = response.split(QLatin1Char('\n'), Qt::SkipEmptyParts);
|
||||
foreach (const QString &activity, acts) {
|
||||
QStringList act = activity.split(QLatin1Char('\t'));
|
||||
if (act.size() >= 2)
|
||||
@@ -2349,7 +2349,7 @@ QString ClearCasePluginPrivate::runExtDiff(const QString &workingDir, const QStr
|
||||
int timeOutS, QTextCodec *outputCodec)
|
||||
{
|
||||
CommandLine diff("diff");
|
||||
diff.addArgs(m_settings.diffArgs.split(' ', Utils::SkipEmptyParts));
|
||||
diff.addArgs(m_settings.diffArgs.split(' ', Qt::SkipEmptyParts));
|
||||
diff.addArgs(arguments);
|
||||
|
||||
SynchronousProcess process;
|
||||
|
||||
Reference in New Issue
Block a user