Fixed bug 449566 cairo-qpainter-surface.cpp fails to compile with gcc 4.3.x, r=pavlov
authorOleg Romashin <romaxa@gmail.com>
Sat, 16 Aug 2008 03:06:39 -0400
changeset 16960 9ba4c8bfa39987501e6c472f8f919db456190777
parent 16959 a476a6e8a70abaac22a0c96e0a25e3733b53a82b
child 16961 9999736a2cf4412ce2aff9e05a677a7c23e2f6ab
push id1298
push userpavlov@mozilla.com
push dateSun, 17 Aug 2008 05:03:09 +0000
treeherderautoland@4a506fa751d8 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspavlov
bugs449566
milestone1.9.1a2pre
Fixed bug 449566 cairo-qpainter-surface.cpp fails to compile with gcc 4.3.x, r=pavlov
embedding/browser/qt/tests/TestQGeckoEmbed.cpp
gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
widget/src/qt/nsWindow.h
--- a/embedding/browser/qt/tests/TestQGeckoEmbed.cpp
+++ b/embedding/browser/qt/tests/TestQGeckoEmbed.cpp
@@ -1,16 +1,17 @@
 #include <qapplication.h>
 #include "mainwindow.h"
 #include "qgeckoembed.h"
 #include "nsXPCOMGlue.h"
 #ifdef MOZ_JPROF
 #include "jprof/jprof.h"
 #endif
 
+#include <limits.h>
 #include <qdir.h>
 
 int main(int argc, char **argv)
 {
     QApplication app(argc, argv);
 
     static const GREVersionRange greVersion = {
         "1.9a", PR_TRUE,
--- a/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
+++ b/gfx/cairo/cairo/src/cairo-qpainter-surface.cpp
@@ -35,16 +35,17 @@
  */
 
 /* Get INT16_MIN etc. as per C99 */
 #define __STDC_LIMIT_MACROS
 
 #include "cairoint.h"
 
 #include "cairo-qpainter.h"
+#include <memory>
 
 #include <QtGui/QPainter>
 #include <QtGui/QPaintEngine>
 #include <QtGui/QPaintDevice>
 #include <QtGui/QImage>
 #include <QtGui/QPixmap>
 #include <QtGui/QBrush>
 #include <QtGui/QPen>
--- a/widget/src/qt/nsWindow.h
+++ b/widget/src/qt/nsWindow.h
@@ -346,17 +346,17 @@ protected:
    gfxASurface        *GetThebesSurface();
 
 private:
     void               GetToplevelWidget(QWidget **aWidget);
     void               SetUrgencyHint(QWidget *top_window, PRBool state);
     void              *SetupPluginPort(void);
     nsresult           SetWindowIconList(const nsCStringArray &aIconList);
     void               SetDefaultIcon(void);
-    void               InitButtonEvent(nsMouseEvent &aEvent, QMouseEvent *aEvent, int aClickCount = 1);
+    void               InitButtonEvent(nsMouseEvent &event, QMouseEvent *aEvent, int aClickCount = 1);
     PRBool             DispatchCommandEvent(nsIAtom* aCommand);
     QWidget           *createQWidget(QWidget *parent, nsWidgetInitData *aInitData);
 
     QWidget            *mDrawingArea;
     MozQWidget *mMozQWidget;
 
     PRUint32            mIsVisible : 1,
                         mActivatePending : 1;