From 506ceaa02734363f68827c0df227dcb0774e8852 Mon Sep 17 00:00:00 2001 From: trialuser02 Date: Mon, 12 Oct 2015 17:21:53 +0000 Subject: improved command line parser (#814) git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@5672 90c681e8-e032-0410-971d-27865f9a5e38 --- src/app/qmmpstarter.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'src/app/qmmpstarter.cpp') diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp index 0b9a51b8d..048d22ebd 100644 --- a/src/app/qmmpstarter.cpp +++ b/src/app/qmmpstarter.cpp @@ -64,9 +64,9 @@ QMMPStarter::QMMPStarter(int argc,char **argv, QObject* parent) : QObject(parent m_option_manager = new BuiltinCommandLineOption(this); QStringList tmp; for (int i = 1;i < argc;i++) - tmp << QString::fromLocal8Bit(argv[i]).trimmed(); + tmp << QString::fromLocal8Bit(argv[i]); - argString = tmp.join("\n"); + argString = tmp.join("|||"); QHash commands = m_option_manager->splitArgs(tmp); if(commands.keys().contains("--help")) @@ -165,7 +165,7 @@ QMMPStarter::~QMMPStarter() void QMMPStarter::startPlayer() { connect(m_server, SIGNAL(newConnection()), SLOT(readCommand())); - QStringList args = argString.split("\n", QString::SkipEmptyParts); + QStringList args = argString.split("|||", QString::SkipEmptyParts); #ifdef Q_OS_WIN QIcon::setThemeSearchPaths(QStringList() << qApp->applicationDirPath() + "/themes/"); @@ -228,7 +228,7 @@ void QMMPStarter::savePosition() void QMMPStarter::writeCommand() { - QString workingDir = QDir::currentPath() + "\n"; + QString workingDir = QDir::currentPath() + "|||"; QByteArray barray; barray.append(workingDir.toUtf8 ()); barray.append(argString.isEmpty() ? "--show-mw" : argString.toUtf8 ()); @@ -260,7 +260,7 @@ void QMMPStarter::readCommand() socket->deleteLater(); return; } - QStringList slist = QString::fromUtf8(inputArray.data()).split("\n",QString::SkipEmptyParts); + QStringList slist = QString::fromUtf8(inputArray.data()).split("|||",QString::SkipEmptyParts); QString cwd = slist.takeAt(0); QString out = processCommandArgs(slist, cwd); if(!out.isEmpty()) -- cgit v1.2.3-13-gbd6f