subversion-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From svn-r...@apache.org
Subject svn commit: r1428163 - in /subversion/branches/1.6.x: ./ STATUS subversion/libsvn_auth_kwallet/kwallet.cpp
Date Thu, 03 Jan 2013 04:01:18 GMT
Author: svn-role
Date: Thu Jan  3 04:01:17 2013
New Revision: 1428163

URL: http://svn.apache.org/viewvc?rev=1428163&view=rev
Log:
Merge r1345740 from trunk:

 * r1345740
   Remove a cast that is both ugly, and apparently illegal in g++ 4.7.
   Justification:
     Fails to build.
   Votes:
     +1: philip, brane, rhuijben

Modified:
    subversion/branches/1.6.x/   (props changed)
    subversion/branches/1.6.x/STATUS
    subversion/branches/1.6.x/subversion/libsvn_auth_kwallet/kwallet.cpp

Propchange: subversion/branches/1.6.x/
------------------------------------------------------------------------------
  Merged /subversion/trunk:r1345740

Modified: subversion/branches/1.6.x/STATUS
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/STATUS?rev=1428163&r1=1428162&r2=1428163&view=diff
==============================================================================
--- subversion/branches/1.6.x/STATUS (original)
+++ subversion/branches/1.6.x/STATUS Thu Jan  3 04:01:17 2013
@@ -72,10 +72,3 @@ Veto-blocked changes:
 
 Approved changes:
 =================
- 
- * r1345740
-   Remove a cast that is both ugly, and apparently illegal in g++ 4.7.
-   Justification:
-     Fails to build.
-   Votes:
-     +1: philip, brane, rhuijben

Modified: subversion/branches/1.6.x/subversion/libsvn_auth_kwallet/kwallet.cpp
URL: http://svn.apache.org/viewvc/subversion/branches/1.6.x/subversion/libsvn_auth_kwallet/kwallet.cpp?rev=1428163&r1=1428162&r2=1428163&view=diff
==============================================================================
--- subversion/branches/1.6.x/subversion/libsvn_auth_kwallet/kwallet.cpp (original)
+++ subversion/branches/1.6.x/subversion/libsvn_auth_kwallet/kwallet.cpp Thu Jan  3 04:01:17
2013
@@ -51,6 +51,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,
@@ -175,12 +178,11 @@ kwallet_password_get(const char **passwo
   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)),
@@ -245,12 +247,11 @@ kwallet_password_set(apr_hash_t *creds,
   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)),



Mime
View raw message