diff options
| author | hjk <hjk121@nokiamail.com> | 2014-02-05 10:43:21 +0100 |
|---|---|---|
| committer | Eike Ziller <eike.ziller@digia.com> | 2014-02-19 09:19:28 +0100 |
| commit | c68ebeed2e47c7a78d790bb732a080edaf07d9ba (patch) | |
| tree | ab861674989f5b4aaf8f8f70275d53a2e075b0f2 /src/plugins/ios/iosrunconfiguration.cpp | |
| parent | a0d29eeb03cfe51ed929a83374c18e3301fefdaf (diff) | |
| download | qt-creator-c68ebeed2e47c7a78d790bb732a080edaf07d9ba.tar.gz | |
QtcProcess: Introduce a QtcProcess::Arguments class
This is used to get a platform-agnostic handle on "command line
arguments". It essentially wraps a single QString on Windows,
and a QStringList everywhere else.
As a consequence, several occurrences of #ifdef Q_OS_*
can be removed from the codebase.
Change-Id: Ic93118c1bd0bce0ebb58f416d395dbaebb861772
Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com>
Diffstat (limited to 'src/plugins/ios/iosrunconfiguration.cpp')
| -rw-r--r-- | src/plugins/ios/iosrunconfiguration.cpp | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/src/plugins/ios/iosrunconfiguration.cpp b/src/plugins/ios/iosrunconfiguration.cpp index b097c490df..4042c4b478 100644 --- a/src/plugins/ios/iosrunconfiguration.cpp +++ b/src/plugins/ios/iosrunconfiguration.cpp @@ -51,6 +51,7 @@ using namespace ProjectExplorer; using namespace QmakeProjectManager; +using namespace Utils; namespace Ios { namespace Internal { @@ -341,27 +342,27 @@ QString IosRunConfigurationWidget::argListToString(const QStringList &args) cons QStringList IosRunConfigurationWidget::stringToArgList(const QString &args) const { - Utils::QtcProcess::SplitError err; - QStringList res = Utils::QtcProcess::splitArgs(args, false, &err); + QtcProcess::SplitError err; + QStringList res = QtcProcess::splitArgs(args, OsTypeMac, false, &err); switch (err) { - case Utils::QtcProcess::SplitOk: + case QtcProcess::SplitOk: break; - case Utils::QtcProcess::BadQuoting: + case QtcProcess::BadQuoting: if (args.at(args.size()-1) == QLatin1Char('\\')) { - res = Utils::QtcProcess::splitArgs(args + QLatin1Char('\\'), false, &err); - if (err != Utils::QtcProcess::SplitOk) - res = Utils::QtcProcess::splitArgs(args + QLatin1Char('\\') + QLatin1Char('\''), - false, &err); - if (err != Utils::QtcProcess::SplitOk) - res = Utils::QtcProcess::splitArgs(args + QLatin1Char('\\') + QLatin1Char('\"'), - false, &err); + res = QtcProcess::splitArgs(args + QLatin1Char('\\'), OsTypeMac, false, &err); + if (err != QtcProcess::SplitOk) + res = QtcProcess::splitArgs(args + QLatin1Char('\\') + QLatin1Char('\''), + OsTypeMac, false, &err); + if (err != QtcProcess::SplitOk) + res = QtcProcess::splitArgs(args + QLatin1Char('\\') + QLatin1Char('\"'), + OsTypeMac, false, &err); } - if (err != Utils::QtcProcess::SplitOk) - res = Utils::QtcProcess::splitArgs(args + QLatin1Char('\''), false, &err); - if (err != Utils::QtcProcess::SplitOk) - res = Utils::QtcProcess::splitArgs(args + QLatin1Char('\"'), false, &err); + if (err != QtcProcess::SplitOk) + res = QtcProcess::splitArgs(args + QLatin1Char('\''), OsTypeMac, false, &err); + if (err != QtcProcess::SplitOk) + res = QtcProcess::splitArgs(args + QLatin1Char('\"'), OsTypeMac, false, &err); break; - case Utils::QtcProcess::FoundMeta: + case QtcProcess::FoundMeta: qDebug() << "IosRunConfigurationWidget FoundMeta (should not happen)"; break; } |