Fix compilation with Q_DECL_OVERRIDE
authorOlivier Goffart <ogoffart@woboq.com>
Fri, 20 Apr 2012 15:18:15 +0000 (17:18 +0200)
committerQt by Nokia <qt-info@nokia.com>
Fri, 20 Apr 2012 20:23:23 +0000 (22:23 +0200)
In C++11, the override keyword is placed after the function declaration

Change-Id: I3a079860762f30fa21eb01611c770713f6ba4acb
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
src/plugins/platforms/cocoa/qcocoaprintersupport.h
src/plugins/platforms/cocoa/qcocoawindow.h
src/widgets/kernel/qapplication_p.h

index db473df..2309025 100644 (file)
@@ -50,11 +50,11 @@ public:
     QCocoaPrinterSupport();
     ~QCocoaPrinterSupport();
 
-    Q_DECL_OVERRIDE QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode);
-    Q_DECL_OVERRIDE QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode printerMode);
-    Q_DECL_OVERRIDE QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &) const;
+    QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode) Q_DECL_OVERRIDE;
+    QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode printerMode) Q_DECL_OVERRIDE;
+    QList<QPrinter::PaperSize> supportedPaperSizes(const QPrinterInfo &) const Q_DECL_OVERRIDE;
 
-    Q_DECL_OVERRIDE QList<QPrinterInfo> availablePrinters();
+    QList<QPrinterInfo> availablePrinters() Q_DECL_OVERRIDE;
 };
 
 #endif // QCOCOAPRINTERSUPPORT_H
index 0d7b8aa..b709f38 100644 (file)
@@ -118,7 +118,7 @@ public:
     void setCurrentContext(QCocoaGLContext *context);
     QCocoaGLContext *currentContext() const;
 
-    Q_DECL_OVERRIDE bool setWindowModified(bool modified);
+    bool setWindowModified(bool modified) Q_DECL_OVERRIDE;
 
 protected:
     // NSWindow handling. The QCocoaWindow/QNSView can either be displayed
index 8f67a29..af7925c 100644 (file)
@@ -198,7 +198,7 @@ public:
     static void dispatchEnterLeave(QWidget *enter, QWidget *leave);
 
     //modality
-    Q_DECL_OVERRIDE bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const;
+    bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const Q_DECL_OVERRIDE;
     static bool isBlockedByModal(QWidget *widget);
     static bool modalState();
     static bool tryModalHelper(QWidget *widget, QWidget **rettop = 0);