Thread: [qjackctl-devel] qjackctl/src main.cpp, 1.38, 1.39 qjackctlSetup.cpp, 1.66, 1.67 qjackctlSetup.h, 1
JACK Audio Connection Kit Qt GUI Interface
Brought to you by:
rncbc
From: Rui N. C. <rn...@us...> - 2009-04-28 08:50:13
|
Update of /cvsroot/qjackctl/qjackctl/src In directory ddv4jf1.ch3.sourceforge.com:/tmp/cvs-serv26773/src Modified Files: main.cpp qjackctlSetup.cpp qjackctlSetup.h Log Message: - Got rid of some Qt3 support remnants: QApplication::argc() and QApplication::argv() replaced by QApplication::arguments(). Index: qjackctlSetup.cpp =================================================================== RCS file: /cvsroot/qjackctl/qjackctl/src/qjackctlSetup.cpp,v retrieving revision 1.66 retrieving revision 1.67 diff -u -d -r1.66 -r1.67 --- qjackctlSetup.cpp 24 Mar 2009 15:11:03 -0000 1.66 +++ qjackctlSetup.cpp 28 Apr 2009 08:49:43 -0000 1.67 @@ -404,7 +404,7 @@ // // Help about command line options. -void qjackctlSetup::print_usage ( const char *arg0 ) +void qjackctlSetup::print_usage ( const QString& arg0 ) { QTextStream out(stderr); const QString sEot = "\n\t"; @@ -428,30 +428,31 @@ // Parse command line arguments into m_settings. -bool qjackctlSetup::parse_args ( int argc, char **argv ) +bool qjackctlSetup::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) { sCmdLine += ' '; - sCmdLine += argv[i]; + sCmdLine += 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") { bStartJack = true; @@ -476,7 +477,7 @@ i++; } else if (sArg == "-h" || sArg == "--help") { - print_usage(argv[0]); + print_usage(args.at(0)); return false; } else if (sArg == "-v" || sArg == "--version") { Index: main.cpp =================================================================== RCS file: /cvsroot/qjackctl/qjackctl/src/main.cpp,v retrieving revision 1.38 retrieving revision 1.39 diff -u -d -r1.38 -r1.39 --- main.cpp 18 Feb 2009 18:52:57 -0000 1.38 +++ main.cpp 28 Apr 2009 08:49:43 -0000 1.39 @@ -251,7 +251,7 @@ // Construct default settings; override with command line arguments. qjackctlSetup settings; - if (!settings.parse_args(app.argc(), app.argv())) { + if (!settings.parse_args(app.arguments())) { app.quit(); return 1; } Index: qjackctlSetup.h =================================================================== RCS file: /cvsroot/qjackctl/qjackctl/src/qjackctlSetup.h,v retrieving revision 1.53 retrieving revision 1.54 diff -u -d -r1.53 -r1.54 --- qjackctlSetup.h 24 Mar 2009 15:11:03 -0000 1.53 +++ qjackctlSetup.h 28 Apr 2009 08:49:43 -0000 1.54 @@ -91,9 +91,9 @@ ~qjackctlSetup(); // 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); // Default (translated) preset name. QString sDefPresetName; |