revert PRUnichar* back to char*; depending on more unichar/UTF8 support

from L10n

xpinstall/src/nsInstall.cpp

@@ -714,10 +714,10 @@ nsInstall::FinalizeInstall(PRInt32* aReturn)
         if (ie == NULL)
             continue;
     
-        PRUnichar *objString = ie->toString();
+        char *objString = ie->toString();
         
         if (mNotifier)
-            mNotifier->FinalizeProgress(objString,
+            mNotifier->FinalizeProgress(nsAutoString(objString).GetUnicode(),
                                         i, mInstalledFiles->GetSize());
 
         if (objString)
@@ -1685,12 +1685,12 @@ nsInstall::ScheduleForInstall(nsInstallObject* ob)
 {
     PRInt32 error = nsInstall::SUCCESS;
 
-    PRUnichar *objString = ob->toString();
+    char *objString = ob->toString();
 
     // flash current item
 
     if (mNotifier)
-        mNotifier->ItemScheduled(objString);
+        mNotifier->ItemScheduled(nsAutoString(objString).GetUnicode());
 
 
     // do any unpacking or other set-up

xpinstall/src/nsInstallDelete.cpp

@@ -134,24 +134,24 @@ void nsInstallDelete::Abort()
 {
 }
 
-PRUnichar* nsInstallDelete::toString()
+char* nsInstallDelete::toString()
 {
-    PRUnichar* buffer = new PRUnichar[1024];
+    char* buffer = new char[1024];
     
     if (buffer == nsnull)
         return nsnull;
 
     if (mDeleteStatus == DELETE_COMPONENT)
     {
-        PRUnichar* temp = (PRUnichar *)mRegistryName.ToNewCString();
-        sprintf( (char *)buffer, nsInstallResources::GetDeleteComponentString(), (char *)temp);
+        char* temp = mRegistryName.ToNewCString();
+        sprintf( buffer, nsInstallResources::GetDeleteComponentString(), temp);
         if (temp)
             delete [] temp;
     }
     else
     {
         if (mFinalFile)
-            sprintf( (char *)buffer, nsInstallResources::GetDeleteFileString(), mFinalFile->GetCString());
+            sprintf( buffer, nsInstallResources::GetDeleteFileString(), mFinalFile->GetCString());
     }
 
     return buffer;

xpinstall/src/nsInstallDelete.h

@@ -55,7 +55,7 @@ class nsInstallDelete : public nsInstallObject
         PRInt32 Prepare();
         PRInt32 Complete();
         void    Abort();
-        PRUnichar*   toString();
+        char*   toString();
 
         PRBool CanUninstall();
         PRBool RegisterPackageNode();

xpinstall/src/nsInstallExecute.cpp

@@ -101,9 +101,9 @@ void nsInstallExecute::Abort()
     DeleteFileNowOrSchedule(*mExecutableFile);
 }
 
-PRUnichar* nsInstallExecute::toString()
+char* nsInstallExecute::toString()
 {
-    PRUnichar* buffer = new PRUnichar[1024];
+    char* buffer = new char[1024];
     
     if (buffer == nsnull)
         return nsnull;
@@ -112,16 +112,16 @@ PRUnichar* nsInstallExecute::toString()
 
     if (mExecutableFile == nsnull)
     {
-        PRUnichar *tempString = (PRUnichar *)mJarLocation.ToNewCString();
+        char *tempString = mJarLocation.ToNewCString();
 
-        sprintf( (char *)buffer, nsInstallResources::GetExecuteString(), (char *)tempString);
+        sprintf( buffer, nsInstallResources::GetExecuteString(), tempString);
         
         if (tempString)
             delete [] tempString;
     }
     else
     {
-        sprintf( (char *)buffer, nsInstallResources::GetExecuteString(), mExecutableFile->GetCString());
+        sprintf( buffer, nsInstallResources::GetExecuteString(), mExecutableFile->GetCString());
     }
     return buffer;
 }

xpinstall/src/nsInstallExecute.h

@@ -51,7 +51,7 @@ class nsInstallExecute : public nsInstallObject
         PRInt32 Prepare();
         PRInt32 Complete();
         void  Abort();
-        PRUnichar* toString();
+        char* toString();
 
         PRBool CanUninstall();
         PRBool RegisterPackageNode();

xpinstall/src/nsInstallFile.cpp

@@ -266,26 +266,26 @@ void nsInstallFile::Abort()
         mExtracedFile->Delete(PR_FALSE);
 }
 
-PRUnichar* nsInstallFile::toString()
+char* nsInstallFile::toString()
 {
-    PRUnichar* buffer = new PRUnichar[1024];
+    char* buffer = new char[1024];
     
     if (buffer == nsnull)
         return nsnull;
 
     if (mFinalFile == nsnull)
     {
-        sprintf( (char *)buffer, nsInstallResources::GetInstallFileString(), nsnull);
+        sprintf( buffer, nsInstallResources::GetInstallFileString(), nsnull);
     }
     else if (mReplaceFile)
     {
         // we are replacing this file.
 
-        sprintf( (char *)buffer, nsInstallResources::GetReplaceFileString(), mFinalFile->GetCString());
+        sprintf( buffer, nsInstallResources::GetReplaceFileString(), mFinalFile->GetCString());
     }
     else
     {
-        sprintf( (char *)buffer, nsInstallResources::GetInstallFileString(), mFinalFile->GetCString());
+        sprintf( buffer, nsInstallResources::GetInstallFileString(), mFinalFile->GetCString());
     }
 
     return buffer;

xpinstall/src/nsInstallFile.h

@@ -63,7 +63,7 @@ class nsInstallFile : public nsInstallObject
         PRInt32 Prepare();
         PRInt32 Complete();
         void  Abort();
-        PRUnichar* toString();
+        char* toString();
 
         PRBool CanUninstall();
         PRBool RegisterPackageNode();

xpinstall/src/nsInstallFileOpItem.cpp

@@ -183,10 +183,10 @@ PRInt32 nsInstallFileOpItem::Complete()
 	return aReturn;
 }
   
-PRUnichar* nsInstallFileOpItem::toString()
+char* nsInstallFileOpItem::toString()
 {
   nsString result;
-  PRUnichar*    resultCString;
+  char*    resultCString;
 
   switch(mCommand)
   {
@@ -195,39 +195,39 @@ PRUnichar* nsInstallFileOpItem::toString()
       result.Append(mSrc->GetNativePathCString());
       result.Append(" to ");
       result.Append(mTarget->GetNativePathCString());
-      resultCString = (PRUnichar *)result.ToNewCString();
+      resultCString = result.ToNewCString();
       break;
     case NS_FOP_FILE_DELETE:
       result = "Delete File: ";
       result.Append(mTarget->GetNativePathCString());
-      resultCString = (PRUnichar *)result.ToNewCString();
+      resultCString = result.ToNewCString();
       break;
     case NS_FOP_FILE_MOVE:
       result = "Move File: ";
       result.Append(mSrc->GetNativePathCString());
       result.Append(" to ");
       result.Append(mTarget->GetNativePathCString());
-      resultCString = (PRUnichar *)result.ToNewCString();
+      resultCString = result.ToNewCString();
       break;
     case NS_FOP_FILE_RENAME:
       result = "Rename File: ";
       result.Append(*mStrTarget);
-      resultCString = (PRUnichar *)result.ToNewCString();
+      resultCString = result.ToNewCString();
       break;
     case NS_FOP_DIR_CREATE:
       result = "Create Folder: ";
       result.Append(mTarget->GetNativePathCString());
-      resultCString = (PRUnichar *)result.ToNewCString();
+      resultCString = result.ToNewCString();
       break;
     case NS_FOP_DIR_REMOVE:
       result = "Remove Folder: ";
       result.Append(mTarget->GetNativePathCString());
-      resultCString = (PRUnichar *)result.ToNewCString();
+      resultCString = result.ToNewCString();
       break;
     case NS_FOP_DIR_RENAME:
       result = "Rename Dir: ";
       result.Append(*mStrTarget);
-      resultCString = (PRUnichar *)result.ToNewCString();
+      resultCString = result.ToNewCString();
       break;
     case NS_FOP_WIN_SHORTCUT_CREATE:
       break;
@@ -237,7 +237,7 @@ PRUnichar* nsInstallFileOpItem::toString()
       break;
     default:
       result = "Unkown file operation command!";
-      resultCString = (PRUnichar *)result.ToNewCString();
+      resultCString = result.ToNewCString();
       break;
   }
   return resultCString;

xpinstall/src/nsInstallFileOpItem.h

@@ -71,7 +71,7 @@ class nsInstallFileOpItem : public nsInstallObject
 
     PRInt32       Prepare(void);
     PRInt32       Complete();
-    PRUnichar*         toString();
+    char*         toString();
     void          Abort();
     
   /* should these be protected? */

xpinstall/src/nsInstallObject.h

@@ -36,7 +36,7 @@ class nsInstallObject
         virtual PRInt32 Complete() = 0;
 
         /* Override with an explanatory string for the progress dialog */
-        virtual PRUnichar* toString() = 0;
+        virtual char* toString() = 0;
 
         /* Override with your clean-up function */
         virtual void Abort() = 0;

xpinstall/src/nsInstallPatch.cpp

@@ -302,15 +302,15 @@ void nsInstallPatch::Abort()
     }
 }
 
-PRUnichar* nsInstallPatch::toString()
+char* nsInstallPatch::toString()
 {
-	PRUnichar* buffer = new PRUnichar[1024];
+	char* buffer = new char[1024];
     
     if (buffer == nsnull)
         return buffer;
 
     if (mTargetFile != nsnull) 
-        sprintf( (char *)buffer, nsInstallResources::GetPatchFileString(), mTargetFile->GetCString()); 
+        sprintf( buffer, nsInstallResources::GetPatchFileString(), mTargetFile->GetCString()); 
 
 	return buffer;
 }

xpinstall/src/nsInstallPatch.h

@@ -52,7 +52,7 @@ class nsInstallPatch : public nsInstallObject
         PRInt32 Prepare();
         PRInt32 Complete();
         void  Abort();
-        PRUnichar* toString();
+        char* toString();
 
         PRBool CanUninstall();
         PRBool RegisterPackageNode();

xpinstall/src/nsInstallUninstall.cpp

@@ -92,16 +92,16 @@ void nsInstallUninstall::Abort()
 {
 }
 
-PRUnichar* nsInstallUninstall::toString()
+char* nsInstallUninstall::toString()
 {
-    PRUnichar* buffer = new PRUnichar[1024];
+    char* buffer = new char[1024];
     
     if (buffer == nsnull)
         return buffer;
     
-    PRUnichar* temp = (PRUnichar *)mUIName.ToNewCString();
+    char* temp = mUIName.ToNewCString();
     
-    sprintf( (char *)buffer, nsInstallResources::GetUninstallString(), (char *)temp);
+    sprintf( buffer, nsInstallResources::GetUninstallString(), temp);
     
     if (temp)
         delete [] temp;

xpinstall/src/nsInstallUninstall.h

@@ -46,7 +46,7 @@ class nsInstallUninstall : public nsInstallObject
         PRInt32 Prepare();
         PRInt32 Complete();
         void  Abort();
-        PRUnichar* toString();
+        char* toString();
 
         PRBool CanUninstall();
         PRBool RegisterPackageNode();

xpinstall/src/nsWinProfileItem.cpp

@@ -48,10 +48,10 @@ PRInt32 nsWinProfileItem::Complete()
 	
     return NS_OK;
 }
-  
-PRUnichar* nsWinProfileItem::toString()
+
+char* nsWinProfileItem::toString()
 {
-  PRUnichar*     resultCString;
+  char*     resultCString;
   
   nsString* filename = new nsString(*mProfile->GetFilename());
   nsString* result = new nsString("Write ");
@@ -67,7 +67,7 @@ PRUnichar* nsWinProfileItem::toString()
   result->Append("=");
   result->Append(*mValue);
 
-  resultCString = (PRUnichar *)result->ToNewCString();
+  resultCString = result->ToNewCString();
   
   delete result;
   delete filename;

xpinstall/src/nsWinProfileItem.h

@@ -47,7 +47,7 @@ public:
    * - writes the data into the .INI file
    */
   PRInt32 Complete();
-  PRUnichar* toString();
+  char* toString();
   
   // no need for special clean-up
   void Abort();

xpinstall/src/nsWinRegItem.cpp

@@ -100,11 +100,11 @@ PRInt32 nsWinRegItem::Complete()
 #define kSRV "Store Registry Value "
 #define kUNK "Unknown "
 
-PRUnichar* nsWinRegItem::toString()
+char* nsWinRegItem::toString()
 {
 	nsString* keyString = nsnull;
 	nsString* result    = nsnull;
-    PRUnichar*     resultCString = nsnull;
+    char*     resultCString = nsnull;
 
 	switch(mCommand)
 	{
@@ -136,7 +136,7 @@ PRUnichar* nsWinRegItem::toString()
     if (result)
     {
         result->Append(*keyString);
-        resultCString = (PRUnichar *)result->ToNewCString();
+        resultCString = result->ToNewCString();
     }
     
     if (keyString) delete keyString;

xpinstall/src/nsWinRegItem.h

@@ -54,7 +54,7 @@ public:
 
   PRInt32 Complete();
   
-  PRUnichar* toString();
+  char* toString();
   
   void Abort();