[OS/2] Bug 522896 - Widget Code Maintenance, part 0: eliminate gcc 4.x warnings, r=pweilbacher

widget/src/os2/nsDeviceContextSpecOS2.cpp

@@ -497,10 +497,10 @@ NS_IMETHODIMP nsDeviceContextSpecOS2::BeginDocument(PRUnichar* aTitle,
   }
 
   char *title = GetACPString(aTitle);
-  const PSZ pszGenericDocName = "Mozilla Document";
-  PSZ pszDocName = title ? title : pszGenericDocName;
+  PCSZ pszGenericDocName = "Mozilla Document";
+  PCSZ pszDocName = title ? title : pszGenericDocName;
   LONG lResult = DevEscape(mPrintDC, DEVESC_STARTDOC,
-                           strlen(pszDocName) + 1, pszDocName,
+                           strlen(pszDocName) + 1, const_cast<BYTE*>(pszDocName),
                            (PLONG)NULL, (PBYTE)NULL);
   mPrintingStarted = PR_TRUE;
   if (title) {

widget/src/os2/nsFilePicker.cpp

@@ -217,7 +217,7 @@ NS_IMETHODIMP nsFilePicker::Show(PRInt16 *retval)
 
     pmydata->ulCurExt = mSelectedType;
 
-    PRBool fileExists;
+    PRBool fileExists = PR_TRUE;
     do {
       DosError(FERR_DISABLEHARDERR);
       WinFileDlg(HWND_DESKTOP, mWnd, &filedlg);

widget/src/os2/nsOS2Uni.cpp

@@ -48,7 +48,7 @@ nsICharsetConverterManager* OS2Uni::gCharsetManager = nsnull;
 struct ConverterInfo
 {
   PRUint16            mCodePage;
-  char*               mConvName;
+  const char*         mConvName;
   nsIUnicodeEncoder*  mEncoder;
   nsIUnicodeDecoder*  mDecoder;
 };

widget/src/os2/nsPrintOS2.cpp

@@ -354,11 +354,11 @@ BOOL PRINTDLG::ShowProperties(ULONG printerNdx)
 /*  Job management                                                          */
 /****************************************************************************/
 
-HDC PrnOpenDC( PRTQUEUE *pInfo, PSZ pszApplicationName, int copies, int destination, char *file )
+HDC PrnOpenDC( PRTQUEUE *pInfo, PCSZ pszApplicationName, int copies, int destination, char *file )
 {
    HDC hdc = 0;
-   PSZ pszLogAddress;
-   PSZ pszDataType;
+   PCSZ pszLogAddress;
+   PCSZ pszDataType;
    LONG dcType;
    DEVOPENSTRUC dop;
 
@@ -381,11 +381,11 @@ HDC PrnOpenDC( PRTQUEUE *pInfo, PSZ pszApplicationName, int copies, int destinat
       dcType = OD_DIRECT;
    } 
 
-   dop.pszLogAddress      = pszLogAddress; 
+   dop.pszLogAddress      = const_cast<PSZ>(pszLogAddress); 
    dop.pszDriverName      = (char*)pInfo->DriverName ();
    dop.pdriv              = pInfo->PQI3 ().pDriverData;
-   dop.pszDataType        = pszDataType; 
-   dop.pszComment         = pszApplicationName;
+   dop.pszDataType        = const_cast<PSZ>(pszDataType); 
+   dop.pszComment         = const_cast<PSZ>(pszApplicationName);
    dop.pszQueueProcName   = pInfo->PQI3 ().pszPrProc;     
    dop.pszQueueProcParams = 0;
    dop.pszSpoolerParams   = 0;     

widget/src/os2/nsPrintOS2.h

@@ -87,7 +87,7 @@ private:
 BOOL PrnClosePrinter( PRTQUEUE *pPrintQueue);
 
 // Get a DC for the selected printer.  Must supply the application name.
-HDC PrnOpenDC( PRTQUEUE *pPrintQueue, PSZ pszApplicationName, int copies, int destination, char *file);
+HDC PrnOpenDC( PRTQUEUE *pPrintQueue, PCSZ pszApplicationName, int copies, int destination, char *file);
 
 // Get the hardcopy caps for the selected form
 BOOL PrnQueryHardcopyCaps( HDC hdc, PHCINFO pHCInfo);

widget/src/os2/nsRwsService.cpp

@@ -89,7 +89,7 @@
 //  function prototypes
 //------------------------------------------------------------------------
 
-static nsresult IsDescendedFrom(PRUint32 wpsFilePtr, char *pszClassname);
+static nsresult IsDescendedFrom(PRUint32 wpsFilePtr, const char *pszClassname);
 static nsresult CreateFileForExtension(const char *aFileExt, nsACString& aPath);
 static nsresult DeleteFileForExtension(const char *aPath);
 static void     AssignNLSString(const PRUnichar *aKey, nsAString& _retval);
@@ -682,7 +682,7 @@ nsRwsService::Observe(nsISupports *aSubject, const char *aTopic,
 
 // this wrapper for somIsA() makes HandlerFromPath() easier to read
 
-static nsresult IsDescendedFrom(PRUint32 wpsFilePtr, char *pszClassname)
+static nsresult IsDescendedFrom(PRUint32 wpsFilePtr, const char *pszClassname)
 {
   PRWSHDR   pHdr = 0;
   nsresult  rv = NS_ERROR_FAILURE;

widget/src/os2/nsWindow.cpp

@@ -1681,9 +1681,9 @@ HBITMAP nsWindow::DataToBitmap(PRUint8* aImageData, PRUint32 aWidth,
   } bi;
 
   memset( &bi, 0, sizeof(bi));
-  bi.white.bBlue = 255;
-  bi.white.bGreen = 255;
-  bi.white.bRed = 255;
+  bi.white.bBlue = (BYTE)255;
+  bi.white.bGreen = (BYTE)255;
+  bi.white.bRed = (BYTE)255;
 
   // fill in the particulars
   bi.head.cbFix = sizeof(bi.head);
@@ -3600,13 +3600,14 @@ PRBool nsWindow::CheckDragStatus(PRUint32 aAction, HPS * oHps)
     // for this window, get the hps;  otherwise, return zero;
     // (if we provide a 2nd hps for a window, the cursor in text
     // fields won't be erased when it's moved to another position)
-  if (oHps)
+  if (oHps) {
     if (getHps && !mDragHps) {
       mDragHps = DrgGetPS(mWnd);
       *oHps = mDragHps;
-    }
-    else
+    } else {
       *oHps = 0;
+    }
+  }
 
   return rtn;
 }