Bug 825150 - Remove const_casts by adding some const-ness to nsIComma…

…ndLineRunner.init(). r=karlt, sr=bsmedberg.
Brli · Jan 3, 2013 · e5fdddd · e5fdddd
1 parent 9ec66c3
commit e5fdddd
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 9 deletions.
diff --git a/toolkit/components/commandlines/nsCommandLine.cpp b/toolkit/components/commandlines/nsCommandLine.cpp
@@ -442,7 +442,7 @@ nsCommandLine::resolveShortcutURL(nsIFile* aFile, nsACString& outURL)
 }
 
 NS_IMETHODIMP
-nsCommandLine::Init(int32_t argc, char** argv, nsIFile* aWorkingDir,
+nsCommandLine::Init(int32_t argc, const char* const* argv, nsIFile* aWorkingDir,
                     uint32_t aState)
 {
   NS_ENSURE_ARG_MIN(aState, 0);

diff --git a/toolkit/components/commandlines/nsICommandLineRunner.idl b/toolkit/components/commandlines/nsICommandLineRunner.idl
@@ -5,7 +5,7 @@
 #include "nsISupports.idl"
 #include "nsICommandLine.idl"
 
-[ptr] native nsCharPtrArray(char*);
+[ptr] native nsArgvArray(const char* const);
 
 /**
  * Extension of nsICommandLine that allows for initialization of new command lines
@@ -17,7 +17,7 @@
  *                    Smedberg <benjamin@smedbergs.us>.
  */
 
-[uuid(c1f4cfbf-a41f-4628-aa6c-9fb914478af8)]
+[uuid(c9f2996c-b25a-4d3d-821f-4cd0c4bc8afb)]
 interface nsICommandLineRunner : nsICommandLine
 {
   /**
@@ -31,7 +31,7 @@ interface nsICommandLineRunner : nsICommandLine
    * @param workingDir The working directory for resolving file and URI paths.
    * @param state      The nsICommandLine.state flag.
    */
-  void init(in long argc, in nsCharPtrArray argv,
+  void init(in long argc, in nsArgvArray argv,
             in nsIFile workingDir, in unsigned long state);
 
   /**

diff --git a/toolkit/components/remote/nsXRemoteService.cpp b/toolkit/components/remote/nsXRemoteService.cpp
@@ -278,8 +278,7 @@ nsXRemoteService::HandleCommand(char* aCommand, nsIDOMWindow* aWindow,
                                     &desktopStartupID);
 
     const char* argv[3] = {"dummyappname", "-remote", aCommand};
-    rv = cmdline->Init(3, const_cast<char**>(argv), nullptr,
-                       nsICommandLine::STATE_REMOTE_EXPLICIT);
+    rv = cmdline->Init(3, argv, nullptr, nsICommandLine::STATE_REMOTE_EXPLICIT);
     if (NS_FAILED(rv))
       return "509 internal error";
 

diff --git a/toolkit/xre/MacApplicationDelegate.mm b/toolkit/xre/MacApplicationDelegate.mm
@@ -225,7 +225,7 @@ - (BOOL)application:(NSApplication*)theApplication openFile:(NSString*)filename
     return NO;
 
   const char *argv[3] = {nullptr, "-file", filePath.get()};
-  rv = cmdLine->Init(3, const_cast<char**>(argv), workingDir, nsICommandLine::STATE_REMOTE_EXPLICIT);
+  rv = cmdLine->Init(3, argv, workingDir, nsICommandLine::STATE_REMOTE_EXPLICIT);
   if (NS_FAILED(rv))
     return NO;
 
@@ -367,7 +367,7 @@ - (void)handleAppleEvent:(NSAppleEventDescriptor*)event withReplyEvent:(NSAppleE
     if (NS_FAILED(rv))
       return;
     const char *argv[3] = {nullptr, "-url", [urlString UTF8String]};
-    rv = cmdLine->Init(3, const_cast<char**>(argv), workingDir, nsICommandLine::STATE_REMOTE_EXPLICIT);
+    rv = cmdLine->Init(3, argv, workingDir, nsICommandLine::STATE_REMOTE_EXPLICIT);
     if (NS_FAILED(rv))
       return;
     rv = cmdLine->Run();

diff --git a/widget/android/nsAppShell.cpp b/widget/android/nsAppShell.cpp
@@ -473,7 +473,7 @@ nsAppShell::ProcessNextNativeEvent(bool mayWait)
             uri,
             flag ? flag : ""
         };
-        nsresult rv = cmdline->Init(4, const_cast<char **>(argv), nullptr, nsICommandLine::STATE_REMOTE_AUTO);
+        nsresult rv = cmdline->Init(4, argv, nullptr, nsICommandLine::STATE_REMOTE_AUTO);
         if (NS_SUCCEEDED(rv))
             cmdline->Run();
         nsMemory::Free(uri);