diff options
| author | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-06-14 19:30:25 +0000 |
|---|---|---|
| committer | trialuser02 <trialuser02@90c681e8-e032-0410-971d-27865f9a5e38> | 2016-06-14 19:30:25 +0000 |
| commit | 16bb56a600c97ff5e1eb48f66755de8118561aa8 (patch) | |
| tree | 561990ec676b9a097cb59e8c975e221c640e7dc4 | |
| parent | 6dd05311d33ca0c89e7542ec117d19b82fca5685 (diff) | |
| download | qmmp-16bb56a600c97ff5e1eb48f66755de8118561aa8.tar.gz qmmp-16bb56a600c97ff5e1eb48f66755de8118561aa8.tar.bz2 qmmp-16bb56a600c97ff5e1eb48f66755de8118561aa8.zip | |
fixed unicode support (#854)
git-svn-id: http://svn.code.sf.net/p/qmmp-dev/code/trunk/qmmp@6451 90c681e8-e032-0410-971d-27865f9a5e38
| -rw-r--r-- | src/app/main.cpp | 4 | ||||
| -rw-r--r-- | src/app/qmmpstarter.cpp | 8 | ||||
| -rw-r--r-- | src/app/qmmpstarter.h | 4 |
3 files changed, 7 insertions, 9 deletions
diff --git a/src/app/main.cpp b/src/app/main.cpp index fc902d37f..f9702b00a 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2013 by Ilya Kotov * + * Copyright (C) 2006-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -52,7 +52,7 @@ int main(int argc, char *argv[]) qt_translator.load(QLibraryInfo::location (QLibraryInfo::TranslationsPath) + "/qt_" + locale); a.installTranslator(&qt_translator); - QMMPStarter starter(argc,argv); + QMMPStarter starter; Q_UNUSED(starter) a.setQuitOnLastWindowClosed(false); diff --git a/src/app/qmmpstarter.cpp b/src/app/qmmpstarter.cpp index 42a19df7f..ddbeabd56 100644 --- a/src/app/qmmpstarter.cpp +++ b/src/app/qmmpstarter.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2015 by Ilya Kotov * + * Copyright (C) 2006-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -53,7 +53,7 @@ using namespace std; -QMMPStarter::QMMPStarter(int argc,char **argv, QObject* parent) : QObject(parent) +QMMPStarter::QMMPStarter() : QObject() { m_player = 0; m_core = 0; @@ -62,9 +62,7 @@ QMMPStarter::QMMPStarter(int argc,char **argv, QObject* parent) : QObject(parent m_named_mutex = 0; #endif m_option_manager = new BuiltinCommandLineOption(this); - QStringList tmp; - for (int i = 1;i < argc;i++) - tmp << QString::fromLocal8Bit(argv[i]); + QStringList tmp = qApp->arguments().mid(1); argString = tmp.join("|||"); QHash <QString, QStringList> commands = m_option_manager->splitArgs(tmp); diff --git a/src/app/qmmpstarter.h b/src/app/qmmpstarter.h index d5880775a..cd2b09445 100644 --- a/src/app/qmmpstarter.h +++ b/src/app/qmmpstarter.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2006-2012 by Ilya Kotov * + * Copyright (C) 2006-2016 by Ilya Kotov * * forkotov02@hotmail.ru * * * * This program is free software; you can redistribute it and/or modify * @@ -44,7 +44,7 @@ class QMMPStarter : public QObject { Q_OBJECT public: - QMMPStarter(int argc,char ** argv,QObject* parent = 0); + QMMPStarter(); ~QMMPStarter(); |