45 lines
1.6 KiB
Diff
45 lines
1.6 KiB
Diff
--- subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:50:48 1345739
|
|
+++ subversion/trunk/subversion/libsvn_auth_kwallet/kwallet.cpp 2012/06/03 18:54:26 1345740
|
|
@@ -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 @@
|
|
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);
|
|
}
|
|
|
|
- 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 @@
|
|
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);
|
|
}
|
|
|
|
- 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)),
|