[qsampler-devel] qsampler/src main.cpp, 1.11, 1.12 qsamplerMainForm.cpp, 1.12, 1.13 qsamplerOptions
A LinuxSampler Qt GUI Interface
Status: Beta
Brought to you by:
rncbc
From: Rui N. C. <rn...@us...> - 2009-04-28 09:04:23
|
Update of /cvsroot/qsampler/qsampler/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv31014/src Modified Files: main.cpp qsamplerMainForm.cpp qsamplerOptions.cpp qsamplerOptions.h Log Message: - Got rid of some Qt3 support remnants: QApplication::argc() and QApplication::argv() replaced by QApplication::arguments(). Index: main.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/main.cpp,v retrieving revision 1.11 retrieving revision 1.12 diff -u -d -r1.11 -r1.12 --- main.cpp 26 Oct 2008 15:44:14 -0000 1.11 +++ main.cpp 28 Apr 2009 09:04:14 -0000 1.12 @@ -1,7 +1,7 @@ // main.cpp // /**************************************************************************** - Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, 2008 Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -262,7 +262,7 @@ // Construct default settings; override with command line arguments. QSampler::Options options; - if (!options.parse_args(app.argc(), app.argv())) { + if (!options.parse_args(app.arguments())) { app.quit(); return 1; } Index: qsamplerMainForm.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerMainForm.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -u -d -r1.12 -r1.13 --- qsamplerMainForm.cpp 19 Feb 2009 11:43:35 -0000 1.12 +++ qsamplerMainForm.cpp 28 Apr 2009 09:04:14 -0000 1.13 @@ -2601,8 +2601,7 @@ "running in the background. The sampler would continue to work\n" "according to your current sampler session and you could alter the\n" "sampler session at any time by relaunching QSampler.\n\n" - "Do you want LinuxSampler to stop or to keep running in\n" - "the background?"), + "Do you want LinuxSampler to stop?"), QMessageBox::Yes | QMessageBox::No) == QMessageBox::No) { bForceServerStop = false; Index: qsamplerOptions.h =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptions.h,v retrieving revision 1.26 retrieving revision 1.27 diff -u -d -r1.26 -r1.27 --- qsamplerOptions.h 20 Dec 2008 23:22:04 -0000 1.26 +++ qsamplerOptions.h 28 Apr 2009 09:04:14 -0000 1.27 @@ -1,7 +1,7 @@ // qsamplerOptions.h // /**************************************************************************** - Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -49,9 +49,9 @@ QSettings& settings(); // Command line arguments parser. - bool parse_args(int argc, char **argv); + bool parse_args(const QStringList& args); // Command line usage helper. - void print_usage(const char *arg0); + void print_usage(const QString& arg0); // Startup supplied session file. QString sSessionFile; Index: qsamplerOptions.cpp =================================================================== RCS file: /cvsroot/qsampler/qsampler/src/qsamplerOptions.cpp,v retrieving revision 1.36 retrieving revision 1.37 diff -u -d -r1.36 -r1.37 --- qsamplerOptions.cpp 20 Dec 2008 23:22:04 -0000 1.36 +++ qsamplerOptions.cpp 28 Apr 2009 09:04:14 -0000 1.37 @@ -1,7 +1,7 @@ // qsamplerOptions.cpp // /**************************************************************************** - Copyright (C) 2004-2008, rncbc aka Rui Nuno Capela. All rights reserved. + Copyright (C) 2004-2009, rncbc aka Rui Nuno Capela. All rights reserved. Copyright (C) 2007, Christian Schoenebeck This program is free software; you can redistribute it and/or @@ -242,7 +242,7 @@ // // Help about command line options. -void Options::print_usage ( const char *arg0 ) +void Options::print_usage ( const QString& arg0 ) { QTextStream out(stderr); out << QObject::tr("Usage: %1 [options] [session-file]\n\n" @@ -258,30 +258,31 @@ // Parse command line arguments into m_settings. -bool Options::parse_args ( int argc, char **argv ) +bool Options::parse_args ( const QStringList& args ) { QTextStream out(stderr); const QString sEol = "\n\n"; int iCmdArgs = 0; + int argc = args.count(); for (int i = 1; i < argc; i++) { if (iCmdArgs > 0) { sSessionFile += " "; - sSessionFile += argv[i]; + sSessionFile += args.at(i); iCmdArgs++; continue; } - QString sArg = argv[i]; + QString sArg = args.at(i); QString sVal = QString::null; int iEqual = sArg.indexOf("="); if (iEqual >= 0) { sVal = sArg.right(sArg.length() - iEqual - 1); sArg = sArg.left(iEqual); } - else if (i < argc) - sVal = argv[i + 1]; + else if (i < argc - 1) + sVal = args.at(i + 1); if (sArg == "-s" || sArg == "--start") { bServerStart = true; @@ -305,7 +306,7 @@ i++; } else if (sArg == "-?" || sArg == "--help") { - print_usage(argv[0]); + print_usage(args.at(0)); return false; } else if (sArg == "-v" || sArg == "--version") { |