On Jun 3, 2012 2:54 PM, <pet...@apache.org> wrote:
>...
> +++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp Sun Jun
3 18:54:26 2012
> @@ -60,6 +60,9 @@
> /* KWallet simple provider, puts passwords in KWallet
*/
>
/*-----------------------------------------------------------------------*/
>
> +static int q_argc = 1;
> +static char q_argv0[] = "svn"; // Build non-const char * from string
constant
> +static char *q_argv[] = { q_argv0 };
>
> static const char *
> get_application_name(apr_hash_t *parameters,
> @@ -212,12 +215,11 @@ kwallet_password_get(svn_boolean_t *done
> QCoreApplication *app;
> if (! qApp)
> {
> - int argc = 1;
> - app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
> + int argc = q_argc;
> + app = new QCoreApplication(argc, q_argv);
Why keep argc around? Just use q_argc.
> }
>
> - KCmdLineArgs::init(1,
> - (char *[1]) {(char *) "svn"},
> + KCmdLineArgs::init(q_argc, q_argv,
> get_application_name(parameters, pool),
> "subversion",
> ki18n(get_application_name(parameters, pool)),
> @@ -289,12 +291,11 @@ kwallet_password_set(svn_boolean_t *done
> QCoreApplication *app;
> if (! qApp)
> {
> - int argc = 1;
> - app = new QCoreApplication(argc, (char *[1]) {(char *) "svn"});
> + int argc = q_argc;
> + app = new QCoreApplication(argc, q_argv);
Likewise.
> }
>
> - KCmdLineArgs::init(1,
> - (char *[1]) {(char *) "svn"},
> + KCmdLineArgs::init(q_argc, q_argv,
> get_application_name(parameters, pool),
> "subversion",
> ki18n(get_application_name(parameters, pool)),
>
>
