Bug 1041311 - Fix Qt compilation. r=romaxa

image/decoders/icon/qt/nsIconChannel.h

@@ -25,8 +25,7 @@ class nsIconChannel MOZ_FINAL : public nsIChannel {
     NS_FORWARD_NSIREQUEST(mRealChannel->)
     NS_FORWARD_NSICHANNEL(mRealChannel->)
 
-    nsIconChannel() {}
-    ~nsIconChannel() {}
+    nsIconChannel() {};
 
     /**
      * Called by nsIconProtocolHandler after it creates this channel.
@@ -35,6 +34,8 @@ class nsIconChannel MOZ_FINAL : public nsIChannel {
      */
     nsresult Init(nsIURI* aURI);
   private:
+    ~nsIconChannel() {};
+
     /**
      * The channel to the temp icon file (e.g. to /tmp/2qy9wjqw.html).
      * Will always be non-null after a successful Init.

toolkit/components/remote/nsQtRemoteService.cpp

@@ -63,6 +63,10 @@ mServerWindow(0)
 {
 }
 
+nsQtRemoteService::~nsQtRemoteService()
+{
+}
+
 NS_IMETHODIMP
 nsQtRemoteService::Startup(const char* aAppName, const char* aProfileName)
 {

toolkit/components/remote/nsQtRemoteService.h

@@ -21,9 +21,10 @@ public:
   NS_DECL_NSIREMOTESERVICE  
 
   nsQtRemoteService();
-  virtual ~nsQtRemoteService() { };
 
 private:
+  virtual ~nsQtRemoteService();
+
   virtual void SetDesktopStartupIDOrTimestamp(const nsACString& aDesktopStartupID,
                                               uint32_t aTimestamp);
 

widget/qt/nsBidiKeyboard.h

@@ -16,6 +16,8 @@ public:
     NS_DECL_NSIBIDIKEYBOARD
 
     nsBidiKeyboard();
+
+protected:
     virtual ~nsBidiKeyboard();
 };
 

widget/qt/nsClipboard.h

@@ -17,7 +17,6 @@ class nsClipboard : public nsIClipboard
 {
 public:
     nsClipboard();
-    virtual ~nsClipboard();
 
     //nsISupports
     NS_DECL_ISUPPORTS
@@ -26,6 +25,8 @@ public:
     NS_DECL_NSICLIPBOARD
 
 protected:
+    virtual ~nsClipboard();
+
     NS_IMETHOD SetNativeClipboardData(nsITransferable *aTransferable,
                                       QClipboard::Mode cbMode);
     NS_IMETHOD GetNativeClipboardData(nsITransferable *aTransferable,
@@ -35,7 +36,6 @@ protected:
     nsCOMPtr<nsIClipboardOwner> mGlobalOwner;
     nsCOMPtr<nsITransferable>   mSelectionTransferable;
     nsCOMPtr<nsITransferable>   mGlobalTransferable;
-    nsRefPtr<nsClipboardPrivacyHandler> mPrivacyHandler;
 };
 
 #endif // nsClipboard_h__

widget/qt/nsDeviceContextSpecQt.cpp

@@ -214,6 +214,10 @@ nsPrinterEnumeratorQt::nsPrinterEnumeratorQt()
 {
 }
 
+nsPrinterEnumeratorQt::~nsPrinterEnumeratorQt()
+{
+}
+
 NS_IMPL_ISUPPORTS(nsPrinterEnumeratorQt, nsIPrinterEnumerator)
 
 NS_IMETHODIMP nsPrinterEnumeratorQt::GetPrinterNameList(

widget/qt/nsDeviceContextSpecQt.h

@@ -19,7 +19,6 @@ class nsDeviceContextSpecQt : public nsIDeviceContextSpec
 {
 public:
     nsDeviceContextSpecQt();
-    virtual ~nsDeviceContextSpecQt();
 
     NS_DECL_ISUPPORTS
 
@@ -39,6 +38,8 @@ public:
     NS_IMETHOD GetPath (const char** aPath);
 
 protected:
+    virtual ~nsDeviceContextSpecQt();
+
     nsCOMPtr<nsIPrintSettings> mPrintSettings;
     bool mToPrinter : 1;      /* If true, print to printer */
     bool mIsPPreview : 1;     /* If true, is print preview */
@@ -54,6 +55,10 @@ public:
     nsPrinterEnumeratorQt();
     NS_DECL_ISUPPORTS
     NS_DECL_NSIPRINTERENUMERATOR
+
+protected:
+    virtual ~nsPrinterEnumeratorQt();
+
 };
 
 #endif /* !nsDeviceContextSpecQt_h___ */

widget/qt/nsPrintDialogQt.h

@@ -15,7 +15,6 @@ class nsPrintDialogServiceQt : public nsIPrintDialogService
 {
 public:
     nsPrintDialogServiceQt();
-    virtual ~nsPrintDialogServiceQt();
 
     NS_DECL_ISUPPORTS
 
@@ -25,6 +24,9 @@ public:
                        nsIWebBrowserPrint* aWebBrowserPrint);
     NS_IMETHODIMP ShowPageSetup(nsIDOMWindow* aParent,
                                 nsIPrintSettings* aSettings);
+
+protected:
+    virtual ~nsPrintDialogServiceQt();
 };
 
 #endif

widget/qt/nsPrintSettingsQt.h

@@ -17,10 +17,9 @@ class nsPrintSettingsQt : public nsPrintSettings
 {
 public:
     NS_DECL_ISUPPORTS_INHERITED
-        NS_DECLARE_STATIC_IID_ACCESSOR(NS_PRINTSETTINGSQT_IID)
+    NS_DECLARE_STATIC_IID_ACCESSOR(NS_PRINTSETTINGSQT_IID)
 
     nsPrintSettingsQt();
-    virtual ~nsPrintSettingsQt();
 
     NS_IMETHOD GetPrintRange(int16_t* aPrintRange);
     NS_IMETHOD SetPrintRange(int16_t aPrintRange);
@@ -71,6 +70,8 @@ public:
     NS_IMETHOD GetEffectivePageSize(double* aWidth, double* aHeight);
 
 protected:
+    virtual ~nsPrintSettingsQt();
+
     nsPrintSettingsQt(const nsPrintSettingsQt& src);
     nsPrintSettingsQt& operator=(const nsPrintSettingsQt& rhs);
 

widget/qt/nsScreenManagerQt.cpp

@@ -69,6 +69,21 @@ nsScreenManagerQt::ScreenForRect(int32_t inLeft, int32_t inTop,
     return NS_OK;
 }
 
+NS_IMETHODIMP
+nsScreenManagerQt::ScreenForId(uint32_t aId, nsIScreen** aOutScreen)
+{
+    if (!mInitialized) {
+        init();
+    }
+
+    if (aId < nScreens) {
+        NS_IF_ADDREF(*aOutScreen = screens[aId]);
+        return NS_OK;
+    }
+
+    return NS_ERROR_FAILURE;
+}
+
 //
 // GetPrimaryScreen
 //

widget/qt/nsScreenManagerQt.h

@@ -17,13 +17,12 @@ class nsScreenManagerQt : public nsIScreenManager
 {
 public:
   nsScreenManagerQt ( );
-  virtual ~nsScreenManagerQt();
 
   NS_DECL_ISUPPORTS
   NS_DECL_NSISCREENMANAGER
 
 private:
-
+  virtual ~nsScreenManagerQt();
   void init ();
 
   nsCOMPtr<nsIScreen> *screens;

widget/qt/nsScreenQt.cpp

@@ -23,6 +23,13 @@ nsScreenQt::~nsScreenQt()
 {
 }
 
+NS_IMETHODIMP
+nsScreenQt::GetId(uint32_t* aId)
+{
+    *aId = mScreen;
+    return NS_OK;
+}
+
 NS_IMETHODIMP
 nsScreenQt::GetRect(int32_t *outLeft,int32_t *outTop,
                     int32_t *outWidth,int32_t *outHeight)

widget/qt/nsScreenQt.h

@@ -16,6 +16,7 @@ public:
   nsScreenQt (int aScreen);
   virtual ~nsScreenQt();
 
+  NS_IMETHOD GetId(uint32_t* aId);
   NS_IMETHOD GetRect(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
   NS_IMETHOD GetAvailRect(int32_t* aLeft, int32_t* aTop, int32_t* aWidth, int32_t* aHeight);
   NS_IMETHOD GetPixelDepth(int32_t* aPixelDepth);

widget/qt/nsWindow.h

@@ -85,7 +85,6 @@ class nsWindow : public nsBaseWidget,
 {
 public:
     nsWindow();
-    virtual ~nsWindow();
 
     NS_DECL_ISUPPORTS_INHERITED
 
@@ -172,6 +171,8 @@ public:
     virtual nsEventStatus tabletEvent(QTabletEvent* event);
 
 protected:
+    virtual ~nsWindow();
+
     nsWindow* mParent;
     bool  mVisible;
     InputContext mInputContext;