From 7eebe4e960bccf525ac7a6a26504bbf1157fd17e Mon Sep 17 00:00:00 2001 From: Olivier Goffart Date: Fri, 20 Apr 2012 17:18:15 +0200 Subject: [PATCH] Fix compilation with Q_DECL_OVERRIDE In C++11, the override keyword is placed after the function declaration Change-Id: I3a079860762f30fa21eb01611c770713f6ba4acb Reviewed-by: Friedemann Kleint --- src/plugins/platforms/cocoa/qcocoaprintersupport.h | 8 ++++---- src/plugins/platforms/cocoa/qcocoawindow.h | 2 +- src/widgets/kernel/qapplication_p.h | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/plugins/platforms/cocoa/qcocoaprintersupport.h b/src/plugins/platforms/cocoa/qcocoaprintersupport.h index db473df..2309025 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintersupport.h +++ b/src/plugins/platforms/cocoa/qcocoaprintersupport.h @@ -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 supportedPaperSizes(const QPrinterInfo &) const; + QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode) Q_DECL_OVERRIDE; + QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode printerMode) Q_DECL_OVERRIDE; + QList supportedPaperSizes(const QPrinterInfo &) const Q_DECL_OVERRIDE; - Q_DECL_OVERRIDE QList availablePrinters(); + QList availablePrinters() Q_DECL_OVERRIDE; }; #endif // QCOCOAPRINTERSUPPORT_H diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index 0d7b8aa..b709f38 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -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 diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 8f67a29..af7925c 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -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); -- 2.7.4