From 47c92fbb0b588b443cead18a5aad5a2b5ad9e4d7 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 10:36:49 +0200 Subject: Replace Q_DECL_OVERRIDE with override where possible Remaining uses of Q_DECL_OVERRIDE are in: src/corelib/global/qcompilerdetection.h src/corelib/global/qglobal.cpp doc/global/qt-cpp-defines.qdocconf (definition and documentation of Q_DECL_OVERRIDE) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: Ib9b05d829add69e98a86238274b6a1fcb19b49ba Reviewed-by: Lars Knoll Reviewed-by: Ville Voutilainen Reviewed-by: Olivier Goffart (Woboq GmbH) --- examples/network/multistreamclient/chatconsumer.h | 4 +- examples/network/multistreamclient/movieconsumer.h | 6 +- examples/network/multistreamclient/timeconsumer.h | 6 +- examples/network/multistreamserver/chatprovider.h | 6 +- examples/network/multistreamserver/server.h | 2 +- examples/network/multistreamserver/timeprovider.h | 2 +- examples/opengl/computegles31/glwindow.h | 2 +- examples/xml/dombookmarks/xbeltree.h | 2 +- src/concurrent/qtconcurrentthreadengine.h | 4 +- src/corelib/animation/qabstractanimation.h | 2 +- src/corelib/animation/qabstractanimation_p.h | 10 +- src/corelib/animation/qanimationgroup.h | 2 +- src/corelib/animation/qparallelanimationgroup.h | 10 +- src/corelib/animation/qparallelanimationgroup_p.h | 2 +- src/corelib/animation/qpauseanimation.h | 6 +- src/corelib/animation/qpropertyanimation.h | 6 +- src/corelib/animation/qsequentialanimationgroup.h | 10 +- .../animation/qsequentialanimationgroup_p.h | 4 +- src/corelib/animation/qvariantanimation.h | 8 +- src/corelib/codecs/qicucodec_p.h | 10 +- src/corelib/codecs/qisciicodec_p.h | 8 +- src/corelib/codecs/qlatincodec_p.h | 20 +- src/corelib/codecs/qtsciicodec_p.h | 8 +- src/corelib/codecs/qutfcodec_p.h | 52 ++--- src/corelib/io/qbuffer.cpp | 4 +- src/corelib/io/qbuffer.h | 22 +-- src/corelib/io/qfile.h | 12 +- src/corelib/io/qfiledevice.h | 18 +- src/corelib/io/qfiledevice_p.h | 2 +- src/corelib/io/qfilesystemwatcher_inotify_p.h | 4 +- src/corelib/io/qfilesystemwatcher_polling_p.h | 4 +- src/corelib/io/qfsfileengine_iterator_p.h | 8 +- src/corelib/io/qfsfileengine_p.h | 70 +++---- src/corelib/io/qnoncontiguousbytedevice_p.h | 58 +++--- src/corelib/io/qprocess.h | 22 +-- src/corelib/io/qresource.cpp | 6 +- src/corelib/io/qresource_iterator_p.h | 6 +- src/corelib/io/qresource_p.h | 60 +++--- src/corelib/io/qsavefile.h | 8 +- src/corelib/io/qsettings.h | 2 +- src/corelib/io/qsettings_p.h | 18 +- src/corelib/io/qtemporaryfile.h | 4 +- src/corelib/itemmodels/qabstractitemmodel.cpp | 12 +- src/corelib/itemmodels/qabstractitemmodel.h | 26 +-- src/corelib/itemmodels/qabstractproxymodel.h | 52 ++--- src/corelib/itemmodels/qidentityproxymodel.h | 38 ++-- src/corelib/itemmodels/qsortfilterproxymodel.cpp | 2 +- src/corelib/itemmodels/qsortfilterproxymodel.h | 60 +++--- src/corelib/itemmodels/qstringlistmodel.h | 18 +- src/corelib/kernel/qcoreapplication.h | 2 +- src/corelib/kernel/qeventdispatcher_glib_p.h | 4 +- src/corelib/kernel/qeventdispatcher_unix_p.h | 6 +- src/corelib/kernel/qeventloop.h | 2 +- src/corelib/kernel/qobject_p.h | 4 +- src/corelib/kernel/qsocketnotifier.h | 2 +- src/corelib/kernel/qtimer.cpp | 2 +- src/corelib/kernel/qtimer.h | 2 +- src/corelib/mimetypes/qmimeprovider_p.h | 38 ++-- src/corelib/statemachine/qabstractstate.h | 2 +- src/corelib/statemachine/qabstracttransition.h | 2 +- src/corelib/statemachine/qeventtransition.h | 6 +- src/corelib/statemachine/qfinalstate.h | 6 +- src/corelib/statemachine/qhistorystate.h | 6 +- src/corelib/statemachine/qsignaltransition.h | 6 +- src/corelib/statemachine/qsignaltransition_p.h | 2 +- src/corelib/statemachine/qstate.cpp | 4 +- src/corelib/statemachine/qstate.h | 6 +- src/corelib/statemachine/qstatemachine.cpp | 8 +- src/corelib/statemachine/qstatemachine.h | 8 +- src/corelib/thread/qexception.h | 4 +- src/corelib/thread/qfuturewatcher.h | 14 +- src/corelib/thread/qfuturewatcher_p.h | 4 +- src/corelib/thread/qthread.h | 2 +- src/corelib/thread/qthread_p.h | 2 +- src/corelib/thread/qthreadpool.cpp | 2 +- src/corelib/tools/qeasingcurve.cpp | 18 +- src/corelib/tools/qtimeline.h | 2 +- src/corelib/tools/qtimezoneprivate_p.h | 170 ++++++++-------- src/dbus/qdbusabstractinterface.cpp | 2 +- src/dbus/qdbusabstractinterface.h | 6 +- src/dbus/qdbusconnection_p.h | 2 +- src/dbus/qdbusconnectioninterface.h | 4 +- src/dbus/qdbusconnectionmanager_p.h | 2 +- src/dbus/qdbusintegrator_p.h | 6 +- src/dbus/qdbusinterface.h | 6 +- src/gui/accessible/qaccessibleobject.h | 28 +-- src/gui/image/qicon_p.h | 22 +-- src/gui/image/qiconloader_p.h | 20 +- src/gui/image/qimage.h | 6 +- src/gui/image/qpaintengine_pic_p.h | 22 +-- src/gui/image/qpicture.cpp | 4 +- src/gui/image/qpicture.h | 6 +- src/gui/image/qpixmap.h | 6 +- src/gui/image/qpixmap_blitter_p.h | 22 +-- src/gui/image/qpixmap_raster_p.h | 38 ++-- src/gui/image/qpixmapcache.cpp | 2 +- src/gui/itemmodels/qstandarditemmodel.h | 44 ++--- src/gui/kernel/qdnd_p.h | 6 +- src/gui/kernel/qguiapplication.h | 6 +- src/gui/kernel/qguiapplication_p.h | 6 +- src/gui/kernel/qoffscreensurface.h | 8 +- src/gui/kernel/qopenglcontext_p.h | 4 +- src/gui/kernel/qopenglwindow.cpp | 8 +- src/gui/kernel/qopenglwindow.h | 8 +- src/gui/kernel/qpaintdevicewindow.h | 8 +- src/gui/kernel/qrasterwindow.cpp | 6 +- src/gui/kernel/qrasterwindow.h | 4 +- src/gui/kernel/qshapedpixmapdndwindow_p.h | 2 +- src/gui/kernel/qsimpledrag_p.h | 14 +- src/gui/kernel/qwindow.h | 10 +- src/gui/opengl/qopenglengineshadermanager.cpp | 4 +- src/gui/opengl/qopenglfunctions.cpp | 4 +- src/gui/opengl/qopenglfunctions_1_0.h | 2 +- src/gui/opengl/qopenglfunctions_1_1.h | 2 +- src/gui/opengl/qopenglfunctions_1_2.h | 2 +- src/gui/opengl/qopenglfunctions_1_3.h | 2 +- src/gui/opengl/qopenglfunctions_1_4.h | 2 +- src/gui/opengl/qopenglfunctions_1_5.h | 2 +- src/gui/opengl/qopenglfunctions_2_0.h | 2 +- src/gui/opengl/qopenglfunctions_2_1.h | 2 +- src/gui/opengl/qopenglfunctions_3_0.h | 2 +- src/gui/opengl/qopenglfunctions_3_1.h | 2 +- .../opengl/qopenglfunctions_3_2_compatibility.h | 2 +- src/gui/opengl/qopenglfunctions_3_2_core.h | 2 +- .../opengl/qopenglfunctions_3_3_compatibility.h | 2 +- src/gui/opengl/qopenglfunctions_3_3_core.h | 2 +- .../opengl/qopenglfunctions_4_0_compatibility.h | 2 +- src/gui/opengl/qopenglfunctions_4_0_core.h | 2 +- .../opengl/qopenglfunctions_4_1_compatibility.h | 2 +- src/gui/opengl/qopenglfunctions_4_1_core.h | 2 +- .../opengl/qopenglfunctions_4_2_compatibility.h | 2 +- src/gui/opengl/qopenglfunctions_4_2_core.h | 2 +- .../opengl/qopenglfunctions_4_3_compatibility.h | 2 +- src/gui/opengl/qopenglfunctions_4_3_core.h | 2 +- .../opengl/qopenglfunctions_4_4_compatibility.h | 2 +- src/gui/opengl/qopenglfunctions_4_4_core.h | 2 +- .../opengl/qopenglfunctions_4_5_compatibility.h | 2 +- src/gui/opengl/qopenglfunctions_4_5_core.h | 2 +- src/gui/opengl/qopenglfunctions_es2.h | 2 +- src/gui/opengl/qopenglgradientcache_p.h | 4 +- src/gui/opengl/qopenglpaintengine_p.h | 56 +++--- src/gui/opengl/qopengltexturecache_p.h | 4 +- src/gui/opengl/qopengltextureglyphcache_p.h | 16 +- src/gui/painting/qpaintengine_blitter_p.h | 64 +++--- src/gui/painting/qpaintengine_raster_p.h | 82 ++++---- src/gui/painting/qpaintengineex_p.h | 30 +-- src/gui/painting/qpdf_p.h | 26 +-- src/gui/painting/qpdfwriter.cpp | 12 +- src/gui/painting/qtextureglyphcache_p.h | 6 +- src/gui/text/qfont_p.h | 2 +- src/gui/text/qfontengine_p.h | 92 ++++----- src/gui/text/qfontengine_qpf2_p.h | 48 ++--- src/gui/text/qstatictext.cpp | 18 +- src/gui/text/qtextdocumentlayout_p.h | 22 +-- src/gui/text/qtexthtmlparser.cpp | 16 +- src/gui/text/qtextimagehandler_p.h | 4 +- src/gui/text/qtextodfwriter.cpp | 4 +- src/gui/text/qtexttable_p.h | 4 +- src/gui/util/qvalidator.h | 10 +- src/network/access/qhttpmultipart_p.h | 18 +- src/network/access/qhttpnetworkreply_p.h | 18 +- src/network/access/qhttpnetworkrequest_p.h | 18 +- src/network/access/qhttpprotocolhandler_p.h | 6 +- src/network/access/qhttpthreaddelegate.cpp | 2 +- src/network/access/qhttpthreaddelegate_p.h | 12 +- .../access/qnetworkaccessauthenticationmanager.cpp | 2 +- src/network/access/qnetworkaccesscache_p.h | 2 +- src/network/access/qnetworkaccesscachebackend_p.h | 6 +- .../access/qnetworkaccessdebugpipebackend_p.h | 10 +- src/network/access/qnetworkaccessfilebackend_p.h | 10 +- src/network/access/qnetworkaccessftpbackend.cpp | 2 +- src/network/access/qnetworkaccessftpbackend_p.h | 10 +- src/network/access/qnetworkdiskcache.h | 16 +- src/network/access/qnetworkfile_p.h | 2 +- src/network/access/qnetworkreply.h | 6 +- src/network/access/qnetworkreplydataimpl_p.h | 12 +- src/network/access/qnetworkreplyfileimpl_p.h | 12 +- src/network/access/qnetworkreplyhttpimpl_p.h | 24 +-- src/network/access/qnetworkreplyimpl_p.h | 24 +-- src/network/access/qspdyprotocolhandler_p.h | 6 +- src/network/bearer/qnetworksession.h | 4 +- src/network/kernel/qdnslookup_p.h | 2 +- src/network/kernel/qhostinfo_p.h | 4 +- src/network/socket/qabstractsocket.h | 22 +-- src/network/socket/qhttpsocketengine_p.h | 70 +++---- src/network/socket/qlocalsocket.h | 20 +- src/network/socket/qnativesocketengine_p.h | 68 +++---- src/network/socket/qsctpserver.h | 2 +- src/network/socket/qsctpserver_p.h | 2 +- src/network/socket/qsctpsocket.h | 8 +- src/network/socket/qsctpsocket_p.h | 6 +- src/network/socket/qsocks5socketengine.cpp | 2 +- src/network/socket/qsocks5socketengine_p.h | 78 ++++---- src/network/socket/qtcpserver_p.h | 12 +- src/network/ssl/qsslsocket.h | 36 ++-- src/network/ssl/qsslsocket_mac_p.h | 16 +- src/network/ssl/qsslsocket_openssl_p.h | 18 +- src/network/ssl/qsslsocket_p.h | 8 +- src/network/ssl/qsslsocket_winrt_p.h | 16 +- .../gl2paintengineex/qglengineshadermanager.cpp | 4 +- .../gl2paintengineex/qpaintengineex_opengl2_p.h | 56 +++--- .../gl2paintengineex/qtextureglyphcache_gl_p.h | 16 +- src/opengl/qgl.h | 8 +- src/opengl/qgl_p.h | 8 +- src/opengl/qglframebufferobject.h | 6 +- src/opengl/qglframebufferobject_p.h | 10 +- src/opengl/qglfunctions.cpp | 4 +- src/opengl/qglpaintdevice_p.h | 14 +- src/opengl/qglpixelbuffer.h | 6 +- src/opengl/qgraphicsshadereffect.cpp | 2 +- src/opengl/qgraphicsshadereffect_p.h | 2 +- .../devicediscovery/qdevicediscovery_dummy_p.h | 2 +- .../devicediscovery/qdevicediscovery_static_p.h | 2 +- .../devicediscovery/qdevicediscovery_udev_p.h | 2 +- src/platformsupport/eglconvenience/qeglpbuffer_p.h | 4 +- .../eglconvenience/qeglplatformcontext_p.h | 16 +- .../eventdispatchers/qeventdispatcher_glib_p.h | 2 +- .../qwindowsguieventdispatcher_p.h | 4 +- .../fbconvenience/qfbbackingstore_p.h | 10 +- src/platformsupport/fbconvenience/qfbscreen_p.h | 14 +- src/platformsupport/fbconvenience/qfbwindow_p.h | 20 +- .../fontconfig/qfontconfigdatabase_p.h | 18 +- .../fontconfig/qfontenginemultifontconfig_p.h | 2 +- .../fontdatabases/freetype/qfontengine_ft_p.h | 86 ++++---- .../freetype/qfreetypefontdatabase_p.h | 10 +- .../fontdatabases/mac/qcoretextfontdatabase_p.h | 18 +- .../fontdatabases/mac/qfontengine_coretext_p.h | 74 +++---- .../windows/qwindowsfontdatabase_ft_p.h | 14 +- .../fontdatabases/windows/qwindowsfontdatabase_p.h | 24 +-- .../fontdatabases/windows/qwindowsfontengine_p.h | 72 +++---- .../windows/qwindowsfontenginedirectwrite_p.h | 50 ++--- .../graphics/qrasterbackingstore_p.h | 10 +- .../input/evdevtablet/qevdevtablethandler_p.h | 2 +- .../input/evdevtouch/qevdevtouchhandler_p.h | 4 +- .../input/integrityhid/qintegrityhidmanager.cpp | 8 +- src/platformsupport/linuxaccessibility/bridge_p.h | 2 +- .../qopenglcompositorbackingstore_p.h | 12 +- .../services/genericunix/qgenericunixservices_p.h | 6 +- .../themes/genericunix/dbusmenu/qdbusmenubar_p.h | 12 +- .../genericunix/dbusmenu/qdbusplatformmenu_p.h | 64 +++--- .../themes/genericunix/dbustray/qdbustrayicon_p.h | 20 +- .../themes/genericunix/qgenericunixthemes_p.h | 28 +-- src/plugins/bearer/android/src/main.cpp | 2 +- .../bearer/android/src/qandroidbearerengine.h | 28 +-- src/plugins/bearer/generic/main.cpp | 2 +- src/plugins/bearer/generic/qgenericengine.h | 18 +- src/plugins/bearer/qnetworksession_impl.h | 44 ++--- src/plugins/generic/evdevkeyboard/main.cpp | 2 +- src/plugins/generic/evdevmouse/main.cpp | 2 +- src/plugins/generic/evdevtablet/main.cpp | 2 +- src/plugins/generic/evdevtouch/main.cpp | 2 +- .../compose/qcomposeplatforminputcontext.h | 10 +- .../compose/qcomposeplatforminputcontextmain.cpp | 2 +- src/plugins/platforminputcontexts/ibus/main.cpp | 2 +- .../ibus/qibusplatforminputcontext.h | 16 +- src/plugins/platforms/cocoa/qcocoaaccessibility.h | 8 +- src/plugins/platforms/cocoa/qcocoabackingstore.h | 4 +- src/plugins/platforms/cocoa/qcocoaclipboard.h | 8 +- .../platforms/cocoa/qcocoacolordialoghelper.h | 10 +- src/plugins/platforms/cocoa/qcocoacursor.h | 6 +- src/plugins/platforms/cocoa/qcocoadrag.h | 4 +- .../platforms/cocoa/qcocoafiledialoghelper.h | 22 +-- .../platforms/cocoa/qcocoafontdialoghelper.h | 10 +- src/plugins/platforms/cocoa/qcocoaglcontext.h | 14 +- src/plugins/platforms/cocoa/qcocoainputcontext.h | 6 +- src/plugins/platforms/cocoa/qcocoaintegration.h | 68 +++---- src/plugins/platforms/cocoa/qcocoamenu.h | 32 +-- src/plugins/platforms/cocoa/qcocoamenubar.h | 10 +- src/plugins/platforms/cocoa/qcocoamenuitem.h | 26 +-- .../platforms/cocoa/qcocoanativeinterface.h | 8 +- src/plugins/platforms/cocoa/qcocoaprintdevice.h | 34 ++-- src/plugins/platforms/cocoa/qcocoaprintersupport.h | 10 +- src/plugins/platforms/cocoa/qcocoaservices.h | 4 +- src/plugins/platforms/cocoa/qcocoasystemtrayicon.h | 18 +- src/plugins/platforms/cocoa/qcocoatheme.h | 24 +-- src/plugins/platforms/cocoa/qcocoawindow.h | 56 +++--- src/plugins/platforms/cocoa/qprintengine_mac_p.h | 4 +- .../direct2d/qwindowsdirect2dbackingstore.h | 10 +- .../direct2d/qwindowsdirect2dintegration.h | 10 +- .../direct2d/qwindowsdirect2dnativeinterface.h | 2 +- .../direct2d/qwindowsdirect2dpaintdevice.h | 6 +- .../direct2d/qwindowsdirect2dpaintengine.h | 50 ++--- .../direct2d/qwindowsdirect2dplatformpixmap.h | 20 +- .../platforms/direct2d/qwindowsdirect2dwindow.h | 2 +- src/plugins/platforms/haiku/main.h | 2 +- src/plugins/platforms/haiku/qhaikuapplication.h | 4 +- src/plugins/platforms/haiku/qhaikuclipboard.h | 10 +- src/plugins/platforms/haiku/qhaikucursor.h | 2 +- src/plugins/platforms/haiku/qhaikuintegration.h | 14 +- .../platforms/haiku/qhaikurasterbackingstore.h | 6 +- src/plugins/platforms/haiku/qhaikurasterwindow.h | 14 +- src/plugins/platforms/haiku/qhaikuscreen.h | 10 +- src/plugins/platforms/haiku/qhaikuservices.h | 6 +- src/plugins/platforms/haiku/qhaikuwindow.h | 34 ++-- src/plugins/platforms/integrity/main.cpp | 2 +- .../platforms/integrity/qintegrityfbintegration.h | 18 +- .../platforms/integrity/qintegrityfbscreen.h | 4 +- .../platforms/integrity/qintegrityhidmanager.cpp | 8 +- .../qiosfileengineassetslibrary.mm | 8 +- src/plugins/platforms/ios/qiosbackingstore.h | 2 +- src/plugins/platforms/ios/qiosclipboard.h | 8 +- src/plugins/platforms/ios/qiosclipboard.mm | 4 +- src/plugins/platforms/ios/qioscontext.h | 16 +- src/plugins/platforms/ios/qioseventdispatcher.h | 4 +- src/plugins/platforms/ios/qiosfiledialog.h | 22 +-- src/plugins/platforms/ios/qiosinputcontext.h | 22 +-- src/plugins/platforms/ios/qiosintegration.h | 34 ++-- src/plugins/platforms/ios/qiosintegration.mm | 4 +- src/plugins/platforms/ios/qiosmenu.h | 52 ++--- src/plugins/platforms/ios/qiosmessagedialog.h | 6 +- src/plugins/platforms/ios/qiosscreen.h | 22 +-- src/plugins/platforms/ios/qiostheme.h | 14 +- src/plugins/platforms/ios/qioswindow.h | 34 ++-- src/plugins/platforms/linuxfb/main.cpp | 2 +- .../platforms/linuxfb/qlinuxfbintegration.h | 18 +- src/plugins/platforms/minimal/main.cpp | 2 +- .../platforms/minimal/qminimalbackingstore.h | 6 +- .../platforms/minimal/qminimalintegration.cpp | 2 +- .../platforms/minimal/qminimalintegration.h | 16 +- src/plugins/platforms/minimalegl/main.cpp | 2 +- .../platforms/minimalegl/qminimaleglbackingstore.h | 10 +- .../minimalegl/qminimaleglintegration.cpp | 2 +- .../platforms/minimalegl/qminimaleglintegration.h | 14 +- .../platforms/minimalegl/qminimaleglscreen.cpp | 2 +- .../platforms/minimalegl/qminimaleglscreen.h | 6 +- .../platforms/minimalegl/qminimaleglwindow.h | 4 +- src/plugins/platforms/offscreen/main.cpp | 2 +- .../platforms/offscreen/qoffscreencommon.cpp | 6 +- src/plugins/platforms/offscreen/qoffscreencommon.h | 20 +- .../platforms/offscreen/qoffscreenintegration.h | 18 +- .../offscreen/qoffscreenintegration_x11.h | 18 +- src/plugins/platforms/offscreen/qoffscreenwindow.h | 12 +- src/plugins/platforms/winrt/qwinrtwindow.h | 4 +- .../xcb/nativepainting/qpaintengine_x11_p.h | 38 ++-- .../platforms/xcb/nativepainting/qpixmap_x11_p.h | 32 +-- src/plugins/platformthemes/gtk3/main.cpp | 2 +- .../platformthemes/gtk3/qgtk3dialoghelpers.h | 42 ++-- src/plugins/platformthemes/gtk3/qgtk3theme.h | 12 +- src/plugins/printsupport/cups/main.cpp | 2 +- src/plugins/printsupport/cups/qcupsprintengine_p.h | 8 +- .../printsupport/cups/qcupsprintersupport_p.h | 10 +- src/plugins/printsupport/cups/qppdprintdevice.h | 34 ++-- .../printsupport/windows/qwindowsprintdevice.h | 30 +-- .../printsupport/windows/qwindowsprintersupport.h | 10 +- src/plugins/sqldrivers/db2/qsql_db2.cpp | 32 +-- src/plugins/sqldrivers/db2/qsql_db2_p.h | 26 +-- src/plugins/sqldrivers/ibase/qsql_ibase.cpp | 16 +- src/plugins/sqldrivers/ibase/qsql_ibase_p.h | 32 +-- src/plugins/sqldrivers/mysql/main.cpp | 2 +- src/plugins/sqldrivers/mysql/qsql_mysql.cpp | 32 +-- src/plugins/sqldrivers/mysql/qsql_mysql_p.h | 28 +-- src/plugins/sqldrivers/oci/qsql_oci.cpp | 22 +-- src/plugins/sqldrivers/oci/qsql_oci_p.h | 24 +-- src/plugins/sqldrivers/odbc/qsql_odbc.cpp | 36 ++-- src/plugins/sqldrivers/odbc/qsql_odbc_p.h | 28 +-- src/plugins/sqldrivers/psql/main.cpp | 2 +- src/plugins/sqldrivers/psql/qsql_psql.cpp | 30 +-- src/plugins/sqldrivers/psql/qsql_psql_p.h | 34 ++-- src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp | 22 +-- src/plugins/sqldrivers/sqlite/qsql_sqlite_p.h | 30 +-- src/plugins/sqldrivers/sqlite/smain.cpp | 2 +- src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp | 16 +- src/plugins/sqldrivers/sqlite2/qsql_sqlite2_p.h | 24 +-- src/plugins/sqldrivers/tds/qsql_tds.cpp | 12 +- src/plugins/sqldrivers/tds/qsql_tds_p.h | 26 +-- src/printsupport/dialogs/qpagesetupdialog.h | 6 +- src/printsupport/dialogs/qpagesetupdialog_unix.cpp | 2 +- src/printsupport/dialogs/qprintdialog.h | 8 +- src/printsupport/dialogs/qprintdialog_unix.cpp | 2 +- src/printsupport/dialogs/qprintpreviewdialog.cpp | 8 +- src/printsupport/dialogs/qprintpreviewdialog.h | 4 +- src/printsupport/kernel/qprintengine_pdf_p.h | 16 +- src/printsupport/kernel/qprinter.cpp | 12 +- src/printsupport/kernel/qprinter.h | 14 +- src/printsupport/widgets/qprintpreviewwidget.cpp | 8 +- src/printsupport/widgets/qprintpreviewwidget.h | 2 +- src/sql/kernel/qsqlcachedresult_p.h | 20 +- src/sql/kernel/qsqldatabase.h | 2 +- src/sql/kernel/qsqlnulldriver_p.h | 52 ++--- src/sql/models/qsqlrelationaltablemodel.cpp | 8 +- src/sql/models/qsqlrelationaltablemodel.h | 22 +-- src/sql/models/qsqltablemodel.h | 26 +-- src/testlib/qbenchmarkperfevents_p.h | 20 +- src/testlib/qcsvbenchmarklogger_p.h | 14 +- src/testlib/qsignalspy.h | 2 +- src/testlib/qxctestlogger_p.h | 16 +- src/tools/uic/cpp/cppwritedeclaration.h | 14 +- src/tools/uic/cpp/cppwriteincludes.h | 18 +- src/tools/uic/cpp/cppwriteinitialization.h | 28 +-- src/tools/uic/customwidgetsinfo.h | 6 +- src/tools/uic/databaseinfo.h | 4 +- src/tools/uic/validator.h | 12 +- src/widgets/accessible/complexwidgets.cpp | 32 +-- src/widgets/accessible/complexwidgets_p.h | 36 ++-- src/widgets/accessible/itemviews_p.h | 176 ++++++++--------- src/widgets/accessible/qaccessiblemenu_p.h | 54 ++--- src/widgets/accessible/qaccessiblewidget.h | 36 ++-- src/widgets/accessible/qaccessiblewidgets_p.h | 132 ++++++------- src/widgets/accessible/rangecontrols_p.h | 72 +++---- src/widgets/accessible/simplewidgets_p.h | 118 +++++------ src/widgets/dialogs/qcolordialog.cpp | 68 +++---- src/widgets/dialogs/qcolordialog.h | 6 +- src/widgets/dialogs/qerrormessage.cpp | 4 +- src/widgets/dialogs/qerrormessage.h | 4 +- src/widgets/dialogs/qfiledialog.h | 8 +- src/widgets/dialogs/qfiledialog_p.h | 22 +-- src/widgets/dialogs/qfileinfogatherer_p.h | 2 +- src/widgets/dialogs/qfilesystemmodel.h | 38 ++-- src/widgets/dialogs/qfontdialog.cpp | 2 +- src/widgets/dialogs/qfontdialog.h | 8 +- src/widgets/dialogs/qfontdialog_p.h | 6 +- src/widgets/dialogs/qfscompleter_p.h | 4 +- src/widgets/dialogs/qinputdialog.cpp | 8 +- src/widgets/dialogs/qinputdialog.h | 8 +- src/widgets/dialogs/qmessagebox.cpp | 10 +- src/widgets/dialogs/qmessagebox.h | 12 +- src/widgets/dialogs/qprogressdialog.h | 10 +- src/widgets/dialogs/qsidebar_p.h | 20 +- src/widgets/dialogs/qwizard.cpp | 4 +- src/widgets/dialogs/qwizard.h | 14 +- src/widgets/effects/qgraphicseffect.h | 12 +- src/widgets/effects/qpixmapfilter_p.h | 14 +- src/widgets/graphicsview/qgraphicsanchorlayout.h | 12 +- src/widgets/graphicsview/qgraphicsanchorlayout_p.h | 4 +- src/widgets/graphicsview/qgraphicsgridlayout.h | 12 +- .../graphicsview/qgraphicsgridlayoutengine_p.h | 14 +- src/widgets/graphicsview/qgraphicsitem.h | 218 ++++++++++----------- src/widgets/graphicsview/qgraphicsitem_p.h | 22 +-- src/widgets/graphicsview/qgraphicslayout.h | 4 +- .../graphicsview/qgraphicslayoutstyleinfo_p.h | 10 +- src/widgets/graphicsview/qgraphicslinearlayout.h | 12 +- src/widgets/graphicsview/qgraphicsproxywidget.h | 64 +++--- src/widgets/graphicsview/qgraphicsscene.h | 4 +- src/widgets/graphicsview/qgraphicsscene_bsp.cpp | 6 +- .../graphicsview/qgraphicsscenebsptreeindex_p.h | 20 +- .../graphicsview/qgraphicsscenelinearindex_p.h | 10 +- src/widgets/graphicsview/qgraphicstransform.h | 4 +- src/widgets/graphicsview/qgraphicsview.h | 50 ++--- src/widgets/graphicsview/qgraphicswidget.h | 30 +-- src/widgets/graphicsview/qgraphicswidget_p.h | 16 +- src/widgets/itemviews/qabstractitemview.h | 38 ++-- src/widgets/itemviews/qcolumnview.h | 36 ++-- src/widgets/itemviews/qcolumnview_p.h | 26 +-- src/widgets/itemviews/qcolumnviewgrip_p.h | 10 +- src/widgets/itemviews/qdirmodel.h | 28 +-- src/widgets/itemviews/qheaderview.h | 52 ++--- src/widgets/itemviews/qitemdelegate.h | 16 +- src/widgets/itemviews/qitemeditorfactory.cpp | 4 +- src/widgets/itemviews/qitemeditorfactory_p.h | 2 +- src/widgets/itemviews/qlistview.h | 66 +++---- src/widgets/itemviews/qlistwidget.h | 8 +- src/widgets/itemviews/qstyleditemdelegate.h | 16 +- src/widgets/itemviews/qtableview.cpp | 2 +- src/widgets/itemviews/qtableview.h | 52 ++--- src/widgets/itemviews/qtablewidget.h | 6 +- src/widgets/itemviews/qtreeview.h | 74 +++---- src/widgets/itemviews/qtreewidget.h | 8 +- src/widgets/itemviews/qtreewidget_p.h | 40 ++-- src/widgets/kernel/qaction.h | 2 +- src/widgets/kernel/qapplication.h | 6 +- src/widgets/kernel/qapplication_p.h | 22 +-- src/widgets/kernel/qboxlayout.cpp | 2 +- src/widgets/kernel/qboxlayout.h | 26 +-- src/widgets/kernel/qdesktopwidget.h | 2 +- src/widgets/kernel/qformlayout.cpp | 2 +- src/widgets/kernel/qformlayout.h | 26 +-- src/widgets/kernel/qgridlayout.cpp | 2 +- src/widgets/kernel/qgridlayout.h | 26 +-- src/widgets/kernel/qlayout.h | 20 +- src/widgets/kernel/qopenglwidget.cpp | 26 +-- src/widgets/kernel/qopenglwidget.h | 12 +- src/widgets/kernel/qshortcut.h | 2 +- src/widgets/kernel/qstackedlayout.cpp | 2 +- src/widgets/kernel/qstackedlayout.h | 18 +- src/widgets/kernel/qstandardgestures_p.h | 30 +-- src/widgets/kernel/qtooltip.cpp | 10 +- src/widgets/kernel/qwhatsthis.cpp | 14 +- src/widgets/kernel/qwidget.h | 14 +- src/widgets/kernel/qwidget_p.h | 22 +-- src/widgets/kernel/qwidgetaction.h | 4 +- src/widgets/kernel/qwidgetwindow.cpp | 6 +- src/widgets/kernel/qwidgetwindow_p.h | 8 +- src/widgets/kernel/qwindowcontainer_p.h | 2 +- .../statemachine/qbasickeyeventtransition_p.h | 4 +- .../statemachine/qbasicmouseeventtransition_p.h | 4 +- src/widgets/statemachine/qkeyeventtransition.h | 4 +- src/widgets/statemachine/qmouseeventtransition.h | 4 +- src/widgets/styles/qcommonstyle.h | 36 ++-- src/widgets/styles/qfusionstyle_p.h | 42 ++-- src/widgets/styles/qpixmapstyle_p.h | 30 +-- src/widgets/styles/qproxystyle.h | 48 ++--- src/widgets/styles/qstyleanimation_p.h | 12 +- src/widgets/styles/qstylesheetstyle.cpp | 20 +- src/widgets/styles/qstylesheetstyle_p.h | 48 ++--- src/widgets/styles/qwindowsstyle_p.h | 30 +-- src/widgets/util/qcompleter.h | 4 +- src/widgets/util/qcompleter_p.h | 26 +-- src/widgets/util/qflickgesture.cpp | 2 +- src/widgets/util/qscroller.cpp | 4 +- src/widgets/util/qsystemtrayicon.h | 2 +- src/widgets/util/qsystemtrayicon_p.h | 8 +- src/widgets/util/qsystemtrayicon_x11.cpp | 12 +- src/widgets/util/qundoview.cpp | 10 +- src/widgets/widgets/qabstractbutton.h | 22 +-- src/widgets/widgets/qabstractscrollarea.h | 34 ++-- src/widgets/widgets/qabstractscrollarea_p.h | 2 +- src/widgets/widgets/qabstractslider.h | 10 +- src/widgets/widgets/qcalendarwidget.cpp | 74 +++---- src/widgets/widgets/qcalendarwidget.h | 14 +- src/widgets/widgets/qcheckbox.h | 16 +- src/widgets/widgets/qcombobox.h | 36 ++-- src/widgets/widgets/qcommandlinkbutton.h | 10 +- src/widgets/widgets/qdatetimeedit_p.h | 34 ++-- src/widgets/widgets/qdial.cpp | 2 +- src/widgets/widgets/qdial.h | 18 +- src/widgets/widgets/qdialogbuttonbox.h | 4 +- src/widgets/widgets/qdockwidget.cpp | 10 +- src/widgets/widgets/qdockwidget.h | 8 +- src/widgets/widgets/qdockwidget_p.h | 22 +-- src/widgets/widgets/qeffects.cpp | 10 +- src/widgets/widgets/qfocusframe.h | 6 +- src/widgets/widgets/qfontcombobox.cpp | 4 +- src/widgets/widgets/qfontcombobox.h | 4 +- src/widgets/widgets/qframe.h | 8 +- src/widgets/widgets/qgroupbox.h | 20 +- src/widgets/widgets/qkeysequenceedit.h | 8 +- src/widgets/widgets/qlabel.h | 28 +-- src/widgets/widgets/qlcdnumber.h | 6 +- src/widgets/widgets/qlineedit.h | 38 ++-- src/widgets/widgets/qlineedit_p.h | 4 +- src/widgets/widgets/qmainwindow.h | 4 +- src/widgets/widgets/qmainwindowlayout.cpp | 22 +-- src/widgets/widgets/qmainwindowlayout_p.h | 26 +-- src/widgets/widgets/qmdiarea.cpp | 4 +- src/widgets/widgets/qmdiarea.h | 24 +-- src/widgets/widgets/qmdiarea_p.h | 16 +- src/widgets/widgets/qmdisubwindow.cpp | 26 +-- src/widgets/widgets/qmdisubwindow.h | 44 ++--- src/widgets/widgets/qmdisubwindow_p.h | 2 +- src/widgets/widgets/qmenu.cpp | 4 +- src/widgets/widgets/qmenu.h | 30 +-- src/widgets/widgets/qmenu_p.h | 2 +- src/widgets/widgets/qmenubar.cpp | 4 +- src/widgets/widgets/qplaintextedit.h | 62 +++--- src/widgets/widgets/qplaintextedit_p.h | 16 +- src/widgets/widgets/qprogressbar.h | 8 +- src/widgets/widgets/qpushbutton.h | 14 +- src/widgets/widgets/qradiobutton.h | 12 +- src/widgets/widgets/qrubberband.h | 12 +- src/widgets/widgets/qscrollarea.h | 14 +- src/widgets/widgets/qscrollbar.h | 20 +- src/widgets/widgets/qsizegrip.h | 22 +-- src/widgets/widgets/qslider.h | 14 +- src/widgets/widgets/qspinbox.cpp | 12 +- src/widgets/widgets/qsplashscreen.h | 4 +- src/widgets/widgets/qsplitter.h | 26 +-- src/widgets/widgets/qstackedwidget.h | 2 +- src/widgets/widgets/qstatusbar.h | 8 +- src/widgets/widgets/qtabbar.h | 28 +-- src/widgets/widgets/qtabbar_p.h | 16 +- src/widgets/widgets/qtabwidget.h | 20 +- src/widgets/widgets/qtextbrowser.cpp | 2 +- src/widgets/widgets/qtextbrowser.h | 18 +- src/widgets/widgets/qtextedit.cpp | 6 +- src/widgets/widgets/qtextedit.h | 48 ++--- src/widgets/widgets/qtoolbar.h | 8 +- src/widgets/widgets/qtoolbarextension_p.h | 4 +- src/widgets/widgets/qtoolbarlayout_p.h | 24 +-- src/widgets/widgets/qtoolbarseparator_p.h | 4 +- src/widgets/widgets/qtoolbox.cpp | 6 +- src/widgets/widgets/qtoolbox.h | 6 +- src/widgets/widgets/qtoolbutton.h | 30 +-- src/widgets/widgets/qwidgetlinecontrol_p.h | 2 +- src/widgets/widgets/qwidgetresizehandler_p.h | 2 +- src/widgets/widgets/qwidgettextcontrol_p.h | 8 +- src/winmain/qtmain_winrt.cpp | 18 +- src/xml/dom/qdom.cpp | 120 ++++++------ src/xml/sax/qxml.cpp | 4 +- src/xml/sax/qxml.h | 114 +++++------ .../qtconcurrentrun/tst_qtconcurrentrun.cpp | 2 +- .../corelib/codecs/qtextcodec/tst_qtextcodec.cpp | 10 +- tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp | 10 +- tests/auto/corelib/io/qprocess/tst_qprocess.cpp | 2 +- .../corelib/io/qtextstream/tst_qtextstream.cpp | 4 +- .../tst_qsortfilterproxymodel.cpp | 4 +- .../qcoreapplication/tst_qcoreapplication.cpp | 4 +- .../qstatemachine/tst_qstatemachine.cpp | 2 +- tests/auto/corelib/thread/qfuture/tst_qfuture.cpp | 6 +- tests/auto/corelib/tools/qvector/tst_qvector.cpp | 2 +- .../gui/kernel/qopenglwindow/tst_qopenglwindow.cpp | 16 +- .../gui/kernel/qrasterwindow/tst_qrasterwindow.cpp | 2 +- .../gui/kernel/qtouchevent/tst_qtouchevent.cpp | 10 +- tests/auto/gui/kernel/qwindow/tst_qwindow.cpp | 2 +- .../auto/gui/text/qstatictext/tst_qstatictext.cpp | 14 +- tests/auto/network/access/http2/http2srv.h | 2 +- .../socket/qlocalsocket/tst_qlocalsocket.cpp | 2 +- .../auto/other/qaccessibility/accessiblewidgets.h | 2 +- .../tools/moc/cxx11-explicit-override-control.h | 40 ++-- .../dialogs/qmessagebox/tst_qmessagebox.cpp | 2 +- .../qprogressdialog/tst_qprogressdialog.cpp | 4 +- .../tst_qgraphicslinearlayout.cpp | 2 +- .../qgraphicswidget/tst_qgraphicswidget.cpp | 6 +- .../qabstractitemview/tst_qabstractitemview.cpp | 12 +- .../itemviews/qheaderview/tst_qheaderview.cpp | 2 +- .../widgets/itemviews/qtreeview/tst_qtreeview.cpp | 2 +- .../qgesturerecognizer/tst_qgesturerecognizer.cpp | 2 +- .../widgets/kernel/qshortcut/tst_qshortcut.cpp | 2 +- tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp | 8 +- .../kernel/qwidget_window/tst_qwidget_window.cpp | 8 +- tests/auto/widgets/styles/qstyle/tst_qstyle.cpp | 26 +-- tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp | 2 +- tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp | 8 +- .../widgets/qopenglwidget/tst_qopenglwidget.cpp | 16 +- .../widgets/widgets/qsplitter/tst_qsplitter.cpp | 2 +- .../widgets/widgets/qtextedit/tst_qtextedit.cpp | 2 +- .../corelib/thread/qthreadpool/tst_qthreadpool.cpp | 2 +- tests/manual/cocoa/menurama/mainwindow.h | 2 +- tests/manual/highdpi/dragwidget.h | 18 +- tests/manual/qscreen/main.cpp | 6 +- tests/manual/touch/main.cpp | 10 +- .../qgraphicsview/rubberband/rubberbandtest.cpp | 4 +- util/glgen/codegenerator.cpp | 2 +- 622 files changed, 4914 insertions(+), 4914 deletions(-) diff --git a/examples/network/multistreamclient/chatconsumer.h b/examples/network/multistreamclient/chatconsumer.h index 9e12f99359..e10c0d7850 100644 --- a/examples/network/multistreamclient/chatconsumer.h +++ b/examples/network/multistreamclient/chatconsumer.h @@ -64,8 +64,8 @@ class ChatConsumer : public Consumer public: explicit ChatConsumer(QObject *parent = nullptr); - QWidget *widget() Q_DECL_OVERRIDE; - void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE; + QWidget *widget() override; + void readDatagram(const QByteArray &ba) override; private slots: void returnPressed(); diff --git a/examples/network/multistreamclient/movieconsumer.h b/examples/network/multistreamclient/movieconsumer.h index 74321a8505..3f78bf2060 100644 --- a/examples/network/multistreamclient/movieconsumer.h +++ b/examples/network/multistreamclient/movieconsumer.h @@ -63,9 +63,9 @@ class MovieConsumer : public Consumer public: explicit MovieConsumer(QObject *parent = nullptr); - QWidget *widget() Q_DECL_OVERRIDE; - void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE; - void serverDisconnected() Q_DECL_OVERRIDE; + QWidget *widget() override; + void readDatagram(const QByteArray &ba) override; + void serverDisconnected() override; private: QLabel *label; diff --git a/examples/network/multistreamclient/timeconsumer.h b/examples/network/multistreamclient/timeconsumer.h index 3faa4a6b1a..84a7796699 100644 --- a/examples/network/multistreamclient/timeconsumer.h +++ b/examples/network/multistreamclient/timeconsumer.h @@ -64,9 +64,9 @@ class TimeConsumer : public Consumer public: explicit TimeConsumer(QObject *parent = nullptr); - QWidget *widget() Q_DECL_OVERRIDE; - void readDatagram(const QByteArray &ba) Q_DECL_OVERRIDE; - void serverDisconnected() Q_DECL_OVERRIDE; + QWidget *widget() override; + void readDatagram(const QByteArray &ba) override; + void serverDisconnected() override; private slots: void timerTick(); diff --git a/examples/network/multistreamserver/chatprovider.h b/examples/network/multistreamserver/chatprovider.h index b6ff61a917..c52fa89240 100644 --- a/examples/network/multistreamserver/chatprovider.h +++ b/examples/network/multistreamserver/chatprovider.h @@ -59,9 +59,9 @@ class ChatProvider : public Provider public: explicit ChatProvider(QObject *parent = nullptr); - void readDatagram(QSctpSocket &from, const QByteArray &ba) Q_DECL_OVERRIDE; - void newConnection(QSctpSocket &client) Q_DECL_OVERRIDE; - void clientDisconnected(QSctpSocket &client) Q_DECL_OVERRIDE; + void readDatagram(QSctpSocket &from, const QByteArray &ba) override; + void newConnection(QSctpSocket &client) override; + void clientDisconnected(QSctpSocket &client) override; }; #endif diff --git a/examples/network/multistreamserver/server.h b/examples/network/multistreamserver/server.h index d9a38e61a4..2380d6ffd6 100644 --- a/examples/network/multistreamserver/server.h +++ b/examples/network/multistreamserver/server.h @@ -72,7 +72,7 @@ public: virtual ~Server(); public slots: - int exec() Q_DECL_OVERRIDE; + int exec() override; private slots: void newConnection(); diff --git a/examples/network/multistreamserver/timeprovider.h b/examples/network/multistreamserver/timeprovider.h index f99cdbc717..a4d08fd67c 100644 --- a/examples/network/multistreamserver/timeprovider.h +++ b/examples/network/multistreamserver/timeprovider.h @@ -59,7 +59,7 @@ class TimeProvider : public Provider public: explicit TimeProvider(QObject *parent = nullptr); - void readDatagram(QSctpSocket &from, const QByteArray &ba) Q_DECL_OVERRIDE; + void readDatagram(QSctpSocket &from, const QByteArray &ba) override; }; #endif diff --git a/examples/opengl/computegles31/glwindow.h b/examples/opengl/computegles31/glwindow.h index 877f7b732e..f243858a45 100644 --- a/examples/opengl/computegles31/glwindow.h +++ b/examples/opengl/computegles31/glwindow.h @@ -86,7 +86,7 @@ public: void setBlurRadius(float blurRadius); protected: - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) override; void setAnimating(bool animate); private: diff --git a/examples/xml/dombookmarks/xbeltree.h b/examples/xml/dombookmarks/xbeltree.h index f6c7ef8bfe..c58e1148ff 100644 --- a/examples/xml/dombookmarks/xbeltree.h +++ b/examples/xml/dombookmarks/xbeltree.h @@ -67,7 +67,7 @@ public: protected: #if !defined(QT_NO_CONTEXTMENU) && !defined(QT_NO_CLIPBOARD) - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) override; #endif private slots: diff --git a/src/concurrent/qtconcurrentthreadengine.h b/src/concurrent/qtconcurrentthreadengine.h index f915e9adfd..44e714044e 100644 --- a/src/concurrent/qtconcurrentthreadengine.h +++ b/src/concurrent/qtconcurrentthreadengine.h @@ -113,7 +113,7 @@ private: void startThreads(); void threadExit(); bool threadThrottleExit(); - void run() Q_DECL_OVERRIDE; + void run() override; virtual void asynchronousFinish() = 0; #ifndef QT_NO_EXCEPTIONS void handleException(const QException &exception); @@ -173,7 +173,7 @@ public: return future; } - void asynchronousFinish() Q_DECL_OVERRIDE + void asynchronousFinish() override { finish(); futureInterfaceTyped()->reportFinished(result()); diff --git a/src/corelib/animation/qabstractanimation.h b/src/corelib/animation/qabstractanimation.h index 727b4e7777..4b6eb9e14e 100644 --- a/src/corelib/animation/qabstractanimation.h +++ b/src/corelib/animation/qabstractanimation.h @@ -118,7 +118,7 @@ public Q_SLOTS: protected: QAbstractAnimation(QAbstractAnimationPrivate &dd, QObject *parent = Q_NULLPTR); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; virtual void updateCurrentTime(int currentTime) = 0; virtual void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState); diff --git a/src/corelib/animation/qabstractanimation_p.h b/src/corelib/animation/qabstractanimation_p.h index 3b901c4426..5593046e48 100644 --- a/src/corelib/animation/qabstractanimation_p.h +++ b/src/corelib/animation/qabstractanimation_p.h @@ -116,7 +116,7 @@ class QDefaultAnimationDriver : public QAnimationDriver Q_OBJECT public: QDefaultAnimationDriver(QUnifiedTimer *timer); - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; private Q_SLOTS: void startTimer(); @@ -196,7 +196,7 @@ public: qint64 elapsed() const; protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private Q_SLOTS: void startTimers(); @@ -265,11 +265,11 @@ public: */ static void updateAnimationTimer(); - void restartAnimationTimer() Q_DECL_OVERRIDE; - void updateAnimationsTime(qint64 delta) Q_DECL_OVERRIDE; + void restartAnimationTimer() override; + void updateAnimationsTime(qint64 delta) override; //useful for profiling/debugging - int runningAnimationCount() Q_DECL_OVERRIDE { return animations.count(); } + int runningAnimationCount() override { return animations.count(); } private Q_SLOTS: void startAnimations(); diff --git a/src/corelib/animation/qanimationgroup.h b/src/corelib/animation/qanimationgroup.h index 20be0c0dd4..574a828ee1 100644 --- a/src/corelib/animation/qanimationgroup.h +++ b/src/corelib/animation/qanimationgroup.h @@ -67,7 +67,7 @@ public: protected: QAnimationGroup(QAnimationGroupPrivate &dd, QObject *parent); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; private: Q_DISABLE_COPY(QAnimationGroup) diff --git a/src/corelib/animation/qparallelanimationgroup.h b/src/corelib/animation/qparallelanimationgroup.h index 3a00e9fd12..19a7f2fd83 100644 --- a/src/corelib/animation/qparallelanimationgroup.h +++ b/src/corelib/animation/qparallelanimationgroup.h @@ -56,15 +56,15 @@ public: QParallelAnimationGroup(QObject *parent = Q_NULLPTR); ~QParallelAnimationGroup(); - int duration() const Q_DECL_OVERRIDE; + int duration() const override; protected: QParallelAnimationGroup(QParallelAnimationGroupPrivate &dd, QObject *parent); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; - void updateCurrentTime(int currentTime) Q_DECL_OVERRIDE; - void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_OVERRIDE; - void updateDirection(QAbstractAnimation::Direction direction) Q_DECL_OVERRIDE; + void updateCurrentTime(int currentTime) override; + void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override; + void updateDirection(QAbstractAnimation::Direction direction) override; private: Q_DISABLE_COPY(QParallelAnimationGroup) diff --git a/src/corelib/animation/qparallelanimationgroup_p.h b/src/corelib/animation/qparallelanimationgroup_p.h index 069ba8e51a..1c9c3072f7 100644 --- a/src/corelib/animation/qparallelanimationgroup_p.h +++ b/src/corelib/animation/qparallelanimationgroup_p.h @@ -78,7 +78,7 @@ public: void connectUncontrolledAnimations(); void disconnectUncontrolledAnimations(); - void animationRemoved(int index, QAbstractAnimation *) Q_DECL_OVERRIDE; + void animationRemoved(int index, QAbstractAnimation *) override; // private slot void _q_uncontrolledAnimationFinished(); diff --git a/src/corelib/animation/qpauseanimation.h b/src/corelib/animation/qpauseanimation.h index c077164beb..541186fa48 100644 --- a/src/corelib/animation/qpauseanimation.h +++ b/src/corelib/animation/qpauseanimation.h @@ -58,12 +58,12 @@ public: QPauseAnimation(int msecs, QObject *parent = Q_NULLPTR); ~QPauseAnimation(); - int duration() const Q_DECL_OVERRIDE; + int duration() const override; void setDuration(int msecs); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void updateCurrentTime(int) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void updateCurrentTime(int) override; private: Q_DISABLE_COPY(QPauseAnimation) diff --git a/src/corelib/animation/qpropertyanimation.h b/src/corelib/animation/qpropertyanimation.h index ecc7524884..419fd1e51c 100644 --- a/src/corelib/animation/qpropertyanimation.h +++ b/src/corelib/animation/qpropertyanimation.h @@ -66,9 +66,9 @@ public: void setPropertyName(const QByteArray &propertyName); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void updateCurrentValue(const QVariant &value) Q_DECL_OVERRIDE; - void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void updateCurrentValue(const QVariant &value) override; + void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override; private: Q_DISABLE_COPY(QPropertyAnimation) diff --git a/src/corelib/animation/qsequentialanimationgroup.h b/src/corelib/animation/qsequentialanimationgroup.h index 3caf93b054..636e39a075 100644 --- a/src/corelib/animation/qsequentialanimationgroup.h +++ b/src/corelib/animation/qsequentialanimationgroup.h @@ -63,18 +63,18 @@ public: QPauseAnimation *insertPause(int index, int msecs); QAbstractAnimation *currentAnimation() const; - int duration() const Q_DECL_OVERRIDE; + int duration() const override; Q_SIGNALS: void currentAnimationChanged(QAbstractAnimation *current); protected: QSequentialAnimationGroup(QSequentialAnimationGroupPrivate &dd, QObject *parent); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; - void updateCurrentTime(int) Q_DECL_OVERRIDE; - void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_OVERRIDE; - void updateDirection(QAbstractAnimation::Direction direction) Q_DECL_OVERRIDE; + void updateCurrentTime(int) override; + void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override; + void updateDirection(QAbstractAnimation::Direction direction) override; private: Q_DISABLE_COPY(QSequentialAnimationGroup) diff --git a/src/corelib/animation/qsequentialanimationgroup_p.h b/src/corelib/animation/qsequentialanimationgroup_p.h index 1b07e1330a..e4f3d9c96a 100644 --- a/src/corelib/animation/qsequentialanimationgroup_p.h +++ b/src/corelib/animation/qsequentialanimationgroup_p.h @@ -82,8 +82,8 @@ public: void setCurrentAnimation(int index, bool intermediate = false); void activateCurrentAnimation(bool intermediate = false); - void animationInsertedAt(int index) Q_DECL_OVERRIDE; - void animationRemoved(int index, QAbstractAnimation *anim) Q_DECL_OVERRIDE; + void animationInsertedAt(int index) override; + void animationRemoved(int index, QAbstractAnimation *anim) override; bool atEnd() const; diff --git a/src/corelib/animation/qvariantanimation.h b/src/corelib/animation/qvariantanimation.h index f21832b256..74d804dacd 100644 --- a/src/corelib/animation/qvariantanimation.h +++ b/src/corelib/animation/qvariantanimation.h @@ -82,7 +82,7 @@ public: QVariant currentValue() const; - int duration() const Q_DECL_OVERRIDE; + int duration() const override; void setDuration(int msecs); QEasingCurve easingCurve() const; @@ -95,10 +95,10 @@ Q_SIGNALS: protected: QVariantAnimation(QVariantAnimationPrivate &dd, QObject *parent = Q_NULLPTR); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; - void updateCurrentTime(int) Q_DECL_OVERRIDE; - void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) Q_DECL_OVERRIDE; + void updateCurrentTime(int) override; + void updateState(QAbstractAnimation::State newState, QAbstractAnimation::State oldState) override; virtual void updateCurrentValue(const QVariant &value); virtual QVariant interpolated(const QVariant &from, const QVariant &to, qreal progress) const; diff --git a/src/corelib/codecs/qicucodec_p.h b/src/corelib/codecs/qicucodec_p.h index 3a373ce5b3..0c2dbe17d6 100644 --- a/src/corelib/codecs/qicucodec_p.h +++ b/src/corelib/codecs/qicucodec_p.h @@ -74,12 +74,12 @@ public: static QTextCodec *codecForNameUnlocked(const char *name); static QTextCodec *codecForMibUnlocked(int mib); - QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; - QByteArray name() const Q_DECL_OVERRIDE; - QList aliases() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + QList aliases() const override; + int mibEnum() const override; private: QIcuCodec(const char *name); diff --git a/src/corelib/codecs/qisciicodec_p.h b/src/corelib/codecs/qisciicodec_p.h index f92c0091ce..f818e7d83e 100644 --- a/src/corelib/codecs/qisciicodec_p.h +++ b/src/corelib/codecs/qisciicodec_p.h @@ -65,11 +65,11 @@ public: static QTextCodec *create(const char *name); - QByteArray name() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + int mibEnum() const override; - QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; private: int idx; diff --git a/src/corelib/codecs/qlatincodec_p.h b/src/corelib/codecs/qlatincodec_p.h index 1042c3b80d..3e258e5ae1 100644 --- a/src/corelib/codecs/qlatincodec_p.h +++ b/src/corelib/codecs/qlatincodec_p.h @@ -63,12 +63,12 @@ class QLatin1Codec : public QTextCodec public: ~QLatin1Codec(); - QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; - QByteArray name() const Q_DECL_OVERRIDE; - QList aliases() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + QList aliases() const override; + int mibEnum() const override; }; @@ -78,12 +78,12 @@ class QLatin15Codec: public QTextCodec public: ~QLatin15Codec(); - QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; - QByteArray name() const Q_DECL_OVERRIDE; - QList aliases() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + QList aliases() const override; + int mibEnum() const override; }; #endif // QT_NO_TEXTCODEC diff --git a/src/corelib/codecs/qtsciicodec_p.h b/src/corelib/codecs/qtsciicodec_p.h index 68ab01f7b5..78f9350a19 100644 --- a/src/corelib/codecs/qtsciicodec_p.h +++ b/src/corelib/codecs/qtsciicodec_p.h @@ -91,11 +91,11 @@ class QTsciiCodec : public QTextCodec { public: ~QTsciiCodec(); - QByteArray name() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + int mibEnum() const override; - QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; }; #endif // QT_NO_CODECS diff --git a/src/corelib/codecs/qutfcodec_p.h b/src/corelib/codecs/qutfcodec_p.h index 152fe174c4..36752cc909 100644 --- a/src/corelib/codecs/qutfcodec_p.h +++ b/src/corelib/codecs/qutfcodec_p.h @@ -310,11 +310,11 @@ class QUtf8Codec : public QTextCodec { public: ~QUtf8Codec(); - QByteArray name() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + int mibEnum() const override; - QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; void convertToUnicode(QString *target, const char *, int, ConverterState *) const; }; @@ -324,12 +324,12 @@ public: QUtf16Codec() { e = DetectEndianness; } ~QUtf16Codec(); - QByteArray name() const Q_DECL_OVERRIDE; - QList aliases() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + QList aliases() const override; + int mibEnum() const override; - QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; protected: DataEndianness e; @@ -338,17 +338,17 @@ protected: class QUtf16BECodec : public QUtf16Codec { public: QUtf16BECodec() : QUtf16Codec() { e = BigEndianness; } - QByteArray name() const Q_DECL_OVERRIDE; - QList aliases() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + QList aliases() const override; + int mibEnum() const override; }; class QUtf16LECodec : public QUtf16Codec { public: QUtf16LECodec() : QUtf16Codec() { e = LittleEndianness; } - QByteArray name() const Q_DECL_OVERRIDE; - QList aliases() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + QList aliases() const override; + int mibEnum() const override; }; class QUtf32Codec : public QTextCodec { @@ -356,12 +356,12 @@ public: QUtf32Codec() { e = DetectEndianness; } ~QUtf32Codec(); - QByteArray name() const Q_DECL_OVERRIDE; - QList aliases() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + QList aliases() const override; + int mibEnum() const override; - QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE; - QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE; + QString convertToUnicode(const char *, int, ConverterState *) const override; + QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override; protected: DataEndianness e; @@ -370,17 +370,17 @@ protected: class QUtf32BECodec : public QUtf32Codec { public: QUtf32BECodec() : QUtf32Codec() { e = BigEndianness; } - QByteArray name() const Q_DECL_OVERRIDE; - QList aliases() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + QList aliases() const override; + int mibEnum() const override; }; class QUtf32LECodec : public QUtf32Codec { public: QUtf32LECodec() : QUtf32Codec() { e = LittleEndianness; } - QByteArray name() const Q_DECL_OVERRIDE; - QList aliases() const Q_DECL_OVERRIDE; - int mibEnum() const Q_DECL_OVERRIDE; + QByteArray name() const override; + QList aliases() const override; + int mibEnum() const override; }; diff --git a/src/corelib/io/qbuffer.cpp b/src/corelib/io/qbuffer.cpp index 86dd737809..e0b9c41323 100644 --- a/src/corelib/io/qbuffer.cpp +++ b/src/corelib/io/qbuffer.cpp @@ -60,8 +60,8 @@ public: QByteArray *buf; QByteArray defaultBuf; - virtual qint64 peek(char *data, qint64 maxSize) Q_DECL_OVERRIDE; - virtual QByteArray peek(qint64 maxSize) Q_DECL_OVERRIDE; + virtual qint64 peek(char *data, qint64 maxSize) override; + virtual QByteArray peek(qint64 maxSize) override; #ifndef QT_NO_QOBJECT // private slots diff --git a/src/corelib/io/qbuffer.h b/src/corelib/io/qbuffer.h index fd05dff311..1c5b16ee50 100644 --- a/src/corelib/io/qbuffer.h +++ b/src/corelib/io/qbuffer.h @@ -73,22 +73,22 @@ public: inline void setData(const char *data, int len); const QByteArray &data() const; - bool open(OpenMode openMode) Q_DECL_OVERRIDE; + bool open(OpenMode openMode) override; - void close() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; - bool seek(qint64 off) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool canReadLine() const Q_DECL_OVERRIDE; + void close() override; + qint64 size() const override; + qint64 pos() const override; + bool seek(qint64 off) override; + bool atEnd() const override; + bool canReadLine() const override; protected: #ifndef QT_NO_QOBJECT - void connectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; - void disconnectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &) override; + void disconnectNotify(const QMetaMethod &) override; #endif - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; private: Q_DECLARE_PRIVATE(QBuffer) diff --git a/src/corelib/io/qfile.h b/src/corelib/io/qfile.h index c5819e8076..02d644446d 100644 --- a/src/corelib/io/qfile.h +++ b/src/corelib/io/qfile.h @@ -70,7 +70,7 @@ public: #endif ~QFile(); - QString fileName() const Q_DECL_OVERRIDE; + QString fileName() const override; void setFileName(const QString &name); #if defined(Q_OS_DARWIN) @@ -124,18 +124,18 @@ public: bool copy(const QString &newName); static bool copy(const QString &fileName, const QString &newName); - bool open(OpenMode flags) Q_DECL_OVERRIDE; + bool open(OpenMode flags) override; bool open(FILE *f, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); bool open(int fd, OpenMode ioFlags, FileHandleFlags handleFlags=DontCloseHandle); - qint64 size() const Q_DECL_OVERRIDE; + qint64 size() const override; - bool resize(qint64 sz) Q_DECL_OVERRIDE; + bool resize(qint64 sz) override; static bool resize(const QString &filename, qint64 sz); - Permissions permissions() const Q_DECL_OVERRIDE; + Permissions permissions() const override; static Permissions permissions(const QString &filename); - bool setPermissions(Permissions permissionSpec) Q_DECL_OVERRIDE; + bool setPermissions(Permissions permissionSpec) override; static bool setPermissions(const QString &filename, Permissions permissionSpec); protected: diff --git a/src/corelib/io/qfiledevice.h b/src/corelib/io/qfiledevice.h index e941781c25..020c90afaf 100644 --- a/src/corelib/io/qfiledevice.h +++ b/src/corelib/io/qfiledevice.h @@ -100,19 +100,19 @@ public: FileError error() const; void unsetError(); - virtual void close() Q_DECL_OVERRIDE; + virtual void close() override; - bool isSequential() const Q_DECL_OVERRIDE; + bool isSequential() const override; int handle() const; virtual QString fileName() const; - qint64 pos() const Q_DECL_OVERRIDE; - bool seek(qint64 offset) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; + qint64 pos() const override; + bool seek(qint64 offset) override; + bool atEnd() const override; bool flush(); - qint64 size() const Q_DECL_OVERRIDE; + qint64 size() const override; virtual bool resize(qint64 sz); virtual Permissions permissions() const; @@ -139,9 +139,9 @@ protected: QFileDevice(QFileDevicePrivate &dd, QObject *parent = Q_NULLPTR); #endif - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; - qint64 readLineData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; + qint64 readLineData(char *data, qint64 maxlen) override; private: Q_DISABLE_COPY(QFileDevice) diff --git a/src/corelib/io/qfiledevice_p.h b/src/corelib/io/qfiledevice_p.h index 60c51afb7e..47053d01b7 100644 --- a/src/corelib/io/qfiledevice_p.h +++ b/src/corelib/io/qfiledevice_p.h @@ -69,7 +69,7 @@ protected: inline bool ensureFlushed() const; - bool putCharHelper(char c) Q_DECL_OVERRIDE; + bool putCharHelper(char c) override; void setError(QFileDevice::FileError err); void setError(QFileDevice::FileError err, const QString &errorString); diff --git a/src/corelib/io/qfilesystemwatcher_inotify_p.h b/src/corelib/io/qfilesystemwatcher_inotify_p.h index 777d62dc8a..0c873466c8 100644 --- a/src/corelib/io/qfilesystemwatcher_inotify_p.h +++ b/src/corelib/io/qfilesystemwatcher_inotify_p.h @@ -70,8 +70,8 @@ public: static QInotifyFileSystemWatcherEngine *create(QObject *parent); - QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; - QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; + QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) override; + QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) override; private Q_SLOTS: void readFromInotify(); diff --git a/src/corelib/io/qfilesystemwatcher_polling_p.h b/src/corelib/io/qfilesystemwatcher_polling_p.h index 6dff08ac05..4c46633fdf 100644 --- a/src/corelib/io/qfilesystemwatcher_polling_p.h +++ b/src/corelib/io/qfilesystemwatcher_polling_p.h @@ -110,8 +110,8 @@ class QPollingFileSystemWatcherEngine : public QFileSystemWatcherEngine public: QPollingFileSystemWatcherEngine(QObject *parent); - QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; - QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) Q_DECL_OVERRIDE; + QStringList addPaths(const QStringList &paths, QStringList *files, QStringList *directories) override; + QStringList removePaths(const QStringList &paths, QStringList *files, QStringList *directories) override; private Q_SLOTS: void timeout(); diff --git a/src/corelib/io/qfsfileengine_iterator_p.h b/src/corelib/io/qfsfileengine_iterator_p.h index 7f094ba9d7..bde00bf578 100644 --- a/src/corelib/io/qfsfileengine_iterator_p.h +++ b/src/corelib/io/qfsfileengine_iterator_p.h @@ -68,11 +68,11 @@ public: QFSFileEngineIterator(QDir::Filters filters, const QStringList &filterNames); ~QFSFileEngineIterator(); - QString next() Q_DECL_OVERRIDE; - bool hasNext() const Q_DECL_OVERRIDE; + QString next() override; + bool hasNext() const override; - QString currentFileName() const Q_DECL_OVERRIDE; - QFileInfo currentFileInfo() const Q_DECL_OVERRIDE; + QString currentFileName() const override; + QFileInfo currentFileInfo() const override; private: void advance() const; diff --git a/src/corelib/io/qfsfileengine_p.h b/src/corelib/io/qfsfileengine_p.h index 1f34dfc2be..bf90995fdd 100644 --- a/src/corelib/io/qfsfileengine_p.h +++ b/src/corelib/io/qfsfileengine_p.h @@ -71,49 +71,49 @@ public: explicit QFSFileEngine(const QString &file); ~QFSFileEngine(); - bool open(QIODevice::OpenMode openMode) Q_DECL_OVERRIDE; + bool open(QIODevice::OpenMode openMode) override; bool open(QIODevice::OpenMode flags, FILE *fh); - bool close() Q_DECL_OVERRIDE; - bool flush() Q_DECL_OVERRIDE; - bool syncToDisk() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; - bool seek(qint64) Q_DECL_OVERRIDE; - bool isSequential() const Q_DECL_OVERRIDE; - bool remove() Q_DECL_OVERRIDE; - bool copy(const QString &newName) Q_DECL_OVERRIDE; - bool rename(const QString &newName) Q_DECL_OVERRIDE; - bool renameOverwrite(const QString &newName) Q_DECL_OVERRIDE; - bool link(const QString &newName) Q_DECL_OVERRIDE; - bool mkdir(const QString &dirName, bool createParentDirectories) const Q_DECL_OVERRIDE; - bool rmdir(const QString &dirName, bool recurseParentDirectories) const Q_DECL_OVERRIDE; - bool setSize(qint64 size) Q_DECL_OVERRIDE; - bool caseSensitive() const Q_DECL_OVERRIDE; - bool isRelativePath() const Q_DECL_OVERRIDE; - QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const Q_DECL_OVERRIDE; - FileFlags fileFlags(FileFlags type) const Q_DECL_OVERRIDE; - bool setPermissions(uint perms) Q_DECL_OVERRIDE; + bool close() override; + bool flush() override; + bool syncToDisk() override; + qint64 size() const override; + qint64 pos() const override; + bool seek(qint64) override; + bool isSequential() const override; + bool remove() override; + bool copy(const QString &newName) override; + bool rename(const QString &newName) override; + bool renameOverwrite(const QString &newName) override; + bool link(const QString &newName) override; + bool mkdir(const QString &dirName, bool createParentDirectories) const override; + bool rmdir(const QString &dirName, bool recurseParentDirectories) const override; + bool setSize(qint64 size) override; + bool caseSensitive() const override; + bool isRelativePath() const override; + QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override; + FileFlags fileFlags(FileFlags type) const override; + bool setPermissions(uint perms) override; QByteArray id() const override; - QString fileName(FileName file) const Q_DECL_OVERRIDE; - uint ownerId(FileOwner) const Q_DECL_OVERRIDE; - QString owner(FileOwner) const Q_DECL_OVERRIDE; - bool setFileTime(const QDateTime &newDate, FileTime time) Q_DECL_OVERRIDE; - QDateTime fileTime(FileTime time) const Q_DECL_OVERRIDE; - void setFileName(const QString &file) Q_DECL_OVERRIDE; - int handle() const Q_DECL_OVERRIDE; + QString fileName(FileName file) const override; + uint ownerId(FileOwner) const override; + QString owner(FileOwner) const override; + bool setFileTime(const QDateTime &newDate, FileTime time) override; + QDateTime fileTime(FileTime time) const override; + void setFileName(const QString &file) override; + int handle() const override; #ifndef QT_NO_FILESYSTEMITERATOR - Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Q_DECL_OVERRIDE; - Iterator *endEntryList() Q_DECL_OVERRIDE; + Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; + Iterator *endEntryList() override; #endif - qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 readLine(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 read(char *data, qint64 maxlen) override; + qint64 readLine(char *data, qint64 maxlen) override; + qint64 write(const char *data, qint64 len) override; bool cloneTo(QAbstractFileEngine *target) override; - bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) Q_DECL_OVERRIDE; - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override; + bool supportsExtension(Extension extension) const override; //FS only!! bool open(QIODevice::OpenMode flags, int fd); diff --git a/src/corelib/io/qnoncontiguousbytedevice_p.h b/src/corelib/io/qnoncontiguousbytedevice_p.h index bb0b533831..ebed1120db 100644 --- a/src/corelib/io/qnoncontiguousbytedevice_p.h +++ b/src/corelib/io/qnoncontiguousbytedevice_p.h @@ -105,12 +105,12 @@ class QNonContiguousByteDeviceByteArrayImpl : public QNonContiguousByteDevice public: QNonContiguousByteDeviceByteArrayImpl(QByteArray *ba); ~QNonContiguousByteDeviceByteArrayImpl(); - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; - bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool reset() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; + const char* readPointer(qint64 maximumLength, qint64 &len) override; + bool advanceReadPointer(qint64 amount) override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; + qint64 pos() const override; protected: QByteArray* byteArray; qint64 currentPosition; @@ -121,12 +121,12 @@ class QNonContiguousByteDeviceRingBufferImpl : public QNonContiguousByteDevice public: QNonContiguousByteDeviceRingBufferImpl(QSharedPointer rb); ~QNonContiguousByteDeviceRingBufferImpl(); - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; - bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool reset() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; + const char* readPointer(qint64 maximumLength, qint64 &len) override; + bool advanceReadPointer(qint64 amount) override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; + qint64 pos() const override; protected: QSharedPointer ringBuffer; qint64 currentPosition; @@ -139,12 +139,12 @@ class QNonContiguousByteDeviceIoDeviceImpl : public QNonContiguousByteDevice public: QNonContiguousByteDeviceIoDeviceImpl(QIODevice *d); ~QNonContiguousByteDeviceIoDeviceImpl(); - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; - bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool reset() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 pos() const Q_DECL_OVERRIDE; + const char* readPointer(qint64 maximumLength, qint64 &len) override; + bool advanceReadPointer(qint64 amount) override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; + qint64 pos() const override; protected: QIODevice* device; QByteArray* currentReadBuffer; @@ -162,11 +162,11 @@ class QNonContiguousByteDeviceBufferImpl : public QNonContiguousByteDevice public: QNonContiguousByteDeviceBufferImpl(QBuffer *b); ~QNonContiguousByteDeviceBufferImpl(); - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE; - bool advanceReadPointer(qint64 amount) Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; - bool reset() Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; + const char* readPointer(qint64 maximumLength, qint64 &len) override; + bool advanceReadPointer(qint64 amount) override; + bool atEnd() const override; + bool reset() override; + qint64 size() const override; protected: QBuffer* buffer; QByteArray byteArray; @@ -179,13 +179,13 @@ class QByteDeviceWrappingIoDevice : public QIODevice public: QByteDeviceWrappingIoDevice (QNonContiguousByteDevice *bd); ~QByteDeviceWrappingIoDevice (); - virtual bool isSequential () const Q_DECL_OVERRIDE; - virtual bool atEnd () const Q_DECL_OVERRIDE; - virtual bool reset () Q_DECL_OVERRIDE; - virtual qint64 size () const Q_DECL_OVERRIDE; + virtual bool isSequential () const override; + virtual bool atEnd () const override; + virtual bool reset () override; + virtual qint64 size () const override; protected: - virtual qint64 readData ( char * data, qint64 maxSize ) Q_DECL_OVERRIDE; - virtual qint64 writeData ( const char * data, qint64 maxSize ) Q_DECL_OVERRIDE; + virtual qint64 readData ( char * data, qint64 maxSize ) override; + virtual qint64 writeData ( const char * data, qint64 maxSize ) override; QNonContiguousByteDevice *byteDevice; }; diff --git a/src/corelib/io/qprocess.h b/src/corelib/io/qprocess.h index c8aef2f0b1..7ce94d5ecd 100644 --- a/src/corelib/io/qprocess.h +++ b/src/corelib/io/qprocess.h @@ -164,7 +164,7 @@ public: #endif void start(OpenMode mode = ReadWrite); bool startDetached(qint64 *pid = nullptr); - bool open(OpenMode mode = ReadWrite) Q_DECL_OVERRIDE; + bool open(OpenMode mode = ReadWrite) override; QString program() const; void setProgram(const QString &program); @@ -227,8 +227,8 @@ public: qint64 processId() const; bool waitForStarted(int msecs = 30000); - bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForReadyRead(int msecs = 30000) override; + bool waitForBytesWritten(int msecs = 30000) override; bool waitForFinished(int msecs = 30000); QByteArray readAllStandardOutput(); @@ -238,12 +238,12 @@ public: QProcess::ExitStatus exitStatus() const; // QIODevice - qint64 bytesAvailable() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override - qint64 bytesToWrite() const Q_DECL_OVERRIDE; - bool isSequential() const Q_DECL_OVERRIDE; - bool canReadLine() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override - void close() Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; // ### Qt6: remove trivial override + qint64 bytesAvailable() const override; // ### Qt6: remove trivial override + qint64 bytesToWrite() const override; + bool isSequential() const override; + bool canReadLine() const override; // ### Qt6: remove trivial override + void close() override; + bool atEnd() const override; // ### Qt6: remove trivial override static int execute(const QString &program, const QStringList &arguments); static int execute(const QString &command); @@ -286,8 +286,8 @@ protected: virtual void setupChildProcess(); // QIODevice - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; private: Q_DECLARE_PRIVATE(QProcess) diff --git a/src/corelib/io/qresource.cpp b/src/corelib/io/qresource.cpp index c1187e5145..9a63374e6f 100644 --- a/src/corelib/io/qresource.cpp +++ b/src/corelib/io/qresource.cpp @@ -911,8 +911,8 @@ public: inline QDynamicBufferResourceRoot(const QString &_root) : root(_root), buffer(0) { } inline ~QDynamicBufferResourceRoot() { } inline const uchar *mappingBuffer() const { return buffer; } - virtual QString mappingRoot() const Q_DECL_OVERRIDE { return root; } - virtual ResourceRootType type() const Q_DECL_OVERRIDE { return Resource_Buffer; } + virtual QString mappingRoot() const override { return root; } + virtual ResourceRootType type() const override { return Resource_Buffer; } // size == -1 means "unknown" bool registerSelf(const uchar *b, int size) @@ -994,7 +994,7 @@ public: } } QString mappingFile() const { return fileName; } - virtual ResourceRootType type() const Q_DECL_OVERRIDE { return Resource_File; } + virtual ResourceRootType type() const override { return Resource_File; } bool registerSelf(const QString &f) { bool fromMM = false; diff --git a/src/corelib/io/qresource_iterator_p.h b/src/corelib/io/qresource_iterator_p.h index 6a4e215864..207a88b0ba 100644 --- a/src/corelib/io/qresource_iterator_p.h +++ b/src/corelib/io/qresource_iterator_p.h @@ -63,10 +63,10 @@ public: QResourceFileEngineIterator(QDir::Filters filters, const QStringList &filterNames); ~QResourceFileEngineIterator(); - QString next() Q_DECL_OVERRIDE; - bool hasNext() const Q_DECL_OVERRIDE; + QString next() override; + bool hasNext() const override; - QString currentFileName() const Q_DECL_OVERRIDE; + QString currentFileName() const override; private: mutable QStringList entries; diff --git a/src/corelib/io/qresource_p.h b/src/corelib/io/qresource_p.h index e08ba64d2b..dcfe46704c 100644 --- a/src/corelib/io/qresource_p.h +++ b/src/corelib/io/qresource_p.h @@ -64,52 +64,52 @@ public: explicit QResourceFileEngine(const QString &path); ~QResourceFileEngine(); - virtual void setFileName(const QString &file) Q_DECL_OVERRIDE; + virtual void setFileName(const QString &file) override; - virtual bool open(QIODevice::OpenMode flags) Q_DECL_OVERRIDE ; - virtual bool close() Q_DECL_OVERRIDE; - virtual bool flush() Q_DECL_OVERRIDE; - virtual qint64 size() const Q_DECL_OVERRIDE; - virtual qint64 pos() const Q_DECL_OVERRIDE; + virtual bool open(QIODevice::OpenMode flags) override ; + virtual bool close() override; + virtual bool flush() override; + virtual qint64 size() const override; + virtual qint64 pos() const override; virtual bool atEnd() const; - virtual bool seek(qint64) Q_DECL_OVERRIDE; - virtual qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - virtual qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; + virtual bool seek(qint64) override; + virtual qint64 read(char *data, qint64 maxlen) override; + virtual qint64 write(const char *data, qint64 len) override; - virtual bool remove() Q_DECL_OVERRIDE; - virtual bool copy(const QString &newName) Q_DECL_OVERRIDE; - virtual bool rename(const QString &newName) Q_DECL_OVERRIDE; - virtual bool link(const QString &newName) Q_DECL_OVERRIDE; + virtual bool remove() override; + virtual bool copy(const QString &newName) override; + virtual bool rename(const QString &newName) override; + virtual bool link(const QString &newName) override; - virtual bool isSequential() const Q_DECL_OVERRIDE; + virtual bool isSequential() const override; - virtual bool isRelativePath() const Q_DECL_OVERRIDE; + virtual bool isRelativePath() const override; - virtual bool mkdir(const QString &dirName, bool createParentDirectories) const Q_DECL_OVERRIDE; - virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const Q_DECL_OVERRIDE; + virtual bool mkdir(const QString &dirName, bool createParentDirectories) const override; + virtual bool rmdir(const QString &dirName, bool recurseParentDirectories) const override; - virtual bool setSize(qint64 size) Q_DECL_OVERRIDE; + virtual bool setSize(qint64 size) override; - virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const Q_DECL_OVERRIDE; + virtual QStringList entryList(QDir::Filters filters, const QStringList &filterNames) const override; - virtual bool caseSensitive() const Q_DECL_OVERRIDE; + virtual bool caseSensitive() const override; - virtual FileFlags fileFlags(FileFlags type) const Q_DECL_OVERRIDE; + virtual FileFlags fileFlags(FileFlags type) const override; - virtual bool setPermissions(uint perms) Q_DECL_OVERRIDE; + virtual bool setPermissions(uint perms) override; - virtual QString fileName(QAbstractFileEngine::FileName file) const Q_DECL_OVERRIDE; + virtual QString fileName(QAbstractFileEngine::FileName file) const override; - virtual uint ownerId(FileOwner) const Q_DECL_OVERRIDE; - virtual QString owner(FileOwner) const Q_DECL_OVERRIDE; + virtual uint ownerId(FileOwner) const override; + virtual QString owner(FileOwner) const override; - virtual QDateTime fileTime(FileTime time) const Q_DECL_OVERRIDE; + virtual QDateTime fileTime(FileTime time) const override; - virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) Q_DECL_OVERRIDE; - virtual Iterator *endEntryList() Q_DECL_OVERRIDE; + virtual Iterator *beginEntryList(QDir::Filters filters, const QStringList &filterNames) override; + virtual Iterator *endEntryList() override; - bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) Q_DECL_OVERRIDE; - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; + bool extension(Extension extension, const ExtensionOption *option = 0, ExtensionReturn *output = 0) override; + bool supportsExtension(Extension extension) const override; }; QT_END_NAMESPACE diff --git a/src/corelib/io/qsavefile.h b/src/corelib/io/qsavefile.h index 09d6e29272..8bfd14eb63 100644 --- a/src/corelib/io/qsavefile.h +++ b/src/corelib/io/qsavefile.h @@ -72,10 +72,10 @@ public: #endif ~QSaveFile(); - QString fileName() const Q_DECL_OVERRIDE; + QString fileName() const override; void setFileName(const QString &name); - bool open(OpenMode flags) Q_DECL_OVERRIDE; + bool open(OpenMode flags) override; bool commit(); void cancelWriting(); @@ -84,10 +84,10 @@ public: bool directWriteFallback() const; protected: - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 writeData(const char *data, qint64 len) override; private: - void close() Q_DECL_OVERRIDE; + void close() override; #if !QT_CONFIG(translation) static QString tr(const char *string) { return QString::fromLatin1(string); } #endif diff --git a/src/corelib/io/qsettings.h b/src/corelib/io/qsettings.h index da5502e5ca..d68d4d65f9 100644 --- a/src/corelib/io/qsettings.h +++ b/src/corelib/io/qsettings.h @@ -199,7 +199,7 @@ public: protected: #ifndef QT_NO_QOBJECT - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; #endif private: diff --git a/src/corelib/io/qsettings_p.h b/src/corelib/io/qsettings_p.h index 7923c24770..d18c96a06c 100644 --- a/src/corelib/io/qsettings_p.h +++ b/src/corelib/io/qsettings_p.h @@ -261,17 +261,17 @@ public: QConfFileSettingsPrivate(const QString &fileName, QSettings::Format format); ~QConfFileSettingsPrivate(); - void remove(const QString &key) Q_DECL_OVERRIDE; - void set(const QString &key, const QVariant &value) Q_DECL_OVERRIDE; - bool get(const QString &key, QVariant *value) const Q_DECL_OVERRIDE; + void remove(const QString &key) override; + void set(const QString &key, const QVariant &value) override; + bool get(const QString &key, QVariant *value) const override; - QStringList children(const QString &prefix, ChildSpec spec) const Q_DECL_OVERRIDE; + QStringList children(const QString &prefix, ChildSpec spec) const override; - void clear() Q_DECL_OVERRIDE; - void sync() Q_DECL_OVERRIDE; - void flush() Q_DECL_OVERRIDE; - bool isWritable() const Q_DECL_OVERRIDE; - QString fileName() const Q_DECL_OVERRIDE; + void clear() override; + void sync() override; + void flush() override; + bool isWritable() const override; + QString fileName() const override; bool readIniFile(const QByteArray &data, UnparsedSettingsMap *unparsedIniSections); static bool readIniSection(const QSettingsKey §ion, const QByteArray &data, diff --git a/src/corelib/io/qtemporaryfile.h b/src/corelib/io/qtemporaryfile.h index 7fc5a299fc..90a6a613e6 100644 --- a/src/corelib/io/qtemporaryfile.h +++ b/src/corelib/io/qtemporaryfile.h @@ -77,7 +77,7 @@ public: // ### Hides open(flags) bool open() { return open(QIODevice::ReadWrite); } - QString fileName() const Q_DECL_OVERRIDE; + QString fileName() const override; QString fileTemplate() const; void setFileTemplate(const QString &name); @@ -95,7 +95,7 @@ public: static QTemporaryFile *createNativeFile(QFile &file); protected: - bool open(OpenMode flags) Q_DECL_OVERRIDE; + bool open(OpenMode flags) override; private: friend class QFile; diff --git a/src/corelib/itemmodels/qabstractitemmodel.cpp b/src/corelib/itemmodels/qabstractitemmodel.cpp index f893cf06e3..44622a0ad9 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.cpp +++ b/src/corelib/itemmodels/qabstractitemmodel.cpp @@ -482,12 +482,12 @@ class QEmptyItemModel : public QAbstractItemModel { public: explicit QEmptyItemModel(QObject *parent = 0) : QAbstractItemModel(parent) {} - QModelIndex index(int, int, const QModelIndex &) const Q_DECL_OVERRIDE { return QModelIndex(); } - QModelIndex parent(const QModelIndex &) const Q_DECL_OVERRIDE { return QModelIndex(); } - int rowCount(const QModelIndex &) const Q_DECL_OVERRIDE { return 0; } - int columnCount(const QModelIndex &) const Q_DECL_OVERRIDE { return 0; } - bool hasChildren(const QModelIndex &) const Q_DECL_OVERRIDE { return false; } - QVariant data(const QModelIndex &, int) const Q_DECL_OVERRIDE { return QVariant(); } + QModelIndex index(int, int, const QModelIndex &) const override { return QModelIndex(); } + QModelIndex parent(const QModelIndex &) const override { return QModelIndex(); } + int rowCount(const QModelIndex &) const override { return 0; } + int columnCount(const QModelIndex &) const override { return 0; } + bool hasChildren(const QModelIndex &) const override { return false; } + QVariant data(const QModelIndex &, int) const override { return QVariant(); } }; Q_GLOBAL_STATIC(QEmptyItemModel, qEmptyModel) diff --git a/src/corelib/itemmodels/qabstractitemmodel.h b/src/corelib/itemmodels/qabstractitemmodel.h index 907ba09676..48e0791cb5 100644 --- a/src/corelib/itemmodels/qabstractitemmodel.h +++ b/src/corelib/itemmodels/qabstractitemmodel.h @@ -370,12 +370,12 @@ public: explicit QAbstractTableModel(QObject *parent = Q_NULLPTR); ~QAbstractTableModel(); - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; using QObject::parent; @@ -384,8 +384,8 @@ protected: private: Q_DISABLE_COPY(QAbstractTableModel) - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &child) const override; + bool hasChildren(const QModelIndex &parent) const override; }; class Q_CORE_EXPORT QAbstractListModel : public QAbstractItemModel @@ -396,12 +396,12 @@ public: explicit QAbstractListModel(QObject *parent = Q_NULLPTR); ~QAbstractListModel(); - QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column = 0, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; using QObject::parent; @@ -410,9 +410,9 @@ protected: private: Q_DISABLE_COPY(QAbstractListModel) - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &child) const override; + int columnCount(const QModelIndex &parent) const override; + bool hasChildren(const QModelIndex &parent) const override; }; // inline implementations diff --git a/src/corelib/itemmodels/qabstractproxymodel.h b/src/corelib/itemmodels/qabstractproxymodel.h index c9eafa09ee..ed7bc91b79 100644 --- a/src/corelib/itemmodels/qabstractproxymodel.h +++ b/src/corelib/itemmodels/qabstractproxymodel.h @@ -68,34 +68,34 @@ public: Q_INVOKABLE virtual QItemSelection mapSelectionToSource(const QItemSelection &selection) const; Q_INVOKABLE virtual QItemSelection mapSelectionFromSource(const QItemSelection &selection) const; - bool submit() Q_DECL_OVERRIDE; - void revert() Q_DECL_OVERRIDE; - - QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - QMap itemData(const QModelIndex &index) const Q_DECL_OVERRIDE; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; - - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; - bool setItemData(const QModelIndex& index, const QMap &roles) Q_DECL_OVERRIDE; - bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; - - QModelIndex buddy(const QModelIndex &index) const Q_DECL_OVERRIDE; - bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE; - void fetchMore(const QModelIndex &parent) Q_DECL_OVERRIDE; - void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; - QSize span(const QModelIndex &index) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; - - QMimeData* mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + bool submit() override; + void revert() override; + + QVariant data(const QModelIndex &proxyIndex, int role = Qt::DisplayRole) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + QMap itemData(const QModelIndex &index) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; + + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; + bool setItemData(const QModelIndex& index, const QMap &roles) override; + bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, int role = Qt::EditRole) override; + + QModelIndex buddy(const QModelIndex &index) const override; + bool canFetchMore(const QModelIndex &parent) const override; + void fetchMore(const QModelIndex &parent) override; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; + QSize span(const QModelIndex &index) const override; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; + + QMimeData* mimeData(const QModelIndexList &indexes) const override; bool canDropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; - QStringList mimeTypes() const Q_DECL_OVERRIDE; - Qt::DropActions supportedDragActions() const Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; + QStringList mimeTypes() const override; + Qt::DropActions supportedDragActions() const override; + Qt::DropActions supportedDropActions() const override; Q_SIGNALS: void sourceModelChanged(QPrivateSignal); diff --git a/src/corelib/itemmodels/qidentityproxymodel.h b/src/corelib/itemmodels/qidentityproxymodel.h index e93740c1a2..4c5f08f7d3 100644 --- a/src/corelib/itemmodels/qidentityproxymodel.h +++ b/src/corelib/itemmodels/qidentityproxymodel.h @@ -57,26 +57,26 @@ public: explicit QIdentityProxyModel(QObject* parent = Q_NULLPTR); ~QIdentityProxyModel(); - int columnCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex mapFromSource(const QModelIndex& sourceIndex) const Q_DECL_OVERRIDE; - QModelIndex mapToSource(const QModelIndex& proxyIndex) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex& child) const Q_DECL_OVERRIDE; + int columnCount(const QModelIndex& parent = QModelIndex()) const override; + QModelIndex index(int row, int column, const QModelIndex& parent = QModelIndex()) const override; + QModelIndex mapFromSource(const QModelIndex& sourceIndex) const override; + QModelIndex mapToSource(const QModelIndex& proxyIndex) const override; + QModelIndex parent(const QModelIndex& child) const override; using QObject::parent; - int rowCount(const QModelIndex& parent = QModelIndex()) const Q_DECL_OVERRIDE; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) Q_DECL_OVERRIDE; - QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; - - QItemSelection mapSelectionFromSource(const QItemSelection& selection) const Q_DECL_OVERRIDE; - QItemSelection mapSelectionToSource(const QItemSelection& selection) const Q_DECL_OVERRIDE; - QModelIndexList match(const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const Q_DECL_OVERRIDE; - void setSourceModel(QAbstractItemModel* sourceModel) Q_DECL_OVERRIDE; - - bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; - bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; - bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; - bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) Q_DECL_OVERRIDE; + int rowCount(const QModelIndex& parent = QModelIndex()) const override; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; + bool dropMimeData(const QMimeData* data, Qt::DropAction action, int row, int column, const QModelIndex& parent) override; + QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; + + QItemSelection mapSelectionFromSource(const QItemSelection& selection) const override; + QItemSelection mapSelectionToSource(const QItemSelection& selection) const override; + QModelIndexList match(const QModelIndex& start, int role, const QVariant& value, int hits = 1, Qt::MatchFlags flags = Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const override; + void setSourceModel(QAbstractItemModel* sourceModel) override; + + bool insertColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override; + bool insertRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; + bool removeColumns(int column, int count, const QModelIndex& parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex& parent = QModelIndex()) override; protected: QIdentityProxyModel(QIdentityProxyModelPrivate &dd, QObject* parent); diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.cpp b/src/corelib/itemmodels/qsortfilterproxymodel.cpp index ef3281df30..fad980f568 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.cpp +++ b/src/corelib/itemmodels/qsortfilterproxymodel.cpp @@ -300,7 +300,7 @@ public: void updateChildrenMapping(const QModelIndex &source_parent, Mapping *parent_mapping, Qt::Orientation orient, int start, int end, int delta_item_count, bool remove); - virtual void _q_sourceModelDestroyed() Q_DECL_OVERRIDE; + virtual void _q_sourceModelDestroyed() override; bool needsReorder(const QVector &source_rows, const QModelIndex &source_parent) const; diff --git a/src/corelib/itemmodels/qsortfilterproxymodel.h b/src/corelib/itemmodels/qsortfilterproxymodel.h index 6f2e9806ed..3c840406e0 100644 --- a/src/corelib/itemmodels/qsortfilterproxymodel.h +++ b/src/corelib/itemmodels/qsortfilterproxymodel.h @@ -73,13 +73,13 @@ public: explicit QSortFilterProxyModel(QObject *parent = Q_NULLPTR); ~QSortFilterProxyModel(); - void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; + void setSourceModel(QAbstractItemModel *sourceModel) override; - QModelIndex mapToSource(const QModelIndex &proxyIndex) const Q_DECL_OVERRIDE; - QModelIndex mapFromSource(const QModelIndex &sourceIndex) const Q_DECL_OVERRIDE; + QModelIndex mapToSource(const QModelIndex &proxyIndex) const override; + QModelIndex mapFromSource(const QModelIndex &sourceIndex) const override; - QItemSelection mapSelectionToSource(const QItemSelection &proxySelection) const Q_DECL_OVERRIDE; - QItemSelection mapSelectionFromSource(const QItemSelection &sourceSelection) const Q_DECL_OVERRIDE; + QItemSelection mapSelectionToSource(const QItemSelection &proxySelection) const override; + QItemSelection mapSelectionFromSource(const QItemSelection &sourceSelection) const override; QRegExp filterRegExp() const; void setFilterRegExp(const QRegExp ®Exp); @@ -129,44 +129,44 @@ protected: public: using QObject::parent; - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; + QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; bool setHeaderData(int section, Qt::Orientation orientation, - const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + const QVariant &value, int role = Qt::EditRole) override; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QMimeData *mimeData(const QModelIndexList &indexes) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; - void fetchMore(const QModelIndex &parent) Q_DECL_OVERRIDE; - bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + void fetchMore(const QModelIndex &parent) override; + bool canFetchMore(const QModelIndex &parent) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; - QModelIndex buddy(const QModelIndex &index) const Q_DECL_OVERRIDE; + QModelIndex buddy(const QModelIndex &index) const override; QModelIndexList match(const QModelIndex &start, int role, const QVariant &value, int hits = 1, Qt::MatchFlags flags = - Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const Q_DECL_OVERRIDE; - QSize span(const QModelIndex &index) const Q_DECL_OVERRIDE; - void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; + Qt::MatchFlags(Qt::MatchStartsWith|Qt::MatchWrap)) const override; + QSize span(const QModelIndex &index) const override; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; - QStringList mimeTypes() const Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + Qt::DropActions supportedDropActions() const override; private: Q_DECLARE_PRIVATE(QSortFilterProxyModel) Q_DISABLE_COPY(QSortFilterProxyModel) diff --git a/src/corelib/itemmodels/qstringlistmodel.h b/src/corelib/itemmodels/qstringlistmodel.h index 3bda848f48..bd601e4f4e 100644 --- a/src/corelib/itemmodels/qstringlistmodel.h +++ b/src/corelib/itemmodels/qstringlistmodel.h @@ -55,23 +55,23 @@ public: explicit QStringListModel(QObject *parent = Q_NULLPTR); explicit QStringListModel(const QStringList &strings, QObject *parent = Q_NULLPTR); - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; - void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; QStringList stringList() const; void setStringList(const QStringList &strings); - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + Qt::DropActions supportedDropActions() const override; private: Q_DISABLE_COPY(QStringListModel) diff --git a/src/corelib/kernel/qcoreapplication.h b/src/corelib/kernel/qcoreapplication.h index 34133533f0..f36c62845a 100644 --- a/src/corelib/kernel/qcoreapplication.h +++ b/src/corelib/kernel/qcoreapplication.h @@ -187,7 +187,7 @@ Q_SIGNALS: void applicationVersionChanged(); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; virtual bool compressEvent(QEvent *, QObject *receiver, QPostEventList *); #endif // QT_NO_QOBJECT diff --git a/src/corelib/kernel/qeventdispatcher_glib_p.h b/src/corelib/kernel/qeventdispatcher_glib_p.h index 8e9925d7a5..434b427f14 100644 --- a/src/corelib/kernel/qeventdispatcher_glib_p.h +++ b/src/corelib/kernel/qeventdispatcher_glib_p.h @@ -70,8 +70,8 @@ public: explicit QEventDispatcherGlib(GMainContext *context, QObject *parent = 0); ~QEventDispatcherGlib(); - bool processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE; - bool hasPendingEvents() Q_DECL_OVERRIDE; + bool processEvents(QEventLoop::ProcessEventsFlags flags) override; + bool hasPendingEvents() override; void registerSocketNotifier(QSocketNotifier *socketNotifier) Q_DECL_FINAL; void unregisterSocketNotifier(QSocketNotifier *socketNotifier) Q_DECL_FINAL; diff --git a/src/corelib/kernel/qeventdispatcher_unix_p.h b/src/corelib/kernel/qeventdispatcher_unix_p.h index bcf5b10baa..aea5ba4f2e 100644 --- a/src/corelib/kernel/qeventdispatcher_unix_p.h +++ b/src/corelib/kernel/qeventdispatcher_unix_p.h @@ -105,8 +105,8 @@ public: explicit QEventDispatcherUNIX(QObject *parent = 0); ~QEventDispatcherUNIX(); - bool processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE; - bool hasPendingEvents() Q_DECL_OVERRIDE; + bool processEvents(QEventLoop::ProcessEventsFlags flags) override; + bool hasPendingEvents() override; void registerSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL; void unregisterSocketNotifier(QSocketNotifier *notifier) Q_DECL_FINAL; @@ -120,7 +120,7 @@ public: void wakeUp() Q_DECL_FINAL; void interrupt() Q_DECL_FINAL; - void flush() Q_DECL_OVERRIDE; + void flush() override; protected: QEventDispatcherUNIX(QEventDispatcherUNIXPrivate &dd, QObject *parent = 0); diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index e62b1d8419..0cb431d7ce 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -76,7 +76,7 @@ public: void wakeUp(); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; public Q_SLOTS: void quit(); diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h index ddae349528..6aea40cf4a 100644 --- a/src/corelib/kernel/qobject_p.h +++ b/src/corelib/kernel/qobject_p.h @@ -432,9 +432,9 @@ struct Q_CORE_EXPORT QAbstractDynamicMetaObject : public QDynamicMetaObjectData, { ~QAbstractDynamicMetaObject(); - virtual QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) Q_DECL_OVERRIDE { return this; } + virtual QAbstractDynamicMetaObject *toDynamicMetaObject(QObject *) override { return this; } virtual int createProperty(const char *, const char *) { return -1; } - virtual int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) Q_DECL_OVERRIDE + virtual int metaCall(QObject *, QMetaObject::Call c, int _id, void **a) override { return metaCall(c, _id, a); } virtual int metaCall(QMetaObject::Call, int _id, void **) { return _id; } // Compat overload }; diff --git a/src/corelib/kernel/qsocketnotifier.h b/src/corelib/kernel/qsocketnotifier.h index 92cdf5be95..360e93a5fb 100644 --- a/src/corelib/kernel/qsocketnotifier.h +++ b/src/corelib/kernel/qsocketnotifier.h @@ -68,7 +68,7 @@ Q_SIGNALS: void activated(int socket, QPrivateSignal); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; private: Q_DISABLE_COPY(QSocketNotifier) diff --git a/src/corelib/kernel/qtimer.cpp b/src/corelib/kernel/qtimer.cpp index 55f75ab17e..85e95d7f7e 100644 --- a/src/corelib/kernel/qtimer.cpp +++ b/src/corelib/kernel/qtimer.cpp @@ -271,7 +271,7 @@ public: Q_SIGNALS: void timeout(); protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; }; QSingleShotTimer::QSingleShotTimer(int msec, Qt::TimerType timerType, const QObject *r, const char *member) diff --git a/src/corelib/kernel/qtimer.h b/src/corelib/kernel/qtimer.h index 7db5fc759b..6790841f8e 100644 --- a/src/corelib/kernel/qtimer.h +++ b/src/corelib/kernel/qtimer.h @@ -203,7 +203,7 @@ public: #endif protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private: Q_DISABLE_COPY(QTimer) diff --git a/src/corelib/mimetypes/qmimeprovider_p.h b/src/corelib/mimetypes/qmimeprovider_p.h index 0be01d2fd0..3eae672823 100644 --- a/src/corelib/mimetypes/qmimeprovider_p.h +++ b/src/corelib/mimetypes/qmimeprovider_p.h @@ -98,17 +98,17 @@ public: QMimeBinaryProvider(QMimeDatabasePrivate *db); virtual ~QMimeBinaryProvider(); - virtual bool isValid() Q_DECL_OVERRIDE; - virtual QMimeType mimeTypeForName(const QString &name) Q_DECL_OVERRIDE; - virtual QMimeGlobMatchResult findByFileName(const QString &fileName) Q_DECL_OVERRIDE; - virtual QStringList parents(const QString &mime) Q_DECL_OVERRIDE; - virtual QString resolveAlias(const QString &name) Q_DECL_OVERRIDE; - virtual QStringList listAliases(const QString &name) Q_DECL_OVERRIDE; - virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) Q_DECL_OVERRIDE; - virtual QList allMimeTypes() Q_DECL_OVERRIDE; - virtual void loadMimeTypePrivate(QMimeTypePrivate &) Q_DECL_OVERRIDE; - virtual void loadIcon(QMimeTypePrivate &) Q_DECL_OVERRIDE; - virtual void loadGenericIcon(QMimeTypePrivate &) Q_DECL_OVERRIDE; + virtual bool isValid() override; + virtual QMimeType mimeTypeForName(const QString &name) override; + virtual QMimeGlobMatchResult findByFileName(const QString &fileName) override; + virtual QStringList parents(const QString &mime) override; + virtual QString resolveAlias(const QString &name) override; + virtual QStringList listAliases(const QString &name) override; + virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) override; + virtual QList allMimeTypes() override; + virtual void loadMimeTypePrivate(QMimeTypePrivate &) override; + virtual void loadIcon(QMimeTypePrivate &) override; + virtual void loadGenericIcon(QMimeTypePrivate &) override; private: struct CacheFile; @@ -141,14 +141,14 @@ public: QMimeXMLProvider(QMimeDatabasePrivate *db); ~QMimeXMLProvider(); - virtual bool isValid() Q_DECL_OVERRIDE; - virtual QMimeType mimeTypeForName(const QString &name) Q_DECL_OVERRIDE; - virtual QMimeGlobMatchResult findByFileName(const QString &fileName) Q_DECL_OVERRIDE; - virtual QStringList parents(const QString &mime) Q_DECL_OVERRIDE; - virtual QString resolveAlias(const QString &name) Q_DECL_OVERRIDE; - virtual QStringList listAliases(const QString &name) Q_DECL_OVERRIDE; - virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) Q_DECL_OVERRIDE; - virtual QList allMimeTypes() Q_DECL_OVERRIDE; + virtual bool isValid() override; + virtual QMimeType mimeTypeForName(const QString &name) override; + virtual QMimeGlobMatchResult findByFileName(const QString &fileName) override; + virtual QStringList parents(const QString &mime) override; + virtual QString resolveAlias(const QString &name) override; + virtual QStringList listAliases(const QString &name) override; + virtual QMimeType findByMagic(const QByteArray &data, int *accuracyPtr) override; + virtual QList allMimeTypes() override; bool load(const QString &fileName, QString *errorMessage); diff --git a/src/corelib/statemachine/qabstractstate.h b/src/corelib/statemachine/qabstractstate.h index 02c7d9e830..fa735ea33d 100644 --- a/src/corelib/statemachine/qabstractstate.h +++ b/src/corelib/statemachine/qabstractstate.h @@ -73,7 +73,7 @@ protected: virtual void onEntry(QEvent *event) = 0; virtual void onExit(QEvent *event) = 0; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QAbstractState(QAbstractStatePrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qabstracttransition.h b/src/corelib/statemachine/qabstracttransition.h index b86d26e969..ec81b8ec2e 100644 --- a/src/corelib/statemachine/qabstracttransition.h +++ b/src/corelib/statemachine/qabstracttransition.h @@ -102,7 +102,7 @@ protected: virtual void onTransition(QEvent *event) = 0; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QAbstractTransition(QAbstractTransitionPrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qeventtransition.h b/src/corelib/statemachine/qeventtransition.h index 3c66e72658..53f3b4cd36 100644 --- a/src/corelib/statemachine/qeventtransition.h +++ b/src/corelib/statemachine/qeventtransition.h @@ -65,10 +65,10 @@ public: void setEventType(QEvent::Type type); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *event) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QEventTransition(QEventTransitionPrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qfinalstate.h b/src/corelib/statemachine/qfinalstate.h index 1563bef397..3e7a844653 100644 --- a/src/corelib/statemachine/qfinalstate.h +++ b/src/corelib/statemachine/qfinalstate.h @@ -55,10 +55,10 @@ public: ~QFinalState(); protected: - void onEntry(QEvent *event) Q_DECL_OVERRIDE; - void onExit(QEvent *event) Q_DECL_OVERRIDE; + void onEntry(QEvent *event) override; + void onExit(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: explicit QFinalState(QFinalStatePrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qhistorystate.h b/src/corelib/statemachine/qhistorystate.h index c20053abf6..e531a2d9fb 100644 --- a/src/corelib/statemachine/qhistorystate.h +++ b/src/corelib/statemachine/qhistorystate.h @@ -80,10 +80,10 @@ Q_SIGNALS: void historyTypeChanged(QPrivateSignal); protected: - void onEntry(QEvent *event) Q_DECL_OVERRIDE; - void onExit(QEvent *event) Q_DECL_OVERRIDE; + void onEntry(QEvent *event) override; + void onExit(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: Q_DISABLE_COPY(QHistoryState) diff --git a/src/corelib/statemachine/qsignaltransition.h b/src/corelib/statemachine/qsignaltransition.h index 97c2916d9a..e64d09384a 100644 --- a/src/corelib/statemachine/qsignaltransition.h +++ b/src/corelib/statemachine/qsignaltransition.h @@ -80,10 +80,10 @@ public: void setSignal(const QByteArray &signal); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *event) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; Q_SIGNALS: void senderObjectChanged(QPrivateSignal); diff --git a/src/corelib/statemachine/qsignaltransition_p.h b/src/corelib/statemachine/qsignaltransition_p.h index f270a5be4a..0666e600a4 100644 --- a/src/corelib/statemachine/qsignaltransition_p.h +++ b/src/corelib/statemachine/qsignaltransition_p.h @@ -70,7 +70,7 @@ public: void unregister(); void maybeRegister(); - virtual void callOnTransition(QEvent *e) Q_DECL_OVERRIDE; + virtual void callOnTransition(QEvent *e) override; const QObject *sender; QByteArray signal; diff --git a/src/corelib/statemachine/qstate.cpp b/src/corelib/statemachine/qstate.cpp index 76dcbf784b..ada20cd6a5 100644 --- a/src/corelib/statemachine/qstate.cpp +++ b/src/corelib/statemachine/qstate.cpp @@ -396,8 +396,8 @@ public: : QAbstractTransition() { setTargetState(target); } protected: - void onTransition(QEvent *) Q_DECL_OVERRIDE {} - bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } + void onTransition(QEvent *) override {} + bool eventTest(QEvent *) override { return true; } }; } // namespace diff --git a/src/corelib/statemachine/qstate.h b/src/corelib/statemachine/qstate.h index 33f84c2de0..1b39d37f3d 100644 --- a/src/corelib/statemachine/qstate.h +++ b/src/corelib/statemachine/qstate.h @@ -116,10 +116,10 @@ Q_SIGNALS: void errorStateChanged(QPrivateSignal); protected: - void onEntry(QEvent *event) Q_DECL_OVERRIDE; - void onExit(QEvent *event) Q_DECL_OVERRIDE; + void onEntry(QEvent *event) override; + void onExit(QEvent *event) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QState(QStatePrivate &dd, QState *parent); diff --git a/src/corelib/statemachine/qstatemachine.cpp b/src/corelib/statemachine/qstatemachine.cpp index 1d80da55c9..b6f0420db0 100644 --- a/src/corelib/statemachine/qstatemachine.cpp +++ b/src/corelib/statemachine/qstatemachine.cpp @@ -1721,8 +1721,8 @@ QAbstractTransition *QStateMachinePrivate::createInitialTransition() const : QAbstractTransition() { setTargetStates(targets); } protected: - virtual bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } - virtual void onTransition(QEvent *) Q_DECL_OVERRIDE {} + virtual bool eventTest(QEvent *) override { return true; } + virtual void onTransition(QEvent *) override {} }; QState *root = rootState(); @@ -2126,8 +2126,8 @@ public: : QAbstractTransition() { setTargetState(target); } protected: - void onTransition(QEvent *) Q_DECL_OVERRIDE { deleteLater(); } - bool eventTest(QEvent *) Q_DECL_OVERRIDE { return true; } + void onTransition(QEvent *) override { deleteLater(); } + bool eventTest(QEvent *) override { return true; } }; } // namespace diff --git a/src/corelib/statemachine/qstatemachine.h b/src/corelib/statemachine/qstatemachine.h index 4f31252eed..7268d0f233 100644 --- a/src/corelib/statemachine/qstatemachine.h +++ b/src/corelib/statemachine/qstatemachine.h @@ -141,7 +141,7 @@ public: QSet configuration() const; #if QT_CONFIG(qeventtransition) - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; #endif public Q_SLOTS: @@ -156,8 +156,8 @@ Q_SIGNALS: protected: - void onEntry(QEvent *event) Q_DECL_OVERRIDE; - void onExit(QEvent *event) Q_DECL_OVERRIDE; + void onEntry(QEvent *event) override; + void onExit(QEvent *event) override; virtual void beginSelectTransitions(QEvent *event); virtual void endSelectTransitions(QEvent *event); @@ -165,7 +165,7 @@ protected: virtual void beginMicrostep(QEvent *event); virtual void endMicrostep(QEvent *event); - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; protected: QStateMachine(QStateMachinePrivate &dd, QObject *parent); diff --git a/src/corelib/thread/qexception.h b/src/corelib/thread/qexception.h index b14d386c69..8bbe597f90 100644 --- a/src/corelib/thread/qexception.h +++ b/src/corelib/thread/qexception.h @@ -80,8 +80,8 @@ public: throw() #endif ; - void raise() const Q_DECL_OVERRIDE; - QUnhandledException *clone() const Q_DECL_OVERRIDE; + void raise() const override; + QUnhandledException *clone() const override; }; namespace QtPrivate { diff --git a/src/corelib/thread/qfuturewatcher.h b/src/corelib/thread/qfuturewatcher.h index 3357e27037..531babb82a 100644 --- a/src/corelib/thread/qfuturewatcher.h +++ b/src/corelib/thread/qfuturewatcher.h @@ -76,7 +76,7 @@ public: void setPendingResultsLimit(int limit); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; Q_SIGNALS: void started(); @@ -98,8 +98,8 @@ public Q_SLOTS: void togglePaused(); protected: - void connectNotify (const QMetaMethod &signal) Q_DECL_OVERRIDE; - void disconnectNotify (const QMetaMethod &signal) Q_DECL_OVERRIDE; + void connectNotify (const QMetaMethod &signal) override; + void disconnectNotify (const QMetaMethod &signal) override; // called from setFuture() implemented in template sub-classes void connectOutputInterface(); @@ -166,8 +166,8 @@ public Q_SLOTS: private: QFuture m_future; - const QFutureInterfaceBase &futureInterface() const Q_DECL_OVERRIDE { return m_future.d; } - QFutureInterfaceBase &futureInterface() Q_DECL_OVERRIDE { return m_future.d; } + const QFutureInterfaceBase &futureInterface() const override { return m_future.d; } + QFutureInterfaceBase &futureInterface() override { return m_future.d; } }; template @@ -197,8 +197,8 @@ public: private: QFuture m_future; - const QFutureInterfaceBase &futureInterface() const Q_DECL_OVERRIDE { return m_future.d; } - QFutureInterfaceBase &futureInterface() Q_DECL_OVERRIDE { return m_future.d; } + const QFutureInterfaceBase &futureInterface() const override { return m_future.d; } + QFutureInterfaceBase &futureInterface() override { return m_future.d; } }; Q_INLINE_TEMPLATE void QFutureWatcher::setFuture(const QFuture &_future) diff --git a/src/corelib/thread/qfuturewatcher_p.h b/src/corelib/thread/qfuturewatcher_p.h index e83bdaf45a..25d1ef8d25 100644 --- a/src/corelib/thread/qfuturewatcher_p.h +++ b/src/corelib/thread/qfuturewatcher_p.h @@ -69,8 +69,8 @@ class QFutureWatcherBasePrivate : public QObjectPrivate, public: QFutureWatcherBasePrivate(); - void postCallOutEvent(const QFutureCallOutEvent &callOutEvent) Q_DECL_OVERRIDE; - void callOutInterfaceDisconnected() Q_DECL_OVERRIDE; + void postCallOutEvent(const QFutureCallOutEvent &callOutEvent) override; + void callOutInterfaceDisconnected() override; void sendCallOutEvent(QFutureCallOutEvent *event); diff --git a/src/corelib/thread/qthread.h b/src/corelib/thread/qthread.h index 5e6f216219..21e7cc74f9 100644 --- a/src/corelib/thread/qthread.h +++ b/src/corelib/thread/qthread.h @@ -116,7 +116,7 @@ public: QAbstractEventDispatcher *eventDispatcher() const; void setEventDispatcher(QAbstractEventDispatcher *eventDispatcher); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; int loopLevel() const; #ifdef QTHREAD_HAS_CREATE diff --git a/src/corelib/thread/qthread_p.h b/src/corelib/thread/qthread_p.h index f3d4750177..1d38eb0ebf 100644 --- a/src/corelib/thread/qthread_p.h +++ b/src/corelib/thread/qthread_p.h @@ -317,7 +317,7 @@ public: void init(); private: - void run() Q_DECL_OVERRIDE; + void run() override; }; QT_END_NAMESPACE diff --git a/src/corelib/thread/qthreadpool.cpp b/src/corelib/thread/qthreadpool.cpp index 9937201619..2ebf910992 100644 --- a/src/corelib/thread/qthreadpool.cpp +++ b/src/corelib/thread/qthreadpool.cpp @@ -56,7 +56,7 @@ class QThreadPoolThread : public QThread { public: QThreadPoolThread(QThreadPoolPrivate *manager); - void run() Q_DECL_OVERRIDE; + void run() override; void registerThreadInactive(); QWaitCondition runnableReady; diff --git a/src/corelib/tools/qeasingcurve.cpp b/src/corelib/tools/qeasingcurve.cpp index 03bb1a1411..1098d7e24c 100644 --- a/src/corelib/tools/qeasingcurve.cpp +++ b/src/corelib/tools/qeasingcurve.cpp @@ -496,7 +496,7 @@ struct BezierEase : public QEasingCurveFunction } } - QEasingCurveFunction *copy() const Q_DECL_OVERRIDE + QEasingCurveFunction *copy() const override { BezierEase *rv = new BezierEase(); rv->_t = _t; @@ -532,7 +532,7 @@ struct BezierEase : public QEasingCurveFunction return newT; } - qreal value(qreal x) Q_DECL_OVERRIDE + qreal value(qreal x) override { Q_ASSERT(_bezierCurves.count() % 3 == 0); @@ -826,7 +826,7 @@ struct TCBEase : public BezierEase : BezierEase(QEasingCurve::TCBSpline) { } - qreal value(qreal x) Q_DECL_OVERRIDE + qreal value(qreal x) override { Q_ASSERT(_bezierCurves.count() % 3 == 0); @@ -846,7 +846,7 @@ struct ElasticEase : public QEasingCurveFunction : QEasingCurveFunction(type, qreal(0.3), qreal(1.0)) { } - QEasingCurveFunction *copy() const Q_DECL_OVERRIDE + QEasingCurveFunction *copy() const override { ElasticEase *rv = new ElasticEase(_t); rv->_p = _p; @@ -856,7 +856,7 @@ struct ElasticEase : public QEasingCurveFunction return rv; } - qreal value(qreal t) Q_DECL_OVERRIDE + qreal value(qreal t) override { qreal p = (_p < 0) ? qreal(0.3) : _p; qreal a = (_a < 0) ? qreal(1.0) : _a; @@ -881,7 +881,7 @@ struct BounceEase : public QEasingCurveFunction : QEasingCurveFunction(type, qreal(0.3), qreal(1.0)) { } - QEasingCurveFunction *copy() const Q_DECL_OVERRIDE + QEasingCurveFunction *copy() const override { BounceEase *rv = new BounceEase(_t); rv->_a = _a; @@ -890,7 +890,7 @@ struct BounceEase : public QEasingCurveFunction return rv; } - qreal value(qreal t) Q_DECL_OVERRIDE + qreal value(qreal t) override { qreal a = (_a < 0) ? qreal(1.0) : _a; switch(_t) { @@ -914,7 +914,7 @@ struct BackEase : public QEasingCurveFunction : QEasingCurveFunction(type, qreal(0.3), qreal(1.0), qreal(1.70158)) { } - QEasingCurveFunction *copy() const Q_DECL_OVERRIDE + QEasingCurveFunction *copy() const override { BackEase *rv = new BackEase(_t); rv->_o = _o; @@ -923,7 +923,7 @@ struct BackEase : public QEasingCurveFunction return rv; } - qreal value(qreal t) Q_DECL_OVERRIDE + qreal value(qreal t) override { qreal o = (_o < 0) ? qreal(1.70158) : _o; switch(_t) { diff --git a/src/corelib/tools/qtimeline.h b/src/corelib/tools/qtimeline.h index f0e9a32e4d..4cba49e185 100644 --- a/src/corelib/tools/qtimeline.h +++ b/src/corelib/tools/qtimeline.h @@ -127,7 +127,7 @@ Q_SIGNALS: void finished(QPrivateSignal); protected: - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; private: Q_DISABLE_COPY(QTimeLine) diff --git a/src/corelib/tools/qtimezoneprivate_p.h b/src/corelib/tools/qtimezoneprivate_p.h index 74b79dce16..fa7f9f618e 100644 --- a/src/corelib/tools/qtimezoneprivate_p.h +++ b/src/corelib/tools/qtimezoneprivate_p.h @@ -189,26 +189,26 @@ public: QUtcTimeZonePrivate *clone() const override; - Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; + Data data(qint64 forMSecsSinceEpoch) const override; - QLocale::Country country() const Q_DECL_OVERRIDE; - QString comment() const Q_DECL_OVERRIDE; + QLocale::Country country() const override; + QString comment() const override; QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, - const QLocale &locale) const Q_DECL_OVERRIDE; - QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + const QLocale &locale) const override; + QString abbreviation(qint64 atMSecsSinceEpoch) const override; - int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + int standardTimeOffset(qint64 atMSecsSinceEpoch) const override; + int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override; - QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; + QByteArray systemTimeZoneId() const override; - QList availableTimeZoneIds() const Q_DECL_OVERRIDE; - QList availableTimeZoneIds(QLocale::Country country) const Q_DECL_OVERRIDE; - QList availableTimeZoneIds(int utcOffset) const Q_DECL_OVERRIDE; + QList availableTimeZoneIds() const override; + QList availableTimeZoneIds(QLocale::Country country) const override; + QList availableTimeZoneIds(int utcOffset) const override; - void serialize(QDataStream &ds) const Q_DECL_OVERRIDE; + void serialize(QDataStream &ds) const override; private: void init(const QByteArray &zoneId); @@ -237,27 +237,27 @@ public: QIcuTimeZonePrivate *clone() const override; QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, - const QLocale &locale) const Q_DECL_OVERRIDE; - QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + const QLocale &locale) const override; + QString abbreviation(qint64 atMSecsSinceEpoch) const override; - int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + int offsetFromUtc(qint64 atMSecsSinceEpoch) const override; + int standardTimeOffset(qint64 atMSecsSinceEpoch) const override; + int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override; - bool hasDaylightTime() const Q_DECL_OVERRIDE; - bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasDaylightTime() const override; + bool isDaylightTime(qint64 atMSecsSinceEpoch) const override; - Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; + Data data(qint64 forMSecsSinceEpoch) const override; - bool hasTransitions() const Q_DECL_OVERRIDE; - Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; - Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasTransitions() const override; + Data nextTransition(qint64 afterMSecsSinceEpoch) const override; + Data previousTransition(qint64 beforeMSecsSinceEpoch) const override; - QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; + QByteArray systemTimeZoneId() const override; - QList availableTimeZoneIds() const Q_DECL_OVERRIDE; - QList availableTimeZoneIds(QLocale::Country country) const Q_DECL_OVERRIDE; - QList availableTimeZoneIds(int offsetFromUtc) const Q_DECL_OVERRIDE; + QList availableTimeZoneIds() const override; + QList availableTimeZoneIds(QLocale::Country country) const override; + QList availableTimeZoneIds(int offsetFromUtc) const override; private: void init(const QByteArray &ianaId); @@ -297,34 +297,34 @@ public: QTzTimeZonePrivate *clone() const override; - QLocale::Country country() const Q_DECL_OVERRIDE; - QString comment() const Q_DECL_OVERRIDE; + QLocale::Country country() const override; + QString comment() const override; QString displayName(qint64 atMSecsSinceEpoch, QTimeZone::NameType nameType, - const QLocale &locale) const Q_DECL_OVERRIDE; + const QLocale &locale) const override; QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, - const QLocale &locale) const Q_DECL_OVERRIDE; - QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + const QLocale &locale) const override; + QString abbreviation(qint64 atMSecsSinceEpoch) const override; - int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + int offsetFromUtc(qint64 atMSecsSinceEpoch) const override; + int standardTimeOffset(qint64 atMSecsSinceEpoch) const override; + int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override; - bool hasDaylightTime() const Q_DECL_OVERRIDE; - bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasDaylightTime() const override; + bool isDaylightTime(qint64 atMSecsSinceEpoch) const override; - Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; + Data data(qint64 forMSecsSinceEpoch) const override; - bool hasTransitions() const Q_DECL_OVERRIDE; - Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; - Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasTransitions() const override; + Data nextTransition(qint64 afterMSecsSinceEpoch) const override; + Data previousTransition(qint64 beforeMSecsSinceEpoch) const override; - QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; + QByteArray systemTimeZoneId() const override; - QList availableTimeZoneIds() const Q_DECL_OVERRIDE; - QList availableTimeZoneIds(QLocale::Country country) const Q_DECL_OVERRIDE; + QList availableTimeZoneIds() const override; + QList availableTimeZoneIds(QLocale::Country country) const override; private: void init(const QByteArray &ianaId); @@ -353,28 +353,28 @@ public: QMacTimeZonePrivate *clone() const override; - QString comment() const Q_DECL_OVERRIDE; + QString comment() const override; QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, - const QLocale &locale) const Q_DECL_OVERRIDE; - QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + const QLocale &locale) const override; + QString abbreviation(qint64 atMSecsSinceEpoch) const override; - int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + int offsetFromUtc(qint64 atMSecsSinceEpoch) const override; + int standardTimeOffset(qint64 atMSecsSinceEpoch) const override; + int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override; - bool hasDaylightTime() const Q_DECL_OVERRIDE; - bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasDaylightTime() const override; + bool isDaylightTime(qint64 atMSecsSinceEpoch) const override; - Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; + Data data(qint64 forMSecsSinceEpoch) const override; - bool hasTransitions() const Q_DECL_OVERRIDE; - Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; - Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasTransitions() const override; + Data nextTransition(qint64 afterMSecsSinceEpoch) const override; + Data previousTransition(qint64 beforeMSecsSinceEpoch) const override; - QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; + QByteArray systemTimeZoneId() const override; - QList availableTimeZoneIds() const Q_DECL_OVERRIDE; + QList availableTimeZoneIds() const override; NSTimeZone *nsTimeZone() const; @@ -406,28 +406,28 @@ public: QWinTimeZonePrivate *clone() const override; - QString comment() const Q_DECL_OVERRIDE; + QString comment() const override; QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, - const QLocale &locale) const Q_DECL_OVERRIDE; - QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + const QLocale &locale) const override; + QString abbreviation(qint64 atMSecsSinceEpoch) const override; - int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + int offsetFromUtc(qint64 atMSecsSinceEpoch) const override; + int standardTimeOffset(qint64 atMSecsSinceEpoch) const override; + int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override; - bool hasDaylightTime() const Q_DECL_OVERRIDE; - bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasDaylightTime() const override; + bool isDaylightTime(qint64 atMSecsSinceEpoch) const override; - Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; + Data data(qint64 forMSecsSinceEpoch) const override; - bool hasTransitions() const Q_DECL_OVERRIDE; - Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; - Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasTransitions() const override; + Data nextTransition(qint64 afterMSecsSinceEpoch) const override; + Data previousTransition(qint64 beforeMSecsSinceEpoch) const override; - QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; + QByteArray systemTimeZoneId() const override; - QList availableTimeZoneIds() const Q_DECL_OVERRIDE; + QList availableTimeZoneIds() const override; private: void init(const QByteArray &ianaId); @@ -457,25 +457,25 @@ public: QAndroidTimeZonePrivate *clone() const override; QString displayName(QTimeZone::TimeType timeType, QTimeZone::NameType nameType, - const QLocale &locale) const Q_DECL_OVERRIDE; - QString abbreviation(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + const QLocale &locale) const override; + QString abbreviation(qint64 atMSecsSinceEpoch) const override; - int offsetFromUtc(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int standardTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; - int daylightTimeOffset(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + int offsetFromUtc(qint64 atMSecsSinceEpoch) const override; + int standardTimeOffset(qint64 atMSecsSinceEpoch) const override; + int daylightTimeOffset(qint64 atMSecsSinceEpoch) const override; - bool hasDaylightTime() const Q_DECL_OVERRIDE; - bool isDaylightTime(qint64 atMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasDaylightTime() const override; + bool isDaylightTime(qint64 atMSecsSinceEpoch) const override; - Data data(qint64 forMSecsSinceEpoch) const Q_DECL_OVERRIDE; + Data data(qint64 forMSecsSinceEpoch) const override; - bool hasTransitions() const Q_DECL_OVERRIDE; - Data nextTransition(qint64 afterMSecsSinceEpoch) const Q_DECL_OVERRIDE; - Data previousTransition(qint64 beforeMSecsSinceEpoch) const Q_DECL_OVERRIDE; + bool hasTransitions() const override; + Data nextTransition(qint64 afterMSecsSinceEpoch) const override; + Data previousTransition(qint64 beforeMSecsSinceEpoch) const override; - QByteArray systemTimeZoneId() const Q_DECL_OVERRIDE; + QByteArray systemTimeZoneId() const override; - QList availableTimeZoneIds() const Q_DECL_OVERRIDE; + QList availableTimeZoneIds() const override; private: void init(const QByteArray &zoneId); diff --git a/src/dbus/qdbusabstractinterface.cpp b/src/dbus/qdbusabstractinterface.cpp index 9f2e688ebb..2239f48a7d 100644 --- a/src/dbus/qdbusabstractinterface.cpp +++ b/src/dbus/qdbusabstractinterface.cpp @@ -73,7 +73,7 @@ public: : QMetaCallEvent(0, 0, Q_NULLPTR, sender, m.methodIndex()) {} - void placeMetaCall(QObject *object) Q_DECL_OVERRIDE + void placeMetaCall(QObject *object) override { QDBusAbstractInterface *iface = static_cast(object); QDBusAbstractInterfacePrivate::finishDisconnectNotify(iface, signalId()); diff --git a/src/dbus/qdbusabstractinterface.h b/src/dbus/qdbusabstractinterface.h index f859c5ee7d..d6b0870787 100644 --- a/src/dbus/qdbusabstractinterface.h +++ b/src/dbus/qdbusabstractinterface.h @@ -67,7 +67,7 @@ class QDBusAbstractInterfacePrivate; class Q_DBUS_EXPORT QDBusAbstractInterfaceBase: public QObject { public: - int qt_metacall(QMetaObject::Call, int, void**) Q_DECL_OVERRIDE; + int qt_metacall(QMetaObject::Call, int, void**) override; protected: QDBusAbstractInterfaceBase(QDBusAbstractInterfacePrivate &dd, QObject *parent); private: @@ -147,8 +147,8 @@ protected: const QDBusConnection &connection, QObject *parent); QDBusAbstractInterface(QDBusAbstractInterfacePrivate &, QObject *parent); - void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; - void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &signal) override; + void disconnectNotify(const QMetaMethod &signal) override; QVariant internalPropGet(const char *propname) const; void internalPropSet(const char *propname, const QVariant &value); QDBusMessage internalConstCall(QDBus::CallMode mode, diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index d323088779..6e58c5bd21 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -271,7 +271,7 @@ private: void _q_newConnection(QDBusConnectionPrivate *newConnection); protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; public slots: // public slots diff --git a/src/dbus/qdbusconnectioninterface.h b/src/dbus/qdbusconnectioninterface.h index 37f35dbe81..c7b1573722 100644 --- a/src/dbus/qdbusconnectioninterface.h +++ b/src/dbus/qdbusconnectioninterface.h @@ -115,8 +115,8 @@ Q_SIGNALS: void NameLost(const QString &); void NameOwnerChanged(const QString &, const QString &, const QString &); protected: - void connectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; - void disconnectNotify(const QMetaMethod &) Q_DECL_OVERRIDE; + void connectNotify(const QMetaMethod &) override; + void disconnectNotify(const QMetaMethod &) override; #endif }; diff --git a/src/dbus/qdbusconnectionmanager_p.h b/src/dbus/qdbusconnectionmanager_p.h index 1c7dea811d..ac49683cee 100644 --- a/src/dbus/qdbusconnectionmanager_p.h +++ b/src/dbus/qdbusconnectionmanager_p.h @@ -85,7 +85,7 @@ signals: void serverRequested(const QString &address, void *server); protected: - void run() Q_DECL_OVERRIDE; + void run() override; private: void executeConnectionRequest(ConnectionRequestData *data); diff --git a/src/dbus/qdbusintegrator_p.h b/src/dbus/qdbusintegrator_p.h index 85a067da1e..6026508a5c 100644 --- a/src/dbus/qdbusintegrator_p.h +++ b/src/dbus/qdbusintegrator_p.h @@ -109,7 +109,7 @@ public: : QMetaCallEvent(0, id, 0, sender, -1), connection(c), message(msg), metaTypes(types), flags(f) { } - void placeMetaCall(QObject *object) Q_DECL_OVERRIDE + void placeMetaCall(QObject *object) override { QDBusConnectionPrivate::d(connection)->deliverCall(object, flags, message, metaTypes, id()); } @@ -132,7 +132,7 @@ public: { } ~QDBusActivateObjectEvent(); - void placeMetaCall(QObject *) Q_DECL_OVERRIDE; + void placeMetaCall(QObject *) override; private: QDBusConnection connection; // just for refcounting @@ -151,7 +151,7 @@ public: : QMetaCallEvent(0, 0, Q_NULLPTR, cp, 0), conn(c), msg(msg), hooks(hooks), hookCount(count) {} ~QDBusSpyCallEvent(); - void placeMetaCall(QObject *) Q_DECL_OVERRIDE; + void placeMetaCall(QObject *) override; static inline void invokeSpyHooks(const QDBusMessage &msg, const Hook *hooks, int hookCount); QDBusConnection conn; // keeps the refcount in QDBusConnectionPrivate up diff --git a/src/dbus/qdbusinterface.h b/src/dbus/qdbusinterface.h index b6c2693400..5d73cf8bc3 100644 --- a/src/dbus/qdbusinterface.h +++ b/src/dbus/qdbusinterface.h @@ -62,9 +62,9 @@ public: QObject *parent = Q_NULLPTR); ~QDBusInterface(); - virtual const QMetaObject *metaObject() const Q_DECL_OVERRIDE; - virtual void *qt_metacast(const char *) Q_DECL_OVERRIDE; - virtual int qt_metacall(QMetaObject::Call, int, void **) Q_DECL_OVERRIDE; + virtual const QMetaObject *metaObject() const override; + virtual void *qt_metacast(const char *) override; + virtual int qt_metacall(QMetaObject::Call, int, void **) override; private: Q_DECLARE_PRIVATE(QDBusInterface) diff --git a/src/gui/accessible/qaccessibleobject.h b/src/gui/accessible/qaccessibleobject.h index dd69dcb081..81479c32ab 100644 --- a/src/gui/accessible/qaccessibleobject.h +++ b/src/gui/accessible/qaccessibleobject.h @@ -56,13 +56,13 @@ class Q_GUI_EXPORT QAccessibleObject : public QAccessibleInterface public: explicit QAccessibleObject(QObject *object); - bool isValid() const Q_DECL_OVERRIDE; - QObject *object() const Q_DECL_OVERRIDE; + bool isValid() const override; + QObject *object() const override; // properties - QRect rect() const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; + QRect rect() const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessibleInterface *childAt(int x, int y) const override; protected: virtual ~QAccessibleObject(); @@ -77,20 +77,20 @@ class Q_GUI_EXPORT QAccessibleApplication : public QAccessibleObject public: QAccessibleApplication(); - QWindow *window() const Q_DECL_OVERRIDE; + QWindow *window() const override; // relations - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface*) const Q_DECL_OVERRIDE; - QAccessibleInterface *focusChild() const Q_DECL_OVERRIDE; + int childCount() const override; + int indexOfChild(const QAccessibleInterface*) const override; + QAccessibleInterface *focusChild() const override; // navigation - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; // properties and state - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; + QAccessible::State state() const override; }; #endif // QT_NO_ACCESSIBILITY diff --git a/src/gui/image/qicon_p.h b/src/gui/image/qicon_p.h index aa358e88af..e384ff9e49 100644 --- a/src/gui/image/qicon_p.h +++ b/src/gui/image/qicon_p.h @@ -112,18 +112,18 @@ public: QPixmapIconEngine(); QPixmapIconEngine(const QPixmapIconEngine &); ~QPixmapIconEngine(); - void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; - QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override; + QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override; QPixmapIconEngineEntry *bestMatch(const QSize &size, QIcon::Mode mode, QIcon::State state, bool sizeOnly); - QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; - void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; - void addFile(const QString &fileName, const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; - - QString key() const Q_DECL_OVERRIDE; - QIconEngine *clone() const Q_DECL_OVERRIDE; - bool read(QDataStream &in) Q_DECL_OVERRIDE; - bool write(QDataStream &out) const Q_DECL_OVERRIDE; - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override; + void addPixmap(const QPixmap &pixmap, QIcon::Mode mode, QIcon::State state) override; + void addFile(const QString &fileName, const QSize &size, QIcon::Mode mode, QIcon::State state) override; + + QString key() const override; + QIconEngine *clone() const override; + bool read(QDataStream &in) override; + bool write(QDataStream &out) const override; + void virtual_hook(int id, void *data) override; private: QPixmapIconEngineEntry *tryMatch(const QSize &size, QIcon::Mode mode, QIcon::State state); diff --git a/src/gui/image/qiconloader_p.h b/src/gui/image/qiconloader_p.h index 9398bca585..0007437ee9 100644 --- a/src/gui/image/qiconloader_p.h +++ b/src/gui/image/qiconloader_p.h @@ -101,13 +101,13 @@ public: struct ScalableEntry : public QIconLoaderEngineEntry { - QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; + QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override; QIcon svgIcon; }; struct PixmapEntry : public QIconLoaderEngineEntry { - QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; + QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override; QPixmap basePixmap; }; @@ -125,20 +125,20 @@ public: QIconLoaderEngine(const QString& iconName = QString()); ~QIconLoaderEngine(); - void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; - QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; - QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) Q_DECL_OVERRIDE; - QIconEngine *clone() const Q_DECL_OVERRIDE; - bool read(QDataStream &in) Q_DECL_OVERRIDE; - bool write(QDataStream &out) const Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QRect &rect, QIcon::Mode mode, QIcon::State state) override; + QPixmap pixmap(const QSize &size, QIcon::Mode mode, QIcon::State state) override; + QSize actualSize(const QSize &size, QIcon::Mode mode, QIcon::State state) override; + QIconEngine *clone() const override; + bool read(QDataStream &in) override; + bool write(QDataStream &out) const override; Q_GUI_EXPORT static QIconLoaderEngineEntry *entryForSize(const QThemeIconInfo &info, const QSize &size, int scale = 1); private: - QString key() const Q_DECL_OVERRIDE; + QString key() const override; bool hasIcon() const; void ensureLoaded(); - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; QIconLoaderEngine(const QIconLoaderEngine &other); QThemeIconInfo m_info; diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h index eccff480bb..dd1751427c 100644 --- a/src/gui/image/qimage.h +++ b/src/gui/image/qimage.h @@ -164,7 +164,7 @@ public: bool isNull() const; - int devType() const Q_DECL_OVERRIDE; + int devType() const override; bool operator==(const QImage &) const; bool operator!=(const QImage &) const; @@ -311,7 +311,7 @@ public: #endif qint64 cacheKey() const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; // Auxiliary data int dotsPerMeterX() const; @@ -349,7 +349,7 @@ public: #endif protected: - virtual int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + virtual int metric(PaintDeviceMetric metric) const override; QImage mirrored_helper(bool horizontal, bool vertical) const; QImage rgbSwapped_helper() const; void mirrored_inplace(bool horizontal, bool vertical); diff --git a/src/gui/image/qpaintengine_pic_p.h b/src/gui/image/qpaintengine_pic_p.h index 7c690c1498..c3044796ad 100644 --- a/src/gui/image/qpaintengine_pic_p.h +++ b/src/gui/image/qpaintengine_pic_p.h @@ -68,10 +68,10 @@ public: QPicturePaintEngine(); ~QPicturePaintEngine(); - bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; - bool end() Q_DECL_OVERRIDE; + bool begin(QPaintDevice *pdev) override; + bool end() override; - void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; + void updateState(const QPaintEngineState &state) override; void updatePen(const QPen &pen); void updateBrush(const QBrush &brush); @@ -86,18 +86,18 @@ public: void updateClipEnabled(bool enabled); void updateOpacity(qreal opacity); - void drawEllipse(const QRectF &rect) Q_DECL_OVERRIDE; - void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE; - void drawPolygon(const QPointF *points, int numPoints, PolygonDrawMode mode) Q_DECL_OVERRIDE; + void drawEllipse(const QRectF &rect) override; + void drawPath(const QPainterPath &path) override; + void drawPolygon(const QPointF *points, int numPoints, PolygonDrawMode mode) override; using QPaintEngine::drawPolygon; - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; - void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) Q_DECL_OVERRIDE; + void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; + void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override; void drawImage(const QRectF &r, const QImage &image, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; - void drawTextItem(const QPointF &p, const QTextItem &ti) Q_DECL_OVERRIDE; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; + void drawTextItem(const QPointF &p, const QTextItem &ti) override; - Type type() const Q_DECL_OVERRIDE { return Picture; } + Type type() const override { return Picture; } protected: QPicturePaintEngine(QPaintEnginePrivate &dptr); diff --git a/src/gui/image/qpicture.cpp b/src/gui/image/qpicture.cpp index bf628e7571..7aa221948e 100644 --- a/src/gui/image/qpicture.cpp +++ b/src/gui/image/qpicture.cpp @@ -456,8 +456,8 @@ public: QFakeDevice() { dpi_x = qt_defaultDpiX(); dpi_y = qt_defaultDpiY(); } void setDpiX(int dpi) { dpi_x = dpi; } void setDpiY(int dpi) { dpi_y = dpi; } - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE { return 0; } - int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE + QPaintEngine *paintEngine() const override { return 0; } + int metric(PaintDeviceMetric m) const override { switch(m) { case PdmPhysicalDpiX: diff --git a/src/gui/image/qpicture.h b/src/gui/image/qpicture.h index db2b767efe..303806809d 100644 --- a/src/gui/image/qpicture.h +++ b/src/gui/image/qpicture.h @@ -62,7 +62,7 @@ public: bool isNull() const; - int devType() const Q_DECL_OVERRIDE; + int devType() const override; uint size() const; const char* data() const; virtual void setData(const char* data, uint size); @@ -98,12 +98,12 @@ public: static QT_DEPRECATED QStringList outputFormatList(); #endif // QT_DEPRECATED_SINCE(5, 10) - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; protected: QPicture(QPicturePrivate &data); - int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric m) const override; private: bool exec(QPainter *p, QDataStream &ds, int i); diff --git a/src/gui/image/qpixmap.h b/src/gui/image/qpixmap.h index d651b57fd5..822773d3c7 100644 --- a/src/gui/image/qpixmap.h +++ b/src/gui/image/qpixmap.h @@ -83,7 +83,7 @@ public: operator QVariant() const; bool isNull() const; - int devType() const Q_DECL_OVERRIDE; + int devType() const override; int width() const; int height() const; @@ -162,7 +162,7 @@ public: bool isQBitmap() const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; inline bool operator!() const { return isNull(); } @@ -172,7 +172,7 @@ public: #endif protected: - int metric(PaintDeviceMetric) const Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric) const override; static QPixmap fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags = Qt::AutoColor); private: diff --git a/src/gui/image/qpixmap_blitter_p.h b/src/gui/image/qpixmap_blitter_p.h index 9889cfb8ec..d70cbcdcc3 100644 --- a/src/gui/image/qpixmap_blitter_p.h +++ b/src/gui/image/qpixmap_blitter_p.h @@ -69,17 +69,17 @@ public: QBlittable *blittable() const; void setBlittable(QBlittable *blittable); - void resize(int width, int height) Q_DECL_OVERRIDE; - int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - void fill(const QColor &color) Q_DECL_OVERRIDE; - QImage *buffer() Q_DECL_OVERRIDE; - QImage toImage() const Q_DECL_OVERRIDE; - bool hasAlphaChannel() const Q_DECL_OVERRIDE; - void fromImage(const QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; - qreal devicePixelRatio() const Q_DECL_OVERRIDE; - void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE; - - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + void resize(int width, int height) override; + int metric(QPaintDevice::PaintDeviceMetric metric) const override; + void fill(const QColor &color) override; + QImage *buffer() override; + QImage toImage() const override; + bool hasAlphaChannel() const override; + void fromImage(const QImage &image, Qt::ImageConversionFlags flags) override; + qreal devicePixelRatio() const override; + void setDevicePixelRatio(qreal scaleFactor) override; + + QPaintEngine *paintEngine() const override; void markRasterOverlay(const QRectF &); void markRasterOverlay(const QPointF &, const QTextItem &); diff --git a/src/gui/image/qpixmap_raster_p.h b/src/gui/image/qpixmap_raster_p.h index 6ea965a324..cff962181a 100644 --- a/src/gui/image/qpixmap_raster_p.h +++ b/src/gui/image/qpixmap_raster_p.h @@ -63,28 +63,28 @@ public: QRasterPlatformPixmap(PixelType type); ~QRasterPlatformPixmap(); - QPlatformPixmap *createCompatiblePlatformPixmap() const Q_DECL_OVERRIDE; - - void resize(int width, int height) Q_DECL_OVERRIDE; - bool fromData(const uchar *buffer, uint len, const char *format, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; - void fromImage(const QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; - void fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; - void fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; - - void copy(const QPlatformPixmap *data, const QRect &rect) Q_DECL_OVERRIDE; - bool scroll(int dx, int dy, const QRect &rect) Q_DECL_OVERRIDE; - void fill(const QColor &color) Q_DECL_OVERRIDE; - bool hasAlphaChannel() const Q_DECL_OVERRIDE; - QImage toImage() const Q_DECL_OVERRIDE; - QImage toImage(const QRect &rect) const Q_DECL_OVERRIDE; - QPaintEngine* paintEngine() const Q_DECL_OVERRIDE; - QImage* buffer() Q_DECL_OVERRIDE; - qreal devicePixelRatio() const Q_DECL_OVERRIDE; - void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE; + QPlatformPixmap *createCompatiblePlatformPixmap() const override; + + void resize(int width, int height) override; + bool fromData(const uchar *buffer, uint len, const char *format, Qt::ImageConversionFlags flags) override; + void fromImage(const QImage &image, Qt::ImageConversionFlags flags) override; + void fromImageInPlace(QImage &image, Qt::ImageConversionFlags flags) override; + void fromImageReader(QImageReader *imageReader, Qt::ImageConversionFlags flags) override; + + void copy(const QPlatformPixmap *data, const QRect &rect) override; + bool scroll(int dx, int dy, const QRect &rect) override; + void fill(const QColor &color) override; + bool hasAlphaChannel() const override; + QImage toImage() const override; + QImage toImage(const QRect &rect) const override; + QPaintEngine* paintEngine() const override; + QImage* buffer() override; + qreal devicePixelRatio() const override; + void setDevicePixelRatio(qreal scaleFactor) override; protected: - int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + int metric(QPaintDevice::PaintDeviceMetric metric) const override; void createPixmapForImage(QImage sourceImage, Qt::ImageConversionFlags flags); void setImage(const QImage &image); QImage image; diff --git a/src/gui/image/qpixmapcache.cpp b/src/gui/image/qpixmapcache.cpp index 742aa31ba9..4b8b1203d6 100644 --- a/src/gui/image/qpixmapcache.cpp +++ b/src/gui/image/qpixmapcache.cpp @@ -193,7 +193,7 @@ public: QPMCache(); ~QPMCache(); - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; bool insert(const QString& key, const QPixmap &pixmap, int cost); QPixmapCache::Key insert(const QPixmap &pixmap, int cost); bool replace(const QPixmapCache::Key &key, const QPixmap &pixmap, int cost); diff --git a/src/gui/itemmodels/qstandarditemmodel.h b/src/gui/itemmodels/qstandarditemmodel.h index 73107b827c..547df92891 100644 --- a/src/gui/itemmodels/qstandarditemmodel.h +++ b/src/gui/itemmodels/qstandarditemmodel.h @@ -333,39 +333,39 @@ public: void setItemRoleNames(const QHash &roleNames); - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; // Qt 6: Remove - QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; + QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; QVariant headerData(int section, Qt::Orientation orientation, - int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + int role = Qt::DisplayRole) const override; bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, - int role = Qt::EditRole) Q_DECL_OVERRIDE; + int role = Qt::EditRole) override; - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; + Qt::DropActions supportedDropActions() const override; - QMap itemData(const QModelIndex &index) const Q_DECL_OVERRIDE; - bool setItemData(const QModelIndex &index, const QMap &roles) Q_DECL_OVERRIDE; + QMap itemData(const QModelIndex &index) const override; + bool setItemData(const QModelIndex &index, const QMap &roles) override; void clear(); using QObject::parent; - void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; QStandardItem *itemFromIndex(const QModelIndex &index) const; QModelIndex indexFromItem(const QStandardItem *item) const; @@ -414,9 +414,9 @@ public: int sortRole() const; void setSortRole(int role); - QStringList mimeTypes() const Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; - bool dropMimeData (const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; + bool dropMimeData (const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; Q_SIGNALS: void itemChanged(QStandardItem *item); diff --git a/src/gui/kernel/qdnd_p.h b/src/gui/kernel/qdnd_p.h index eaf6c74fd4..e7d83cbbaf 100644 --- a/src/gui/kernel/qdnd_p.h +++ b/src/gui/kernel/qdnd_p.h @@ -77,8 +77,8 @@ public: QInternalMimeData(); ~QInternalMimeData(); - bool hasFormat(const QString &mimeType) const Q_DECL_OVERRIDE; - QStringList formats() const Q_DECL_OVERRIDE; + bool hasFormat(const QString &mimeType) const override; + QStringList formats() const override; static bool canReadData(const QString &mimeType); @@ -87,7 +87,7 @@ public: static QByteArray renderDataHelper(const QString &mimeType, const QMimeData *data); protected: - QVariant retrieveData(const QString &mimeType, QVariant::Type type) const Q_DECL_OVERRIDE; + QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override; virtual bool hasFormat_sys(const QString &mimeType) const = 0; virtual QStringList formats_sys() const = 0; diff --git a/src/gui/kernel/qguiapplication.h b/src/gui/kernel/qguiapplication.h index 6721970222..4394787d54 100644 --- a/src/gui/kernel/qguiapplication.h +++ b/src/gui/kernel/qguiapplication.h @@ -155,7 +155,7 @@ public: static Qt::ApplicationState applicationState(); static int exec(); - bool notify(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool notify(QObject *, QEvent *) override; #ifndef QT_NO_SESSIONMANAGER // session management @@ -187,8 +187,8 @@ Q_SIGNALS: void applicationDisplayNameChanged(); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; - bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) override; QGuiApplication(QGuiApplicationPrivate &p); diff --git a/src/gui/kernel/qguiapplication_p.h b/src/gui/kernel/qguiapplication_p.h index 014ed861df..ee5c5f8cde 100644 --- a/src/gui/kernel/qguiapplication_p.h +++ b/src/gui/kernel/qguiapplication_p.h @@ -85,13 +85,13 @@ public: void init(); void createPlatformIntegration(); - void createEventDispatcher() Q_DECL_OVERRIDE; - void eventDispatcherReady() Q_DECL_OVERRIDE; + void createEventDispatcher() override; + void eventDispatcherReady() override; virtual void notifyLayoutDirectionChange(); virtual void notifyActiveWindowChange(QWindow *previous); - virtual bool shouldQuit() Q_DECL_OVERRIDE; + virtual bool shouldQuit() override; bool shouldQuitInternal(const QWindowList &processedWindows); virtual bool tryCloseAllWindows(); diff --git a/src/gui/kernel/qoffscreensurface.h b/src/gui/kernel/qoffscreensurface.h index 3295ae0d40..c3f4656850 100644 --- a/src/gui/kernel/qoffscreensurface.h +++ b/src/gui/kernel/qoffscreensurface.h @@ -62,7 +62,7 @@ public: explicit QOffscreenSurface(QScreen *screen = Q_NULLPTR); virtual ~QOffscreenSurface(); - SurfaceType surfaceType() const Q_DECL_OVERRIDE; + SurfaceType surfaceType() const override; void create(); void destroy(); @@ -70,10 +70,10 @@ public: bool isValid() const; void setFormat(const QSurfaceFormat &format); - QSurfaceFormat format() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; QSurfaceFormat requestedFormat() const; - QSize size() const Q_DECL_OVERRIDE; + QSize size() const override; QScreen *screen() const; void setScreen(QScreen *screen); @@ -91,7 +91,7 @@ private Q_SLOTS: private: - QPlatformSurface *surfaceHandle() const Q_DECL_OVERRIDE; + QPlatformSurface *surfaceHandle() const override; Q_DISABLE_COPY(QOffscreenSurface) }; diff --git a/src/gui/kernel/qopenglcontext_p.h b/src/gui/kernel/qopenglcontext_p.h index 64bf55beee..eeb1a83283 100644 --- a/src/gui/kernel/qopenglcontext_p.h +++ b/src/gui/kernel/qopenglcontext_p.h @@ -114,12 +114,12 @@ public: GLuint id() const { return m_id; } protected: - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_id = 0; } - void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE; + void freeResource(QOpenGLContext *context) override; private: GLuint m_id; diff --git a/src/gui/kernel/qopenglwindow.cpp b/src/gui/kernel/qopenglwindow.cpp index 5170c7ab63..f82430005b 100644 --- a/src/gui/kernel/qopenglwindow.cpp +++ b/src/gui/kernel/qopenglwindow.cpp @@ -163,7 +163,7 @@ class QOpenGLWindowPaintDevice : public QOpenGLPaintDevice { public: QOpenGLWindowPaintDevice(QOpenGLWindow *window) : m_window(window) { } - void ensureActiveTarget() Q_DECL_OVERRIDE; + void ensureActiveTarget() override; QOpenGLWindow *m_window; }; @@ -188,9 +188,9 @@ public: void bindFBO(); void initialize(); - void beginPaint(const QRegion ®ion) Q_DECL_OVERRIDE; - void endPaint() Q_DECL_OVERRIDE; - void flush(const QRegion ®ion) Q_DECL_OVERRIDE; + void beginPaint(const QRegion ®ion) override; + void endPaint() override; + void flush(const QRegion ®ion) override; QOpenGLWindow::UpdateBehavior updateBehavior; bool hasFboBlit; diff --git a/src/gui/kernel/qopenglwindow.h b/src/gui/kernel/qopenglwindow.h index fe236f9538..85b380249b 100644 --- a/src/gui/kernel/qopenglwindow.h +++ b/src/gui/kernel/qopenglwindow.h @@ -91,10 +91,10 @@ protected: virtual void paintUnderGL(); virtual void paintOverGL(); - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *) const Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + int metric(PaintDeviceMetric metric) const override; + QPaintDevice *redirected(QPoint *) const override; private: Q_DISABLE_COPY(QOpenGLWindow) diff --git a/src/gui/kernel/qpaintdevicewindow.h b/src/gui/kernel/qpaintdevicewindow.h index 81b41dcdd5..3be078132f 100644 --- a/src/gui/kernel/qpaintdevicewindow.h +++ b/src/gui/kernel/qpaintdevicewindow.h @@ -68,14 +68,14 @@ public Q_SLOTS: protected: virtual void paintEvent(QPaintEvent *event); - int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - void exposeEvent(QExposeEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric metric) const override; + void exposeEvent(QExposeEvent *) override; + bool event(QEvent *event) override; QPaintDeviceWindow(QPaintDeviceWindowPrivate &dd, QWindow *parent); private: - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; Q_DISABLE_COPY(QPaintDeviceWindow) }; diff --git a/src/gui/kernel/qrasterwindow.cpp b/src/gui/kernel/qrasterwindow.cpp index 73871e0f39..d06fee62cf 100644 --- a/src/gui/kernel/qrasterwindow.cpp +++ b/src/gui/kernel/qrasterwindow.cpp @@ -70,7 +70,7 @@ class QRasterWindowPrivate : public QPaintDeviceWindowPrivate { Q_DECLARE_PUBLIC(QRasterWindow) public: - void beginPaint(const QRegion ®ion) Q_DECL_OVERRIDE + void beginPaint(const QRegion ®ion) override { Q_Q(QRasterWindow); const QSize size = q->size(); @@ -81,12 +81,12 @@ public: backingstore->beginPaint(region); } - void endPaint() Q_DECL_OVERRIDE + void endPaint() override { backingstore->endPaint(); } - void flush(const QRegion ®ion) Q_DECL_OVERRIDE + void flush(const QRegion ®ion) override { Q_Q(QRasterWindow); backingstore->flush(region, q); diff --git a/src/gui/kernel/qrasterwindow.h b/src/gui/kernel/qrasterwindow.h index 9b29183ad6..6dee03c3ad 100644 --- a/src/gui/kernel/qrasterwindow.h +++ b/src/gui/kernel/qrasterwindow.h @@ -57,8 +57,8 @@ public: ~QRasterWindow(); protected: - int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *) const Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric metric) const override; + QPaintDevice *redirected(QPoint *) const override; private: Q_DISABLE_COPY(QRasterWindow) diff --git a/src/gui/kernel/qshapedpixmapdndwindow_p.h b/src/gui/kernel/qshapedpixmapdndwindow_p.h index 2c25ca7c76..477938867c 100644 --- a/src/gui/kernel/qshapedpixmapdndwindow_p.h +++ b/src/gui/kernel/qshapedpixmapdndwindow_p.h @@ -71,7 +71,7 @@ public: void updateGeometry(const QPoint &pos); protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; private: QPixmap m_pixmap; diff --git a/src/gui/kernel/qsimpledrag_p.h b/src/gui/kernel/qsimpledrag_p.h index 45c13e43b2..4db8eb4505 100644 --- a/src/gui/kernel/qsimpledrag_p.h +++ b/src/gui/kernel/qsimpledrag_p.h @@ -72,10 +72,10 @@ class Q_GUI_EXPORT QBasicDrag : public QPlatformDrag, public QObject public: virtual ~QBasicDrag(); - virtual Qt::DropAction drag(QDrag *drag) Q_DECL_OVERRIDE; - void cancelDrag() Q_DECL_OVERRIDE; + virtual Qt::DropAction drag(QDrag *drag) override; + void cancelDrag() override; - virtual bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + virtual bool eventFilter(QObject *o, QEvent *e) override; protected: QBasicDrag(); @@ -127,10 +127,10 @@ public: QSimpleDrag(); protected: - virtual void startDrag() Q_DECL_OVERRIDE; - virtual void cancel() Q_DECL_OVERRIDE; - virtual void move(const QPoint &globalPos) Q_DECL_OVERRIDE; - virtual void drop(const QPoint &globalPos) Q_DECL_OVERRIDE; + virtual void startDrag() override; + virtual void cancel() override; + virtual void move(const QPoint &globalPos) override; + virtual void drop(const QPoint &globalPos) override; private: QWindow *m_current_window; diff --git a/src/gui/kernel/qwindow.h b/src/gui/kernel/qwindow.h index 4a874caacb..be8f10529d 100644 --- a/src/gui/kernel/qwindow.h +++ b/src/gui/kernel/qwindow.h @@ -146,7 +146,7 @@ public: virtual ~QWindow(); void setSurfaceType(SurfaceType surfaceType); - SurfaceType surfaceType() const Q_DECL_OVERRIDE; + SurfaceType surfaceType() const override; bool isVisible() const; @@ -168,7 +168,7 @@ public: void setModality(Qt::WindowModality modality); void setFormat(const QSurfaceFormat &format); - QSurfaceFormat format() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; QSurfaceFormat requestedFormat() const; void setFlags(Qt::WindowFlags flags); @@ -233,7 +233,7 @@ public: inline int x() const { return geometry().x(); } inline int y() const { return geometry().y(); } - QSize size() const Q_DECL_OVERRIDE { return geometry().size(); } + QSize size() const override { return geometry().size(); } inline QPoint position() const { return geometry().topLeft(); } void setPosition(const QPoint &pt); @@ -347,7 +347,7 @@ protected: virtual void hideEvent(QHideEvent *); // TODO Qt 6 - add closeEvent virtual handler - virtual bool event(QEvent *) Q_DECL_OVERRIDE; + virtual bool event(QEvent *) override; virtual void keyPressEvent(QKeyEvent *); virtual void keyReleaseEvent(QKeyEvent *); virtual void mousePressEvent(QMouseEvent *); @@ -367,7 +367,7 @@ protected: private: Q_PRIVATE_SLOT(d_func(), void _q_clearAlert()) - QPlatformSurface *surfaceHandle() const Q_DECL_OVERRIDE; + QPlatformSurface *surfaceHandle() const override; Q_DISABLE_COPY(QWindow) diff --git a/src/gui/opengl/qopenglengineshadermanager.cpp b/src/gui/opengl/qopenglengineshadermanager.cpp index 3a94fa8805..2f7afa4a66 100644 --- a/src/gui/opengl/qopenglengineshadermanager.cpp +++ b/src/gui/opengl/qopenglengineshadermanager.cpp @@ -69,13 +69,13 @@ public: delete m_shaders; } - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { delete m_shaders; m_shaders = 0; } - void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *) override { } diff --git a/src/gui/opengl/qopenglfunctions.cpp b/src/gui/opengl/qopenglfunctions.cpp index 5e3537e47b..739ecacc51 100644 --- a/src/gui/opengl/qopenglfunctions.cpp +++ b/src/gui/opengl/qopenglfunctions.cpp @@ -216,13 +216,13 @@ struct QOpenGLFunctionsPrivateEx : public QOpenGLExtensionsPrivate, public QOpen , m_extensions(-1) {} - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_features = -1; m_extensions = -1; } - void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *) override { // no gl resources to free } diff --git a/src/gui/opengl/qopenglfunctions_1_0.h b/src/gui/opengl/qopenglfunctions_1_0.h index 8284604086..cddb7251ed 100644 --- a/src/gui/opengl/qopenglfunctions_1_0.h +++ b/src/gui/opengl/qopenglfunctions_1_0.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_0(); ~QOpenGLFunctions_1_0(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_1.h b/src/gui/opengl/qopenglfunctions_1_1.h index 052d3e93bd..8a9f16ec4c 100644 --- a/src/gui/opengl/qopenglfunctions_1_1.h +++ b/src/gui/opengl/qopenglfunctions_1_1.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_1(); ~QOpenGLFunctions_1_1(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_2.h b/src/gui/opengl/qopenglfunctions_1_2.h index 6b36500a79..7daca0923d 100644 --- a/src/gui/opengl/qopenglfunctions_1_2.h +++ b/src/gui/opengl/qopenglfunctions_1_2.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_2(); ~QOpenGLFunctions_1_2(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_3.h b/src/gui/opengl/qopenglfunctions_1_3.h index 3ed5851d5d..b527b57946 100644 --- a/src/gui/opengl/qopenglfunctions_1_3.h +++ b/src/gui/opengl/qopenglfunctions_1_3.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_3(); ~QOpenGLFunctions_1_3(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_4.h b/src/gui/opengl/qopenglfunctions_1_4.h index 849fad6744..1f3f5a9c0a 100644 --- a/src/gui/opengl/qopenglfunctions_1_4.h +++ b/src/gui/opengl/qopenglfunctions_1_4.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_4(); ~QOpenGLFunctions_1_4(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_1_5.h b/src/gui/opengl/qopenglfunctions_1_5.h index 18914a8957..d2f5311211 100644 --- a/src/gui/opengl/qopenglfunctions_1_5.h +++ b/src/gui/opengl/qopenglfunctions_1_5.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_1_5(); ~QOpenGLFunctions_1_5(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_2_0.h b/src/gui/opengl/qopenglfunctions_2_0.h index 74a91e0ff0..556597a9b3 100644 --- a/src/gui/opengl/qopenglfunctions_2_0.h +++ b/src/gui/opengl/qopenglfunctions_2_0.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_2_0(); ~QOpenGLFunctions_2_0(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_2_1.h b/src/gui/opengl/qopenglfunctions_2_1.h index e9212640f7..f053222c71 100644 --- a/src/gui/opengl/qopenglfunctions_2_1.h +++ b/src/gui/opengl/qopenglfunctions_2_1.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_2_1(); ~QOpenGLFunctions_2_1(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_0.h b/src/gui/opengl/qopenglfunctions_3_0.h index 1082d869d1..c592050c24 100644 --- a/src/gui/opengl/qopenglfunctions_3_0.h +++ b/src/gui/opengl/qopenglfunctions_3_0.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_0(); ~QOpenGLFunctions_3_0(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_1.h b/src/gui/opengl/qopenglfunctions_3_1.h index 2691dd29e7..3a8d3891f3 100644 --- a/src/gui/opengl/qopenglfunctions_3_1.h +++ b/src/gui/opengl/qopenglfunctions_3_1.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_1(); ~QOpenGLFunctions_3_1(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h index 9f34190721..391e725953 100644 --- a/src/gui/opengl/qopenglfunctions_3_2_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_3_2_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_2_Compatibility(); ~QOpenGLFunctions_3_2_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_2_core.h b/src/gui/opengl/qopenglfunctions_3_2_core.h index 2d5ee14bee..1eafb6f441 100644 --- a/src/gui/opengl/qopenglfunctions_3_2_core.h +++ b/src/gui/opengl/qopenglfunctions_3_2_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_2_Core(); ~QOpenGLFunctions_3_2_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h index a5c0cab63c..185dd5aab4 100644 --- a/src/gui/opengl/qopenglfunctions_3_3_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_3_3_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_3_Compatibility(); ~QOpenGLFunctions_3_3_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_3_3_core.h b/src/gui/opengl/qopenglfunctions_3_3_core.h index 4f0132d959..47d54d717e 100644 --- a/src/gui/opengl/qopenglfunctions_3_3_core.h +++ b/src/gui/opengl/qopenglfunctions_3_3_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_3_3_Core(); ~QOpenGLFunctions_3_3_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h index 1fa5e8a361..c0e42443d3 100644 --- a/src/gui/opengl/qopenglfunctions_4_0_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_0_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_0_Compatibility(); ~QOpenGLFunctions_4_0_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_0_core.h b/src/gui/opengl/qopenglfunctions_4_0_core.h index 8fd2af2d04..6cb55e86f7 100644 --- a/src/gui/opengl/qopenglfunctions_4_0_core.h +++ b/src/gui/opengl/qopenglfunctions_4_0_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_0_Core(); ~QOpenGLFunctions_4_0_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h index a284f8e6d3..bee169b50c 100644 --- a/src/gui/opengl/qopenglfunctions_4_1_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_1_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_1_Compatibility(); ~QOpenGLFunctions_4_1_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_1_core.h b/src/gui/opengl/qopenglfunctions_4_1_core.h index d35db3c839..3a4fd0743b 100644 --- a/src/gui/opengl/qopenglfunctions_4_1_core.h +++ b/src/gui/opengl/qopenglfunctions_4_1_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_1_Core(); ~QOpenGLFunctions_4_1_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h index 7b45859984..6726d5fc44 100644 --- a/src/gui/opengl/qopenglfunctions_4_2_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_2_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_2_Compatibility(); ~QOpenGLFunctions_4_2_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_2_core.h b/src/gui/opengl/qopenglfunctions_4_2_core.h index 80bb33e7d8..a921329741 100644 --- a/src/gui/opengl/qopenglfunctions_4_2_core.h +++ b/src/gui/opengl/qopenglfunctions_4_2_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_2_Core(); ~QOpenGLFunctions_4_2_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h index 515467a38d..b9d4eb1d6f 100644 --- a/src/gui/opengl/qopenglfunctions_4_3_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_3_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_3_Compatibility(); ~QOpenGLFunctions_4_3_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_3_core.h b/src/gui/opengl/qopenglfunctions_4_3_core.h index 4a700c36d7..da552d64af 100644 --- a/src/gui/opengl/qopenglfunctions_4_3_core.h +++ b/src/gui/opengl/qopenglfunctions_4_3_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_3_Core(); ~QOpenGLFunctions_4_3_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h index f2d640cdaf..7a05bd802d 100644 --- a/src/gui/opengl/qopenglfunctions_4_4_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_4_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_4_Compatibility(); ~QOpenGLFunctions_4_4_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_4_core.h b/src/gui/opengl/qopenglfunctions_4_4_core.h index bcb7383a9e..6b29a9659b 100644 --- a/src/gui/opengl/qopenglfunctions_4_4_core.h +++ b/src/gui/opengl/qopenglfunctions_4_4_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_4_Core(); ~QOpenGLFunctions_4_4_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_5_compatibility.h b/src/gui/opengl/qopenglfunctions_4_5_compatibility.h index b164538686..7a97085a85 100644 --- a/src/gui/opengl/qopenglfunctions_4_5_compatibility.h +++ b/src/gui/opengl/qopenglfunctions_4_5_compatibility.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_5_Compatibility(); ~QOpenGLFunctions_4_5_Compatibility(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_4_5_core.h b/src/gui/opengl/qopenglfunctions_4_5_core.h index 0940d8cf61..bb1b17f7b1 100644 --- a/src/gui/opengl/qopenglfunctions_4_5_core.h +++ b/src/gui/opengl/qopenglfunctions_4_5_core.h @@ -65,7 +65,7 @@ public: QOpenGLFunctions_4_5_Core(); ~QOpenGLFunctions_4_5_Core(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL 1.0 core functions void glViewport(GLint x, GLint y, GLsizei width, GLsizei height); diff --git a/src/gui/opengl/qopenglfunctions_es2.h b/src/gui/opengl/qopenglfunctions_es2.h index 3b7d2806ea..851eb5951b 100644 --- a/src/gui/opengl/qopenglfunctions_es2.h +++ b/src/gui/opengl/qopenglfunctions_es2.h @@ -57,7 +57,7 @@ public: QOpenGLFunctions_ES2(); ~QOpenGLFunctions_ES2(); - bool initializeOpenGLFunctions() Q_DECL_OVERRIDE; + bool initializeOpenGLFunctions() override; // OpenGL ES2 core functions void glActiveTexture(GLenum texture); diff --git a/src/gui/opengl/qopenglgradientcache_p.h b/src/gui/opengl/qopenglgradientcache_p.h index a2ed85c061..cbdbbb0c54 100644 --- a/src/gui/opengl/qopenglgradientcache_p.h +++ b/src/gui/opengl/qopenglgradientcache_p.h @@ -85,8 +85,8 @@ public: GLuint getBuffer(const QGradient &gradient, qreal opacity); inline int paletteSize() const { return 1024; } - void invalidateResource() Q_DECL_OVERRIDE; - void freeResource(QOpenGLContext *ctx) Q_DECL_OVERRIDE; + void invalidateResource() override; + void freeResource(QOpenGLContext *ctx) override; private: inline int maxCacheSize() const { return 60; } diff --git a/src/gui/opengl/qopenglpaintengine_p.h b/src/gui/opengl/qopenglpaintengine_p.h index 679b3c0557..0541ce6168 100644 --- a/src/gui/opengl/qopenglpaintengine_p.h +++ b/src/gui/opengl/qopenglpaintengine_p.h @@ -116,37 +116,37 @@ public: QOpenGL2PaintEngineEx(); ~QOpenGL2PaintEngineEx(); - bool begin(QPaintDevice *device) Q_DECL_OVERRIDE; + bool begin(QPaintDevice *device) override; void ensureActive(); - bool end() Q_DECL_OVERRIDE; - - virtual void clipEnabledChanged() Q_DECL_OVERRIDE; - virtual void penChanged() Q_DECL_OVERRIDE; - virtual void brushChanged() Q_DECL_OVERRIDE; - virtual void brushOriginChanged() Q_DECL_OVERRIDE; - virtual void opacityChanged() Q_DECL_OVERRIDE; - virtual void compositionModeChanged() Q_DECL_OVERRIDE; - virtual void renderHintsChanged() Q_DECL_OVERRIDE; - virtual void transformChanged() Q_DECL_OVERRIDE; - - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; + bool end() override; + + virtual void clipEnabledChanged() override; + virtual void penChanged() override; + virtual void brushChanged() override; + virtual void brushOriginChanged() override; + virtual void opacityChanged() override; + virtual void compositionModeChanged() override; + virtual void renderHintsChanged() override; + virtual void transformChanged() override; + + virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, - QPainter::PixmapFragmentHints hints) Q_DECL_OVERRIDE; + QPainter::PixmapFragmentHints hints) override; virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; - virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; - virtual void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE; - virtual void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE; - virtual void clip(const QVectorPath &path, Qt::ClipOperation op) Q_DECL_OVERRIDE; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; + virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) override; + virtual void fill(const QVectorPath &path, const QBrush &brush) override; + virtual void stroke(const QVectorPath &path, const QPen &pen) override; + virtual void clip(const QVectorPath &path, Qt::ClipOperation op) override; - virtual void drawStaticTextItem(QStaticTextItem *textItem) Q_DECL_OVERRIDE; + virtual void drawStaticTextItem(QStaticTextItem *textItem) override; bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr); - Type type() const Q_DECL_OVERRIDE { return OpenGL2; } + Type type() const override { return OpenGL2; } - virtual void setState(QPainterState *s) Q_DECL_OVERRIDE; - virtual QPainterState *createState(QPainterState *orig) const Q_DECL_OVERRIDE; + virtual void setState(QPainterState *s) override; + virtual QPainterState *createState(QPainterState *orig) const override; inline QOpenGL2PaintEngineState *state() { return static_cast(QPaintEngineEx::state()); } @@ -154,16 +154,16 @@ public: return static_cast(QPaintEngineEx::state()); } - void beginNativePainting() Q_DECL_OVERRIDE; - void endNativePainting() Q_DECL_OVERRIDE; + void beginNativePainting() override; + void endNativePainting() override; void invalidateState(); void setRenderTextActive(bool); bool isNativePaintingActive() const; - bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE { return false; } - bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE; + bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const override { return false; } + bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const override; private: Q_DISABLE_COPY(QOpenGL2PaintEngineEx) @@ -265,7 +265,7 @@ public: void updateClipScissorTest(); void setScissor(const QRect &rect); void regenerateClip(); - void systemStateChanged() Q_DECL_OVERRIDE; + void systemStateChanged() override; void setVertexAttribArrayEnabled(int arrayIndex, bool enabled = true); void syncGlState(); diff --git a/src/gui/opengl/qopengltexturecache_p.h b/src/gui/opengl/qopengltexturecache_p.h index 4a438c8d95..b9d7df91e3 100644 --- a/src/gui/opengl/qopengltexturecache_p.h +++ b/src/gui/opengl/qopengltexturecache_p.h @@ -82,8 +82,8 @@ public: void invalidate(qint64 key); - void invalidateResource() Q_DECL_OVERRIDE; - void freeResource(QOpenGLContext *ctx) Q_DECL_OVERRIDE; + void invalidateResource() override; + void freeResource(QOpenGLContext *ctx) override; private: GLuint bindTexture(QOpenGLContext *context, qint64 key, const QImage &image, QOpenGLTextureCache::BindOptions options); diff --git a/src/gui/opengl/qopengltextureglyphcache_p.h b/src/gui/opengl/qopengltextureglyphcache_p.h index 6a1550dbed..0b7b5f6082 100644 --- a/src/gui/opengl/qopengltextureglyphcache_p.h +++ b/src/gui/opengl/qopengltextureglyphcache_p.h @@ -81,7 +81,7 @@ public: #endif } - void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *context) override { QOpenGLContext *ctx = context; #ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG @@ -93,7 +93,7 @@ public: ctx->functions()->glDeleteTextures(1, &m_texture); } - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_texture = 0; m_fbo = 0; @@ -113,12 +113,12 @@ public: QOpenGLTextureGlyphCache(QFontEngine::GlyphFormat glyphFormat, const QTransform &matrix); ~QOpenGLTextureGlyphCache(); - virtual void createTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void resizeTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) Q_DECL_OVERRIDE; - virtual int glyphPadding() const Q_DECL_OVERRIDE; - virtual int maxTextureWidth() const Q_DECL_OVERRIDE; - virtual int maxTextureHeight() const Q_DECL_OVERRIDE; + virtual void createTextureData(int width, int height) override; + virtual void resizeTextureData(int width, int height) override; + virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) override; + virtual int glyphPadding() const override; + virtual int maxTextureWidth() const override; + virtual int maxTextureHeight() const override; inline GLuint texture() const { QOpenGLTextureGlyphCache *that = const_cast(this); diff --git a/src/gui/painting/qpaintengine_blitter_p.h b/src/gui/painting/qpaintengine_blitter_p.h index 40f5347b26..fb5dfe2318 100644 --- a/src/gui/painting/qpaintengine_blitter_p.h +++ b/src/gui/painting/qpaintengine_blitter_p.h @@ -67,48 +67,48 @@ class Q_GUI_EXPORT QBlitterPaintEngine : public QRasterPaintEngine public: QBlitterPaintEngine(QBlittablePlatformPixmap *p); - virtual QPaintEngine::Type type() const Q_DECL_OVERRIDE + virtual QPaintEngine::Type type() const override { return Blitter; } - virtual bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; - virtual bool end() Q_DECL_OVERRIDE; + virtual bool begin(QPaintDevice *pdev) override; + virtual bool end() override; // Call down into QBlittable - void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE; - void fillRect(const QRectF &rect, const QBrush &brush) Q_DECL_OVERRIDE; - void fillRect(const QRectF &rect, const QColor &color) Q_DECL_OVERRIDE; - void drawRects(const QRect *rects, int rectCount) Q_DECL_OVERRIDE; - void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE; - void drawPixmap(const QPointF &p, const QPixmap &pm) Q_DECL_OVERRIDE; - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; + void fill(const QVectorPath &path, const QBrush &brush) override; + void fillRect(const QRectF &rect, const QBrush &brush) override; + void fillRect(const QRectF &rect, const QColor &color) override; + void drawRects(const QRect *rects, int rectCount) override; + void drawRects(const QRectF *rects, int rectCount) override; + void drawPixmap(const QPointF &p, const QPixmap &pm) override; + void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; // State tracking - void setState(QPainterState *s) Q_DECL_OVERRIDE; - virtual void clipEnabledChanged() Q_DECL_OVERRIDE; - virtual void penChanged() Q_DECL_OVERRIDE; - virtual void brushChanged() Q_DECL_OVERRIDE; - virtual void opacityChanged() Q_DECL_OVERRIDE; - virtual void compositionModeChanged() Q_DECL_OVERRIDE; - virtual void renderHintsChanged() Q_DECL_OVERRIDE; - virtual void transformChanged() Q_DECL_OVERRIDE; + void setState(QPainterState *s) override; + virtual void clipEnabledChanged() override; + virtual void penChanged() override; + virtual void brushChanged() override; + virtual void opacityChanged() override; + virtual void compositionModeChanged() override; + virtual void renderHintsChanged() override; + virtual void transformChanged() override; // Override to lock the QBlittable before using raster - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - void fillPath(const QPainterPath &path, QSpanData *fillData) Q_DECL_OVERRIDE; - void fillPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - void drawEllipse(const QRectF &rect) Q_DECL_OVERRIDE; - void drawImage(const QPointF &p, const QImage &img) Q_DECL_OVERRIDE; + void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) override; + void fillPath(const QPainterPath &path, QSpanData *fillData) override; + void fillPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + void drawEllipse(const QRectF &rect) override; + void drawImage(const QPointF &p, const QImage &img) override; void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; - void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr) Q_DECL_OVERRIDE; - void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; - void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE; - void drawPoints(const QPoint *points, int pointCount) Q_DECL_OVERRIDE; - void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE; - void drawStaticTextItem(QStaticTextItem *) Q_DECL_OVERRIDE; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; + void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr) override; + void drawTextItem(const QPointF &p, const QTextItem &textItem) override; + void drawPoints(const QPointF *points, int pointCount) override; + void drawPoints(const QPoint *points, int pointCount) override; + void stroke(const QVectorPath &path, const QPen &pen) override; + void drawStaticTextItem(QStaticTextItem *) override; bool drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions, - QFontEngine *fontEngine) Q_DECL_OVERRIDE; + QFontEngine *fontEngine) override; }; QT_END_NAMESPACE diff --git a/src/gui/painting/qpaintengine_raster_p.h b/src/gui/painting/qpaintengine_raster_p.h index e2e0f821e3..8c6f668d9d 100644 --- a/src/gui/painting/qpaintengine_raster_p.h +++ b/src/gui/painting/qpaintengine_raster_p.h @@ -135,20 +135,20 @@ public: QRasterPaintEngine(QPaintDevice *device); ~QRasterPaintEngine(); - bool begin(QPaintDevice *device) Q_DECL_OVERRIDE; - bool end() Q_DECL_OVERRIDE; - - void penChanged() Q_DECL_OVERRIDE; - void brushChanged() Q_DECL_OVERRIDE; - void brushOriginChanged() Q_DECL_OVERRIDE; - void opacityChanged() Q_DECL_OVERRIDE; - void compositionModeChanged() Q_DECL_OVERRIDE; - void renderHintsChanged() Q_DECL_OVERRIDE; - void transformChanged() Q_DECL_OVERRIDE; - void clipEnabledChanged() Q_DECL_OVERRIDE; - - void setState(QPainterState *s) Q_DECL_OVERRIDE; - QPainterState *createState(QPainterState *orig) const Q_DECL_OVERRIDE; + bool begin(QPaintDevice *device) override; + bool end() override; + + void penChanged() override; + void brushChanged() override; + void brushOriginChanged() override; + void opacityChanged() override; + void compositionModeChanged() override; + void renderHintsChanged() override; + void transformChanged() override; + void clipEnabledChanged() override; + + void setState(QPainterState *s) override; + QPainterState *createState(QPainterState *orig) const override; inline QRasterPaintEngineState *state() { return static_cast(QPaintEngineEx::state()); } @@ -164,40 +164,40 @@ public: virtual void fillPath(const QPainterPath &path, QSpanData *fillData); virtual void fillPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode); - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; + void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) override; - void drawEllipse(const QRectF &rect) Q_DECL_OVERRIDE; + void drawEllipse(const QRectF &rect) override; - void fillRect(const QRectF &rect, const QBrush &brush) Q_DECL_OVERRIDE; - void fillRect(const QRectF &rect, const QColor &color) Q_DECL_OVERRIDE; + void fillRect(const QRectF &rect, const QBrush &brush) override; + void fillRect(const QRectF &rect, const QColor &color) override; - void drawRects(const QRect *rects, int rectCount) Q_DECL_OVERRIDE; - void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE; + void drawRects(const QRect *rects, int rectCount) override; + void drawRects(const QRectF *rects, int rectCount) override; - void drawPixmap(const QPointF &p, const QPixmap &pm) Q_DECL_OVERRIDE; - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; - void drawImage(const QPointF &p, const QImage &img) Q_DECL_OVERRIDE; + void drawPixmap(const QPointF &p, const QPixmap &pm) override; + void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; + void drawImage(const QPointF &p, const QImage &img) override; void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; - void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr) Q_DECL_OVERRIDE; - void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; + void drawTiledPixmap(const QRectF &r, const QPixmap &pm, const QPointF &sr) override; + void drawTextItem(const QPointF &p, const QTextItem &textItem) override; - void drawLines(const QLine *line, int lineCount) Q_DECL_OVERRIDE; - void drawLines(const QLineF *line, int lineCount) Q_DECL_OVERRIDE; + void drawLines(const QLine *line, int lineCount) override; + void drawLines(const QLineF *line, int lineCount) override; - void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE; - void drawPoints(const QPoint *points, int pointCount) Q_DECL_OVERRIDE; + void drawPoints(const QPointF *points, int pointCount) override; + void drawPoints(const QPoint *points, int pointCount) override; - void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE; - void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE; + void stroke(const QVectorPath &path, const QPen &pen) override; + void fill(const QVectorPath &path, const QBrush &brush) override; - void clip(const QVectorPath &path, Qt::ClipOperation op) Q_DECL_OVERRIDE; - void clip(const QRect &rect, Qt::ClipOperation op) Q_DECL_OVERRIDE; - void clip(const QRegion ®ion, Qt::ClipOperation op) Q_DECL_OVERRIDE; + void clip(const QVectorPath &path, Qt::ClipOperation op) override; + void clip(const QRect &rect, Qt::ClipOperation op) override; + void clip(const QRegion ®ion, Qt::ClipOperation op) override; inline const QClipData *clipData() const; - void drawStaticTextItem(QStaticTextItem *textItem) Q_DECL_OVERRIDE; + void drawStaticTextItem(QStaticTextItem *textItem) override; virtual bool drawCachedGlyphs(int numGlyphs, const glyph_t *glyphs, const QFixedPoint *positions, QFontEngine *fontEngine); @@ -227,12 +227,12 @@ public: QRasterBuffer *rasterBuffer(); void alphaPenBlt(const void* src, int bpl, int depth, int rx,int ry,int w,int h, bool useGammaCorrection); - Type type() const Q_DECL_OVERRIDE { return Raster; } + Type type() const override { return Raster; } - QPoint coordinateOffset() const Q_DECL_OVERRIDE; + QPoint coordinateOffset() const override; - bool requiresPretransformedGlyphPositions(QFontEngine *fontEngine, const QTransform &m) const Q_DECL_OVERRIDE; - bool shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &m) const Q_DECL_OVERRIDE; + bool requiresPretransformedGlyphPositions(QFontEngine *fontEngine, const QTransform &m) const override; + bool shouldDrawCachedGlyphs(QFontEngine *fontEngine, const QTransform &m) const override; protected: QRasterPaintEngine(QRasterPaintEnginePrivate &d, QPaintDevice *); diff --git a/src/gui/painting/qpaintengineex_p.h b/src/gui/painting/qpaintengineex_p.h index 7c2c98140f..b2f8b64029 100644 --- a/src/gui/painting/qpaintengineex_p.h +++ b/src/gui/painting/qpaintengineex_p.h @@ -103,36 +103,36 @@ public: virtual void drawRoundedRect(const QRectF &rect, qreal xrad, qreal yrad, Qt::SizeMode mode); - virtual void drawRects(const QRect *rects, int rectCount) Q_DECL_OVERRIDE; - virtual void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE; + virtual void drawRects(const QRect *rects, int rectCount) override; + virtual void drawRects(const QRectF *rects, int rectCount) override; - virtual void drawLines(const QLine *lines, int lineCount) Q_DECL_OVERRIDE; - virtual void drawLines(const QLineF *lines, int lineCount) Q_DECL_OVERRIDE; + virtual void drawLines(const QLine *lines, int lineCount) override; + virtual void drawLines(const QLineF *lines, int lineCount) override; - virtual void drawEllipse(const QRectF &r) Q_DECL_OVERRIDE; - virtual void drawEllipse(const QRect &r) Q_DECL_OVERRIDE; + virtual void drawEllipse(const QRectF &r) override; + virtual void drawEllipse(const QRect &r) override; - virtual void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE; + virtual void drawPath(const QPainterPath &path) override; - virtual void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE; - virtual void drawPoints(const QPoint *points, int pointCount) Q_DECL_OVERRIDE; + virtual void drawPoints(const QPointF *points, int pointCount) override; + virtual void drawPoints(const QPoint *points, int pointCount) override; - virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; + virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + virtual void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) override; - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE = 0; + virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override = 0; virtual void drawPixmap(const QPointF &pos, const QPixmap &pm); virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE = 0; + Qt::ImageConversionFlags flags = Qt::AutoColor) override = 0; virtual void drawImage(const QPointF &pos, const QImage &image); - virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) Q_DECL_OVERRIDE; + virtual void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override; virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, QFlags hints); - virtual void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; + virtual void updateState(const QPaintEngineState &state) override; virtual void drawStaticTextItem(QStaticTextItem *); diff --git a/src/gui/painting/qpdf_p.h b/src/gui/painting/qpdf_p.h index f5bb4e17a8..5a909f2ede 100644 --- a/src/gui/painting/qpdf_p.h +++ b/src/gui/painting/qpdf_p.h @@ -186,28 +186,28 @@ public: void setPdfVersion(PdfVersion version); // reimplementations QPaintEngine - bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; - bool end() Q_DECL_OVERRIDE; + bool begin(QPaintDevice *pdev) override; + bool end() override; - void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE; - void drawLines(const QLineF *lines, int lineCount) Q_DECL_OVERRIDE; - void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE; - void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - void drawPath (const QPainterPath & path) Q_DECL_OVERRIDE; + void drawPoints(const QPointF *points, int pointCount) override; + void drawLines(const QLineF *lines, int lineCount) override; + void drawRects(const QRectF *rects, int rectCount) override; + void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + void drawPath (const QPainterPath & path) override; - void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; + void drawTextItem(const QPointF &p, const QTextItem &textItem) override; - void drawPixmap (const QRectF & rectangle, const QPixmap & pixmap, const QRectF & sr) Q_DECL_OVERRIDE; + void drawPixmap (const QRectF & rectangle, const QPixmap & pixmap, const QRectF & sr) override; void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; - void drawTiledPixmap (const QRectF & rectangle, const QPixmap & pixmap, const QPointF & point) Q_DECL_OVERRIDE; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; + void drawTiledPixmap (const QRectF & rectangle, const QPixmap & pixmap, const QPointF & point) override; void drawHyperlink(const QRectF &r, const QUrl &url); - void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; + void updateState(const QPaintEngineState &state) override; int metric(QPaintDevice::PaintDeviceMetric metricType) const; - Type type() const Q_DECL_OVERRIDE; + Type type() const override; // end reimplementations QPaintEngine // Printer stuff... diff --git a/src/gui/painting/qpdfwriter.cpp b/src/gui/painting/qpdfwriter.cpp index 5af465edeb..2f24c7efcb 100644 --- a/src/gui/painting/qpdfwriter.cpp +++ b/src/gui/painting/qpdfwriter.cpp @@ -79,7 +79,7 @@ public: virtual ~QPdfPagedPaintDevicePrivate() {} - bool setPageLayout(const QPageLayout &newPageLayout) Q_DECL_OVERRIDE + bool setPageLayout(const QPageLayout &newPageLayout) override { // Try to set the paint engine page layout pd->engine->setPageLayout(newPageLayout); @@ -88,7 +88,7 @@ public: return m_pageLayout.isEquivalentTo(newPageLayout); } - bool setPageSize(const QPageSize &pageSize) Q_DECL_OVERRIDE + bool setPageSize(const QPageSize &pageSize) override { // Try to set the paint engine page size pd->engine->setPageSize(pageSize); @@ -97,7 +97,7 @@ public: return m_pageLayout.pageSize().isEquivalentTo(pageSize); } - bool setPageOrientation(QPageLayout::Orientation orientation) Q_DECL_OVERRIDE + bool setPageOrientation(QPageLayout::Orientation orientation) override { // Set the print engine value pd->engine->setPageOrientation(orientation); @@ -106,12 +106,12 @@ public: return m_pageLayout.orientation() == orientation; } - bool setPageMargins(const QMarginsF &margins) Q_DECL_OVERRIDE + bool setPageMargins(const QMarginsF &margins) override { return setPageMargins(margins, pageLayout().units()); } - bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units) Q_DECL_OVERRIDE + bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units) override { // Try to set engine margins pd->engine->setPageMargins(margins, units); @@ -120,7 +120,7 @@ public: return m_pageLayout.margins() == margins && m_pageLayout.units() == units; } - QPageLayout pageLayout() const Q_DECL_OVERRIDE + QPageLayout pageLayout() const override { return pd->engine->pageLayout(); } diff --git a/src/gui/painting/qtextureglyphcache_p.h b/src/gui/painting/qtextureglyphcache_p.h index 25253b496a..3da28872b1 100644 --- a/src/gui/painting/qtextureglyphcache_p.h +++ b/src/gui/painting/qtextureglyphcache_p.h @@ -169,9 +169,9 @@ public: : QTextureGlyphCache(format, matrix) { } ~QImageTextureGlyphCache(); - virtual void createTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void resizeTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) Q_DECL_OVERRIDE; + virtual void createTextureData(int width, int height) override; + virtual void resizeTextureData(int width, int height) override; + virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) override; inline const QImage &image() const { return m_image; } diff --git a/src/gui/text/qfont_p.h b/src/gui/text/qfont_p.h index 9e5d0b4329..350ba7ce3c 100644 --- a/src/gui/text/qfont_p.h +++ b/src/gui/text/qfont_p.h @@ -282,7 +282,7 @@ public: private: void increaseCost(uint cost); void decreaseCost(uint cost); - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; void decreaseCache(); static const uint min_cost; diff --git a/src/gui/text/qfontengine_p.h b/src/gui/text/qfontengine_p.h index 1ae2e86a93..a411e9ce4c 100644 --- a/src/gui/text/qfontengine_p.h +++ b/src/gui/text/qfontengine_p.h @@ -411,27 +411,27 @@ public: QFontEngineBox(int size); ~QFontEngineBox(); - virtual glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE; - virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE; - virtual void recalcAdvances(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE; + virtual glyph_t glyphIndex(uint ucs4) const override; + virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const override; + virtual void recalcAdvances(QGlyphLayout *, ShaperFlags) const override; void draw(QPaintEngine *p, qreal x, qreal y, const QTextItemInt &si); - virtual void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; + virtual void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) override; - virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE; - virtual glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE; - virtual QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE; + virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override; + virtual glyph_metrics_t boundingBox(glyph_t glyph) override; + virtual QFontEngine *cloneWithSize(qreal pixelSize) const override; - virtual QFixed ascent() const Q_DECL_OVERRIDE; - virtual QFixed capHeight() const Q_DECL_OVERRIDE; - virtual QFixed descent() const Q_DECL_OVERRIDE; - virtual QFixed leading() const Q_DECL_OVERRIDE; - virtual qreal maxCharWidth() const Q_DECL_OVERRIDE; - virtual qreal minLeftBearing() const Q_DECL_OVERRIDE { return 0; } - virtual qreal minRightBearing() const Q_DECL_OVERRIDE { return 0; } - virtual QImage alphaMapForGlyph(glyph_t) Q_DECL_OVERRIDE; + virtual QFixed ascent() const override; + virtual QFixed capHeight() const override; + virtual QFixed descent() const override; + virtual QFixed leading() const override; + virtual qreal maxCharWidth() const override; + virtual qreal minLeftBearing() const override { return 0; } + virtual qreal minRightBearing() const override { return 0; } + virtual QImage alphaMapForGlyph(glyph_t) override; - virtual bool canRender(const QChar *string, int len) const Q_DECL_OVERRIDE; + virtual bool canRender(const QChar *string, int len) const override; inline int size() const { return _size; } @@ -449,36 +449,36 @@ public: explicit QFontEngineMulti(QFontEngine *engine, int script, const QStringList &fallbackFamilies = QStringList()); ~QFontEngineMulti(); - virtual glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE; - virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE; - - virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE; - virtual glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE; - - virtual void recalcAdvances(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE; - virtual void doKerning(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE; - virtual void addOutlineToPath(qreal, qreal, const QGlyphLayout &, QPainterPath *, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; - virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) Q_DECL_OVERRIDE; - - virtual QFixed ascent() const Q_DECL_OVERRIDE; - virtual QFixed capHeight() const Q_DECL_OVERRIDE; - virtual QFixed descent() const Q_DECL_OVERRIDE; - virtual QFixed leading() const Q_DECL_OVERRIDE; - virtual QFixed xHeight() const Q_DECL_OVERRIDE; - virtual QFixed averageCharWidth() const Q_DECL_OVERRIDE; - virtual QImage alphaMapForGlyph(glyph_t) Q_DECL_OVERRIDE; - virtual QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition) Q_DECL_OVERRIDE; - virtual QImage alphaMapForGlyph(glyph_t, const QTransform &t) Q_DECL_OVERRIDE; - virtual QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; - virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; - - virtual QFixed lineThickness() const Q_DECL_OVERRIDE; - virtual QFixed underlinePosition() const Q_DECL_OVERRIDE; - virtual qreal maxCharWidth() const Q_DECL_OVERRIDE; - virtual qreal minLeftBearing() const Q_DECL_OVERRIDE; - virtual qreal minRightBearing() const Q_DECL_OVERRIDE; - - virtual bool canRender(const QChar *string, int len) const Q_DECL_OVERRIDE; + virtual glyph_t glyphIndex(uint ucs4) const override; + virtual bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const override; + + virtual glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override; + virtual glyph_metrics_t boundingBox(glyph_t glyph) override; + + virtual void recalcAdvances(QGlyphLayout *, ShaperFlags) const override; + virtual void doKerning(QGlyphLayout *, ShaperFlags) const override; + virtual void addOutlineToPath(qreal, qreal, const QGlyphLayout &, QPainterPath *, QTextItem::RenderFlags flags) override; + virtual void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) override; + + virtual QFixed ascent() const override; + virtual QFixed capHeight() const override; + virtual QFixed descent() const override; + virtual QFixed leading() const override; + virtual QFixed xHeight() const override; + virtual QFixed averageCharWidth() const override; + virtual QImage alphaMapForGlyph(glyph_t) override; + virtual QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition) override; + virtual QImage alphaMapForGlyph(glyph_t, const QTransform &t) override; + virtual QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override; + virtual QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override; + + virtual QFixed lineThickness() const override; + virtual QFixed underlinePosition() const override; + virtual qreal maxCharWidth() const override; + virtual qreal minLeftBearing() const override; + virtual qreal minRightBearing() const override; + + virtual bool canRender(const QChar *string, int len) const override; inline int fallbackFamilyCount() const { return m_fallbackFamilies.size(); } inline QString fallbackFamilyAt(int at) const { return m_fallbackFamilies.at(at); } diff --git a/src/gui/text/qfontengine_qpf2_p.h b/src/gui/text/qfontengine_qpf2_p.h index e5c38ffbaf..b2dc620ad1 100644 --- a/src/gui/text/qfontengine_qpf2_p.h +++ b/src/gui/text/qfontengine_qpf2_p.h @@ -158,30 +158,30 @@ public: QFontEngineQPF2(const QFontDef &def, const QByteArray &data); ~QFontEngineQPF2(); - FaceId faceId() const Q_DECL_OVERRIDE { return face_id; } - bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE; - - virtual glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE; - bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE; - void recalcAdvances(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE; - - void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; - QImage alphaMapForGlyph(glyph_t t) Q_DECL_OVERRIDE; - - glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE; - glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE; - - QFixed ascent() const Q_DECL_OVERRIDE; - QFixed capHeight() const Q_DECL_OVERRIDE; - QFixed descent() const Q_DECL_OVERRIDE; - QFixed leading() const Q_DECL_OVERRIDE; - qreal maxCharWidth() const Q_DECL_OVERRIDE; - qreal minLeftBearing() const Q_DECL_OVERRIDE; - qreal minRightBearing() const Q_DECL_OVERRIDE; - QFixed underlinePosition() const Q_DECL_OVERRIDE; - QFixed lineThickness() const Q_DECL_OVERRIDE; - - virtual int glyphCount() const Q_DECL_OVERRIDE { return glyphMapEntries; } + FaceId faceId() const override { return face_id; } + bool getSfntTableData(uint tag, uchar *buffer, uint *length) const override; + + virtual glyph_t glyphIndex(uint ucs4) const override; + bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const override; + void recalcAdvances(QGlyphLayout *, ShaperFlags) const override; + + void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) override; + QImage alphaMapForGlyph(glyph_t t) override; + + glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override; + glyph_metrics_t boundingBox(glyph_t glyph) override; + + QFixed ascent() const override; + QFixed capHeight() const override; + QFixed descent() const override; + QFixed leading() const override; + qreal maxCharWidth() const override; + qreal minLeftBearing() const override; + qreal minRightBearing() const override; + QFixed underlinePosition() const override; + QFixed lineThickness() const override; + + virtual int glyphCount() const override { return glyphMapEntries; } bool isValid() const; diff --git a/src/gui/text/qstatictext.cpp b/src/gui/text/qstatictext.cpp index dbc2e6e558..d6f97547c4 100644 --- a/src/gui/text/qstatictext.cpp +++ b/src/gui/text/qstatictext.cpp @@ -439,7 +439,7 @@ namespace { { } - virtual void updateState(const QPaintEngineState &newState) Q_DECL_OVERRIDE + virtual void updateState(const QPaintEngineState &newState) override { if (newState.state() & QPaintEngine::DirtyPen && newState.pen().color() != m_currentColor) { @@ -448,7 +448,7 @@ namespace { } } - virtual void drawTextItem(const QPointF &position, const QTextItem &textItem) Q_DECL_OVERRIDE + virtual void drawTextItem(const QPointF &position, const QTextItem &textItem) override { const QTextItemInt &ti = static_cast(textItem); @@ -484,15 +484,15 @@ namespace { m_items.append(currentItem); } - virtual void drawPolygon(const QPointF *, int , PolygonDrawMode ) Q_DECL_OVERRIDE + virtual void drawPolygon(const QPointF *, int , PolygonDrawMode ) override { /* intentionally empty */ } - virtual bool begin(QPaintDevice *) Q_DECL_OVERRIDE { return true; } - virtual bool end() Q_DECL_OVERRIDE { return true; } - virtual void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) Q_DECL_OVERRIDE {} - virtual Type type() const Q_DECL_OVERRIDE + virtual bool begin(QPaintDevice *) override { return true; } + virtual bool end() override { return true; } + virtual void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) override {} + virtual Type type() const override { return User; } @@ -537,7 +537,7 @@ namespace { delete m_paintEngine; } - int metric(PaintDeviceMetric m) const Q_DECL_OVERRIDE + int metric(PaintDeviceMetric m) const override { int val; switch (m) { @@ -574,7 +574,7 @@ namespace { return val; } - virtual QPaintEngine *paintEngine() const Q_DECL_OVERRIDE + virtual QPaintEngine *paintEngine() const override { return m_paintEngine; } diff --git a/src/gui/text/qtextdocumentlayout_p.h b/src/gui/text/qtextdocumentlayout_p.h index 710c49628e..2054ebaa35 100644 --- a/src/gui/text/qtextdocumentlayout_p.h +++ b/src/gui/text/qtextdocumentlayout_p.h @@ -73,11 +73,11 @@ public: explicit QTextDocumentLayout(QTextDocument *doc); // from the abstract layout - void draw(QPainter *painter, const PaintContext &context) Q_DECL_OVERRIDE; - int hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const Q_DECL_OVERRIDE; + void draw(QPainter *painter, const PaintContext &context) override; + int hitTest(const QPointF &point, Qt::HitTestAccuracy accuracy) const override; - int pageCount() const Q_DECL_OVERRIDE; - QSizeF documentSize() const Q_DECL_OVERRIDE; + int pageCount() const override; + QSizeF documentSize() const override; void setCursorWidth(int width); int cursorWidth() const; @@ -88,8 +88,8 @@ public: // internal for QTextEdit's NoWrap mode void setViewport(const QRectF &viewport); - virtual QRectF frameBoundingRect(QTextFrame *frame) const Q_DECL_OVERRIDE; - virtual QRectF blockBoundingRect(const QTextBlock &block) const Q_DECL_OVERRIDE; + virtual QRectF frameBoundingRect(QTextFrame *frame) const override; + virtual QRectF blockBoundingRect(const QTextBlock &block) const override; QRectF tableBoundingRect(QTextTable *table) const; QRectF tableCellBoundingRect(QTextTable *table, const QTextTableCell &cell) const; @@ -104,12 +104,12 @@ public: bool contentHasAlignment() const; protected: - void documentChanged(int from, int oldLength, int length) Q_DECL_OVERRIDE; - void resizeInlineObject(QTextInlineObject item, int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE; - void positionInlineObject(QTextInlineObject item, int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE; + void documentChanged(int from, int oldLength, int length) override; + void resizeInlineObject(QTextInlineObject item, int posInDocument, const QTextFormat &format) override; + void positionInlineObject(QTextInlineObject item, int posInDocument, const QTextFormat &format) override; void drawInlineObject(QPainter *p, const QRectF &rect, QTextInlineObject item, - int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE; - virtual void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + int posInDocument, const QTextFormat &format) override; + virtual void timerEvent(QTimerEvent *e) override; private: QRectF doLayout(int from, int oldLength, int length); void layoutFinished(); diff --git a/src/gui/text/qtexthtmlparser.cpp b/src/gui/text/qtexthtmlparser.cpp index be10efad8d..9154182df1 100644 --- a/src/gui/text/qtexthtmlparser.cpp +++ b/src/gui/text/qtexthtmlparser.cpp @@ -1708,14 +1708,14 @@ public: inline QTextHtmlStyleSelector(const QTextHtmlParser *parser) : parser(parser) { nameCaseSensitivity = Qt::CaseInsensitive; } - virtual QStringList nodeNames(NodePtr node) const Q_DECL_OVERRIDE; - virtual QString attribute(NodePtr node, const QString &name) const Q_DECL_OVERRIDE; - virtual bool hasAttributes(NodePtr node) const Q_DECL_OVERRIDE; - virtual bool isNullNode(NodePtr node) const Q_DECL_OVERRIDE; - virtual NodePtr parentNode(NodePtr node) const Q_DECL_OVERRIDE; - virtual NodePtr previousSiblingNode(NodePtr node) const Q_DECL_OVERRIDE; - virtual NodePtr duplicateNode(NodePtr node) const Q_DECL_OVERRIDE; - virtual void freeNode(NodePtr node) const Q_DECL_OVERRIDE; + virtual QStringList nodeNames(NodePtr node) const override; + virtual QString attribute(NodePtr node, const QString &name) const override; + virtual bool hasAttributes(NodePtr node) const override; + virtual bool isNullNode(NodePtr node) const override; + virtual NodePtr parentNode(NodePtr node) const override; + virtual NodePtr previousSiblingNode(NodePtr node) const override; + virtual NodePtr duplicateNode(NodePtr node) const override; + virtual void freeNode(NodePtr node) const override; private: const QTextHtmlParser *parser; diff --git a/src/gui/text/qtextimagehandler_p.h b/src/gui/text/qtextimagehandler_p.h index a22c91ecbf..339ef0af4f 100644 --- a/src/gui/text/qtextimagehandler_p.h +++ b/src/gui/text/qtextimagehandler_p.h @@ -67,8 +67,8 @@ class Q_GUI_EXPORT QTextImageHandler : public QObject, public: explicit QTextImageHandler(QObject *parent = 0); - virtual QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE; - virtual void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) Q_DECL_OVERRIDE; + virtual QSizeF intrinsicSize(QTextDocument *doc, int posInDocument, const QTextFormat &format) override; + virtual void drawObject(QPainter *p, const QRectF &rect, QTextDocument *doc, int posInDocument, const QTextFormat &format) override; QImage image(QTextDocument *doc, const QTextImageFormat &imageFormat); }; diff --git a/src/gui/text/qtextodfwriter.cpp b/src/gui/text/qtextodfwriter.cpp index e228b3c840..a9eb2d4de9 100644 --- a/src/gui/text/qtextodfwriter.cpp +++ b/src/gui/text/qtextodfwriter.cpp @@ -94,7 +94,7 @@ public: if (contentStream) contentStream->close(); } - virtual void addFile(const QString &, const QString &, const QByteArray &) Q_DECL_OVERRIDE + virtual void addFile(const QString &, const QString &, const QByteArray &) override { // we ignore this... } @@ -137,7 +137,7 @@ public: zip.close(); } - virtual void addFile(const QString &fileName, const QString &mimeType, const QByteArray &bytes) Q_DECL_OVERRIDE + virtual void addFile(const QString &fileName, const QString &mimeType, const QByteArray &bytes) override { zip.addFile(fileName, bytes); addFile(fileName, mimeType); diff --git a/src/gui/text/qtexttable_p.h b/src/gui/text/qtexttable_p.h index 848537272d..c969e1d5bc 100644 --- a/src/gui/text/qtexttable_p.h +++ b/src/gui/text/qtexttable_p.h @@ -65,8 +65,8 @@ public: ~QTextTablePrivate(); static QTextTable *createTable(QTextDocumentPrivate *, int pos, int rows, int cols, const QTextTableFormat &tableFormat); - void fragmentAdded(QChar type, uint fragment) Q_DECL_OVERRIDE; - void fragmentRemoved(QChar type, uint fragment) Q_DECL_OVERRIDE; + void fragmentAdded(QChar type, uint fragment) override; + void fragmentRemoved(QChar type, uint fragment) override; void update() const; diff --git a/src/gui/util/qvalidator.h b/src/gui/util/qvalidator.h index eba4b54672..a30f5bfa83 100644 --- a/src/gui/util/qvalidator.h +++ b/src/gui/util/qvalidator.h @@ -97,8 +97,8 @@ public: QIntValidator(int bottom, int top, QObject *parent = Q_NULLPTR); ~QIntValidator(); - QValidator::State validate(QString &, int &) const Q_DECL_OVERRIDE; - void fixup(QString &input) const Q_DECL_OVERRIDE; + QValidator::State validate(QString &, int &) const override; + void fixup(QString &input) const override; void setBottom(int); void setTop(int); @@ -139,7 +139,7 @@ public: ScientificNotation }; Q_ENUM(Notation) - QValidator::State validate(QString &, int &) const Q_DECL_OVERRIDE; + QValidator::State validate(QString &, int &) const override; virtual void setRange(double bottom, double top, int decimals = 0); void setBottom(double); @@ -178,7 +178,7 @@ public: explicit QRegExpValidator(const QRegExp& rx, QObject *parent = Q_NULLPTR); ~QRegExpValidator(); - virtual QValidator::State validate(QString& input, int& pos) const Q_DECL_OVERRIDE; + virtual QValidator::State validate(QString& input, int& pos) const override; void setRegExp(const QRegExp& rx); const QRegExp& regExp() const { return r; } @@ -208,7 +208,7 @@ public: explicit QRegularExpressionValidator(const QRegularExpression &re, QObject *parent = Q_NULLPTR); ~QRegularExpressionValidator(); - virtual QValidator::State validate(QString &input, int &pos) const Q_DECL_OVERRIDE; + virtual QValidator::State validate(QString &input, int &pos) const override; QRegularExpression regularExpression() const; diff --git a/src/network/access/qhttpmultipart_p.h b/src/network/access/qhttpmultipart_p.h index a03df9cb13..342ec775b4 100644 --- a/src/network/access/qhttpmultipart_p.h +++ b/src/network/access/qhttpmultipart_p.h @@ -124,30 +124,30 @@ public: ~QHttpMultiPartIODevice() { } - virtual bool atEnd() const Q_DECL_OVERRIDE { + virtual bool atEnd() const override { return readPointer == size(); } - virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE { + virtual qint64 bytesAvailable() const override { return size() - readPointer; } - virtual void close() Q_DECL_OVERRIDE { + virtual void close() override { readPointer = 0; partOffsets.clear(); deviceSize = -1; QIODevice::close(); } - virtual qint64 bytesToWrite() const Q_DECL_OVERRIDE { + virtual qint64 bytesToWrite() const override { return 0; } - virtual qint64 size() const Q_DECL_OVERRIDE; - virtual bool isSequential() const Q_DECL_OVERRIDE; - virtual bool reset() Q_DECL_OVERRIDE; - virtual qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE; - virtual qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE; + virtual qint64 size() const override; + virtual bool isSequential() const override; + virtual bool reset() override; + virtual qint64 readData(char *data, qint64 maxSize) override; + virtual qint64 writeData(const char *data, qint64 maxSize) override; QHttpMultiPartPrivate *multiPart; qint64 readPointer; diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h index faab03f056..d2248740b8 100644 --- a/src/network/access/qhttpnetworkreply_p.h +++ b/src/network/access/qhttpnetworkreply_p.h @@ -92,18 +92,18 @@ public: explicit QHttpNetworkReply(const QUrl &url = QUrl(), QObject *parent = 0); virtual ~QHttpNetworkReply(); - QUrl url() const Q_DECL_OVERRIDE; - void setUrl(const QUrl &url) Q_DECL_OVERRIDE; + QUrl url() const override; + void setUrl(const QUrl &url) override; - int majorVersion() const Q_DECL_OVERRIDE; - int minorVersion() const Q_DECL_OVERRIDE; + int majorVersion() const override; + int minorVersion() const override; - qint64 contentLength() const Q_DECL_OVERRIDE; - void setContentLength(qint64 length) Q_DECL_OVERRIDE; + qint64 contentLength() const override; + void setContentLength(qint64 length) override; - QList > header() const Q_DECL_OVERRIDE; - QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const Q_DECL_OVERRIDE; - void setHeaderField(const QByteArray &name, const QByteArray &data) Q_DECL_OVERRIDE; + QList > header() const override; + QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const override; + void setHeaderField(const QByteArray &name, const QByteArray &data) override; void parseHeader(const QByteArray &header); // mainly for testing QHttpNetworkRequest request() const; diff --git a/src/network/access/qhttpnetworkrequest_p.h b/src/network/access/qhttpnetworkrequest_p.h index 00f0e0df97..4fd973cf3f 100644 --- a/src/network/access/qhttpnetworkrequest_p.h +++ b/src/network/access/qhttpnetworkrequest_p.h @@ -90,18 +90,18 @@ public: QHttpNetworkRequest &operator=(const QHttpNetworkRequest &other); bool operator==(const QHttpNetworkRequest &other) const; - QUrl url() const Q_DECL_OVERRIDE; - void setUrl(const QUrl &url) Q_DECL_OVERRIDE; + QUrl url() const override; + void setUrl(const QUrl &url) override; - int majorVersion() const Q_DECL_OVERRIDE; - int minorVersion() const Q_DECL_OVERRIDE; + int majorVersion() const override; + int minorVersion() const override; - qint64 contentLength() const Q_DECL_OVERRIDE; - void setContentLength(qint64 length) Q_DECL_OVERRIDE; + qint64 contentLength() const override; + void setContentLength(qint64 length) override; - QList > header() const Q_DECL_OVERRIDE; - QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const Q_DECL_OVERRIDE; - void setHeaderField(const QByteArray &name, const QByteArray &data) Q_DECL_OVERRIDE; + QList > header() const override; + QByteArray headerField(const QByteArray &name, const QByteArray &defaultValue = QByteArray()) const override; + void setHeaderField(const QByteArray &name, const QByteArray &data) override; Operation operation() const; void setOperation(Operation operation); diff --git a/src/network/access/qhttpprotocolhandler_p.h b/src/network/access/qhttpprotocolhandler_p.h index 863b988be3..902a7ea0b2 100644 --- a/src/network/access/qhttpprotocolhandler_p.h +++ b/src/network/access/qhttpprotocolhandler_p.h @@ -64,9 +64,9 @@ public: QHttpProtocolHandler(QHttpNetworkConnectionChannel *channel); private: - virtual void _q_receiveReply() Q_DECL_OVERRIDE; - virtual void _q_readyRead() Q_DECL_OVERRIDE; - virtual bool sendRequest() Q_DECL_OVERRIDE; + virtual void _q_receiveReply() override; + virtual void _q_readyRead() override; + virtual bool sendRequest() override; }; QT_END_NAMESPACE diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp index c4225536af..a3c8227fda 100644 --- a/src/network/access/qhttpthreaddelegate.cpp +++ b/src/network/access/qhttpthreaddelegate.cpp @@ -197,7 +197,7 @@ public: setShareable(true); } - virtual void dispose() Q_DECL_OVERRIDE + virtual void dispose() override { #if 0 // sample code; do this right with the API Q_ASSERT(!isWorking()); diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h index 2f6954aa3b..d59cf095ca 100644 --- a/src/network/access/qhttpthreaddelegate_p.h +++ b/src/network/access/qhttpthreaddelegate_p.h @@ -216,12 +216,12 @@ public: { } - qint64 pos() const Q_DECL_OVERRIDE + qint64 pos() const override { return m_pos; } - const char* readPointer(qint64 maximumLength, qint64 &len) Q_DECL_OVERRIDE + const char* readPointer(qint64 maximumLength, qint64 &len) override { if (m_amount > 0) { len = m_amount; @@ -241,7 +241,7 @@ public: return 0; } - bool advanceReadPointer(qint64 a) Q_DECL_OVERRIDE + bool advanceReadPointer(qint64 a) override { if (m_data == 0) return false; @@ -256,7 +256,7 @@ public: return true; } - bool atEnd() const Q_DECL_OVERRIDE + bool atEnd() const override { if (m_amount > 0) return false; @@ -264,7 +264,7 @@ public: return m_atEnd; } - bool reset() Q_DECL_OVERRIDE + bool reset() override { m_amount = 0; m_data = 0; @@ -286,7 +286,7 @@ public: return b; } - qint64 size() const Q_DECL_OVERRIDE + qint64 size() const override { return m_size; } diff --git a/src/network/access/qnetworkaccessauthenticationmanager.cpp b/src/network/access/qnetworkaccessauthenticationmanager.cpp index 2b07833cda..b661cc45b3 100644 --- a/src/network/access/qnetworkaccessauthenticationmanager.cpp +++ b/src/network/access/qnetworkaccessauthenticationmanager.cpp @@ -95,7 +95,7 @@ public: } } - virtual void dispose() Q_DECL_OVERRIDE { delete this; } + virtual void dispose() override { delete this; } }; #ifndef QT_NO_NETWORKPROXY diff --git a/src/network/access/qnetworkaccesscache_p.h b/src/network/access/qnetworkaccesscache_p.h index 3732b5cbb4..69ea649a8a 100644 --- a/src/network/access/qnetworkaccesscache_p.h +++ b/src/network/access/qnetworkaccesscache_p.h @@ -106,7 +106,7 @@ signals: void entryReady(QNetworkAccessCache::CacheableObject *); protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private: // idea copied from qcache.h diff --git a/src/network/access/qnetworkaccesscachebackend_p.h b/src/network/access/qnetworkaccesscachebackend_p.h index 8db1a6b1d5..dfb0ce84d9 100644 --- a/src/network/access/qnetworkaccesscachebackend_p.h +++ b/src/network/access/qnetworkaccesscachebackend_p.h @@ -65,12 +65,12 @@ public: QNetworkAccessCacheBackend(); ~QNetworkAccessCacheBackend(); - void open() Q_DECL_OVERRIDE; - void closeDownstreamChannel() Q_DECL_OVERRIDE; + void open() override; + void closeDownstreamChannel() override; void closeUpstreamChannel(); void upstreamReadyRead(); - void downstreamReadyWrite() Q_DECL_OVERRIDE; + void downstreamReadyWrite() override; private: bool sendCacheContents(); diff --git a/src/network/access/qnetworkaccessdebugpipebackend_p.h b/src/network/access/qnetworkaccessdebugpipebackend_p.h index 1d1af61dbd..d9a7aabdad 100644 --- a/src/network/access/qnetworkaccessdebugpipebackend_p.h +++ b/src/network/access/qnetworkaccessdebugpipebackend_p.h @@ -68,10 +68,10 @@ public: QNetworkAccessDebugPipeBackend(); virtual ~QNetworkAccessDebugPipeBackend(); - virtual void open() Q_DECL_OVERRIDE; - virtual void closeDownstreamChannel() Q_DECL_OVERRIDE; + virtual void open() override; + virtual void closeDownstreamChannel() override; - virtual void downstreamReadyWrite() Q_DECL_OVERRIDE; + virtual void downstreamReadyWrite() override; protected: void pushFromSocketToDownstream(); @@ -101,9 +101,9 @@ private: class QNetworkAccessDebugPipeBackendFactory: public QNetworkAccessBackendFactory { public: - virtual QStringList supportedSchemes() const Q_DECL_OVERRIDE; + virtual QStringList supportedSchemes() const override; virtual QNetworkAccessBackend *create(QNetworkAccessManager::Operation op, - const QNetworkRequest &request) const Q_DECL_OVERRIDE; + const QNetworkRequest &request) const override; }; #endif // QT_BUILD_INTERNAL diff --git a/src/network/access/qnetworkaccessfilebackend_p.h b/src/network/access/qnetworkaccessfilebackend_p.h index 081ff2b9e7..2c01fb1121 100644 --- a/src/network/access/qnetworkaccessfilebackend_p.h +++ b/src/network/access/qnetworkaccessfilebackend_p.h @@ -66,10 +66,10 @@ public: QNetworkAccessFileBackend(); virtual ~QNetworkAccessFileBackend(); - virtual void open() Q_DECL_OVERRIDE; - virtual void closeDownstreamChannel() Q_DECL_OVERRIDE; + virtual void open() override; + virtual void closeDownstreamChannel() override; - virtual void downstreamReadyWrite() Q_DECL_OVERRIDE; + virtual void downstreamReadyWrite() override; public slots: void uploadReadyReadSlot(); @@ -87,9 +87,9 @@ private: class QNetworkAccessFileBackendFactory: public QNetworkAccessBackendFactory { public: - virtual QStringList supportedSchemes() const Q_DECL_OVERRIDE; + virtual QStringList supportedSchemes() const override; virtual QNetworkAccessBackend *create(QNetworkAccessManager::Operation op, - const QNetworkRequest &request) const Q_DECL_OVERRIDE; + const QNetworkRequest &request) const override; }; QT_END_NAMESPACE diff --git a/src/network/access/qnetworkaccessftpbackend.cpp b/src/network/access/qnetworkaccessftpbackend.cpp index 6d1ee645fe..239f37daf5 100644 --- a/src/network/access/qnetworkaccessftpbackend.cpp +++ b/src/network/access/qnetworkaccessftpbackend.cpp @@ -96,7 +96,7 @@ public: setShareable(false); } - void dispose() Q_DECL_OVERRIDE + void dispose() override { connect(this, SIGNAL(done(bool)), this, SLOT(deleteLater())); close(); diff --git a/src/network/access/qnetworkaccessftpbackend_p.h b/src/network/access/qnetworkaccessftpbackend_p.h index cdf6b7a07f..39a6b957f1 100644 --- a/src/network/access/qnetworkaccessftpbackend_p.h +++ b/src/network/access/qnetworkaccessftpbackend_p.h @@ -84,10 +84,10 @@ public: QNetworkAccessFtpBackend(); virtual ~QNetworkAccessFtpBackend(); - virtual void open() Q_DECL_OVERRIDE; - virtual void closeDownstreamChannel() Q_DECL_OVERRIDE; + virtual void open() override; + virtual void closeDownstreamChannel() override; - virtual void downstreamReadyWrite() Q_DECL_OVERRIDE; + virtual void downstreamReadyWrite() override; enum CacheCleanupMode { ReleaseCachedConnection, @@ -115,9 +115,9 @@ private: class QNetworkAccessFtpBackendFactory: public QNetworkAccessBackendFactory { public: - virtual QStringList supportedSchemes() const Q_DECL_OVERRIDE; + virtual QStringList supportedSchemes() const override; virtual QNetworkAccessBackend *create(QNetworkAccessManager::Operation op, - const QNetworkRequest &request) const Q_DECL_OVERRIDE; + const QNetworkRequest &request) const override; }; QT_END_NAMESPACE diff --git a/src/network/access/qnetworkdiskcache.h b/src/network/access/qnetworkdiskcache.h index a3aa8d3a07..4f1bbe44e7 100644 --- a/src/network/access/qnetworkdiskcache.h +++ b/src/network/access/qnetworkdiskcache.h @@ -63,18 +63,18 @@ public: qint64 maximumCacheSize() const; void setMaximumCacheSize(qint64 size); - qint64 cacheSize() const Q_DECL_OVERRIDE; - QNetworkCacheMetaData metaData(const QUrl &url) Q_DECL_OVERRIDE; - void updateMetaData(const QNetworkCacheMetaData &metaData) Q_DECL_OVERRIDE; - QIODevice *data(const QUrl &url) Q_DECL_OVERRIDE; - bool remove(const QUrl &url) Q_DECL_OVERRIDE; - QIODevice *prepare(const QNetworkCacheMetaData &metaData) Q_DECL_OVERRIDE; - void insert(QIODevice *device) Q_DECL_OVERRIDE; + qint64 cacheSize() const override; + QNetworkCacheMetaData metaData(const QUrl &url) override; + void updateMetaData(const QNetworkCacheMetaData &metaData) override; + QIODevice *data(const QUrl &url) override; + bool remove(const QUrl &url) override; + QIODevice *prepare(const QNetworkCacheMetaData &metaData) override; + void insert(QIODevice *device) override; QNetworkCacheMetaData fileMetaData(const QString &fileName) const; public Q_SLOTS: - void clear() Q_DECL_OVERRIDE; + void clear() override; protected: virtual qint64 expire(); diff --git a/src/network/access/qnetworkfile_p.h b/src/network/access/qnetworkfile_p.h index dd56b24bd8..e788308d82 100644 --- a/src/network/access/qnetworkfile_p.h +++ b/src/network/access/qnetworkfile_p.h @@ -67,7 +67,7 @@ public: public Q_SLOTS: void open(); - void close() Q_DECL_OVERRIDE; + void close() override; Q_SIGNALS: void finished(bool ok); diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h index d858e07d84..0912294a10 100644 --- a/src/network/access/qnetworkreply.h +++ b/src/network/access/qnetworkreply.h @@ -114,8 +114,8 @@ public: ~QNetworkReply(); // reimplemented from QIODevice - virtual void close() Q_DECL_OVERRIDE; - virtual bool isSequential() const Q_DECL_OVERRIDE; + virtual void close() override; + virtual bool isSequential() const override; // like QAbstractSocket: qint64 readBufferSize() const; @@ -171,7 +171,7 @@ Q_SIGNALS: protected: explicit QNetworkReply(QObject *parent = Q_NULLPTR); QNetworkReply(QNetworkReplyPrivate &dd, QObject *parent); - virtual qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + virtual qint64 writeData(const char *data, qint64 len) override; void setOperation(QNetworkAccessManager::Operation operation); void setRequest(const QNetworkRequest &request); diff --git a/src/network/access/qnetworkreplydataimpl_p.h b/src/network/access/qnetworkreplydataimpl_p.h index c8b44d7539..81d2110d69 100644 --- a/src/network/access/qnetworkreplydataimpl_p.h +++ b/src/network/access/qnetworkreplydataimpl_p.h @@ -67,15 +67,15 @@ class QNetworkReplyDataImpl: public QNetworkReply public: QNetworkReplyDataImpl(QObject *parent, const QNetworkRequest &req, const QNetworkAccessManager::Operation op); ~QNetworkReplyDataImpl(); - virtual void abort() Q_DECL_OVERRIDE; + virtual void abort() override; // reimplemented from QNetworkReply - virtual void close() Q_DECL_OVERRIDE; - virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE; - virtual bool isSequential () const Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; + virtual void close() override; + virtual qint64 bytesAvailable() const override; + virtual bool isSequential () const override; + qint64 size() const override; - virtual qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; + virtual qint64 readData(char *data, qint64 maxlen) override; Q_DECLARE_PRIVATE(QNetworkReplyDataImpl) }; diff --git a/src/network/access/qnetworkreplyfileimpl_p.h b/src/network/access/qnetworkreplyfileimpl_p.h index d6af66152e..55aece0bed 100644 --- a/src/network/access/qnetworkreplyfileimpl_p.h +++ b/src/network/access/qnetworkreplyfileimpl_p.h @@ -67,15 +67,15 @@ class QNetworkReplyFileImpl: public QNetworkReply public: QNetworkReplyFileImpl(QNetworkAccessManager *manager, const QNetworkRequest &req, const QNetworkAccessManager::Operation op); ~QNetworkReplyFileImpl(); - virtual void abort() Q_DECL_OVERRIDE; + virtual void abort() override; // reimplemented from QNetworkReply - virtual void close() Q_DECL_OVERRIDE; - virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE; - virtual bool isSequential () const Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; + virtual void close() override; + virtual qint64 bytesAvailable() const override; + virtual bool isSequential () const override; + qint64 size() const override; - virtual qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; + virtual qint64 readData(char *data, qint64 maxlen) override; private Q_SLOTS: void fileOpenFinished(bool isOpen); diff --git a/src/network/access/qnetworkreplyhttpimpl_p.h b/src/network/access/qnetworkreplyhttpimpl_p.h index 26b16e8386..91e9207601 100644 --- a/src/network/access/qnetworkreplyhttpimpl_p.h +++ b/src/network/access/qnetworkreplyhttpimpl_p.h @@ -86,14 +86,14 @@ public: QNetworkReplyHttpImpl(QNetworkAccessManager* const, const QNetworkRequest&, QNetworkAccessManager::Operation&, QIODevice* outgoingData); virtual ~QNetworkReplyHttpImpl(); - void close() Q_DECL_OVERRIDE; - void abort() Q_DECL_OVERRIDE; - qint64 bytesAvailable() const Q_DECL_OVERRIDE; - bool isSequential () const Q_DECL_OVERRIDE; - qint64 size() const Q_DECL_OVERRIDE; - qint64 readData(char*, qint64) Q_DECL_OVERRIDE; - void setReadBufferSize(qint64 size) Q_DECL_OVERRIDE; - bool canReadLine () const Q_DECL_OVERRIDE; + void close() override; + void abort() override; + qint64 bytesAvailable() const override; + bool isSequential () const override; + qint64 size() const override; + qint64 readData(char*, qint64) override; + void setReadBufferSize(qint64 size) override; + bool canReadLine () const override; Q_DECLARE_PRIVATE(QNetworkReplyHttpImpl) Q_PRIVATE_SLOT(d_func(), void _q_startOperation()) @@ -141,10 +141,10 @@ public: #ifndef QT_NO_SSL protected: - void ignoreSslErrors() Q_DECL_OVERRIDE; - void ignoreSslErrorsImplementation(const QList &errors) Q_DECL_OVERRIDE; - void setSslConfigurationImplementation(const QSslConfiguration &configuration) Q_DECL_OVERRIDE; - void sslConfigurationImplementation(QSslConfiguration &configuration) const Q_DECL_OVERRIDE; + void ignoreSslErrors() override; + void ignoreSslErrorsImplementation(const QList &errors) override; + void setSslConfigurationImplementation(const QSslConfiguration &configuration) override; + void sslConfigurationImplementation(QSslConfiguration &configuration) const override; #endif signals: diff --git a/src/network/access/qnetworkreplyimpl_p.h b/src/network/access/qnetworkreplyimpl_p.h index 7cd99392d3..f4e8284ab6 100644 --- a/src/network/access/qnetworkreplyimpl_p.h +++ b/src/network/access/qnetworkreplyimpl_p.h @@ -76,15 +76,15 @@ class QNetworkReplyImpl: public QNetworkReply public: QNetworkReplyImpl(QObject *parent = 0); ~QNetworkReplyImpl(); - virtual void abort() Q_DECL_OVERRIDE; + virtual void abort() override; // reimplemented from QNetworkReply / QIODevice - virtual void close() Q_DECL_OVERRIDE; - virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE; - virtual void setReadBufferSize(qint64 size) Q_DECL_OVERRIDE; + virtual void close() override; + virtual qint64 bytesAvailable() const override; + virtual void setReadBufferSize(qint64 size) override; - virtual qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - virtual bool event(QEvent *) Q_DECL_OVERRIDE; + virtual qint64 readData(char *data, qint64 maxlen) override; + virtual bool event(QEvent *) override; Q_DECLARE_PRIVATE(QNetworkReplyImpl) Q_PRIVATE_SLOT(d_func(), void _q_startOperation()) @@ -101,10 +101,10 @@ public: #ifndef QT_NO_SSL protected: - void sslConfigurationImplementation(QSslConfiguration &configuration) const Q_DECL_OVERRIDE; - void setSslConfigurationImplementation(const QSslConfiguration &configuration) Q_DECL_OVERRIDE; - virtual void ignoreSslErrors() Q_DECL_OVERRIDE; - virtual void ignoreSslErrorsImplementation(const QList &errors) Q_DECL_OVERRIDE; + void sslConfigurationImplementation(QSslConfiguration &configuration) const override; + void setSslConfigurationImplementation(const QSslConfiguration &configuration) override; + virtual void ignoreSslErrors() override; + virtual void ignoreSslErrorsImplementation(const QList &errors) override; #endif }; @@ -219,9 +219,9 @@ public: QNetworkAccessManager::Operation op); ~QDisabledNetworkReply(); - void abort() Q_DECL_OVERRIDE { } + void abort() override { } protected: - qint64 readData(char *, qint64) Q_DECL_OVERRIDE { return -1; } + qint64 readData(char *, qint64) override { return -1; } }; #endif diff --git a/src/network/access/qspdyprotocolhandler_p.h b/src/network/access/qspdyprotocolhandler_p.h index 0a18505b23..bfc2390ccc 100644 --- a/src/network/access/qspdyprotocolhandler_p.h +++ b/src/network/access/qspdyprotocolhandler_p.h @@ -101,9 +101,9 @@ public: Q_DECLARE_FLAGS(SETTINGS_ID_Flags, SETTINGS_ID_Flag) - virtual void _q_receiveReply() Q_DECL_OVERRIDE; - virtual void _q_readyRead() Q_DECL_OVERRIDE; - virtual bool sendRequest() Q_DECL_OVERRIDE; + virtual void _q_receiveReply() override; + virtual void _q_readyRead() override; + virtual bool sendRequest() override; private slots: void _q_uploadDataReadyRead(); diff --git a/src/network/bearer/qnetworksession.h b/src/network/bearer/qnetworksession.h index d96b8915eb..c7e27145a2 100644 --- a/src/network/bearer/qnetworksession.h +++ b/src/network/bearer/qnetworksession.h @@ -131,8 +131,8 @@ Q_SIGNALS: void usagePoliciesChanged(QNetworkSession::UsagePolicies usagePolicies); protected: - virtual void connectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; - virtual void disconnectNotify(const QMetaMethod &signal) Q_DECL_OVERRIDE; + virtual void connectNotify(const QMetaMethod &signal) override; + virtual void disconnectNotify(const QMetaMethod &signal) override; private: Q_DISABLE_COPY(QNetworkSession) diff --git a/src/network/kernel/qdnslookup_p.h b/src/network/kernel/qdnslookup_p.h index d070286383..5b5f4b1f12 100644 --- a/src/network/kernel/qdnslookup_p.h +++ b/src/network/kernel/qdnslookup_p.h @@ -118,7 +118,7 @@ public: , requestName(name) , nameserver(nameserver) { } - void run() Q_DECL_OVERRIDE; + void run() override; signals: void finished(const QDnsLookupReply &reply); diff --git a/src/network/kernel/qhostinfo_p.h b/src/network/kernel/qhostinfo_p.h index dd46818a19..d1da814e54 100644 --- a/src/network/kernel/qhostinfo_p.h +++ b/src/network/kernel/qhostinfo_p.h @@ -194,7 +194,7 @@ public: QHostInfoRunnable(const QString &hn, int i); QHostInfoRunnable(const QString &hn, int i, const QObject *receiver, QtPrivate::QSlotObjectBase *slotObj); - void run() Q_DECL_OVERRIDE; + void run() override; QString toBeLookedUp; int id; @@ -225,7 +225,7 @@ public: QHostInfoLookupManager(); ~QHostInfoLookupManager(); - void clear() Q_DECL_OVERRIDE; + void clear() override; void work(); // called from QHostInfo diff --git a/src/network/socket/qabstractsocket.h b/src/network/socket/qabstractsocket.h index 73a8f11537..ce4d2a74c6 100644 --- a/src/network/socket/qabstractsocket.h +++ b/src/network/socket/qabstractsocket.h @@ -154,10 +154,10 @@ public: bool isValid() const; - qint64 bytesAvailable() const Q_DECL_OVERRIDE; - qint64 bytesToWrite() const Q_DECL_OVERRIDE; + qint64 bytesAvailable() const override; + qint64 bytesToWrite() const override; - bool canReadLine() const Q_DECL_OVERRIDE; // ### Qt6: remove me + bool canReadLine() const override; // ### Qt6: remove me quint16 localPort() const; QHostAddress localAddress() const; @@ -182,15 +182,15 @@ public: SocketError error() const; // from QIODevice - void close() Q_DECL_OVERRIDE; - bool isSequential() const Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; // ### Qt6: remove me + void close() override; + bool isSequential() const override; + bool atEnd() const override; // ### Qt6: remove me bool flush(); // for synchronous access virtual bool waitForConnected(int msecs = 30000); - bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForReadyRead(int msecs = 30000) override; + bool waitForBytesWritten(int msecs = 30000) override; virtual bool waitForDisconnected(int msecs = 30000); #ifndef QT_NO_NETWORKPROXY @@ -209,9 +209,9 @@ Q_SIGNALS: #endif protected: - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 readLineData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 readLineData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; void setSocketState(SocketState state); void setSocketError(SocketError socketError); diff --git a/src/network/socket/qhttpsocketengine_p.h b/src/network/socket/qhttpsocketengine_p.h index 07815a7e51..c8863f1fb5 100644 --- a/src/network/socket/qhttpsocketengine_p.h +++ b/src/network/socket/qhttpsocketengine_p.h @@ -80,62 +80,62 @@ public: QHttpSocketEngine(QObject *parent = 0); ~QHttpSocketEngine(); - bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) Q_DECL_OVERRIDE; - bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) Q_DECL_OVERRIDE; + bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) override; + bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) override; void setProxy(const QNetworkProxy &networkProxy); - qintptr socketDescriptor() const Q_DECL_OVERRIDE; + qintptr socketDescriptor() const override; - bool isValid() const Q_DECL_OVERRIDE; + bool isValid() const override; bool connectInternal(); - bool connectToHost(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE; - bool connectToHostByName(const QString &name, quint16 port) Q_DECL_OVERRIDE; - bool bind(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE; - bool listen() Q_DECL_OVERRIDE; - int accept() Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; + bool connectToHost(const QHostAddress &address, quint16 port) override; + bool connectToHostByName(const QString &name, quint16 port) override; + bool bind(const QHostAddress &address, quint16 port) override; + bool listen() override; + int accept() override; + void close() override; - qint64 bytesAvailable() const Q_DECL_OVERRIDE; + qint64 bytesAvailable() const override; - qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 read(char *data, qint64 maxlen) override; + qint64 write(const char *data, qint64 len) override; #ifndef QT_NO_UDPSOCKET #ifndef QT_NO_NETWORKINTERFACE bool joinMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &interface) Q_DECL_OVERRIDE; + const QNetworkInterface &interface) override; bool leaveMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &interface) Q_DECL_OVERRIDE; - QNetworkInterface multicastInterface() const Q_DECL_OVERRIDE; - bool setMulticastInterface(const QNetworkInterface &iface) Q_DECL_OVERRIDE; + const QNetworkInterface &interface) override; + QNetworkInterface multicastInterface() const override; + bool setMulticastInterface(const QNetworkInterface &iface) override; #endif // QT_NO_NETWORKINTERFACE - bool hasPendingDatagrams() const Q_DECL_OVERRIDE; - qint64 pendingDatagramSize() const Q_DECL_OVERRIDE; + bool hasPendingDatagrams() const override; + qint64 pendingDatagramSize() const override; #endif // QT_NO_UDPSOCKET qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader *, - PacketHeaderOptions) Q_DECL_OVERRIDE; - qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) Q_DECL_OVERRIDE; - qint64 bytesToWrite() const Q_DECL_OVERRIDE; + PacketHeaderOptions) override; + qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) override; + qint64 bytesToWrite() const override; - int option(SocketOption option) const Q_DECL_OVERRIDE; - bool setOption(SocketOption option, int value) Q_DECL_OVERRIDE; + int option(SocketOption option) const override; + bool setOption(SocketOption option, int value) override; - bool waitForRead(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE; - bool waitForWrite(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE; + bool waitForRead(int msecs = 30000, bool *timedOut = 0) override; + bool waitForWrite(int msecs = 30000, bool *timedOut = 0) override; bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite, bool checkRead, bool checkWrite, - int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE; + int msecs = 30000, bool *timedOut = 0) override; - bool isReadNotificationEnabled() const Q_DECL_OVERRIDE; - void setReadNotificationEnabled(bool enable) Q_DECL_OVERRIDE; - bool isWriteNotificationEnabled() const Q_DECL_OVERRIDE; - void setWriteNotificationEnabled(bool enable) Q_DECL_OVERRIDE; - bool isExceptionNotificationEnabled() const Q_DECL_OVERRIDE; - void setExceptionNotificationEnabled(bool enable) Q_DECL_OVERRIDE; + bool isReadNotificationEnabled() const override; + void setReadNotificationEnabled(bool enable) override; + bool isWriteNotificationEnabled() const override; + void setWriteNotificationEnabled(bool enable) override; + bool isExceptionNotificationEnabled() const override; + void setExceptionNotificationEnabled(bool enable) override; public slots: void slotSocketConnected(); @@ -190,8 +190,8 @@ class Q_AUTOTEST_EXPORT QHttpSocketEngineHandler : public QSocketEngineHandler { public: virtual QAbstractSocketEngine *createSocketEngine(QAbstractSocket::SocketType socketType, - const QNetworkProxy &, QObject *parent) Q_DECL_OVERRIDE; - virtual QAbstractSocketEngine *createSocketEngine(qintptr socketDescripter, QObject *parent) Q_DECL_OVERRIDE; + const QNetworkProxy &, QObject *parent) override; + virtual QAbstractSocketEngine *createSocketEngine(qintptr socketDescripter, QObject *parent) override; }; #endif diff --git a/src/network/socket/qlocalsocket.h b/src/network/socket/qlocalsocket.h index 9905d3a86c..bea87236b8 100644 --- a/src/network/socket/qlocalsocket.h +++ b/src/network/socket/qlocalsocket.h @@ -91,12 +91,12 @@ public: QString fullServerName() const; void abort(); - virtual bool isSequential() const Q_DECL_OVERRIDE; - virtual qint64 bytesAvailable() const Q_DECL_OVERRIDE; - virtual qint64 bytesToWrite() const Q_DECL_OVERRIDE; - virtual bool canReadLine() const Q_DECL_OVERRIDE; - virtual bool open(OpenMode openMode = ReadWrite) Q_DECL_OVERRIDE; - virtual void close() Q_DECL_OVERRIDE; + virtual bool isSequential() const override; + virtual qint64 bytesAvailable() const override; + virtual qint64 bytesToWrite() const override; + virtual bool canReadLine() const override; + virtual bool open(OpenMode openMode = ReadWrite) override; + virtual void close() override; LocalSocketError error() const; bool flush(); bool isValid() const; @@ -109,10 +109,10 @@ public: qintptr socketDescriptor() const; LocalSocketState state() const; - bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForBytesWritten(int msecs = 30000) override; bool waitForConnected(int msecs = 30000); bool waitForDisconnected(int msecs = 30000); - bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForReadyRead(int msecs = 30000) override; Q_SIGNALS: void connected(); @@ -121,8 +121,8 @@ Q_SIGNALS: void stateChanged(QLocalSocket::LocalSocketState socketState); protected: - virtual qint64 readData(char*, qint64) Q_DECL_OVERRIDE; - virtual qint64 writeData(const char*, qint64) Q_DECL_OVERRIDE; + virtual qint64 readData(char*, qint64) override; + virtual qint64 writeData(const char*, qint64) override; private: Q_DISABLE_COPY(QLocalSocket) diff --git a/src/network/socket/qnativesocketengine_p.h b/src/network/socket/qnativesocketengine_p.h index 08e72072ef..bfea824bcb 100644 --- a/src/network/socket/qnativesocketengine_p.h +++ b/src/network/socket/qnativesocketengine_p.h @@ -128,43 +128,43 @@ public: QNativeSocketEngine(QObject *parent = 0); ~QNativeSocketEngine(); - bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) Q_DECL_OVERRIDE; - bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) Q_DECL_OVERRIDE; + bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) override; + bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) override; - qintptr socketDescriptor() const Q_DECL_OVERRIDE; + qintptr socketDescriptor() const override; - bool isValid() const Q_DECL_OVERRIDE; + bool isValid() const override; - bool connectToHost(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE; - bool connectToHostByName(const QString &name, quint16 port) Q_DECL_OVERRIDE; - bool bind(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE; - bool listen() Q_DECL_OVERRIDE; - int accept() Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; + bool connectToHost(const QHostAddress &address, quint16 port) override; + bool connectToHostByName(const QString &name, quint16 port) override; + bool bind(const QHostAddress &address, quint16 port) override; + bool listen() override; + int accept() override; + void close() override; - qint64 bytesAvailable() const Q_DECL_OVERRIDE; + qint64 bytesAvailable() const override; - qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 read(char *data, qint64 maxlen) override; + qint64 write(const char *data, qint64 len) override; #ifndef QT_NO_UDPSOCKET #ifndef QT_NO_NETWORKINTERFACE bool joinMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &iface) Q_DECL_OVERRIDE; + const QNetworkInterface &iface) override; bool leaveMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &iface) Q_DECL_OVERRIDE; - QNetworkInterface multicastInterface() const Q_DECL_OVERRIDE; - bool setMulticastInterface(const QNetworkInterface &iface) Q_DECL_OVERRIDE; + const QNetworkInterface &iface) override; + QNetworkInterface multicastInterface() const override; + bool setMulticastInterface(const QNetworkInterface &iface) override; #endif - bool hasPendingDatagrams() const Q_DECL_OVERRIDE; - qint64 pendingDatagramSize() const Q_DECL_OVERRIDE; + bool hasPendingDatagrams() const override; + qint64 pendingDatagramSize() const override; #endif // QT_NO_UDPSOCKET qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader * = 0, - PacketHeaderOptions = WantNone) Q_DECL_OVERRIDE; - qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) Q_DECL_OVERRIDE; - qint64 bytesToWrite() const Q_DECL_OVERRIDE; + PacketHeaderOptions = WantNone) override; + qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) override; + qint64 bytesToWrite() const override; qint64 receiveBufferSize() const; void setReceiveBufferSize(qint64 bufferSize); @@ -172,21 +172,21 @@ public: qint64 sendBufferSize() const; void setSendBufferSize(qint64 bufferSize); - int option(SocketOption option) const Q_DECL_OVERRIDE; - bool setOption(SocketOption option, int value) Q_DECL_OVERRIDE; + int option(SocketOption option) const override; + bool setOption(SocketOption option, int value) override; - bool waitForRead(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE; - bool waitForWrite(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE; + bool waitForRead(int msecs = 30000, bool *timedOut = 0) override; + bool waitForWrite(int msecs = 30000, bool *timedOut = 0) override; bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite, bool checkRead, bool checkWrite, - int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE; - - bool isReadNotificationEnabled() const Q_DECL_OVERRIDE; - void setReadNotificationEnabled(bool enable) Q_DECL_OVERRIDE; - bool isWriteNotificationEnabled() const Q_DECL_OVERRIDE; - void setWriteNotificationEnabled(bool enable) Q_DECL_OVERRIDE; - bool isExceptionNotificationEnabled() const Q_DECL_OVERRIDE; - void setExceptionNotificationEnabled(bool enable) Q_DECL_OVERRIDE; + int msecs = 30000, bool *timedOut = 0) override; + + bool isReadNotificationEnabled() const override; + void setReadNotificationEnabled(bool enable) override; + bool isWriteNotificationEnabled() const override; + void setWriteNotificationEnabled(bool enable) override; + bool isExceptionNotificationEnabled() const override; + void setExceptionNotificationEnabled(bool enable) override; public Q_SLOTS: // non-virtual override; diff --git a/src/network/socket/qsctpserver.h b/src/network/socket/qsctpserver.h index 1afdab28a0..b678ba053d 100644 --- a/src/network/socket/qsctpserver.h +++ b/src/network/socket/qsctpserver.h @@ -63,7 +63,7 @@ public: QSctpSocket *nextPendingDatagramConnection(); protected: - void incomingConnection(qintptr handle) Q_DECL_OVERRIDE; + void incomingConnection(qintptr handle) override; private: Q_DISABLE_COPY(QSctpServer) diff --git a/src/network/socket/qsctpserver_p.h b/src/network/socket/qsctpserver_p.h index 274939fc3d..8816cc150e 100644 --- a/src/network/socket/qsctpserver_p.h +++ b/src/network/socket/qsctpserver_p.h @@ -66,7 +66,7 @@ public: int maximumChannelCount; - void configureCreatedSocket() Q_DECL_OVERRIDE; + void configureCreatedSocket() override; }; #endif // QT_NO_SCTP diff --git a/src/network/socket/qsctpsocket.h b/src/network/socket/qsctpsocket.h index 9bed1890ff..5288da6129 100644 --- a/src/network/socket/qsctpsocket.h +++ b/src/network/socket/qsctpsocket.h @@ -56,8 +56,8 @@ public: explicit QSctpSocket(QObject *parent = nullptr); virtual ~QSctpSocket(); - void close() Q_DECL_OVERRIDE; - void disconnectFromHost() Q_DECL_OVERRIDE; + void close() override; + void disconnectFromHost() override; void setMaximumChannelCount(int count); int maximumChannelCount() const; @@ -67,8 +67,8 @@ public: bool writeDatagram(const QNetworkDatagram &datagram); protected: - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 readLineData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 readLineData(char *data, qint64 maxlen) override; private: Q_DISABLE_COPY(QSctpSocket) diff --git a/src/network/socket/qsctpsocket_p.h b/src/network/socket/qsctpsocket_p.h index 3f765ebed9..8f9413cb47 100644 --- a/src/network/socket/qsctpsocket_p.h +++ b/src/network/socket/qsctpsocket_p.h @@ -70,8 +70,8 @@ public: QSctpSocketPrivate(); virtual ~QSctpSocketPrivate(); - bool canReadNotification() Q_DECL_OVERRIDE; - bool writeToSocket() Q_DECL_OVERRIDE; + bool canReadNotification() override; + bool writeToSocket() override; QByteArray incomingDatagram; int maximumChannelCount; @@ -80,7 +80,7 @@ public: QVector readHeaders; QVector writeHeaders; - void configureCreatedSocket() Q_DECL_OVERRIDE; + void configureCreatedSocket() override; }; #endif // QT_NO_SCTP diff --git a/src/network/socket/qsocks5socketengine.cpp b/src/network/socket/qsocks5socketengine.cpp index 2847b910f3..64bbdedcfd 100644 --- a/src/network/socket/qsocks5socketengine.cpp +++ b/src/network/socket/qsocks5socketengine.cpp @@ -322,7 +322,7 @@ public: QSocks5BindData *retrieve(qintptr socketDescriptor); protected: - void timerEvent(QTimerEvent * event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent * event) override; QMutex mutex; int sweepTimerId; diff --git a/src/network/socket/qsocks5socketengine_p.h b/src/network/socket/qsocks5socketengine_p.h index ec50d71283..38139b065f 100644 --- a/src/network/socket/qsocks5socketengine_p.h +++ b/src/network/socket/qsocks5socketengine_p.h @@ -68,62 +68,62 @@ public: QSocks5SocketEngine(QObject *parent = 0); ~QSocks5SocketEngine(); - bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) Q_DECL_OVERRIDE; - bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) Q_DECL_OVERRIDE; + bool initialize(QAbstractSocket::SocketType type, QAbstractSocket::NetworkLayerProtocol protocol = QAbstractSocket::IPv4Protocol) override; + bool initialize(qintptr socketDescriptor, QAbstractSocket::SocketState socketState = QAbstractSocket::ConnectedState) override; void setProxy(const QNetworkProxy &networkProxy); - qintptr socketDescriptor() const Q_DECL_OVERRIDE; + qintptr socketDescriptor() const override; - bool isValid() const Q_DECL_OVERRIDE; + bool isValid() const override; bool connectInternal(); - bool connectToHost(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE; - bool connectToHostByName(const QString &name, quint16 port) Q_DECL_OVERRIDE; - bool bind(const QHostAddress &address, quint16 port) Q_DECL_OVERRIDE; - bool listen() Q_DECL_OVERRIDE; - int accept() Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; + bool connectToHost(const QHostAddress &address, quint16 port) override; + bool connectToHostByName(const QString &name, quint16 port) override; + bool bind(const QHostAddress &address, quint16 port) override; + bool listen() override; + int accept() override; + void close() override; - qint64 bytesAvailable() const Q_DECL_OVERRIDE; + qint64 bytesAvailable() const override; - qint64 read(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 write(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 read(char *data, qint64 maxlen) override; + qint64 write(const char *data, qint64 len) override; #ifndef QT_NO_UDPSOCKET #ifndef QT_NO_NETWORKINTERFACE bool joinMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &interface) Q_DECL_OVERRIDE; + const QNetworkInterface &interface) override; bool leaveMulticastGroup(const QHostAddress &groupAddress, - const QNetworkInterface &interface) Q_DECL_OVERRIDE; - QNetworkInterface multicastInterface() const Q_DECL_OVERRIDE; - bool setMulticastInterface(const QNetworkInterface &iface) Q_DECL_OVERRIDE; + const QNetworkInterface &interface) override; + QNetworkInterface multicastInterface() const override; + bool setMulticastInterface(const QNetworkInterface &iface) override; #endif // QT_NO_NETWORKINTERFACE - bool hasPendingDatagrams() const Q_DECL_OVERRIDE; - qint64 pendingDatagramSize() const Q_DECL_OVERRIDE; + bool hasPendingDatagrams() const override; + qint64 pendingDatagramSize() const override; #endif // QT_NO_UDPSOCKET qint64 readDatagram(char *data, qint64 maxlen, QIpPacketHeader * = 0, - PacketHeaderOptions = WantNone) Q_DECL_OVERRIDE; - qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) Q_DECL_OVERRIDE; - qint64 bytesToWrite() const Q_DECL_OVERRIDE; + PacketHeaderOptions = WantNone) override; + qint64 writeDatagram(const char *data, qint64 len, const QIpPacketHeader &) override; + qint64 bytesToWrite() const override; - int option(SocketOption option) const Q_DECL_OVERRIDE; - bool setOption(SocketOption option, int value) Q_DECL_OVERRIDE; + int option(SocketOption option) const override; + bool setOption(SocketOption option, int value) override; - bool waitForRead(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE; - bool waitForWrite(int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE; + bool waitForRead(int msecs = 30000, bool *timedOut = 0) override; + bool waitForWrite(int msecs = 30000, bool *timedOut = 0) override; bool waitForReadOrWrite(bool *readyToRead, bool *readyToWrite, bool checkRead, bool checkWrite, - int msecs = 30000, bool *timedOut = 0) Q_DECL_OVERRIDE; + int msecs = 30000, bool *timedOut = 0) override; - bool isReadNotificationEnabled() const Q_DECL_OVERRIDE; - void setReadNotificationEnabled(bool enable) Q_DECL_OVERRIDE; - bool isWriteNotificationEnabled() const Q_DECL_OVERRIDE; - void setWriteNotificationEnabled(bool enable) Q_DECL_OVERRIDE; - bool isExceptionNotificationEnabled() const Q_DECL_OVERRIDE; - void setExceptionNotificationEnabled(bool enable) Q_DECL_OVERRIDE; + bool isReadNotificationEnabled() const override; + void setReadNotificationEnabled(bool enable) override; + bool isWriteNotificationEnabled() const override; + void setWriteNotificationEnabled(bool enable) override; + bool isExceptionNotificationEnabled() const override; + void setExceptionNotificationEnabled(bool enable) override; private: Q_DECLARE_PRIVATE(QSocks5SocketEngine) @@ -166,11 +166,11 @@ class QSocks5PasswordAuthenticator : public QSocks5Authenticator { public: QSocks5PasswordAuthenticator(const QString &userName, const QString &password); - char methodId() Q_DECL_OVERRIDE; - bool beginAuthenticate(QTcpSocket *socket, bool *completed) Q_DECL_OVERRIDE; - bool continueAuthenticate(QTcpSocket *socket, bool *completed) Q_DECL_OVERRIDE; + char methodId() override; + bool beginAuthenticate(QTcpSocket *socket, bool *completed) override; + bool continueAuthenticate(QTcpSocket *socket, bool *completed) override; - QString errorString() Q_DECL_OVERRIDE; + QString errorString() override; private: QString userName; @@ -287,8 +287,8 @@ class Q_AUTOTEST_EXPORT QSocks5SocketEngineHandler : public QSocketEngineHandler { public: virtual QAbstractSocketEngine *createSocketEngine(QAbstractSocket::SocketType socketType, - const QNetworkProxy &, QObject *parent) Q_DECL_OVERRIDE; - virtual QAbstractSocketEngine *createSocketEngine(qintptr socketDescriptor, QObject *parent) Q_DECL_OVERRIDE; + const QNetworkProxy &, QObject *parent) override; + virtual QAbstractSocketEngine *createSocketEngine(qintptr socketDescriptor, QObject *parent) override; }; diff --git a/src/network/socket/qtcpserver_p.h b/src/network/socket/qtcpserver_p.h index b7fae4c105..6ee8c5f0b1 100644 --- a/src/network/socket/qtcpserver_p.h +++ b/src/network/socket/qtcpserver_p.h @@ -93,13 +93,13 @@ public: virtual void configureCreatedSocket(); // from QAbstractSocketEngineReceiver - void readNotification() Q_DECL_OVERRIDE; - void closeNotification() Q_DECL_OVERRIDE { readNotification(); } - void writeNotification() Q_DECL_OVERRIDE {} - void exceptionNotification() Q_DECL_OVERRIDE {} - void connectionNotification() Q_DECL_OVERRIDE {} + void readNotification() override; + void closeNotification() override { readNotification(); } + void writeNotification() override {} + void exceptionNotification() override {} + void connectionNotification() override {} #ifndef QT_NO_NETWORKPROXY - void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *) Q_DECL_OVERRIDE {} + void proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *) override {} #endif }; diff --git a/src/network/ssl/qsslsocket.h b/src/network/ssl/qsslsocket.h index 1b29cd4637..43b60e4f39 100644 --- a/src/network/ssl/qsslsocket.h +++ b/src/network/ssl/qsslsocket.h @@ -81,20 +81,20 @@ public: explicit QSslSocket(QObject *parent = Q_NULLPTR); ~QSslSocket(); - void resume() Q_DECL_OVERRIDE; // to continue after proxy authentication required, SSL errors etc. + void resume() override; // to continue after proxy authentication required, SSL errors etc. // Autostarting the SSL client handshake. void connectToHostEncrypted(const QString &hostName, quint16 port, OpenMode mode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol); void connectToHostEncrypted(const QString &hostName, quint16 port, const QString &sslPeerName, OpenMode mode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol); bool setSocketDescriptor(qintptr socketDescriptor, SocketState state = ConnectedState, - OpenMode openMode = ReadWrite) Q_DECL_OVERRIDE; + OpenMode openMode = ReadWrite) override; using QAbstractSocket::connectToHost; - void connectToHost(const QString &hostName, quint16 port, OpenMode openMode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol) Q_DECL_OVERRIDE; - void disconnectFromHost() Q_DECL_OVERRIDE; + void connectToHost(const QString &hostName, quint16 port, OpenMode openMode = ReadWrite, NetworkLayerProtocol protocol = AnyIPProtocol) override; + void disconnectFromHost() override; - virtual void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value) Q_DECL_OVERRIDE; - virtual QVariant socketOption(QAbstractSocket::SocketOption option) Q_DECL_OVERRIDE; + virtual void setSocketOption(QAbstractSocket::SocketOption option, const QVariant &value) override; + virtual QVariant socketOption(QAbstractSocket::SocketOption option) override; SslMode mode() const; bool isEncrypted() const; @@ -112,16 +112,16 @@ public: void setPeerVerifyName(const QString &hostName); // From QIODevice - qint64 bytesAvailable() const Q_DECL_OVERRIDE; - qint64 bytesToWrite() const Q_DECL_OVERRIDE; - bool canReadLine() const Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - bool atEnd() const Q_DECL_OVERRIDE; + qint64 bytesAvailable() const override; + qint64 bytesToWrite() const override; + bool canReadLine() const override; + void close() override; + bool atEnd() const override; bool flush(); // ### Qt6: remove me (implementation moved to private flush()) void abort(); // From QAbstractSocket: - void setReadBufferSize(qint64 size) Q_DECL_OVERRIDE; + void setReadBufferSize(qint64 size) override; // Similar to QIODevice's: qint64 encryptedBytesAvailable() const; @@ -179,11 +179,11 @@ public: QT_DEPRECATED_X("Use QSslConfiguration::systemCaCertificates()") static QList systemCaCertificates(); #endif // QT_DEPRECATED_SINCE(5, 5) - bool waitForConnected(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForConnected(int msecs = 30000) override; bool waitForEncrypted(int msecs = 30000); - bool waitForReadyRead(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForBytesWritten(int msecs = 30000) Q_DECL_OVERRIDE; - bool waitForDisconnected(int msecs = 30000) Q_DECL_OVERRIDE; + bool waitForReadyRead(int msecs = 30000) override; + bool waitForBytesWritten(int msecs = 30000) override; + bool waitForDisconnected(int msecs = 30000) override; QList sslErrors() const; @@ -209,8 +209,8 @@ Q_SIGNALS: void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *authenticator); protected: - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE; - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE; + qint64 readData(char *data, qint64 maxlen) override; + qint64 writeData(const char *data, qint64 len) override; private: Q_DECLARE_PRIVATE(QSslSocket) diff --git a/src/network/ssl/qsslsocket_mac_p.h b/src/network/ssl/qsslsocket_mac_p.h index 9e1d18981e..34e30ebb16 100644 --- a/src/network/ssl/qsslsocket_mac_p.h +++ b/src/network/ssl/qsslsocket_mac_p.h @@ -86,14 +86,14 @@ public: virtual ~QSslSocketBackendPrivate(); // Final-overriders (QSslSocketPrivate): - void continueHandshake() Q_DECL_OVERRIDE; - void disconnected() Q_DECL_OVERRIDE; - void disconnectFromHost() Q_DECL_OVERRIDE; - QSslCipher sessionCipher() const Q_DECL_OVERRIDE; - QSsl::SslProtocol sessionProtocol() const Q_DECL_OVERRIDE; - void startClientEncryption() Q_DECL_OVERRIDE; - void startServerEncryption() Q_DECL_OVERRIDE; - void transmit() Q_DECL_OVERRIDE; + void continueHandshake() override; + void disconnected() override; + void disconnectFromHost() override; + QSslCipher sessionCipher() const override; + QSsl::SslProtocol sessionProtocol() const override; + void startClientEncryption() override; + void startServerEncryption() override; + void transmit() override; static QList verify(QList certificateChain, const QString &hostName); diff --git a/src/network/ssl/qsslsocket_openssl_p.h b/src/network/ssl/qsslsocket_openssl_p.h index 7f9e884045..2a800cdc34 100644 --- a/src/network/ssl/qsslsocket_openssl_p.h +++ b/src/network/ssl/qsslsocket_openssl_p.h @@ -132,22 +132,22 @@ public: #endif // Platform specific functions - void startClientEncryption() Q_DECL_OVERRIDE; - void startServerEncryption() Q_DECL_OVERRIDE; - void transmit() Q_DECL_OVERRIDE; + void startClientEncryption() override; + void startServerEncryption() override; + void transmit() override; bool startHandshake(); - void disconnectFromHost() Q_DECL_OVERRIDE; - void disconnected() Q_DECL_OVERRIDE; - QSslCipher sessionCipher() const Q_DECL_OVERRIDE; - QSsl::SslProtocol sessionProtocol() const Q_DECL_OVERRIDE; - void continueHandshake() Q_DECL_OVERRIDE; + void disconnectFromHost() override; + void disconnected() override; + QSslCipher sessionCipher() const override; + QSsl::SslProtocol sessionProtocol() const override; + void continueHandshake() override; bool checkSslErrors(); void storePeerCertificates(); unsigned int tlsPskClientCallback(const char *hint, char *identity, unsigned int max_identity_len, unsigned char *psk, unsigned int max_psk_len); unsigned int tlsPskServerCallback(const char *identity, unsigned char *psk, unsigned int max_psk_len); #ifdef Q_OS_WIN void fetchCaRootForCert(const QSslCertificate &cert); - void _q_caRootLoaded(QSslCertificate,QSslCertificate) Q_DECL_OVERRIDE; + void _q_caRootLoaded(QSslCertificate,QSslCertificate) override; #endif Q_AUTOTEST_EXPORT static long setupOpenSslOptions(QSsl::SslProtocol protocol, QSsl::SslOptions sslOptions); diff --git a/src/network/ssl/qsslsocket_p.h b/src/network/ssl/qsslsocket_p.h index 5e5a8d2371..a545c618ce 100644 --- a/src/network/ssl/qsslsocket_p.h +++ b/src/network/ssl/qsslsocket_p.h @@ -170,7 +170,7 @@ public: static void checkSettingSslContext(QSslSocket*, QSharedPointer); static QSharedPointer sslContext(QSslSocket *socket); bool isPaused() const; - bool bind(const QHostAddress &address, quint16, QAbstractSocket::BindMode) Q_DECL_OVERRIDE; + bool bind(const QHostAddress &address, quint16, QAbstractSocket::BindMode) override; void _q_connectedSlot(); void _q_hostFoundSlot(); void _q_disconnectedSlot(); @@ -189,9 +189,9 @@ public: static QList unixRootCertDirectories(); // used also by QSslContext - virtual qint64 peek(char *data, qint64 maxSize) Q_DECL_OVERRIDE; - virtual QByteArray peek(qint64 maxSize) Q_DECL_OVERRIDE; - bool flush() Q_DECL_OVERRIDE; + virtual qint64 peek(char *data, qint64 maxSize) override; + virtual QByteArray peek(qint64 maxSize) override; + bool flush() override; // Platform specific functions virtual void startClientEncryption() = 0; diff --git a/src/network/ssl/qsslsocket_winrt_p.h b/src/network/ssl/qsslsocket_winrt_p.h index 1043aeee11..030db6d4fa 100644 --- a/src/network/ssl/qsslsocket_winrt_p.h +++ b/src/network/ssl/qsslsocket_winrt_p.h @@ -80,14 +80,14 @@ public: ~QSslSocketBackendPrivate(); // Platform specific functions - void startClientEncryption() Q_DECL_OVERRIDE; - void startServerEncryption() Q_DECL_OVERRIDE; - void transmit() Q_DECL_OVERRIDE; - void disconnectFromHost() Q_DECL_OVERRIDE; - void disconnected() Q_DECL_OVERRIDE; - QSslCipher sessionCipher() const Q_DECL_OVERRIDE; - QSsl::SslProtocol sessionProtocol() const Q_DECL_OVERRIDE; - void continueHandshake() Q_DECL_OVERRIDE; + void startClientEncryption() override; + void startServerEncryption() override; + void transmit() override; + void disconnectFromHost() override; + void disconnected() override; + QSslCipher sessionCipher() const override; + QSsl::SslProtocol sessionProtocol() const override; + void continueHandshake() override; static QList defaultCiphers(); static QList verify(const QList &certificateChain, const QString &hostName); diff --git a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp index ec673e8726..47e8531959 100644 --- a/src/opengl/gl2paintengineex/qglengineshadermanager.cpp +++ b/src/opengl/gl2paintengineex/qglengineshadermanager.cpp @@ -68,13 +68,13 @@ public: delete m_shaders; } - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { delete m_shaders; m_shaders = 0; } - void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *) override { } diff --git a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h index 0f96732278..d1ed621790 100644 --- a/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h +++ b/src/opengl/gl2paintengineex/qpaintengineex_opengl2_p.h @@ -108,37 +108,37 @@ public: QGL2PaintEngineEx(); ~QGL2PaintEngineEx(); - bool begin(QPaintDevice *device) Q_DECL_OVERRIDE; + bool begin(QPaintDevice *device) override; void ensureActive(); - bool end() Q_DECL_OVERRIDE; - - virtual void clipEnabledChanged() Q_DECL_OVERRIDE; - virtual void penChanged() Q_DECL_OVERRIDE; - virtual void brushChanged() Q_DECL_OVERRIDE; - virtual void brushOriginChanged() Q_DECL_OVERRIDE; - virtual void opacityChanged() Q_DECL_OVERRIDE; - virtual void compositionModeChanged() Q_DECL_OVERRIDE; - virtual void renderHintsChanged() Q_DECL_OVERRIDE; - virtual void transformChanged() Q_DECL_OVERRIDE; - - virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; + bool end() override; + + virtual void clipEnabledChanged() override; + virtual void penChanged() override; + virtual void brushChanged() override; + virtual void brushOriginChanged() override; + virtual void opacityChanged() override; + virtual void compositionModeChanged() override; + virtual void renderHintsChanged() override; + virtual void transformChanged() override; + + virtual void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; virtual void drawPixmapFragments(const QPainter::PixmapFragment *fragments, int fragmentCount, const QPixmap &pixmap, - QPainter::PixmapFragmentHints hints) Q_DECL_OVERRIDE; + QPainter::PixmapFragmentHints hints) override; virtual void drawImage(const QRectF &r, const QImage &pm, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; - virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; - virtual void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE; - virtual void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE; - virtual void clip(const QVectorPath &path, Qt::ClipOperation op) Q_DECL_OVERRIDE; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; + virtual void drawTextItem(const QPointF &p, const QTextItem &textItem) override; + virtual void fill(const QVectorPath &path, const QBrush &brush) override; + virtual void stroke(const QVectorPath &path, const QPen &pen) override; + virtual void clip(const QVectorPath &path, Qt::ClipOperation op) override; - virtual void drawStaticTextItem(QStaticTextItem *textItem) Q_DECL_OVERRIDE; + virtual void drawStaticTextItem(QStaticTextItem *textItem) override; bool drawTexture(const QRectF &r, GLuint textureId, const QSize &size, const QRectF &sr); - Type type() const Q_DECL_OVERRIDE { return OpenGL2; } + Type type() const override { return OpenGL2; } - virtual void setState(QPainterState *s) Q_DECL_OVERRIDE; - virtual QPainterState *createState(QPainterState *orig) const Q_DECL_OVERRIDE; + virtual void setState(QPainterState *s) override; + virtual QPainterState *createState(QPainterState *orig) const override; inline QGL2PaintEngineState *state() { return static_cast(QPaintEngineEx::state()); } @@ -146,16 +146,16 @@ public: return static_cast(QPaintEngineEx::state()); } - void beginNativePainting() Q_DECL_OVERRIDE; - void endNativePainting() Q_DECL_OVERRIDE; + void beginNativePainting() override; + void endNativePainting() override; void invalidateState(); void setRenderTextActive(bool); bool isNativePaintingActive() const; - bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE { return false; } - bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const Q_DECL_OVERRIDE; + bool requiresPretransformedGlyphPositions(QFontEngine *, const QTransform &) const override { return false; } + bool shouldDrawCachedGlyphs(QFontEngine *, const QTransform &) const override; void setTranslateZ(GLfloat z); @@ -244,7 +244,7 @@ public: void updateClipScissorTest(); void setScissor(const QRect &rect); void regenerateClip(); - void systemStateChanged() Q_DECL_OVERRIDE; + void systemStateChanged() override; static QGLEngineShaderManager* shaderManagerForEngine(QGL2PaintEngineEx *engine) { return engine->d_func()->shaderManager; } diff --git a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h index 95401d10c1..e76216ef5d 100644 --- a/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h +++ b/src/opengl/gl2paintengineex/qtextureglyphcache_gl_p.h @@ -79,7 +79,7 @@ struct QGLGlyphTexture : public QOpenGLSharedResource #endif } - void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *context) override { const QGLContext *ctx = QGLContext::fromOpenGLContext(context); #ifdef QT_GL_TEXTURE_GLYPH_CACHE_DEBUG @@ -93,7 +93,7 @@ struct QGLGlyphTexture : public QOpenGLSharedResource ctx->contextHandle()->functions()->glDeleteTextures(1, &m_texture); } - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_texture = 0; m_fbo = 0; @@ -113,12 +113,12 @@ public: QGLTextureGlyphCache(QFontEngine::GlyphFormat format, const QTransform &matrix); ~QGLTextureGlyphCache(); - virtual void createTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void resizeTextureData(int width, int height) Q_DECL_OVERRIDE; - virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) Q_DECL_OVERRIDE; - virtual int glyphPadding() const Q_DECL_OVERRIDE; - virtual int maxTextureWidth() const Q_DECL_OVERRIDE; - virtual int maxTextureHeight() const Q_DECL_OVERRIDE; + virtual void createTextureData(int width, int height) override; + virtual void resizeTextureData(int width, int height) override; + virtual void fillTexture(const Coord &c, glyph_t glyph, QFixed subPixelPosition) override; + virtual int glyphPadding() const override; + virtual int maxTextureWidth() const override; + virtual int maxTextureHeight() const override; inline GLuint texture() const { QGLTextureGlyphCache *that = const_cast(this); diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index ab418c191a..8bafdb1031 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -413,7 +413,7 @@ public: const QFont & fnt = QFont()); void renderText(double x, double y, double z, const QString & str, const QFont & fnt = QFont()); - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; GLuint bindTexture(const QImage &image, GLenum target, GLint format, QGLContext::BindOptions options); @@ -437,7 +437,7 @@ public Q_SLOTS: virtual void updateOverlayGL(); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; virtual void initializeGL(); virtual void resizeGL(int w, int h); virtual void paintGL(); @@ -449,8 +449,8 @@ protected: void setAutoBufferSwap(bool on); bool autoBufferSwap() const; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent*) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent*) override; + void resizeEvent(QResizeEvent*) override; virtual void glInit(); virtual void glDraw(); diff --git a/src/opengl/qgl_p.h b/src/opengl/qgl_p.h index 9ab5cd36a2..6b4d83888f 100644 --- a/src/opengl/qgl_p.h +++ b/src/opengl/qgl_p.h @@ -140,7 +140,7 @@ public: void initContext(QGLContext *context, const QGLWidget* shareWidget); bool renderCxPm(QPixmap *pixmap); void cleanupColormaps(); - void aboutToDestroy() Q_DECL_OVERRIDE { + void aboutToDestroy() override { if (glcx && !parent_changing) glcx->reset(); } @@ -488,12 +488,12 @@ public: } protected: - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_id = 0; } - void freeResource(QOpenGLContext *context) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *context) override { if (m_id) { freeResource(QGLContext::fromOpenGLContext(context), m_id); @@ -517,7 +517,7 @@ public: } protected: - void freeResource(QGLContext *ctx, GLuint id) Q_DECL_OVERRIDE + void freeResource(QGLContext *ctx, GLuint id) override { m_func(ctx, id); } diff --git a/src/opengl/qglframebufferobject.h b/src/opengl/qglframebufferobject.h index f4b6d1ddc1..c88063cbb5 100644 --- a/src/opengl/qglframebufferobject.h +++ b/src/opengl/qglframebufferobject.h @@ -84,7 +84,7 @@ public: QImage toImage() const; Attachment attachment() const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; GLuint handle() const; static bool bindDefault(); @@ -101,8 +101,8 @@ public: GLenum filter = GL_NEAREST); protected: - int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - int devType() const Q_DECL_OVERRIDE { return QInternal::FramebufferObject; } + int metric(PaintDeviceMetric metric) const override; + int devType() const override { return QInternal::FramebufferObject; } private: Q_DISABLE_COPY(QGLFramebufferObject) diff --git a/src/opengl/qglframebufferobject_p.h b/src/opengl/qglframebufferobject_p.h index d3af1fdbaa..bf5e21cf0b 100644 --- a/src/opengl/qglframebufferobject_p.h +++ b/src/opengl/qglframebufferobject_p.h @@ -106,11 +106,11 @@ public: class QGLFBOGLPaintDevice : public QGLPaintDevice { public: - virtual QPaintEngine* paintEngine() const Q_DECL_OVERRIDE {return fbo->paintEngine();} - virtual QSize size() const Q_DECL_OVERRIDE {return fbo->size();} - virtual QGLContext* context() const Q_DECL_OVERRIDE; - virtual QGLFormat format() const Q_DECL_OVERRIDE {return fboFormat;} - virtual bool alphaRequested() const Q_DECL_OVERRIDE { return reqAlpha; } + virtual QPaintEngine* paintEngine() const override {return fbo->paintEngine();} + virtual QSize size() const override {return fbo->size();} + virtual QGLContext* context() const override; + virtual QGLFormat format() const override {return fboFormat;} + virtual bool alphaRequested() const override { return reqAlpha; } void setFBO(QGLFramebufferObject* f, QGLFramebufferObject::Attachment attachment); diff --git a/src/opengl/qglfunctions.cpp b/src/opengl/qglfunctions.cpp index a1ea1b1e56..07e1194342 100644 --- a/src/opengl/qglfunctions.cpp +++ b/src/opengl/qglfunctions.cpp @@ -159,12 +159,12 @@ struct QGLFunctionsPrivateEx : public QGLFunctionsPrivate, public QOpenGLSharedR delete funcs; } - void invalidateResource() Q_DECL_OVERRIDE + void invalidateResource() override { m_features = -1; } - void freeResource(QOpenGLContext *) Q_DECL_OVERRIDE + void freeResource(QOpenGLContext *) override { // no gl resources to free } diff --git a/src/opengl/qglpaintdevice_p.h b/src/opengl/qglpaintdevice_p.h index 3b34b2d244..bfecdabd53 100644 --- a/src/opengl/qglpaintdevice_p.h +++ b/src/opengl/qglpaintdevice_p.h @@ -64,7 +64,7 @@ public: QGLPaintDevice(); virtual ~QGLPaintDevice(); - int devType() const Q_DECL_OVERRIDE {return QInternal::OpenGL;} + int devType() const override {return QInternal::OpenGL;} virtual void beginPaint(); virtual void ensureActiveTarget(); @@ -80,7 +80,7 @@ public: static QGLPaintDevice* getDevice(QPaintDevice*); protected: - int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + int metric(QPaintDevice::PaintDeviceMetric metric) const override; GLuint m_previousFBO; GLuint m_thisFBO; }; @@ -93,13 +93,13 @@ class Q_OPENGL_EXPORT QGLWidgetGLPaintDevice : public QGLPaintDevice public: QGLWidgetGLPaintDevice(); - virtual QPaintEngine* paintEngine() const Q_DECL_OVERRIDE; + virtual QPaintEngine* paintEngine() const override; // QGLWidgets need to do swapBufers in endPaint: - virtual void beginPaint() Q_DECL_OVERRIDE; - virtual void endPaint() Q_DECL_OVERRIDE; - virtual QSize size() const Q_DECL_OVERRIDE; - virtual QGLContext* context() const Q_DECL_OVERRIDE; + virtual void beginPaint() override; + virtual void endPaint() override; + virtual QSize size() const override; + virtual QGLContext* context() const override; void setWidget(QGLWidget*); diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h index bd30ca2663..9735f51e4f 100644 --- a/src/opengl/qglpixelbuffer.h +++ b/src/opengl/qglpixelbuffer.h @@ -81,14 +81,14 @@ public: Qt::HANDLE handle() const; QImage toImage() const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; QGLFormat format() const; static bool hasOpenGLPbuffers(); protected: - int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - int devType() const Q_DECL_OVERRIDE { return QInternal::Pbuffer; } + int metric(PaintDeviceMetric metric) const override; + int devType() const override { return QInternal::Pbuffer; } private: Q_DISABLE_COPY(QGLPixelBuffer) diff --git a/src/opengl/qgraphicsshadereffect.cpp b/src/opengl/qgraphicsshadereffect.cpp index 218f4af866..cf3d307d71 100644 --- a/src/opengl/qgraphicsshadereffect.cpp +++ b/src/opengl/qgraphicsshadereffect.cpp @@ -143,7 +143,7 @@ public: setSource(source); } - void setUniforms(QGLShaderProgram *program) Q_DECL_OVERRIDE; + void setUniforms(QGLShaderProgram *program) override; QGraphicsShaderEffect *effect; }; diff --git a/src/opengl/qgraphicsshadereffect_p.h b/src/opengl/qgraphicsshadereffect_p.h index d7e0ec51d4..9efcecd25f 100644 --- a/src/opengl/qgraphicsshadereffect_p.h +++ b/src/opengl/qgraphicsshadereffect_p.h @@ -74,7 +74,7 @@ public: void setPixelShaderFragment(const QByteArray& code); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; void setUniformsDirty(); virtual void setUniforms(QGLShaderProgram *program); diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h index fea3a06cbd..fe669c8dec 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h +++ b/src/platformsupport/devicediscovery/qdevicediscovery_dummy_p.h @@ -61,7 +61,7 @@ class QDeviceDiscoveryDummy : public QDeviceDiscovery public: QDeviceDiscoveryDummy(QDeviceTypes types, QObject *parent = 0); - QStringList scanConnectedDevices() Q_DECL_OVERRIDE; + QStringList scanConnectedDevices() override; }; QT_END_NAMESPACE diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h index ab5a9c6f12..93110c3c55 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h +++ b/src/platformsupport/devicediscovery/qdevicediscovery_static_p.h @@ -61,7 +61,7 @@ class QDeviceDiscoveryStatic : public QDeviceDiscovery public: QDeviceDiscoveryStatic(QDeviceTypes types, QObject *parent = 0); - QStringList scanConnectedDevices() Q_DECL_OVERRIDE; + QStringList scanConnectedDevices() override; private: bool checkDeviceType(const QString &device); diff --git a/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h b/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h index 3c53ef3f17..28618d0b21 100644 --- a/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h +++ b/src/platformsupport/devicediscovery/qdevicediscovery_udev_p.h @@ -63,7 +63,7 @@ class QDeviceDiscoveryUDev : public QDeviceDiscovery public: QDeviceDiscoveryUDev(QDeviceTypes types, struct udev *udev, QObject *parent = 0); ~QDeviceDiscoveryUDev(); - QStringList scanConnectedDevices() Q_DECL_OVERRIDE; + QStringList scanConnectedDevices() override; private slots: void handleUDevNotification(); diff --git a/src/platformsupport/eglconvenience/qeglpbuffer_p.h b/src/platformsupport/eglconvenience/qeglpbuffer_p.h index 38370c0e62..eed8cd9dca 100644 --- a/src/platformsupport/eglconvenience/qeglpbuffer_p.h +++ b/src/platformsupport/eglconvenience/qeglpbuffer_p.h @@ -63,8 +63,8 @@ public: QEGLPlatformContext::Flags flags = 0); ~QEGLPbuffer(); - QSurfaceFormat format() const Q_DECL_OVERRIDE { return m_format; } - bool isValid() const Q_DECL_OVERRIDE { return m_pbuffer != EGL_NO_SURFACE; } + QSurfaceFormat format() const override { return m_format; } + bool isValid() const override { return m_pbuffer != EGL_NO_SURFACE; } EGLSurface pbuffer() const { return m_pbuffer; } diff --git a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h index 9d41eecd99..d6cbbe4131 100644 --- a/src/platformsupport/eglconvenience/qeglplatformcontext_p.h +++ b/src/platformsupport/eglconvenience/qeglplatformcontext_p.h @@ -72,15 +72,15 @@ public: Flags flags = 0); ~QEGLPlatformContext(); - void initialize() Q_DECL_OVERRIDE; - bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; - void doneCurrent() Q_DECL_OVERRIDE; - void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; - QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; + void initialize() override; + bool makeCurrent(QPlatformSurface *surface) override; + void doneCurrent() override; + void swapBuffers(QPlatformSurface *surface) override; + QFunctionPointer getProcAddress(const char *procName) override; - QSurfaceFormat format() const Q_DECL_OVERRIDE; - bool isSharing() const Q_DECL_OVERRIDE { return m_shareContext != EGL_NO_CONTEXT; } - bool isValid() const Q_DECL_OVERRIDE { return m_eglContext != EGL_NO_CONTEXT; } + QSurfaceFormat format() const override; + bool isSharing() const override { return m_shareContext != EGL_NO_CONTEXT; } + bool isValid() const override { return m_eglContext != EGL_NO_CONTEXT; } EGLContext eglContext() const; EGLDisplay eglDisplay() const; diff --git a/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h b/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h index bed2532856..5930dc68e7 100644 --- a/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h +++ b/src/platformsupport/eventdispatchers/qeventdispatcher_glib_p.h @@ -67,7 +67,7 @@ public: explicit QPAEventDispatcherGlib(QObject *parent = 0); ~QPAEventDispatcherGlib(); - bool processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE; + bool processEvents(QEventLoop::ProcessEventsFlags flags) override; QEventLoop::ProcessEventsFlags m_flags; }; diff --git a/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher_p.h b/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher_p.h index 9a23b5c0bd..4ff047a60e 100644 --- a/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher_p.h +++ b/src/platformsupport/eventdispatchers/qwindowsguieventdispatcher_p.h @@ -63,8 +63,8 @@ public: static const char *windowsMessageName(UINT msg); - bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE; - void sendPostedEvents() Q_DECL_OVERRIDE; + bool QT_ENSURE_STACK_ALIGNED_FOR_SSE processEvents(QEventLoop::ProcessEventsFlags flags) override; + void sendPostedEvents() override; private: QEventLoop::ProcessEventsFlags m_flags; diff --git a/src/platformsupport/fbconvenience/qfbbackingstore_p.h b/src/platformsupport/fbconvenience/qfbbackingstore_p.h index c8dfe3489c..c4762c9327 100644 --- a/src/platformsupport/fbconvenience/qfbbackingstore_p.h +++ b/src/platformsupport/fbconvenience/qfbbackingstore_p.h @@ -66,10 +66,10 @@ public: QFbBackingStore(QWindow *window); ~QFbBackingStore(); - QPaintDevice *paintDevice() Q_DECL_OVERRIDE { return &mImage; } - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override { return &mImage; } + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; - void resize(const QSize &size, const QRegion ®ion) Q_DECL_OVERRIDE; + void resize(const QSize &size, const QRegion ®ion) override; const QImage image(); QImage toImage() const override; @@ -77,8 +77,8 @@ public: void lock(); void unlock(); - void beginPaint(const QRegion &) Q_DECL_OVERRIDE; - void endPaint() Q_DECL_OVERRIDE; + void beginPaint(const QRegion &) override; + void endPaint() override; protected: friend class QFbWindow; diff --git a/src/platformsupport/fbconvenience/qfbscreen_p.h b/src/platformsupport/fbconvenience/qfbscreen_p.h index 1c27a941cc..eed615de36 100644 --- a/src/platformsupport/fbconvenience/qfbscreen_p.h +++ b/src/platformsupport/fbconvenience/qfbscreen_p.h @@ -78,14 +78,14 @@ public: virtual bool initialize(); - QRect geometry() const Q_DECL_OVERRIDE { return mGeometry; } - int depth() const Q_DECL_OVERRIDE { return mDepth; } - QImage::Format format() const Q_DECL_OVERRIDE { return mFormat; } - QSizeF physicalSize() const Q_DECL_OVERRIDE { return mPhysicalSize; } - QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return mCursor; } + QRect geometry() const override { return mGeometry; } + int depth() const override { return mDepth; } + QImage::Format format() const override { return mFormat; } + QSizeF physicalSize() const override { return mPhysicalSize; } + QPlatformCursor *cursor() const override { return mCursor; } QWindow *topWindow() const; - QWindow *topLevelAt(const QPoint & p) const Q_DECL_OVERRIDE; + QWindow *topLevelAt(const QPoint & p) const override; // compositor api virtual void addWindow(QFbWindow *window); @@ -109,7 +109,7 @@ protected: virtual QRegion doRedraw(); void initializeCompositor(); - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; QFbWindow *windowForId(WId wid) const; diff --git a/src/platformsupport/fbconvenience/qfbwindow_p.h b/src/platformsupport/fbconvenience/qfbwindow_p.h index 20bac46c69..76b34ce041 100644 --- a/src/platformsupport/fbconvenience/qfbwindow_p.h +++ b/src/platformsupport/fbconvenience/qfbwindow_p.h @@ -64,17 +64,17 @@ public: QFbWindow(QWindow *window); ~QFbWindow(); - void raise() Q_DECL_OVERRIDE; - void lower() Q_DECL_OVERRIDE; + void raise() override; + void lower() override; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setGeometry(const QRect &rect) override; + void setVisible(bool visible) override; - void setWindowState(Qt::WindowStates state) Q_DECL_OVERRIDE; - void setWindowFlags(Qt::WindowFlags type) Q_DECL_OVERRIDE; + void setWindowState(Qt::WindowStates state) override; + void setWindowFlags(Qt::WindowFlags type) override; Qt::WindowFlags windowFlags() const; - WId winId() const Q_DECL_OVERRIDE { return mWindowId; } + WId winId() const override { return mWindowId; } void setBackingStore(QFbBackingStore *store) { mBackingStore = store; } QFbBackingStore *backingStore() const { return mBackingStore; } @@ -83,9 +83,9 @@ public: virtual void repaint(const QRegion&); - void propagateSizeHints() Q_DECL_OVERRIDE { } - bool setKeyboardGrabEnabled(bool) Q_DECL_OVERRIDE { return false; } - bool setMouseGrabEnabled(bool) Q_DECL_OVERRIDE { return false; } + void propagateSizeHints() override { } + bool setKeyboardGrabEnabled(bool) override { return false; } + bool setMouseGrabEnabled(bool) override { return false; } protected: friend class QFbScreen; diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h index 6a3261de30..a7257c2f98 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h +++ b/src/platformsupport/fontdatabases/fontconfig/qfontconfigdatabase_p.h @@ -61,15 +61,15 @@ class QFontEngineFT; class QFontconfigDatabase : public QFreeTypeFontDatabase { public: - void populateFontDatabase() Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) Q_DECL_OVERRIDE; - QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE; - QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE; - QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE; - QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE; - QString resolveFontFamilyAlias(const QString &family) const Q_DECL_OVERRIDE; - QFont defaultFont() const Q_DECL_OVERRIDE; + void populateFontDatabase() override; + void invalidate() override; + QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) override; + QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override; + QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override; + QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const override; + QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override; + QString resolveFontFamilyAlias(const QString &family) const override; + QFont defaultFont() const override; private: void setupFontEngine(QFontEngineFT *engine, const QFontDef &fontDef) const; diff --git a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h index 1d2f451722..7f560c2d05 100644 --- a/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h +++ b/src/platformsupport/fontdatabases/fontconfig/qfontenginemultifontconfig_p.h @@ -63,7 +63,7 @@ public: ~QFontEngineMultiFontConfig(); - bool shouldLoadFontEngineForCharacter(int at, uint ucs4) const Q_DECL_OVERRIDE; + bool shouldLoadFontEngineForCharacter(int at, uint ucs4) const override; private: FcPattern* getMatchPatternForFallback(int at) const; diff --git a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h index 2993e3b616..7efd175402 100644 --- a/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h +++ b/src/platformsupport/fontdatabases/freetype/qfontengine_ft_p.h @@ -190,68 +190,68 @@ private: mutable int fast_glyph_count; }; - QFontEngine::FaceId faceId() const Q_DECL_OVERRIDE; - QFontEngine::Properties properties() const Q_DECL_OVERRIDE; - QFixed emSquareSize() const Q_DECL_OVERRIDE; - bool supportsSubPixelPositions() const Q_DECL_OVERRIDE + QFontEngine::FaceId faceId() const override; + QFontEngine::Properties properties() const override; + QFixed emSquareSize() const override; + bool supportsSubPixelPositions() const override { return default_hint_style == HintLight || default_hint_style == HintNone; } - bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE; - int synthesized() const Q_DECL_OVERRIDE; + bool getSfntTableData(uint tag, uchar *buffer, uint *length) const override; + int synthesized() const override; - QFixed ascent() const Q_DECL_OVERRIDE; - QFixed capHeight() const Q_DECL_OVERRIDE; - QFixed descent() const Q_DECL_OVERRIDE; - QFixed leading() const Q_DECL_OVERRIDE; - QFixed xHeight() const Q_DECL_OVERRIDE; - QFixed averageCharWidth() const Q_DECL_OVERRIDE; + QFixed ascent() const override; + QFixed capHeight() const override; + QFixed descent() const override; + QFixed leading() const override; + QFixed xHeight() const override; + QFixed averageCharWidth() const override; - qreal maxCharWidth() const Q_DECL_OVERRIDE; - QFixed lineThickness() const Q_DECL_OVERRIDE; - QFixed underlinePosition() const Q_DECL_OVERRIDE; + qreal maxCharWidth() const override; + QFixed lineThickness() const override; + QFixed underlinePosition() const override; - glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE; - void doKerning(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE; + glyph_t glyphIndex(uint ucs4) const override; + void doKerning(QGlyphLayout *, ShaperFlags) const override; - void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE; + void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) override; - bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE; + bool supportsTransformation(const QTransform &transform) const override; void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs, - QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; + QPainterPath *path, QTextItem::RenderFlags flags) override; void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, - QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; + QPainterPath *path, QTextItem::RenderFlags flags) override; - bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE; + bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const override; - glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE; - glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE; - glyph_metrics_t boundingBox(glyph_t glyph, const QTransform &matrix) Q_DECL_OVERRIDE; + glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override; + glyph_metrics_t boundingBox(glyph_t glyph) override; + glyph_metrics_t boundingBox(glyph_t glyph, const QTransform &matrix) override; - void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags flags) const Q_DECL_OVERRIDE; - QImage alphaMapForGlyph(glyph_t g) Q_DECL_OVERRIDE { return alphaMapForGlyph(g, 0); } - QImage alphaMapForGlyph(glyph_t, QFixed) Q_DECL_OVERRIDE; - QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; - QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; - QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; + void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags flags) const override; + QImage alphaMapForGlyph(glyph_t g) override { return alphaMapForGlyph(g, 0); } + QImage alphaMapForGlyph(glyph_t, QFixed) override; + QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) override; + QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override; + QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override; glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed subPixelPosition, const QTransform &matrix, - QFontEngine::GlyphFormat format) Q_DECL_OVERRIDE; + QFontEngine::GlyphFormat format) override; QImage *lockedAlphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, GlyphFormat neededFormat, const QTransform &t, - QPoint *offset) Q_DECL_OVERRIDE; - bool hasInternalCaching() const Q_DECL_OVERRIDE { return cacheEnabled; } - void unlockAlphaMapForGlyph() Q_DECL_OVERRIDE; - bool expectsGammaCorrectedBlending() const Q_DECL_OVERRIDE; + QPoint *offset) override; + bool hasInternalCaching() const override { return cacheEnabled; } + void unlockAlphaMapForGlyph() override; + bool expectsGammaCorrectedBlending() const override; - void removeGlyphFromCache(glyph_t glyph) Q_DECL_OVERRIDE; - int glyphMargin(QFontEngine::GlyphFormat /* format */) Q_DECL_OVERRIDE { return 0; } + void removeGlyphFromCache(glyph_t glyph) override; + int glyphMargin(QFontEngine::GlyphFormat /* format */) override { return 0; } - int glyphCount() const Q_DECL_OVERRIDE; + int glyphCount() const override; enum Scaling { Scaled, @@ -282,13 +282,13 @@ private: bool init(FaceId faceId, bool antialias, GlyphFormat format, QFreetypeFace *freetypeFace); - int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints) Q_DECL_OVERRIDE; + int getPointInOutline(glyph_t glyph, int flags, quint32 point, QFixed *xpos, QFixed *ypos, quint32 *nPoints) override; void setQtDefaultHintStyle(QFont::HintingPreference hintingPreference); - void setDefaultHintStyle(HintStyle style) Q_DECL_OVERRIDE; + void setDefaultHintStyle(HintStyle style) override; - QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE; - Qt::HANDLE handle() const Q_DECL_OVERRIDE; + QFontEngine *cloneWithSize(qreal pixelSize) const override; + Qt::HANDLE handle() const override; bool initFromFontEngine(const QFontEngineFT *fontEngine); HintStyle defaultHintStyle() const { return default_hint_style; } diff --git a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase_p.h b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase_p.h index 6d51361400..0b2956b16e 100644 --- a/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase_p.h +++ b/src/platformsupport/fontdatabases/freetype/qfreetypefontdatabase_p.h @@ -66,11 +66,11 @@ struct FontFile class QFreeTypeFontDatabase : public QPlatformFontDatabase { public: - void populateFontDatabase() Q_DECL_OVERRIDE; - QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE; - QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE; - QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE; - void releaseHandle(void *handle) Q_DECL_OVERRIDE; + void populateFontDatabase() override; + QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override; + QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override; + QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override; + void releaseHandle(void *handle) override; static QStringList addTTFile(const QByteArray &fontData, const QByteArray &file); }; diff --git a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h index 2b4c4e3ceb..76ab31c046 100644 --- a/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/mac/qcoretextfontdatabase_p.h @@ -70,18 +70,18 @@ class QCoreTextFontDatabase : public QPlatformFontDatabase public: QCoreTextFontDatabase(); ~QCoreTextFontDatabase(); - void populateFontDatabase() Q_DECL_OVERRIDE; + void populateFontDatabase() override; bool populateFamilyAliases() override; - void populateFamily(const QString &familyName) Q_DECL_OVERRIDE; + void populateFamily(const QString &familyName) override; void invalidate() override; - QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE; - QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE; - void releaseHandle(void *handle) Q_DECL_OVERRIDE; - bool isPrivateFontFamily(const QString &family) const Q_DECL_OVERRIDE; - QFont defaultFont() const Q_DECL_OVERRIDE; - bool fontsAlwaysScalable() const Q_DECL_OVERRIDE; - QList standardSizes() const Q_DECL_OVERRIDE; + QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const override; + QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override; + void releaseHandle(void *handle) override; + bool isPrivateFontFamily(const QString &family) const override; + QFont defaultFont() const override; + bool fontsAlwaysScalable() const override; + QList standardSizes() const override; // For iOS and OS X platform themes QFont *themeFont(QPlatformTheme::Font) const; diff --git a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h index 2986f0aaec..1f7b346909 100644 --- a/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h +++ b/src/platformsupport/fontdatabases/mac/qfontengine_coretext_p.h @@ -70,53 +70,53 @@ public: QCoreTextFontEngine(CGFontRef font, const QFontDef &def); ~QCoreTextFontEngine(); - glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE; - bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE; - void recalcAdvances(QGlyphLayout *, ShaperFlags) const Q_DECL_OVERRIDE; + glyph_t glyphIndex(uint ucs4) const override; + bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const override; + void recalcAdvances(QGlyphLayout *, ShaperFlags) const override; - glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE; - glyph_metrics_t boundingBox(glyph_t glyph) Q_DECL_OVERRIDE; + glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override; + glyph_metrics_t boundingBox(glyph_t glyph) override; - QFixed ascent() const Q_DECL_OVERRIDE; - QFixed capHeight() const Q_DECL_OVERRIDE; - QFixed descent() const Q_DECL_OVERRIDE; - QFixed leading() const Q_DECL_OVERRIDE; - QFixed xHeight() const Q_DECL_OVERRIDE; - qreal maxCharWidth() const Q_DECL_OVERRIDE; - QFixed averageCharWidth() const Q_DECL_OVERRIDE; + QFixed ascent() const override; + QFixed capHeight() const override; + QFixed descent() const override; + QFixed leading() const override; + QFixed xHeight() const override; + qreal maxCharWidth() const override; + QFixed averageCharWidth() const override; void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int numGlyphs, - QPainterPath *path, QTextItem::RenderFlags) Q_DECL_OVERRIDE; + QPainterPath *path, QTextItem::RenderFlags) override; - bool canRender(const QChar *string, int len) const Q_DECL_OVERRIDE; + bool canRender(const QChar *string, int len) const override; - int synthesized() const Q_DECL_OVERRIDE { return synthesisFlags; } - bool supportsSubPixelPositions() const Q_DECL_OVERRIDE { return true; } + int synthesized() const override { return synthesisFlags; } + bool supportsSubPixelPositions() const override { return true; } - QFixed lineThickness() const Q_DECL_OVERRIDE; - QFixed underlinePosition() const Q_DECL_OVERRIDE; + QFixed lineThickness() const override; + QFixed underlinePosition() const override; void draw(CGContextRef ctx, qreal x, qreal y, const QTextItemInt &ti, int paintDeviceHeight); - FaceId faceId() const Q_DECL_OVERRIDE; - bool getSfntTableData(uint /*tag*/, uchar * /*buffer*/, uint * /*length*/) const Q_DECL_OVERRIDE; - void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE; - QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition) Q_DECL_OVERRIDE; - QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; - QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; - glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) Q_DECL_OVERRIDE; - QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; - QFixed emSquareSize() const Q_DECL_OVERRIDE; - void doKerning(QGlyphLayout *g, ShaperFlags flags) const Q_DECL_OVERRIDE; - - bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE; - bool expectsGammaCorrectedBlending() const Q_DECL_OVERRIDE; - - QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE; - Qt::HANDLE handle() const Q_DECL_OVERRIDE; - int glyphMargin(QFontEngine::GlyphFormat format) Q_DECL_OVERRIDE { Q_UNUSED(format); return 0; } - - QFontEngine::Properties properties() const Q_DECL_OVERRIDE; + FaceId faceId() const override; + bool getSfntTableData(uint /*tag*/, uchar * /*buffer*/, uint * /*length*/) const override; + void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) override; + QImage alphaMapForGlyph(glyph_t, QFixed subPixelPosition) override; + QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) override; + QImage alphaRGBMapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override; + glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) override; + QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override; + QFixed emSquareSize() const override; + void doKerning(QGlyphLayout *g, ShaperFlags flags) const override; + + bool supportsTransformation(const QTransform &transform) const override; + bool expectsGammaCorrectedBlending() const override; + + QFontEngine *cloneWithSize(qreal pixelSize) const override; + Qt::HANDLE handle() const override; + int glyphMargin(QFontEngine::GlyphFormat format) override { Q_UNUSED(format); return 0; } + + QFontEngine::Properties properties() const override; static bool ct_getSfntTable(void *user_data, uint tag, uchar *buffer, uint *length); static QFont::Weight qtWeightFromCFWeight(float value); diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h index 2df81274ad..c3d201b3a0 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_ft_p.h @@ -60,18 +60,18 @@ QT_BEGIN_NAMESPACE class QWindowsFontDatabaseFT : public QFreeTypeFontDatabase { public: - void populateFontDatabase() Q_DECL_OVERRIDE; - void populateFamily(const QString &familyName) Q_DECL_OVERRIDE; - QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE; + void populateFontDatabase() override; + void populateFamily(const QString &familyName) override; + QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override; QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, - QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE; + QFont::HintingPreference hintingPreference) override; QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, - QChar::Script script) const Q_DECL_OVERRIDE; + QChar::Script script) const override; - QString fontDir() const Q_DECL_OVERRIDE; - QFont defaultFont() const Q_DECL_OVERRIDE; + QString fontDir() const override; + QFont defaultFont() const override; }; QT_END_NAMESPACE diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h index 15172c09da..bbdb90f70a 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontdatabase_p.h @@ -95,18 +95,18 @@ public: QWindowsFontDatabase(); ~QWindowsFontDatabase(); - void populateFontDatabase() Q_DECL_OVERRIDE; - void populateFamily(const QString &familyName) Q_DECL_OVERRIDE; - QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) Q_DECL_OVERRIDE; - QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) Q_DECL_OVERRIDE; - QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) Q_DECL_OVERRIDE; - QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const Q_DECL_OVERRIDE; - QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) Q_DECL_OVERRIDE; - void releaseHandle(void *handle) Q_DECL_OVERRIDE; - QString fontDir() const Q_DECL_OVERRIDE; - - QFont defaultFont() const Q_DECL_OVERRIDE { return systemDefaultFont(); } - bool fontsAlwaysScalable() const Q_DECL_OVERRIDE; + void populateFontDatabase() override; + void populateFamily(const QString &familyName) override; + QFontEngineMulti *fontEngineMulti(QFontEngine *fontEngine, QChar::Script script) override; + QFontEngine *fontEngine(const QFontDef &fontDef, void *handle) override; + QFontEngine *fontEngine(const QByteArray &fontData, qreal pixelSize, QFont::HintingPreference hintingPreference) override; + QStringList fallbacksForFamily(const QString &family, QFont::Style style, QFont::StyleHint styleHint, QChar::Script script) const override; + QStringList addApplicationFont(const QByteArray &fontData, const QString &fileName) override; + void releaseHandle(void *handle) override; + QString fontDir() const override; + + QFont defaultFont() const override { return systemDefaultFont(); } + bool fontsAlwaysScalable() const override; void derefUniqueFont(const QString &uniqueFont); void refUniqueFont(const QString &uniqueFont); diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h index 76b45d7a7b..2ec391c4da 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontengine_p.h @@ -76,53 +76,53 @@ public: void initFontInfo(const QFontDef &request, int dpi); - QFixed lineThickness() const Q_DECL_OVERRIDE; - Properties properties() const Q_DECL_OVERRIDE; - void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) Q_DECL_OVERRIDE; - FaceId faceId() const Q_DECL_OVERRIDE; - bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE; - int synthesized() const Q_DECL_OVERRIDE; - QFixed emSquareSize() const Q_DECL_OVERRIDE; - - glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE; - bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const Q_DECL_OVERRIDE; - void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const Q_DECL_OVERRIDE; - - void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; + QFixed lineThickness() const override; + Properties properties() const override; + void getUnscaledGlyph(glyph_t glyph, QPainterPath *path, glyph_metrics_t *metrics) override; + FaceId faceId() const override; + bool getSfntTableData(uint tag, uchar *buffer, uint *length) const override; + int synthesized() const override; + QFixed emSquareSize() const override; + + glyph_t glyphIndex(uint ucs4) const override; + bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, ShaperFlags flags) const override; + void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const override; + + void addOutlineToPath(qreal x, qreal y, const QGlyphLayout &glyphs, QPainterPath *path, QTextItem::RenderFlags flags) override; virtual void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs, - QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; + QPainterPath *path, QTextItem::RenderFlags flags) override; HGDIOBJ selectDesignFont() const; - glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE; - glyph_metrics_t boundingBox(glyph_t g) Q_DECL_OVERRIDE { return boundingBox(g, QTransform()); } - glyph_metrics_t boundingBox(glyph_t g, const QTransform &t) Q_DECL_OVERRIDE; + glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override; + glyph_metrics_t boundingBox(glyph_t g) override { return boundingBox(g, QTransform()); } + glyph_metrics_t boundingBox(glyph_t g, const QTransform &t) override; - QFixed ascent() const Q_DECL_OVERRIDE; - QFixed descent() const Q_DECL_OVERRIDE; - QFixed leading() const Q_DECL_OVERRIDE; - QFixed xHeight() const Q_DECL_OVERRIDE; - QFixed capHeight() const Q_DECL_OVERRIDE; - QFixed averageCharWidth() const Q_DECL_OVERRIDE; - qreal maxCharWidth() const Q_DECL_OVERRIDE; - qreal minLeftBearing() const Q_DECL_OVERRIDE; - qreal minRightBearing() const Q_DECL_OVERRIDE; + QFixed ascent() const override; + QFixed descent() const override; + QFixed leading() const override; + QFixed xHeight() const override; + QFixed capHeight() const override; + QFixed averageCharWidth() const override; + qreal maxCharWidth() const override; + qreal minLeftBearing() const override; + qreal minRightBearing() const override; - QImage alphaMapForGlyph(glyph_t t) Q_DECL_OVERRIDE { return alphaMapForGlyph(t, QTransform()); } - QImage alphaMapForGlyph(glyph_t, const QTransform &xform) Q_DECL_OVERRIDE; - QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform) Q_DECL_OVERRIDE; - glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) Q_DECL_OVERRIDE; + QImage alphaMapForGlyph(glyph_t t) override { return alphaMapForGlyph(t, QTransform()); } + QImage alphaMapForGlyph(glyph_t, const QTransform &xform) override; + QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform) override; + glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, const QTransform &matrix, GlyphFormat) override; - QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE; - Qt::HANDLE handle() const Q_DECL_OVERRIDE; - bool supportsTransformation(const QTransform &transform) const Q_DECL_OVERRIDE; + QFontEngine *cloneWithSize(qreal pixelSize) const override; + Qt::HANDLE handle() const override; + bool supportsTransformation(const QTransform &transform) const override; #ifndef Q_CC_MINGW - void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) Q_DECL_OVERRIDE; + void getGlyphBearings(glyph_t glyph, qreal *leftBearing = 0, qreal *rightBearing = 0) override; #endif - bool hasUnreliableGlyphOutline() const Q_DECL_OVERRIDE; + bool hasUnreliableGlyphOutline() const override; int getGlyphIndexes(const QChar *ch, int numChars, QGlyphLayout *glyphs) const; void getCMap(); @@ -173,7 +173,7 @@ class QWindowsMultiFontEngine : public QFontEngineMulti public: explicit QWindowsMultiFontEngine(QFontEngine *fe, int script); - QFontEngine *loadEngine(int at) Q_DECL_OVERRIDE; + QFontEngine *loadEngine(int at) override; }; QT_END_NAMESPACE diff --git a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h index db4e79e44f..83fdddfa26 100644 --- a/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h +++ b/src/platformsupport/fontdatabases/windows/qwindowsfontenginedirectwrite_p.h @@ -80,41 +80,41 @@ public: void initFontInfo(const QFontDef &request, int dpi); - QFixed lineThickness() const Q_DECL_OVERRIDE; - QFixed underlinePosition() const Q_DECL_OVERRIDE; - bool getSfntTableData(uint tag, uchar *buffer, uint *length) const Q_DECL_OVERRIDE; - QFixed emSquareSize() const Q_DECL_OVERRIDE; + QFixed lineThickness() const override; + QFixed underlinePosition() const override; + bool getSfntTableData(uint tag, uchar *buffer, uint *length) const override; + QFixed emSquareSize() const override; - glyph_t glyphIndex(uint ucs4) const Q_DECL_OVERRIDE; + glyph_t glyphIndex(uint ucs4) const override; bool stringToCMap(const QChar *str, int len, QGlyphLayout *glyphs, int *nglyphs, - ShaperFlags flags) const Q_DECL_OVERRIDE; - void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const Q_DECL_OVERRIDE; + ShaperFlags flags) const override; + void recalcAdvances(QGlyphLayout *glyphs, ShaperFlags) const override; void addGlyphsToPath(glyph_t *glyphs, QFixedPoint *positions, int nglyphs, - QPainterPath *path, QTextItem::RenderFlags flags) Q_DECL_OVERRIDE; + QPainterPath *path, QTextItem::RenderFlags flags) override; - glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) Q_DECL_OVERRIDE; - glyph_metrics_t boundingBox(glyph_t g) Q_DECL_OVERRIDE; + glyph_metrics_t boundingBox(const QGlyphLayout &glyphs) override; + glyph_metrics_t boundingBox(glyph_t g) override; glyph_metrics_t alphaMapBoundingBox(glyph_t glyph, QFixed, - const QTransform &matrix, GlyphFormat) Q_DECL_OVERRIDE; + const QTransform &matrix, GlyphFormat) override; - QFixed ascent() const Q_DECL_OVERRIDE; - QFixed capHeight() const Q_DECL_OVERRIDE; - QFixed descent() const Q_DECL_OVERRIDE; - QFixed leading() const Q_DECL_OVERRIDE; - QFixed xHeight() const Q_DECL_OVERRIDE; - qreal maxCharWidth() const Q_DECL_OVERRIDE; - FaceId faceId() const Q_DECL_OVERRIDE; + QFixed ascent() const override; + QFixed capHeight() const override; + QFixed descent() const override; + QFixed leading() const override; + QFixed xHeight() const override; + qreal maxCharWidth() const override; + FaceId faceId() const override; - bool supportsSubPixelPositions() const Q_DECL_OVERRIDE; + bool supportsSubPixelPositions() const override; - QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition) Q_DECL_OVERRIDE; - QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; - QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform) Q_DECL_OVERRIDE; - QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) Q_DECL_OVERRIDE; + QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition) override; + QImage alphaMapForGlyph(glyph_t glyph, QFixed subPixelPosition, const QTransform &t) override; + QImage alphaRGBMapForGlyph(glyph_t t, QFixed subPixelPosition, const QTransform &xform) override; + QImage bitmapForGlyph(glyph_t, QFixed subPixelPosition, const QTransform &t) override; - QFontEngine *cloneWithSize(qreal pixelSize) const Q_DECL_OVERRIDE; - Qt::HANDLE handle() const Q_DECL_OVERRIDE; + QFontEngine *cloneWithSize(qreal pixelSize) const override; + Qt::HANDLE handle() const override; const QSharedPointer &fontEngineData() const { return m_fontEngineData; } diff --git a/src/platformsupport/graphics/qrasterbackingstore_p.h b/src/platformsupport/graphics/qrasterbackingstore_p.h index 2764fd6432..357e861d1d 100644 --- a/src/platformsupport/graphics/qrasterbackingstore_p.h +++ b/src/platformsupport/graphics/qrasterbackingstore_p.h @@ -62,12 +62,12 @@ public: QRasterBackingStore(QWindow *window); ~QRasterBackingStore(); - void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; - bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE; - void beginPaint(const QRegion ®ion) Q_DECL_OVERRIDE; + void resize(const QSize &size, const QRegion &staticContents) override; + bool scroll(const QRegion &area, int dx, int dy) override; + void beginPaint(const QRegion ®ion) override; - QPaintDevice *paintDevice() Q_DECL_OVERRIDE; - QImage toImage() const Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override; + QImage toImage() const override; protected: virtual QImage::Format format() const; diff --git a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h index 20dfda89f7..cd760ba40a 100644 --- a/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h +++ b/src/platformsupport/input/evdevtablet/qevdevtablethandler_p.h @@ -88,7 +88,7 @@ class QEvdevTabletHandlerThread : public QDaemonThread public: explicit QEvdevTabletHandlerThread(const QString &device, const QString &spec, QObject *parent = 0); ~QEvdevTabletHandlerThread(); - void run() Q_DECL_OVERRIDE; + void run() override; QEvdevTabletHandler *handler() { return m_handler; } private: diff --git a/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h b/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h index d22aca3266..b93744815c 100644 --- a/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h +++ b/src/platformsupport/input/evdevtouch/qevdevtouchhandler_p.h @@ -110,11 +110,11 @@ class QEvdevTouchScreenHandlerThread : public QDaemonThread public: explicit QEvdevTouchScreenHandlerThread(const QString &device, const QString &spec, QObject *parent = Q_NULLPTR); ~QEvdevTouchScreenHandlerThread(); - void run() Q_DECL_OVERRIDE; + void run() override; bool isTouchDeviceRegistered() const; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; public slots: void scheduleTouchPointUpdate(); diff --git a/src/platformsupport/input/integrityhid/qintegrityhidmanager.cpp b/src/platformsupport/input/integrityhid/qintegrityhidmanager.cpp index 8089a6e38b..e472693077 100644 --- a/src/platformsupport/input/integrityhid/qintegrityhidmanager.cpp +++ b/src/platformsupport/input/integrityhid/qintegrityhidmanager.cpp @@ -75,8 +75,8 @@ public: { CheckSuccess(gh_hid_close(handle)); }; - void process_event(void) Q_DECL_OVERRIDE; - void async_wait(void) Q_DECL_OVERRIDE; + void process_event(void) override; + void async_wait(void) override; HIDDriver *get_driver(void) { return driver; }; HIDHandle get_handle(void) { return handle; }; private: @@ -94,8 +94,8 @@ public: { qDeleteAll(devices); }; - void process_event(void) Q_DECL_OVERRIDE; - void async_wait(void) Q_DECL_OVERRIDE; + void process_event(void) override; + void async_wait(void) override; void find_devices(void); private: QHash devices; diff --git a/src/platformsupport/linuxaccessibility/bridge_p.h b/src/platformsupport/linuxaccessibility/bridge_p.h index 1e435ca351..c48bbd3710 100644 --- a/src/platformsupport/linuxaccessibility/bridge_p.h +++ b/src/platformsupport/linuxaccessibility/bridge_p.h @@ -74,7 +74,7 @@ public: virtual ~QSpiAccessibleBridge(); - void notifyAccessibilityUpdate(QAccessibleEvent *event) Q_DECL_OVERRIDE; + void notifyAccessibilityUpdate(QAccessibleEvent *event) override; QDBusConnection dBusConnection() const; public Q_SLOTS: diff --git a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h b/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h index 0b025e4304..efba688c13 100644 --- a/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h +++ b/src/platformsupport/platformcompositor/qopenglcompositorbackingstore_p.h @@ -66,17 +66,17 @@ public: QOpenGLCompositorBackingStore(QWindow *window); ~QOpenGLCompositorBackingStore(); - QPaintDevice *paintDevice() Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override; - void beginPaint(const QRegion ®ion) Q_DECL_OVERRIDE; + void beginPaint(const QRegion ®ion) override; - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; - void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; + void resize(const QSize &size, const QRegion &staticContents) override; - QImage toImage() const Q_DECL_OVERRIDE; + QImage toImage() const override; void composeAndFlush(QWindow *window, const QRegion ®ion, const QPoint &offset, QPlatformTextureList *textures, QOpenGLContext *context, - bool translucentBackground) Q_DECL_OVERRIDE; + bool translucentBackground) override; const QPlatformTextureList *textures() const { return m_textures; } diff --git a/src/platformsupport/services/genericunix/qgenericunixservices_p.h b/src/platformsupport/services/genericunix/qgenericunixservices_p.h index 205b2e6160..8ac3de6f03 100644 --- a/src/platformsupport/services/genericunix/qgenericunixservices_p.h +++ b/src/platformsupport/services/genericunix/qgenericunixservices_p.h @@ -61,10 +61,10 @@ class QGenericUnixServices : public QPlatformServices public: QGenericUnixServices() {} - QByteArray desktopEnvironment() const Q_DECL_OVERRIDE; + QByteArray desktopEnvironment() const override; - bool openUrl(const QUrl &url) Q_DECL_OVERRIDE; - bool openDocument(const QUrl &url) Q_DECL_OVERRIDE; + bool openUrl(const QUrl &url) override; + bool openDocument(const QUrl &url) override; private: QString m_webBrowser; diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h index 8266a395f5..364e7da4b6 100644 --- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusmenubar_p.h @@ -67,12 +67,12 @@ public: QDBusMenuBar(); virtual ~QDBusMenuBar(); - void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) Q_DECL_OVERRIDE; - void removeMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; - void syncMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; - void handleReparent(QWindow *newParentWindow) Q_DECL_OVERRIDE; - QPlatformMenu *menuForTag(quintptr tag) const Q_DECL_OVERRIDE; - QPlatformMenu *createMenu() const Q_DECL_OVERRIDE; + void insertMenu(QPlatformMenu *menu, QPlatformMenu *before) override; + void removeMenu(QPlatformMenu *menu) override; + void syncMenu(QPlatformMenu *menu) override; + void handleReparent(QWindow *newParentWindow) override; + QPlatformMenu *menuForTag(quintptr tag) const override; + QPlatformMenu *createMenu() const override; private: QDBusPlatformMenu *m_menu; diff --git a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h index 5458e2fdd5..8a31f82fb0 100644 --- a/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h +++ b/src/platformsupport/themes/genericunix/dbusmenu/qdbusplatformmenu_p.h @@ -77,31 +77,31 @@ public: ~QDBusPlatformMenuItem(); const QString text() const { return m_text; } - void setText(const QString &text) Q_DECL_OVERRIDE; + void setText(const QString &text) override; QIcon icon() const { return m_icon; } - void setIcon(const QIcon &icon) Q_DECL_OVERRIDE; + void setIcon(const QIcon &icon) override; const QPlatformMenu *menu() const { return m_subMenu; } - void setMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; + void setMenu(QPlatformMenu *menu) override; bool isEnabled() const { return m_isEnabled; } - void setEnabled(bool enabled) Q_DECL_OVERRIDE; + void setEnabled(bool enabled) override; bool isVisible() const { return m_isVisible; } - void setVisible(bool isVisible) Q_DECL_OVERRIDE; + void setVisible(bool isVisible) override; bool isSeparator() const { return m_isSeparator; } - void setIsSeparator(bool isSeparator) Q_DECL_OVERRIDE; - void setFont(const QFont &font) Q_DECL_OVERRIDE { Q_UNUSED(font); } - void setRole(MenuRole role) Q_DECL_OVERRIDE; + void setIsSeparator(bool isSeparator) override; + void setFont(const QFont &font) override { Q_UNUSED(font); } + void setRole(MenuRole role) override; bool isCheckable() const { return m_isCheckable; } - void setCheckable(bool checkable) Q_DECL_OVERRIDE; + void setCheckable(bool checkable) override; bool isChecked() const { return m_isChecked; } - void setChecked(bool isChecked) Q_DECL_OVERRIDE; + void setChecked(bool isChecked) override; bool hasExclusiveGroup() const { return m_hasExclusiveGroup; } - void setHasExclusiveGroup(bool hasExclusiveGroup) Q_DECL_OVERRIDE; + void setHasExclusiveGroup(bool hasExclusiveGroup) override; #ifndef QT_NO_SHORTCUT QKeySequence shortcut() const { return m_shortcut; } - void setShortcut(const QKeySequence& shortcut) Q_DECL_OVERRIDE; + void setShortcut(const QKeySequence& shortcut) override; #endif - void setIconSize(int size) Q_DECL_OVERRIDE { Q_UNUSED(size); } - void setNativeContents(WId item) Q_DECL_OVERRIDE { Q_UNUSED(item); } + void setIconSize(int size) override { Q_UNUSED(size); } + void setNativeContents(WId item) override { Q_UNUSED(item); } int dbusID() const { return m_dbusID; } @@ -133,35 +133,35 @@ class QDBusPlatformMenu : public QPlatformMenu public: QDBusPlatformMenu(); ~QDBusPlatformMenu(); - void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE; - void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; + void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) override; + void removeMenuItem(QPlatformMenuItem *menuItem) override; void syncSubMenu(const QDBusPlatformMenu *menu); - void syncMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; - void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE { Q_UNUSED(enable); } + void syncMenuItem(QPlatformMenuItem *menuItem) override; + void syncSeparatorsCollapsible(bool enable) override { Q_UNUSED(enable); } const QString text() const { return m_text; } - void setText(const QString &text) Q_DECL_OVERRIDE; + void setText(const QString &text) override; QIcon icon() const { return m_icon; } - void setIcon(const QIcon &icon) Q_DECL_OVERRIDE; - bool isEnabled() const Q_DECL_OVERRIDE { return m_isEnabled; } - void setEnabled(bool enabled) Q_DECL_OVERRIDE; + void setIcon(const QIcon &icon) override; + bool isEnabled() const override { return m_isEnabled; } + void setEnabled(bool enabled) override; bool isVisible() const { return m_isVisible; } - void setVisible(bool visible) Q_DECL_OVERRIDE; - void setMinimumWidth(int width) Q_DECL_OVERRIDE { Q_UNUSED(width); } - void setFont(const QFont &font) Q_DECL_OVERRIDE { Q_UNUSED(font); } - void setMenuType(MenuType type) Q_DECL_OVERRIDE { Q_UNUSED(type); } + void setVisible(bool visible) override; + void setMinimumWidth(int width) override { Q_UNUSED(width); } + void setFont(const QFont &font) override { Q_UNUSED(font); } + void setMenuType(MenuType type) override { Q_UNUSED(type); } void setContainingMenuItem(QDBusPlatformMenuItem *item); - void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) Q_DECL_OVERRIDE; + void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) override; - void dismiss() Q_DECL_OVERRIDE { } // Closes this and all its related menu popups + void dismiss() override { } // Closes this and all its related menu popups - QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE; - QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE; + QPlatformMenuItem *menuItemAt(int position) const override; + QPlatformMenuItem *menuItemForTag(quintptr tag) const override; const QList items() const; - QPlatformMenuItem *createMenuItem() const Q_DECL_OVERRIDE; - QPlatformMenu *createSubMenu() const Q_DECL_OVERRIDE; + QPlatformMenuItem *createMenuItem() const override; + QPlatformMenu *createSubMenu() const override; uint revision() const { return m_revision; } diff --git a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h index 4c9bc8f7e3..7034a7edb4 100644 --- a/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h +++ b/src/platformsupport/themes/genericunix/dbustray/qdbustrayicon_p.h @@ -91,18 +91,18 @@ public: QDBusMenuConnection * dBusConnection(); - void init() Q_DECL_OVERRIDE; - void cleanup() Q_DECL_OVERRIDE; - void updateIcon(const QIcon &icon) Q_DECL_OVERRIDE; - void updateToolTip(const QString &tooltip) Q_DECL_OVERRIDE; - void updateMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; - QPlatformMenu *createMenu() const Q_DECL_OVERRIDE; + void init() override; + void cleanup() override; + void updateIcon(const QIcon &icon) override; + void updateToolTip(const QString &tooltip) override; + void updateMenu(QPlatformMenu *menu) override; + QPlatformMenu *createMenu() const override; void showMessage(const QString &title, const QString &msg, - const QIcon &icon, MessageIcon iconType, int msecs) Q_DECL_OVERRIDE; + const QIcon &icon, MessageIcon iconType, int msecs) override; - bool isSystemTrayAvailable() const Q_DECL_OVERRIDE; - bool supportsMessages() const Q_DECL_OVERRIDE { return true; } - QRect geometry() const Q_DECL_OVERRIDE { return QRect(); } + bool isSystemTrayAvailable() const override; + bool supportsMessages() const override { return true; } + QRect geometry() const override { return QRect(); } QString category() const { return m_category; } QString status() const { return m_status; } diff --git a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h index da13390662..186e5a7dff 100644 --- a/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h +++ b/src/platformsupport/themes/genericunix/qgenericunixthemes_p.h @@ -81,15 +81,15 @@ public: static QPlatformTheme *createUnixTheme(const QString &name); static QStringList themeNames(); - const QFont *font(Font type) const Q_DECL_OVERRIDE; - QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; + const QFont *font(Font type) const override; + QVariant themeHint(ThemeHint hint) const override; static QStringList xdgIconThemePaths(); #ifndef QT_NO_DBUS - QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE; + QPlatformMenuBar *createPlatformMenuBar() const override; #endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) - QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; + QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override; #endif static const char *name; @@ -105,19 +105,19 @@ public: QKdeTheme(const QStringList& kdeDirs, int kdeVersion); static QPlatformTheme *createKdeTheme(); - QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; + QVariant themeHint(ThemeHint hint) const override; QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions iconOptions = 0) const override; - const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; + const QPalette *palette(Palette type = SystemPalette) const override; - const QFont *font(Font type) const Q_DECL_OVERRIDE; + const QFont *font(Font type) const override; #ifndef QT_NO_DBUS - QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE; + QPlatformMenuBar *createPlatformMenuBar() const override; #endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) - QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; + QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override; #endif static const char *name; @@ -131,18 +131,18 @@ class QGnomeTheme : public QPlatformTheme Q_DECLARE_PRIVATE(QGnomeTheme) public: QGnomeTheme(); - QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; + QVariant themeHint(ThemeHint hint) const override; QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions = 0) const override; - const QFont *font(Font type) const Q_DECL_OVERRIDE; - QString standardButtonText(int button) const Q_DECL_OVERRIDE; + const QFont *font(Font type) const override; + QString standardButtonText(int button) const override; virtual QString gtkFontName() const; #ifndef QT_NO_DBUS - QPlatformMenuBar *createPlatformMenuBar() const Q_DECL_OVERRIDE; + QPlatformMenuBar *createPlatformMenuBar() const override; #endif #if !defined(QT_NO_DBUS) && !defined(QT_NO_SYSTEMTRAYICON) - QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; + QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override; #endif static const char *name; diff --git a/src/plugins/bearer/android/src/main.cpp b/src/plugins/bearer/android/src/main.cpp index 3892766b89..f3a5074e5d 100644 --- a/src/plugins/bearer/android/src/main.cpp +++ b/src/plugins/bearer/android/src/main.cpp @@ -50,7 +50,7 @@ class QAndroidBearerEnginePlugin : public QBearerEnginePlugin Q_PLUGIN_METADATA(IID "org.qt-project.Qt.QBearerEngineFactoryInterface" FILE "android.json") public: - QBearerEngine *create(const QString &key) const Q_DECL_OVERRIDE + QBearerEngine *create(const QString &key) const override { return (key == QLatin1String("android")) ? new QAndroidBearerEngine() : 0; } diff --git a/src/plugins/bearer/android/src/qandroidbearerengine.h b/src/plugins/bearer/android/src/qandroidbearerengine.h index f404ca65eb..837b02232d 100644 --- a/src/plugins/bearer/android/src/qandroidbearerengine.h +++ b/src/plugins/bearer/android/src/qandroidbearerengine.h @@ -60,20 +60,20 @@ class QAndroidBearerEngine : public QBearerEngineImpl public: explicit QAndroidBearerEngine(QObject *parent = 0); - ~QAndroidBearerEngine() Q_DECL_OVERRIDE; - - QString getInterfaceFromId(const QString &id) Q_DECL_OVERRIDE; - bool hasIdentifier(const QString &id) Q_DECL_OVERRIDE; - void connectToId(const QString &id) Q_DECL_OVERRIDE; - void disconnectFromId(const QString &id) Q_DECL_OVERRIDE; - QNetworkSession::State sessionStateForId(const QString &id) Q_DECL_OVERRIDE; - QNetworkConfigurationManager::Capabilities capabilities() const Q_DECL_OVERRIDE; - QNetworkSessionPrivate *createSessionBackend() Q_DECL_OVERRIDE; - QNetworkConfigurationPrivatePointer defaultConfiguration() Q_DECL_OVERRIDE; - bool requiresPolling() const Q_DECL_OVERRIDE; - quint64 bytesWritten(const QString &id) Q_DECL_OVERRIDE; - quint64 bytesReceived(const QString &id) Q_DECL_OVERRIDE; - quint64 startTime(const QString &id) Q_DECL_OVERRIDE; + ~QAndroidBearerEngine() override; + + QString getInterfaceFromId(const QString &id) override; + bool hasIdentifier(const QString &id) override; + void connectToId(const QString &id) override; + void disconnectFromId(const QString &id) override; + QNetworkSession::State sessionStateForId(const QString &id) override; + QNetworkConfigurationManager::Capabilities capabilities() const override; + QNetworkSessionPrivate *createSessionBackend() override; + QNetworkConfigurationPrivatePointer defaultConfiguration() override; + bool requiresPolling() const override; + quint64 bytesWritten(const QString &id) override; + quint64 bytesReceived(const QString &id) override; + quint64 startTime(const QString &id) override; Q_INVOKABLE void initialize(); Q_INVOKABLE void requestUpdate(); diff --git a/src/plugins/bearer/generic/main.cpp b/src/plugins/bearer/generic/main.cpp index 80e7b7d9aa..82a9ce97f4 100644 --- a/src/plugins/bearer/generic/main.cpp +++ b/src/plugins/bearer/generic/main.cpp @@ -54,7 +54,7 @@ public: QGenericEnginePlugin(); ~QGenericEnginePlugin(); - QBearerEngine *create(const QString &key) const Q_DECL_OVERRIDE; + QBearerEngine *create(const QString &key) const override; }; QGenericEnginePlugin::QGenericEnginePlugin() diff --git a/src/plugins/bearer/generic/qgenericengine.h b/src/plugins/bearer/generic/qgenericengine.h index e680eb9cc0..08960d66f6 100644 --- a/src/plugins/bearer/generic/qgenericengine.h +++ b/src/plugins/bearer/generic/qgenericengine.h @@ -58,24 +58,24 @@ public: QGenericEngine(QObject *parent = 0); ~QGenericEngine(); - QString getInterfaceFromId(const QString &id) Q_DECL_OVERRIDE; - bool hasIdentifier(const QString &id) Q_DECL_OVERRIDE; + QString getInterfaceFromId(const QString &id) override; + bool hasIdentifier(const QString &id) override; - void connectToId(const QString &id) Q_DECL_OVERRIDE; - void disconnectFromId(const QString &id) Q_DECL_OVERRIDE; + void connectToId(const QString &id) override; + void disconnectFromId(const QString &id) override; Q_INVOKABLE void initialize(); Q_INVOKABLE void requestUpdate(); - QNetworkSession::State sessionStateForId(const QString &id) Q_DECL_OVERRIDE; + QNetworkSession::State sessionStateForId(const QString &id) override; - QNetworkConfigurationManager::Capabilities capabilities() const Q_DECL_OVERRIDE; + QNetworkConfigurationManager::Capabilities capabilities() const override; - QNetworkSessionPrivate *createSessionBackend() Q_DECL_OVERRIDE; + QNetworkSessionPrivate *createSessionBackend() override; - QNetworkConfigurationPrivatePointer defaultConfiguration() Q_DECL_OVERRIDE; + QNetworkConfigurationPrivatePointer defaultConfiguration() override; - bool requiresPolling() const Q_DECL_OVERRIDE; + bool requiresPolling() const override; private Q_SLOTS: void doRequestUpdate(); diff --git a/src/plugins/bearer/qnetworksession_impl.h b/src/plugins/bearer/qnetworksession_impl.h index e9c0e383fc..d9aa6ca8fb 100644 --- a/src/plugins/bearer/qnetworksession_impl.h +++ b/src/plugins/bearer/qnetworksession_impl.h @@ -75,31 +75,31 @@ public: //that the state is immediately updated (w/o actually opening //a session). Also this function should take care of //notification hooks to discover future state changes. - void syncStateWithInterface() Q_DECL_OVERRIDE; + void syncStateWithInterface() override; #ifndef QT_NO_NETWORKINTERFACE - QNetworkInterface currentInterface() const Q_DECL_OVERRIDE; + QNetworkInterface currentInterface() const override; #endif - QVariant sessionProperty(const QString& key) const Q_DECL_OVERRIDE; - void setSessionProperty(const QString& key, const QVariant& value) Q_DECL_OVERRIDE; - - void open() Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - void stop() Q_DECL_OVERRIDE; - void migrate() Q_DECL_OVERRIDE; - void accept() Q_DECL_OVERRIDE; - void ignore() Q_DECL_OVERRIDE; - void reject() Q_DECL_OVERRIDE; - - QString errorString() const Q_DECL_OVERRIDE; //must return translated string - QNetworkSession::SessionError error() const Q_DECL_OVERRIDE; - - quint64 bytesWritten() const Q_DECL_OVERRIDE; - quint64 bytesReceived() const Q_DECL_OVERRIDE; - quint64 activeTime() const Q_DECL_OVERRIDE; - - QNetworkSession::UsagePolicies usagePolicies() const Q_DECL_OVERRIDE; - void setUsagePolicies(QNetworkSession::UsagePolicies) Q_DECL_OVERRIDE; + QVariant sessionProperty(const QString& key) const override; + void setSessionProperty(const QString& key, const QVariant& value) override; + + void open() override; + void close() override; + void stop() override; + void migrate() override; + void accept() override; + void ignore() override; + void reject() override; + + QString errorString() const override; //must return translated string + QNetworkSession::SessionError error() const override; + + quint64 bytesWritten() const override; + quint64 bytesReceived() const override; + quint64 activeTime() const override; + + QNetworkSession::UsagePolicies usagePolicies() const override; + void setUsagePolicies(QNetworkSession::UsagePolicies) override; private Q_SLOTS: void networkConfigurationsChanged(); diff --git a/src/plugins/generic/evdevkeyboard/main.cpp b/src/plugins/generic/evdevkeyboard/main.cpp index ef08cd56ab..5c170e1a06 100644 --- a/src/plugins/generic/evdevkeyboard/main.cpp +++ b/src/plugins/generic/evdevkeyboard/main.cpp @@ -50,7 +50,7 @@ class QEvdevKeyboardPlugin : public QGenericPlugin public: QEvdevKeyboardPlugin(); - QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE; + QObject* create(const QString &key, const QString &specification) override; }; QEvdevKeyboardPlugin::QEvdevKeyboardPlugin() diff --git a/src/plugins/generic/evdevmouse/main.cpp b/src/plugins/generic/evdevmouse/main.cpp index 86ec7cb575..1b8517f4c4 100644 --- a/src/plugins/generic/evdevmouse/main.cpp +++ b/src/plugins/generic/evdevmouse/main.cpp @@ -50,7 +50,7 @@ class QEvdevMousePlugin : public QGenericPlugin public: QEvdevMousePlugin(); - QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE; + QObject* create(const QString &key, const QString &specification) override; }; QEvdevMousePlugin::QEvdevMousePlugin() diff --git a/src/plugins/generic/evdevtablet/main.cpp b/src/plugins/generic/evdevtablet/main.cpp index 0646d71146..f43a32910d 100644 --- a/src/plugins/generic/evdevtablet/main.cpp +++ b/src/plugins/generic/evdevtablet/main.cpp @@ -50,7 +50,7 @@ class QEvdevTabletPlugin : public QGenericPlugin public: QEvdevTabletPlugin(); - QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE; + QObject* create(const QString &key, const QString &specification) override; }; QEvdevTabletPlugin::QEvdevTabletPlugin() diff --git a/src/plugins/generic/evdevtouch/main.cpp b/src/plugins/generic/evdevtouch/main.cpp index aa60614936..f1a0ad53ab 100644 --- a/src/plugins/generic/evdevtouch/main.cpp +++ b/src/plugins/generic/evdevtouch/main.cpp @@ -50,7 +50,7 @@ class QEvdevTouchScreenPlugin : public QGenericPlugin public: QEvdevTouchScreenPlugin(); - QObject* create(const QString &key, const QString &specification) Q_DECL_OVERRIDE; + QObject* create(const QString &key, const QString &specification) override; }; QEvdevTouchScreenPlugin::QEvdevTouchScreenPlugin() diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h index f82280903d..4830959665 100644 --- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontext.h @@ -58,11 +58,11 @@ public: QComposeInputContext(); ~QComposeInputContext(); - bool isValid() const Q_DECL_OVERRIDE; - void setFocusObject(QObject *object) Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE; - bool filterEvent(const QEvent *event) Q_DECL_OVERRIDE; + bool isValid() const override; + void setFocusObject(QObject *object) override; + void reset() override; + void update(Qt::InputMethodQueries) override; + bool filterEvent(const QEvent *event) override; protected: void clearComposeBuffer(); diff --git a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp index 97a7242ca6..6b33df65b9 100644 --- a/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp +++ b/src/plugins/platforminputcontexts/compose/qcomposeplatforminputcontextmain.cpp @@ -51,7 +51,7 @@ class QComposePlatformInputContextPlugin : public QPlatformInputContextPlugin Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "compose.json") public: - QComposeInputContext *create(const QString &, const QStringList &) Q_DECL_OVERRIDE; + QComposeInputContext *create(const QString &, const QStringList &) override; }; QComposeInputContext *QComposePlatformInputContextPlugin::create(const QString &system, const QStringList ¶mList) diff --git a/src/plugins/platforminputcontexts/ibus/main.cpp b/src/plugins/platforminputcontexts/ibus/main.cpp index 2846f52c8c..0a7da3b14c 100644 --- a/src/plugins/platforminputcontexts/ibus/main.cpp +++ b/src/plugins/platforminputcontexts/ibus/main.cpp @@ -51,7 +51,7 @@ class QIbusPlatformInputContextPlugin : public QPlatformInputContextPlugin Q_PLUGIN_METADATA(IID QPlatformInputContextFactoryInterface_iid FILE "ibus.json") public: - QIBusPlatformInputContext *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QIBusPlatformInputContext *create(const QString&, const QStringList&) override; }; QIBusPlatformInputContext *QIbusPlatformInputContextPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h index 94fa5c3d60..c708bc0c38 100644 --- a/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h +++ b/src/plugins/platforminputcontexts/ibus/qibusplatforminputcontext.h @@ -86,15 +86,15 @@ public: QIBusPlatformInputContext(); ~QIBusPlatformInputContext(); - bool isValid() const Q_DECL_OVERRIDE; - void setFocusObject(QObject *object) Q_DECL_OVERRIDE; + bool isValid() const override; + void setFocusObject(QObject *object) override; - void invokeAction(QInputMethod::Action a, int x) Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - void commit() Q_DECL_OVERRIDE; - void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE; - bool filterEvent(const QEvent *event) Q_DECL_OVERRIDE; - QLocale locale() const Q_DECL_OVERRIDE; + void invokeAction(QInputMethod::Action a, int x) override; + void reset() override; + void commit() override; + void update(Qt::InputMethodQueries) override; + bool filterEvent(const QEvent *event) override; + QLocale locale() const override; public Q_SLOTS: void commitText(const QDBusVariant &text); diff --git a/src/plugins/platforms/cocoa/qcocoaaccessibility.h b/src/plugins/platforms/cocoa/qcocoaaccessibility.h index e7957276c2..e456364555 100644 --- a/src/plugins/platforms/cocoa/qcocoaaccessibility.h +++ b/src/plugins/platforms/cocoa/qcocoaaccessibility.h @@ -53,10 +53,10 @@ class QCocoaAccessibility : public QPlatformAccessibility public: QCocoaAccessibility(); ~QCocoaAccessibility(); - void notifyAccessibilityUpdate(QAccessibleEvent *event) Q_DECL_OVERRIDE; - void setRootObject(QObject *o) Q_DECL_OVERRIDE; - void initialize() Q_DECL_OVERRIDE; - void cleanup() Q_DECL_OVERRIDE; + void notifyAccessibilityUpdate(QAccessibleEvent *event) override; + void setRootObject(QObject *o) override; + void initialize() override; + void cleanup() override; }; namespace QCocoaAccessible { diff --git a/src/plugins/platforms/cocoa/qcocoabackingstore.h b/src/plugins/platforms/cocoa/qcocoabackingstore.h index 002e5b40a8..58ba3f2d4d 100644 --- a/src/plugins/platforms/cocoa/qcocoabackingstore.h +++ b/src/plugins/platforms/cocoa/qcocoabackingstore.h @@ -55,11 +55,11 @@ public: void beginPaint(const QRegion &) override; void endPaint() override; - void flush(QWindow *, const QRegion &, const QPoint &) Q_DECL_OVERRIDE; + void flush(QWindow *, const QRegion &, const QPoint &) override; private: bool windowHasUnifiedToolbar() const; - QImage::Format format() const Q_DECL_OVERRIDE; + QImage::Format format() const override; void redrawRoundedBottomCorners(CGRect) const; QCFType m_cgImage; }; diff --git a/src/plugins/platforms/cocoa/qcocoaclipboard.h b/src/plugins/platforms/cocoa/qcocoaclipboard.h index cab2cfaa91..a78d8f4187 100644 --- a/src/plugins/platforms/cocoa/qcocoaclipboard.h +++ b/src/plugins/platforms/cocoa/qcocoaclipboard.h @@ -56,10 +56,10 @@ class QCocoaClipboard : public QObject, public QPlatformClipboard public: QCocoaClipboard(); - QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - bool supportsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; - bool ownsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; + QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override; + void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override; + bool supportsMode(QClipboard::Mode mode) const override; + bool ownsMode(QClipboard::Mode mode) const override; private Q_SLOTS: void handleApplicationStateChanged(Qt::ApplicationState state); diff --git a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h index 133efd6db8..01ac7e181d 100644 --- a/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoacolordialoghelper.h @@ -55,12 +55,12 @@ public: QCocoaColorDialogHelper(); ~QCocoaColorDialogHelper(); - void exec() Q_DECL_OVERRIDE; - bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; + void exec() override; + bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) override; + void hide() override; - void setCurrentColor(const QColor&) Q_DECL_OVERRIDE; - QColor currentColor() const Q_DECL_OVERRIDE; + void setCurrentColor(const QColor&) override; + QColor currentColor() const override; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoacursor.h b/src/plugins/platforms/cocoa/qcocoacursor.h index d1586660a4..58b9ef2151 100644 --- a/src/plugins/platforms/cocoa/qcocoacursor.h +++ b/src/plugins/platforms/cocoa/qcocoacursor.h @@ -53,9 +53,9 @@ public: QCocoaCursor(); ~QCocoaCursor(); - void changeCursor(QCursor *cursor, QWindow *window) Q_DECL_OVERRIDE; - QPoint pos() const Q_DECL_OVERRIDE; - void setPos(const QPoint &position) Q_DECL_OVERRIDE; + void changeCursor(QCursor *cursor, QWindow *window) override; + QPoint pos() const override; + void setPos(const QPoint &position) override; private: QHash m_cursors; NSCursor *convertCursor(QCursor *cursor); diff --git a/src/plugins/platforms/cocoa/qcocoadrag.h b/src/plugins/platforms/cocoa/qcocoadrag.h index c7277a47bf..dc0cc17dfb 100644 --- a/src/plugins/platforms/cocoa/qcocoadrag.h +++ b/src/plugins/platforms/cocoa/qcocoadrag.h @@ -56,10 +56,10 @@ public: ~QCocoaDrag(); QMimeData *dragMimeData(); - Qt::DropAction drag(QDrag *m_drag) Q_DECL_OVERRIDE; + Qt::DropAction drag(QDrag *m_drag) override; Qt::DropAction defaultAction(Qt::DropActions possibleActions, - Qt::KeyboardModifiers modifiers) const Q_DECL_OVERRIDE; + Qt::KeyboardModifiers modifiers) const override; /** * to meet NSView dragImage:at guarantees, we need to record the original diff --git a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h index f5ba1dc22e..2ddda14289 100644 --- a/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoafiledialoghelper.h @@ -59,19 +59,19 @@ public: QCocoaFileDialogHelper(); virtual ~QCocoaFileDialogHelper(); - void exec() Q_DECL_OVERRIDE; + void exec() override; - bool defaultNameFilterDisables() const Q_DECL_OVERRIDE; + bool defaultNameFilterDisables() const override; - bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; - void setDirectory(const QUrl &directory) Q_DECL_OVERRIDE; - QUrl directory() const Q_DECL_OVERRIDE; - void selectFile(const QUrl &filename) Q_DECL_OVERRIDE; - QList selectedFiles() const Q_DECL_OVERRIDE; - void setFilter() Q_DECL_OVERRIDE; - void selectNameFilter(const QString &filter) Q_DECL_OVERRIDE; - QString selectedNameFilter() const Q_DECL_OVERRIDE; + bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) override; + void hide() override; + void setDirectory(const QUrl &directory) override; + QUrl directory() const override; + void selectFile(const QUrl &filename) override; + QList selectedFiles() const override; + void setFilter() override; + void selectNameFilter(const QString &filter) override; + QString selectedNameFilter() const override; public: bool showCocoaFilePanel(Qt::WindowModality windowModality, QWindow *parent); diff --git a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h index c3fad7cfd6..14f12f2d76 100644 --- a/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h +++ b/src/plugins/platforms/cocoa/qcocoafontdialoghelper.h @@ -54,13 +54,13 @@ public: QCocoaFontDialogHelper(); ~QCocoaFontDialogHelper(); - void exec() Q_DECL_OVERRIDE; + void exec() override; - bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; + bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) override; + void hide() override; - void setCurrentFont(const QFont &) Q_DECL_OVERRIDE; - QFont currentFont() const Q_DECL_OVERRIDE; + void setCurrentFont(const QFont &) override; + QFont currentFont() const override; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaglcontext.h b/src/plugins/platforms/cocoa/qcocoaglcontext.h index 1a66cec0e3..129307acf4 100644 --- a/src/plugins/platforms/cocoa/qcocoaglcontext.h +++ b/src/plugins/platforms/cocoa/qcocoaglcontext.h @@ -55,22 +55,22 @@ public: QCocoaGLContext(const QSurfaceFormat &format, QPlatformOpenGLContext *share, const QVariant &nativeHandle); ~QCocoaGLContext(); - QSurfaceFormat format() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; - void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; + void swapBuffers(QPlatformSurface *surface) override; - bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; - void doneCurrent() Q_DECL_OVERRIDE; + bool makeCurrent(QPlatformSurface *surface) override; + void doneCurrent() override; - QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; + QFunctionPointer getProcAddress(const char *procName) override; void update(); static NSOpenGLPixelFormat *createNSOpenGLPixelFormat(const QSurfaceFormat &format); NSOpenGLContext *nsOpenGLContext() const; - bool isSharing() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; + bool isSharing() const override; + bool isValid() const override; void windowWasHidden(); diff --git a/src/plugins/platforms/cocoa/qcocoainputcontext.h b/src/plugins/platforms/cocoa/qcocoainputcontext.h index a248ca0d8d..7190ba0de8 100644 --- a/src/plugins/platforms/cocoa/qcocoainputcontext.h +++ b/src/plugins/platforms/cocoa/qcocoainputcontext.h @@ -53,11 +53,11 @@ public: explicit QCocoaInputContext(); ~QCocoaInputContext(); - bool isValid() const Q_DECL_OVERRIDE { return true; } + bool isValid() const override { return true; } - void reset() Q_DECL_OVERRIDE; + void reset() override; - QLocale locale() const Q_DECL_OVERRIDE { return m_locale; } + QLocale locale() const override { return m_locale; } void updateLocale(); private Q_SLOTS: diff --git a/src/plugins/platforms/cocoa/qcocoaintegration.h b/src/plugins/platforms/cocoa/qcocoaintegration.h index d3f2079042..bf01addb81 100644 --- a/src/plugins/platforms/cocoa/qcocoaintegration.h +++ b/src/plugins/platforms/cocoa/qcocoaintegration.h @@ -66,20 +66,20 @@ public: // ---------------------------------------------------- // Virtual methods overridden from QPlatformScreen - QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE { return m_geometry; } - QRect availableGeometry() const Q_DECL_OVERRIDE { return m_availableGeometry; } - int depth() const Q_DECL_OVERRIDE { return m_depth; } - QImage::Format format() const Q_DECL_OVERRIDE { return m_format; } - qreal devicePixelRatio() const Q_DECL_OVERRIDE; - QSizeF physicalSize() const Q_DECL_OVERRIDE { return m_physicalSize; } - QDpi logicalDpi() const Q_DECL_OVERRIDE { return m_logicalDpi; } - qreal refreshRate() const Q_DECL_OVERRIDE { return m_refreshRate; } - QString name() const Q_DECL_OVERRIDE { return m_name; } - QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return m_cursor; } - QWindow *topLevelAt(const QPoint &point) const Q_DECL_OVERRIDE; - QList virtualSiblings() const Q_DECL_OVERRIDE { return m_siblings; } - QPlatformScreen::SubpixelAntialiasingType subpixelAntialiasingTypeHint() const Q_DECL_OVERRIDE; + QPixmap grabWindow(WId window, int x, int y, int width, int height) const override; + QRect geometry() const override { return m_geometry; } + QRect availableGeometry() const override { return m_availableGeometry; } + int depth() const override { return m_depth; } + QImage::Format format() const override { return m_format; } + qreal devicePixelRatio() const override; + QSizeF physicalSize() const override { return m_physicalSize; } + QDpi logicalDpi() const override { return m_logicalDpi; } + qreal refreshRate() const override { return m_refreshRate; } + QString name() const override { return m_name; } + QPlatformCursor *cursor() const override { return m_cursor; } + QWindow *topLevelAt(const QPoint &point) const override; + QList virtualSiblings() const override { return m_siblings; } + QPlatformScreen::SubpixelAntialiasingType subpixelAntialiasingTypeHint() const override; // ---------------------------------------------------- // Additional methods @@ -126,34 +126,34 @@ public: static QCocoaIntegration *instance(); Options options() const; - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformWindow *createForeignWindow(QWindow *window, WId nativeHandle) const Q_DECL_OVERRIDE; + bool hasCapability(QPlatformIntegration::Capability cap) const override; + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformWindow *createForeignWindow(QWindow *window, WId nativeHandle) const override; #ifndef QT_NO_OPENGL - QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; + QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override; #endif - QPlatformBackingStore *createPlatformBackingStore(QWindow *widget) const Q_DECL_OVERRIDE; + QPlatformBackingStore *createPlatformBackingStore(QWindow *widget) const override; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QAbstractEventDispatcher *createEventDispatcher() const override; - QCoreTextFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; - QCocoaNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; - QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; + QCoreTextFontDatabase *fontDatabase() const override; + QCocoaNativeInterface *nativeInterface() const override; + QPlatformInputContext *inputContext() const override; #ifndef QT_NO_ACCESSIBILITY - QCocoaAccessibility *accessibility() const Q_DECL_OVERRIDE; + QCocoaAccessibility *accessibility() const override; #endif #ifndef QT_NO_CLIPBOARD - QCocoaClipboard *clipboard() const Q_DECL_OVERRIDE; + QCocoaClipboard *clipboard() const override; #endif - QCocoaDrag *drag() const Q_DECL_OVERRIDE; + QCocoaDrag *drag() const override; - QStringList themeNames() const Q_DECL_OVERRIDE; - QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE; - QCocoaServices *services() const Q_DECL_OVERRIDE; - QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + QStringList themeNames() const override; + QPlatformTheme *createPlatformTheme(const QString &name) const override; + QCocoaServices *services() const override; + QVariant styleHint(StyleHint hint) const override; - Qt::KeyboardModifiers queryKeyboardModifiers() const Q_DECL_OVERRIDE; - QList possibleKeys(const QKeyEvent *event) const Q_DECL_OVERRIDE; + Qt::KeyboardModifiers queryKeyboardModifiers() const override; + QList possibleKeys(const QKeyEvent *event) const override; void updateScreens(); QCocoaScreen *screenForNSScreen(NSScreen *nsScreen); @@ -167,9 +167,9 @@ public: QCocoaWindow *activePopupWindow() const; QList *popupWindowStack(); - void setApplicationIcon(const QIcon &icon) const Q_DECL_OVERRIDE; + void setApplicationIcon(const QIcon &icon) const override; - void beep() const Q_DECL_OVERRIDE; + void beep() const override; private: static QCocoaIntegration *mInstance; diff --git a/src/plugins/platforms/cocoa/qcocoamenu.h b/src/plugins/platforms/cocoa/qcocoamenu.h index 484f185fc0..4392de2f9b 100644 --- a/src/plugins/platforms/cocoa/qcocoamenu.h +++ b/src/plugins/platforms/cocoa/qcocoamenu.h @@ -55,32 +55,32 @@ public: QCocoaMenu(); ~QCocoaMenu(); - void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE; - void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; - void syncMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; - void setEnabled(bool enabled) Q_DECL_OVERRIDE; - bool isEnabled() const Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; - void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) Q_DECL_OVERRIDE; - void dismiss() Q_DECL_OVERRIDE; + void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) override; + void removeMenuItem(QPlatformMenuItem *menuItem) override; + void syncMenuItem(QPlatformMenuItem *menuItem) override; + void setEnabled(bool enabled) override; + bool isEnabled() const override; + void setVisible(bool visible) override; + void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) override; + void dismiss() override; - void syncSeparatorsCollapsible(bool enable) Q_DECL_OVERRIDE; + void syncSeparatorsCollapsible(bool enable) override; void propagateEnabledState(bool enabled); - void setIcon(const QIcon &icon) Q_DECL_OVERRIDE { Q_UNUSED(icon) } + void setIcon(const QIcon &icon) override { Q_UNUSED(icon) } - void setText(const QString &text) Q_DECL_OVERRIDE; - void setMinimumWidth(int width) Q_DECL_OVERRIDE; - void setFont(const QFont &font) Q_DECL_OVERRIDE; + void setText(const QString &text) override; + void setMinimumWidth(int width) override; + void setFont(const QFont &font) override; inline NSMenu *nsMenu() const { return m_nativeMenu; } inline bool isVisible() const { return m_visible; } - QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE; - QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE; + QPlatformMenuItem *menuItemAt(int position) const override; + QPlatformMenuItem *menuItemForTag(quintptr tag) const override; QList items() const; QList merged() const; @@ -91,7 +91,7 @@ public: bool isOpen() const; void setIsOpen(bool isOpen); - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; private: QCocoaMenuItem *itemOrNull(int index) const; diff --git a/src/plugins/platforms/cocoa/qcocoamenubar.h b/src/plugins/platforms/cocoa/qcocoamenubar.h index 0725e9db68..0a46e80695 100644 --- a/src/plugins/platforms/cocoa/qcocoamenubar.h +++ b/src/plugins/platforms/cocoa/qcocoamenubar.h @@ -56,11 +56,11 @@ public: QCocoaMenuBar(); ~QCocoaMenuBar(); - void insertMenu(QPlatformMenu *menu, QPlatformMenu* before) Q_DECL_OVERRIDE; - void removeMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; - void syncMenu(QPlatformMenu *menuItem) Q_DECL_OVERRIDE; - void handleReparent(QWindow *newParentWindow) Q_DECL_OVERRIDE; - QPlatformMenu *menuForTag(quintptr tag) const Q_DECL_OVERRIDE; + void insertMenu(QPlatformMenu *menu, QPlatformMenu* before) override; + void removeMenu(QPlatformMenu *menu) override; + void syncMenu(QPlatformMenu *menuItem) override; + void handleReparent(QWindow *newParentWindow) override; + QPlatformMenu *menuForTag(quintptr tag) const override; inline NSMenu *nsMenu() const { return m_nativeMenu; } diff --git a/src/plugins/platforms/cocoa/qcocoamenuitem.h b/src/plugins/platforms/cocoa/qcocoamenuitem.h index 53862d0484..2b598ee3a0 100644 --- a/src/plugins/platforms/cocoa/qcocoamenuitem.h +++ b/src/plugins/platforms/cocoa/qcocoamenuitem.h @@ -78,22 +78,22 @@ public: QCocoaMenuItem(); ~QCocoaMenuItem(); - void setText(const QString &text) Q_DECL_OVERRIDE; - void setIcon(const QIcon &icon) Q_DECL_OVERRIDE; - void setMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; - void setVisible(bool isVisible) Q_DECL_OVERRIDE; - void setIsSeparator(bool isSeparator) Q_DECL_OVERRIDE; - void setFont(const QFont &font) Q_DECL_OVERRIDE; - void setRole(MenuRole role) Q_DECL_OVERRIDE; + void setText(const QString &text) override; + void setIcon(const QIcon &icon) override; + void setMenu(QPlatformMenu *menu) override; + void setVisible(bool isVisible) override; + void setIsSeparator(bool isSeparator) override; + void setFont(const QFont &font) override; + void setRole(MenuRole role) override; #ifndef QT_NO_SHORTCUT - void setShortcut(const QKeySequence& shortcut) Q_DECL_OVERRIDE; + void setShortcut(const QKeySequence& shortcut) override; #endif - void setCheckable(bool checkable) Q_DECL_OVERRIDE { Q_UNUSED(checkable) } - void setChecked(bool isChecked) Q_DECL_OVERRIDE; - void setEnabled(bool isEnabled) Q_DECL_OVERRIDE; - void setIconSize(int size) Q_DECL_OVERRIDE; + void setCheckable(bool checkable) override { Q_UNUSED(checkable) } + void setChecked(bool isChecked) override; + void setEnabled(bool isEnabled) override; + void setIconSize(int size) override; - void setNativeContents(WId item) Q_DECL_OVERRIDE; + void setNativeContents(WId item) override; inline QString text() const { return m_text; } inline NSMenuItem * nsItem() { return m_native; } diff --git a/src/plugins/platforms/cocoa/qcocoanativeinterface.h b/src/plugins/platforms/cocoa/qcocoanativeinterface.h index 26fbe3e4bc..c78f1d5a7f 100644 --- a/src/plugins/platforms/cocoa/qcocoanativeinterface.h +++ b/src/plugins/platforms/cocoa/qcocoanativeinterface.h @@ -60,18 +60,18 @@ public: QCocoaNativeInterface(); #ifndef QT_NO_OPENGL - void *nativeResourceForContext(const QByteArray &resourceString, QOpenGLContext *context) Q_DECL_OVERRIDE; + void *nativeResourceForContext(const QByteArray &resourceString, QOpenGLContext *context) override; #endif - void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) Q_DECL_OVERRIDE; + void *nativeResourceForWindow(const QByteArray &resourceString, QWindow *window) override; - NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource) Q_DECL_OVERRIDE; + NativeResourceForIntegrationFunction nativeResourceFunctionForIntegration(const QByteArray &resource) override; #ifndef QT_NO_OPENGL static void *cglContextForContext(QOpenGLContext *context); static void *nsOpenGLContextForContext(QOpenGLContext* context); #endif - QFunctionPointer platformFunction(const QByteArray &function) const Q_DECL_OVERRIDE; + QFunctionPointer platformFunction(const QByteArray &function) const override; public Q_SLOTS: void onAppFocusWindowChanged(QWindow *window); diff --git a/src/plugins/platforms/cocoa/qcocoaprintdevice.h b/src/plugins/platforms/cocoa/qcocoaprintdevice.h index c726cca4e5..20b27f3286 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintdevice.h +++ b/src/plugins/platforms/cocoa/qcocoaprintdevice.h @@ -68,37 +68,37 @@ public: explicit QCocoaPrintDevice(const QString &id); virtual ~QCocoaPrintDevice(); - bool isValid() const Q_DECL_OVERRIDE; - bool isDefault() const Q_DECL_OVERRIDE; + bool isValid() const override; + bool isDefault() const override; - QPrint::DeviceState state() const Q_DECL_OVERRIDE; + QPrint::DeviceState state() const override; - QPageSize defaultPageSize() const Q_DECL_OVERRIDE; + QPageSize defaultPageSize() const override; QMarginsF printableMargins(const QPageSize &pageSize, QPageLayout::Orientation orientation, - int resolution) const Q_DECL_OVERRIDE; + int resolution) const override; - int defaultResolution() const Q_DECL_OVERRIDE; + int defaultResolution() const override; - QPrint::InputSlot defaultInputSlot() const Q_DECL_OVERRIDE; + QPrint::InputSlot defaultInputSlot() const override; - QPrint::OutputBin defaultOutputBin() const Q_DECL_OVERRIDE; + QPrint::OutputBin defaultOutputBin() const override; - QPrint::DuplexMode defaultDuplexMode() const Q_DECL_OVERRIDE; + QPrint::DuplexMode defaultDuplexMode() const override; - QPrint::ColorMode defaultColorMode() const Q_DECL_OVERRIDE; + QPrint::ColorMode defaultColorMode() const override; PMPrinter macPrinter() const; PMPaper macPaper(const QPageSize &pageSize) const; protected: - void loadPageSizes() const Q_DECL_OVERRIDE; - void loadResolutions() const Q_DECL_OVERRIDE; - void loadInputSlots() const Q_DECL_OVERRIDE; - void loadOutputBins() const Q_DECL_OVERRIDE; - void loadDuplexModes() const Q_DECL_OVERRIDE; - void loadColorModes() const Q_DECL_OVERRIDE; - void loadMimeTypes() const Q_DECL_OVERRIDE; + void loadPageSizes() const override; + void loadResolutions() const override; + void loadInputSlots() const override; + void loadOutputBins() const override; + void loadDuplexModes() const override; + void loadColorModes() const override; + void loadMimeTypes() const override; private: QPageSize createPageSize(const PMPaper &paper) const; diff --git a/src/plugins/platforms/cocoa/qcocoaprintersupport.h b/src/plugins/platforms/cocoa/qcocoaprintersupport.h index a07bf0ec1b..40a638207a 100644 --- a/src/plugins/platforms/cocoa/qcocoaprintersupport.h +++ b/src/plugins/platforms/cocoa/qcocoaprintersupport.h @@ -53,12 +53,12 @@ public: QCocoaPrinterSupport(); ~QCocoaPrinterSupport(); - QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) Q_DECL_OVERRIDE; - QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode printerMode) Q_DECL_OVERRIDE; + QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) override; + QPaintEngine *createPaintEngine(QPrintEngine *, QPrinter::PrinterMode printerMode) override; - QPrintDevice createPrintDevice(const QString &id) Q_DECL_OVERRIDE; - QStringList availablePrintDeviceIds() const Q_DECL_OVERRIDE; - QString defaultPrintDeviceId() const Q_DECL_OVERRIDE; + QPrintDevice createPrintDevice(const QString &id) override; + QStringList availablePrintDeviceIds() const override; + QString defaultPrintDeviceId() const override; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoaservices.h b/src/plugins/platforms/cocoa/qcocoaservices.h index c2ceede0f0..62a8891f96 100644 --- a/src/plugins/platforms/cocoa/qcocoaservices.h +++ b/src/plugins/platforms/cocoa/qcocoaservices.h @@ -47,8 +47,8 @@ QT_BEGIN_NAMESPACE class QCocoaServices : public QPlatformServices { public: - bool openUrl(const QUrl &url) Q_DECL_OVERRIDE; - bool openDocument(const QUrl &url) Q_DECL_OVERRIDE; + bool openUrl(const QUrl &url) override; + bool openDocument(const QUrl &url) override; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h index d542a3cb8f..2f1a1e42a9 100644 --- a/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h +++ b/src/plugins/platforms/cocoa/qcocoasystemtrayicon.h @@ -57,17 +57,17 @@ class Q_GUI_EXPORT QCocoaSystemTrayIcon : public QPlatformSystemTrayIcon public: QCocoaSystemTrayIcon() : m_sys(0) {} - void init() Q_DECL_OVERRIDE; - void cleanup() Q_DECL_OVERRIDE; - void updateIcon(const QIcon &icon) Q_DECL_OVERRIDE; - void updateToolTip(const QString &toolTip) Q_DECL_OVERRIDE; - void updateMenu(QPlatformMenu *menu) Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; + void init() override; + void cleanup() override; + void updateIcon(const QIcon &icon) override; + void updateToolTip(const QString &toolTip) override; + void updateMenu(QPlatformMenu *menu) override; + QRect geometry() const override; void showMessage(const QString &title, const QString &msg, - const QIcon& icon, MessageIcon iconType, int secs) Q_DECL_OVERRIDE; + const QIcon& icon, MessageIcon iconType, int secs) override; - bool isSystemTrayAvailable() const Q_DECL_OVERRIDE; - bool supportsMessages() const Q_DECL_OVERRIDE; + bool isSystemTrayAvailable() const override; + bool supportsMessages() const override; private: QSystemTrayIconSys *m_sys; diff --git a/src/plugins/platforms/cocoa/qcocoatheme.h b/src/plugins/platforms/cocoa/qcocoatheme.h index 27c071a8cd..69eaf8db56 100644 --- a/src/plugins/platforms/cocoa/qcocoatheme.h +++ b/src/plugins/platforms/cocoa/qcocoatheme.h @@ -56,25 +56,25 @@ public: void reset(); - QPlatformMenuItem* createPlatformMenuItem() const Q_DECL_OVERRIDE; - QPlatformMenu* createPlatformMenu() const Q_DECL_OVERRIDE; - QPlatformMenuBar* createPlatformMenuBar() const Q_DECL_OVERRIDE; + QPlatformMenuItem* createPlatformMenuItem() const override; + QPlatformMenu* createPlatformMenu() const override; + QPlatformMenuBar* createPlatformMenuBar() const override; #ifndef QT_NO_SYSTEMTRAYICON - QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const Q_DECL_OVERRIDE; + QPlatformSystemTrayIcon *createPlatformSystemTrayIcon() const override; #endif - bool usePlatformNativeDialog(DialogType dialogType) const Q_DECL_OVERRIDE; - QPlatformDialogHelper *createPlatformDialogHelper(DialogType dialogType) const Q_DECL_OVERRIDE; + bool usePlatformNativeDialog(DialogType dialogType) const override; + QPlatformDialogHelper *createPlatformDialogHelper(DialogType dialogType) const override; - const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; - const QFont *font(Font type = SystemFont) const Q_DECL_OVERRIDE; - QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const Q_DECL_OVERRIDE; + const QPalette *palette(Palette type = SystemPalette) const override; + const QFont *font(Font type = SystemFont) const override; + QPixmap standardPixmap(StandardPixmap sp, const QSizeF &size) const override; QIcon fileIcon(const QFileInfo &fileInfo, QPlatformTheme::IconOptions options = 0) const override; - QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; - QString standardButtonText(int button) const Q_DECL_OVERRIDE; - QKeySequence standardButtonShortcut(int button) const Q_DECL_OVERRIDE; + QVariant themeHint(ThemeHint hint) const override; + QString standardButtonText(int button) const override; + QKeySequence standardButtonShortcut(int button) const override; static const char *name; diff --git a/src/plugins/platforms/cocoa/qcocoawindow.h b/src/plugins/platforms/cocoa/qcocoawindow.h index e20f033a43..7f5a87ea3d 100644 --- a/src/plugins/platforms/cocoa/qcocoawindow.h +++ b/src/plugins/platforms/cocoa/qcocoawindow.h @@ -97,36 +97,36 @@ public: void initialize() override; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; + void setGeometry(const QRect &rect) override; + QRect geometry() const override; void setCocoaGeometry(const QRect &rect); - void setVisible(bool visible) Q_DECL_OVERRIDE; - void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE; - void setWindowState(Qt::WindowStates state) Q_DECL_OVERRIDE; - void setWindowTitle(const QString &title) Q_DECL_OVERRIDE; - void setWindowFilePath(const QString &filePath) Q_DECL_OVERRIDE; - void setWindowIcon(const QIcon &icon) Q_DECL_OVERRIDE; - void setAlertState(bool enabled) Q_DECL_OVERRIDE; - bool isAlertState() const Q_DECL_OVERRIDE; - void raise() Q_DECL_OVERRIDE; - void lower() Q_DECL_OVERRIDE; - bool isExposed() const Q_DECL_OVERRIDE; + void setVisible(bool visible) override; + void setWindowFlags(Qt::WindowFlags flags) override; + void setWindowState(Qt::WindowStates state) override; + void setWindowTitle(const QString &title) override; + void setWindowFilePath(const QString &filePath) override; + void setWindowIcon(const QIcon &icon) override; + void setAlertState(bool enabled) override; + bool isAlertState() const override; + void raise() override; + void lower() override; + bool isExposed() const override; bool isOpaque() const; - void propagateSizeHints() Q_DECL_OVERRIDE; - void setOpacity(qreal level) Q_DECL_OVERRIDE; - void setMask(const QRegion ®ion) Q_DECL_OVERRIDE; - bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE; - bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE; - QMargins frameMargins() const Q_DECL_OVERRIDE; - QSurfaceFormat format() const Q_DECL_OVERRIDE; + void propagateSizeHints() override; + void setOpacity(qreal level) override; + void setMask(const QRegion ®ion) override; + bool setKeyboardGrabEnabled(bool grab) override; + bool setMouseGrabEnabled(bool grab) override; + QMargins frameMargins() const override; + QSurfaceFormat format() const override; - bool isForeignWindow() const Q_DECL_OVERRIDE; + bool isForeignWindow() const override; - void requestActivateWindow() Q_DECL_OVERRIDE; + void requestActivateWindow() override; - WId winId() const Q_DECL_OVERRIDE; - void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE; + WId winId() const override; + void setParent(const QPlatformWindow *window) override; NSView *view() const; NSWindow *nativeWindow() const; @@ -165,10 +165,10 @@ public: QCocoaGLContext *currentContext() const; #endif - bool setWindowModified(bool modified) Q_DECL_OVERRIDE; + bool setWindowModified(bool modified) override; - void setFrameStrutEventsEnabled(bool enabled) Q_DECL_OVERRIDE; - bool frameStrutEventsEnabled() const Q_DECL_OVERRIDE + void setFrameStrutEventsEnabled(bool enabled) override; + bool frameStrutEventsEnabled() const override { return m_frameStrutEventsEnabled; } void setMenubar(QCocoaMenuBar *mb); @@ -187,7 +187,7 @@ public: void applyContentBorderThickness(NSWindow *window = nullptr); void updateNSToolbar(); - qreal devicePixelRatio() const Q_DECL_OVERRIDE; + qreal devicePixelRatio() const override; QWindow *childWindowAt(QPoint windowPoint); bool shouldRefuseKeyWindowAndFirstResponder(); diff --git a/src/plugins/platforms/cocoa/qprintengine_mac_p.h b/src/plugins/platforms/cocoa/qprintengine_mac_p.h index 2d46a250d5..9514f3e691 100644 --- a/src/plugins/platforms/cocoa/qprintengine_mac_p.h +++ b/src/plugins/platforms/cocoa/qprintengine_mac_p.h @@ -150,8 +150,8 @@ public: PMPrintSession session() const { return static_cast([printInfo PMPrintSession]); } PMPrintSettings settings() const { return static_cast([printInfo PMPrintSettings]); } - QPaintEngine *aggregateEngine() Q_DECL_OVERRIDE { return paintEngine; } - Qt::HANDLE nativeHandle() Q_DECL_OVERRIDE { return q_func()->handle(); } + QPaintEngine *aggregateEngine() override { return paintEngine; } + Qt::HANDLE nativeHandle() override { return q_func()->handle(); } }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h index 670c4e9840..f72ea2b038 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dbackingstore.h @@ -54,12 +54,12 @@ public: QWindowsDirect2DBackingStore(QWindow *window); ~QWindowsDirect2DBackingStore(); - void beginPaint(const QRegion &) Q_DECL_OVERRIDE; - void endPaint() Q_DECL_OVERRIDE; + void beginPaint(const QRegion &) override; + void endPaint() override; - QPaintDevice *paintDevice() Q_DECL_OVERRIDE; - void flush(QWindow *targetWindow, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; - void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override; + void flush(QWindow *targetWindow, const QRegion ®ion, const QPoint &offset) override; + void resize(const QSize &size, const QRegion &staticContents) override; QImage toImage() const override; }; diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.h b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.h index 43f2a08745..39ca1d0dbf 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.h +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dintegration.h @@ -58,15 +58,15 @@ public: static QWindowsDirect2DIntegration *instance(); - QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; - QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QPlatformNativeInterface *nativeInterface() const override; + QPlatformPixmap *createPlatformPixmap(QPlatformPixmap::PixelType type) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; + QAbstractEventDispatcher *createEventDispatcher() const override; QWindowsDirect2DContext *direct2DContext() const; protected: - QWindowsWindow *createPlatformWindowHelper(QWindow *window, const QWindowsWindowData &) const Q_DECL_OVERRIDE; + QWindowsWindow *createPlatformWindowHelper(QWindow *window, const QWindowsWindowData &) const override; private: explicit QWindowsDirect2DIntegration(const QStringList ¶mList); diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dnativeinterface.h b/src/plugins/platforms/direct2d/qwindowsdirect2dnativeinterface.h index d57136129b..fce6ff9969 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dnativeinterface.h +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dnativeinterface.h @@ -48,7 +48,7 @@ class QWindowsDirect2DNativeInterface : public QWindowsNativeInterface { Q_OBJECT public: - void *nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *bs) Q_DECL_OVERRIDE; + void *nativeResourceForBackingStore(const QByteArray &resource, QBackingStore *bs) override; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.h b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.h index f434ef993c..1f23d604f5 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.h +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintdevice.h @@ -58,11 +58,11 @@ public: QWindowsDirect2DPaintEngine::Flags paintFlags = QWindowsDirect2DPaintEngine::NoFlag); ~QWindowsDirect2DPaintDevice(); - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; - int devType() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; + int devType() const override; protected: - int metric(PaintDeviceMetric metric) const Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric metric) const override; private: QScopedPointer d_ptr; diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h index a8f63af5d5..b9616acd6a 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dpaintengine.h @@ -65,45 +65,45 @@ public: QWindowsDirect2DPaintEngine(QWindowsDirect2DBitmap *bitmap, Flags flags); - bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; - bool end() Q_DECL_OVERRIDE; + bool begin(QPaintDevice *pdev) override; + bool end() override; - Type type() const Q_DECL_OVERRIDE; + Type type() const override; - void setState(QPainterState *s) Q_DECL_OVERRIDE; + void setState(QPainterState *s) override; - void draw(const QVectorPath &path) Q_DECL_OVERRIDE; + void draw(const QVectorPath &path) override; - void fill(const QVectorPath &path, const QBrush &brush) Q_DECL_OVERRIDE; + void fill(const QVectorPath &path, const QBrush &brush) override; void fill(ID2D1Geometry *geometry, const QBrush &brush); - void stroke(const QVectorPath &path, const QPen &pen) Q_DECL_OVERRIDE; + void stroke(const QVectorPath &path, const QPen &pen) override; void stroke(ID2D1Geometry *geometry, const QPen &pen); - void clip(const QVectorPath &path, Qt::ClipOperation op) Q_DECL_OVERRIDE; + void clip(const QVectorPath &path, Qt::ClipOperation op) override; - void clipEnabledChanged() Q_DECL_OVERRIDE; - void penChanged() Q_DECL_OVERRIDE; - void brushChanged() Q_DECL_OVERRIDE; - void brushOriginChanged() Q_DECL_OVERRIDE; - void opacityChanged() Q_DECL_OVERRIDE; - void compositionModeChanged() Q_DECL_OVERRIDE; - void renderHintsChanged() Q_DECL_OVERRIDE; - void transformChanged() Q_DECL_OVERRIDE; + void clipEnabledChanged() override; + void penChanged() override; + void brushChanged() override; + void brushOriginChanged() override; + void opacityChanged() override; + void compositionModeChanged() override; + void renderHintsChanged() override; + void transformChanged() override; - void fillRect(const QRectF &rect, const QBrush &brush) Q_DECL_OVERRIDE; + void fillRect(const QRectF &rect, const QBrush &brush) override; - void drawRects(const QRect *rects, int rectCount) Q_DECL_OVERRIDE; - void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE; + void drawRects(const QRect *rects, int rectCount) override; + void drawRects(const QRectF *rects, int rectCount) override; - void drawEllipse(const QRectF &r) Q_DECL_OVERRIDE; - void drawEllipse(const QRect &r) Q_DECL_OVERRIDE; + void drawEllipse(const QRectF &r) override; + void drawEllipse(const QRect &r) override; - void drawImage(const QRectF &rectangle, const QImage &image, const QRectF &sr, Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; + void drawImage(const QRectF &rectangle, const QImage &image, const QRectF &sr, Qt::ImageConversionFlags flags = Qt::AutoColor) override; + void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; - void drawStaticTextItem(QStaticTextItem *staticTextItem) Q_DECL_OVERRIDE; - void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; + void drawStaticTextItem(QStaticTextItem *staticTextItem) override; + void drawTextItem(const QPointF &p, const QTextItem &textItem) override; private: void ensureBrush(); diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h b/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h index 5f65a2313a..0448613a95 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dplatformpixmap.h @@ -59,21 +59,21 @@ public: QWindowsDirect2DPlatformPixmap(PixelType pixelType, QWindowsDirect2DPaintEngine::Flags flags, QWindowsDirect2DBitmap *bitmap); ~QWindowsDirect2DPlatformPixmap(); - void resize(int width, int height) Q_DECL_OVERRIDE; - void fromImage(const QImage &image, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; + void resize(int width, int height) override; + void fromImage(const QImage &image, Qt::ImageConversionFlags flags) override; - int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - void fill(const QColor &color) Q_DECL_OVERRIDE; + int metric(QPaintDevice::PaintDeviceMetric metric) const override; + void fill(const QColor &color) override; - bool hasAlphaChannel() const Q_DECL_OVERRIDE; + bool hasAlphaChannel() const override; - QImage toImage() const Q_DECL_OVERRIDE; - QImage toImage(const QRect &rect) const Q_DECL_OVERRIDE; + QImage toImage() const override; + QImage toImage(const QRect &rect) const override; - QPaintEngine* paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine* paintEngine() const override; - qreal devicePixelRatio() const Q_DECL_OVERRIDE; - void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE; + qreal devicePixelRatio() const override; + void setDevicePixelRatio(qreal scaleFactor) override; QWindowsDirect2DBitmap *bitmap() const; diff --git a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h index 156d4660d1..3ac532d938 100644 --- a/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h +++ b/src/plugins/platforms/direct2d/qwindowsdirect2dwindow.h @@ -56,7 +56,7 @@ public: QWindowsDirect2DWindow(QWindow *window, const QWindowsWindowData &data); ~QWindowsDirect2DWindow(); - void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE; + void setWindowFlags(Qt::WindowFlags flags) override; QPixmap *pixmap(); void flush(QWindowsDirect2DBitmap *bitmap, const QRegion ®ion, const QPoint &offset); diff --git a/src/plugins/platforms/haiku/main.h b/src/plugins/platforms/haiku/main.h index 82f3313652..e316b79d7c 100644 --- a/src/plugins/platforms/haiku/main.h +++ b/src/plugins/platforms/haiku/main.h @@ -47,7 +47,7 @@ class QHaikuIntegrationPlugin : public QPlatformIntegrationPlugin Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "haiku.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/haiku/qhaikuapplication.h b/src/plugins/platforms/haiku/qhaikuapplication.h index 0696df8109..a9ea442691 100644 --- a/src/plugins/platforms/haiku/qhaikuapplication.h +++ b/src/plugins/platforms/haiku/qhaikuapplication.h @@ -49,8 +49,8 @@ class QHaikuApplication : public BApplication public: explicit QHaikuApplication(const char *signature); - bool QuitRequested() Q_DECL_OVERRIDE; - void RefsReceived(BMessage* message) Q_DECL_OVERRIDE; + bool QuitRequested() override; + void RefsReceived(BMessage* message) override; }; #endif diff --git a/src/plugins/platforms/haiku/qhaikuclipboard.h b/src/plugins/platforms/haiku/qhaikuclipboard.h index 3dd4496e8d..b6eb3f591f 100644 --- a/src/plugins/platforms/haiku/qhaikuclipboard.h +++ b/src/plugins/platforms/haiku/qhaikuclipboard.h @@ -54,13 +54,13 @@ public: QHaikuClipboard(); ~QHaikuClipboard(); - QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - bool supportsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; - bool ownsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; + QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override; + void setMimeData(QMimeData *data, QClipboard::Mode mode = QClipboard::Clipboard) override; + bool supportsMode(QClipboard::Mode mode) const override; + bool ownsMode(QClipboard::Mode mode) const override; // override from BHandler to catch change notifications from Haiku clipboard - void MessageReceived(BMessage* message) Q_DECL_OVERRIDE; + void MessageReceived(BMessage* message) override; private: QMimeData *m_systemMimeData; diff --git a/src/plugins/platforms/haiku/qhaikucursor.h b/src/plugins/platforms/haiku/qhaikucursor.h index 5d70c97d9e..73a1d2c492 100644 --- a/src/plugins/platforms/haiku/qhaikucursor.h +++ b/src/plugins/platforms/haiku/qhaikucursor.h @@ -52,7 +52,7 @@ public: QHaikuCursor(); #ifndef QT_NO_CURSOR - void changeCursor(QCursor *windowCursor, QWindow *window) Q_DECL_OVERRIDE; + void changeCursor(QCursor *windowCursor, QWindow *window) override; #endif private: diff --git a/src/plugins/platforms/haiku/qhaikuintegration.h b/src/plugins/platforms/haiku/qhaikuintegration.h index 1b938acb82..5c7a173c91 100644 --- a/src/plugins/platforms/haiku/qhaikuintegration.h +++ b/src/plugins/platforms/haiku/qhaikuintegration.h @@ -54,17 +54,17 @@ public: explicit QHaikuIntegration(const QStringList ¶mList); ~QHaikuIntegration(); - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; + bool hasCapability(QPlatformIntegration::Capability cap) const override; - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; + QAbstractEventDispatcher *createEventDispatcher() const override; - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; - QPlatformServices *services() const Q_DECL_OVERRIDE; + QPlatformFontDatabase *fontDatabase() const override; + QPlatformServices *services() const override; #ifndef QT_NO_CLIPBOARD - QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; + QPlatformClipboard *clipboard() const override; #endif private: diff --git a/src/plugins/platforms/haiku/qhaikurasterbackingstore.h b/src/plugins/platforms/haiku/qhaikurasterbackingstore.h index 06a46e7eb3..060ab27126 100644 --- a/src/plugins/platforms/haiku/qhaikurasterbackingstore.h +++ b/src/plugins/platforms/haiku/qhaikurasterbackingstore.h @@ -55,9 +55,9 @@ public: explicit QHaikuRasterBackingStore(QWindow *window); ~QHaikuRasterBackingStore(); - QPaintDevice *paintDevice() Q_DECL_OVERRIDE; - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; - void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override; + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; + void resize(const QSize &size, const QRegion &staticContents) override; private: BBitmap *m_bitmap; diff --git a/src/plugins/platforms/haiku/qhaikurasterwindow.h b/src/plugins/platforms/haiku/qhaikurasterwindow.h index ae57e0f0e4..fd821be763 100644 --- a/src/plugins/platforms/haiku/qhaikurasterwindow.h +++ b/src/plugins/platforms/haiku/qhaikurasterwindow.h @@ -53,13 +53,13 @@ class HaikuViewProxy : public QObject, public BView public: explicit HaikuViewProxy(BWindow *window, QObject *parent = Q_NULLPTR); - void MessageReceived(BMessage *message) Q_DECL_OVERRIDE; - void Draw(BRect updateRect) Q_DECL_OVERRIDE; - void MouseDown(BPoint pos) Q_DECL_OVERRIDE; - void MouseUp(BPoint pos) Q_DECL_OVERRIDE; - void MouseMoved(BPoint pos, uint32 code, const BMessage *dragMessage) Q_DECL_OVERRIDE; - void KeyDown(const char *bytes, int32 numBytes) Q_DECL_OVERRIDE; - void KeyUp(const char *bytes, int32 numBytes) Q_DECL_OVERRIDE; + void MessageReceived(BMessage *message) override; + void Draw(BRect updateRect) override; + void MouseDown(BPoint pos) override; + void MouseUp(BPoint pos) override; + void MouseMoved(BPoint pos, uint32 code, const BMessage *dragMessage) override; + void KeyDown(const char *bytes, int32 numBytes) override; + void KeyUp(const char *bytes, int32 numBytes) override; Q_SIGNALS: void mouseEvent(const QPoint &localPosition, const QPoint &globalPosition, Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::MouseEventSource source); diff --git a/src/plugins/platforms/haiku/qhaikuscreen.h b/src/plugins/platforms/haiku/qhaikuscreen.h index 49fa3f0a60..98de6fdd03 100644 --- a/src/plugins/platforms/haiku/qhaikuscreen.h +++ b/src/plugins/platforms/haiku/qhaikuscreen.h @@ -53,13 +53,13 @@ public: QHaikuScreen(); ~QHaikuScreen(); - QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE; + QPixmap grabWindow(WId window, int x, int y, int width, int height) const override; - QRect geometry() const Q_DECL_OVERRIDE; - int depth() const Q_DECL_OVERRIDE; - QImage::Format format() const Q_DECL_OVERRIDE; + QRect geometry() const override; + int depth() const override; + QImage::Format format() const override; - QPlatformCursor *cursor() const Q_DECL_OVERRIDE; + QPlatformCursor *cursor() const override; private: BScreen *m_screen; diff --git a/src/plugins/platforms/haiku/qhaikuservices.h b/src/plugins/platforms/haiku/qhaikuservices.h index a210eb8b61..59ff6395fb 100644 --- a/src/plugins/platforms/haiku/qhaikuservices.h +++ b/src/plugins/platforms/haiku/qhaikuservices.h @@ -47,10 +47,10 @@ QT_BEGIN_NAMESPACE class QHaikuServices : public QPlatformServices { public: - bool openUrl(const QUrl &url) Q_DECL_OVERRIDE; - bool openDocument(const QUrl &url) Q_DECL_OVERRIDE; + bool openUrl(const QUrl &url) override; + bool openDocument(const QUrl &url) override; - QByteArray desktopEnvironment() const Q_DECL_OVERRIDE; + QByteArray desktopEnvironment() const override; }; QT_END_NAMESPACE diff --git a/src/plugins/platforms/haiku/qhaikuwindow.h b/src/plugins/platforms/haiku/qhaikuwindow.h index 5bfb99e532..efa47939a7 100644 --- a/src/plugins/platforms/haiku/qhaikuwindow.h +++ b/src/plugins/platforms/haiku/qhaikuwindow.h @@ -53,12 +53,12 @@ class HaikuWindowProxy : public QObject, public BWindow public: explicit HaikuWindowProxy(QWindow *window, const QRect &rect, QObject *parent = Q_NULLPTR); - void FrameMoved(BPoint pos) Q_DECL_OVERRIDE; - void FrameResized(float width, float height) Q_DECL_OVERRIDE; - void WindowActivated(bool activated) Q_DECL_OVERRIDE; - void Minimize(bool minimize) Q_DECL_OVERRIDE; - void Zoom(BPoint pos, float width, float height) Q_DECL_OVERRIDE; - bool QuitRequested() Q_DECL_OVERRIDE; + void FrameMoved(BPoint pos) override; + void FrameResized(float width, float height) override; + void WindowActivated(bool activated) override; + void Minimize(bool minimize) override; + void Zoom(BPoint pos, float width, float height) override; + bool QuitRequested() override; void zoomByQt(); @@ -83,23 +83,23 @@ public: explicit QHaikuWindow(QWindow *window); virtual ~QHaikuWindow(); - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - QMargins frameMargins() const Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setGeometry(const QRect &rect) override; + QMargins frameMargins() const override; + void setVisible(bool visible) override; - bool isExposed() const Q_DECL_OVERRIDE; - bool isActive() const Q_DECL_OVERRIDE; + bool isExposed() const override; + bool isActive() const override; - WId winId() const Q_DECL_OVERRIDE; + WId winId() const override; BWindow* nativeHandle() const; - void requestActivateWindow() Q_DECL_OVERRIDE; - void setWindowState(Qt::WindowStates state) Q_DECL_OVERRIDE; - void setWindowFlags(Qt::WindowFlags flags) Q_DECL_OVERRIDE; + void requestActivateWindow() override; + void setWindowState(Qt::WindowStates state) override; + void setWindowFlags(Qt::WindowFlags flags) override; - void setWindowTitle(const QString &title) Q_DECL_OVERRIDE; + void setWindowTitle(const QString &title) override; - void propagateSizeHints() Q_DECL_OVERRIDE; + void propagateSizeHints() override; protected: HaikuWindowProxy *m_window; diff --git a/src/plugins/platforms/integrity/main.cpp b/src/plugins/platforms/integrity/main.cpp index f75e227335..6313aa47e5 100644 --- a/src/plugins/platforms/integrity/main.cpp +++ b/src/plugins/platforms/integrity/main.cpp @@ -47,7 +47,7 @@ class QIntegrityFbIntegrationPlugin : public QPlatformIntegrationPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "integrity.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration* QIntegrityFbIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/integrity/qintegrityfbintegration.h b/src/plugins/platforms/integrity/qintegrityfbintegration.h index a954dc2356..d0cd5417ab 100644 --- a/src/plugins/platforms/integrity/qintegrityfbintegration.h +++ b/src/plugins/platforms/integrity/qintegrityfbintegration.h @@ -54,19 +54,19 @@ public: QIntegrityFbIntegration(const QStringList ¶mList); ~QIntegrityFbIntegration(); - void initialize() Q_DECL_OVERRIDE; - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; + void initialize() override; + bool hasCapability(QPlatformIntegration::Capability cap) const override; - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QAbstractEventDispatcher *createEventDispatcher() const override; - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; - QPlatformServices *services() const Q_DECL_OVERRIDE; - QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE { return m_inputContext; } + QPlatformFontDatabase *fontDatabase() const override; + QPlatformServices *services() const override; + QPlatformInputContext *inputContext() const override { return m_inputContext; } - QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; + QPlatformNativeInterface *nativeInterface() const override; QList screens() const; diff --git a/src/plugins/platforms/integrity/qintegrityfbscreen.h b/src/plugins/platforms/integrity/qintegrityfbscreen.h index 6bc78913c9..c38b4f073d 100644 --- a/src/plugins/platforms/integrity/qintegrityfbscreen.h +++ b/src/plugins/platforms/integrity/qintegrityfbscreen.h @@ -57,9 +57,9 @@ public: bool initialize(); - QPixmap grabWindow(WId wid, int x, int y, int width, int height) const Q_DECL_OVERRIDE; + QPixmap grabWindow(WId wid, int x, int y, int width, int height) const override; - QRegion doRedraw() Q_DECL_OVERRIDE; + QRegion doRedraw() override; private: QStringList mArgs; diff --git a/src/plugins/platforms/integrity/qintegrityhidmanager.cpp b/src/plugins/platforms/integrity/qintegrityhidmanager.cpp index 49583735f5..3570b90134 100644 --- a/src/plugins/platforms/integrity/qintegrityhidmanager.cpp +++ b/src/plugins/platforms/integrity/qintegrityhidmanager.cpp @@ -73,8 +73,8 @@ public: { CheckSuccess(gh_hid_close(handle)); }; - void process_event(void) Q_DECL_OVERRIDE; - void async_wait(void) Q_DECL_OVERRIDE; + void process_event(void) override; + void async_wait(void) override; HIDDriver *get_driver(void) { return driver; }; HIDHandle get_handle(void) { return handle; }; private: @@ -92,8 +92,8 @@ public: { qDeleteAll(devices); }; - void process_event(void) Q_DECL_OVERRIDE; - void async_wait(void) Q_DECL_OVERRIDE; + void process_event(void) override; + void async_wait(void) override; void find_devices(void); private: QHash devices; diff --git a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm index bea2897240..54152aebf7 100644 --- a/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm +++ b/src/plugins/platforms/ios/optional/nsphotolibrarysupport/qiosfileengineassetslibrary.mm @@ -302,7 +302,7 @@ public: g_iteratorCurrentUrl.setLocalData(QString()); } - QString next() Q_DECL_OVERRIDE + QString next() override { // Cache the URL that we are about to return, since QDir will immediately create a // new file engine on the file and ask if it exists. Unless we do this, we end up @@ -314,17 +314,17 @@ public: return url; } - bool hasNext() const Q_DECL_OVERRIDE + bool hasNext() const override { return m_enumerator->hasNext(); } - QString currentFileName() const Q_DECL_OVERRIDE + QString currentFileName() const override { return g_iteratorCurrentUrl.localData(); } - QFileInfo currentFileInfo() const Q_DECL_OVERRIDE + QFileInfo currentFileInfo() const override { return QFileInfo(currentFileName()); } diff --git a/src/plugins/platforms/ios/qiosbackingstore.h b/src/plugins/platforms/ios/qiosbackingstore.h index 3954347471..a0fcb1a7a7 100644 --- a/src/plugins/platforms/ios/qiosbackingstore.h +++ b/src/plugins/platforms/ios/qiosbackingstore.h @@ -54,7 +54,7 @@ public: QIOSBackingStore(QWindow *window); ~QIOSBackingStore(); - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; private: QOpenGLContext *m_context; diff --git a/src/plugins/platforms/ios/qiosclipboard.h b/src/plugins/platforms/ios/qiosclipboard.h index f3ccfcace0..3fe9b29b71 100644 --- a/src/plugins/platforms/ios/qiosclipboard.h +++ b/src/plugins/platforms/ios/qiosclipboard.h @@ -58,10 +58,10 @@ public: QIOSClipboard(); ~QIOSClipboard(); - QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - void setMimeData(QMimeData *mimeData, QClipboard::Mode mode = QClipboard::Clipboard) Q_DECL_OVERRIDE; - bool supportsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; - bool ownsMode(QClipboard::Mode mode) const Q_DECL_OVERRIDE; + QMimeData *mimeData(QClipboard::Mode mode = QClipboard::Clipboard) override; + void setMimeData(QMimeData *mimeData, QClipboard::Mode mode = QClipboard::Clipboard) override; + bool supportsMode(QClipboard::Mode mode) const override; + bool ownsMode(QClipboard::Mode mode) const override; private: QUIClipboard *m_clipboard; diff --git a/src/plugins/platforms/ios/qiosclipboard.mm b/src/plugins/platforms/ios/qiosclipboard.mm index 15deb3332e..9a975eadc9 100644 --- a/src/plugins/platforms/ios/qiosclipboard.mm +++ b/src/plugins/platforms/ios/qiosclipboard.mm @@ -138,8 +138,8 @@ public: QIOSMimeData(QClipboard::Mode mode) : QMimeData(), m_mode(mode) { } ~QIOSMimeData() { } - QStringList formats() const Q_DECL_OVERRIDE; - QVariant retrieveData(const QString &mimeType, QVariant::Type type) const Q_DECL_OVERRIDE; + QStringList formats() const override; + QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override; private: const QClipboard::Mode m_mode; diff --git a/src/plugins/platforms/ios/qioscontext.h b/src/plugins/platforms/ios/qioscontext.h index 5b7917f7b4..7539e981c0 100644 --- a/src/plugins/platforms/ios/qioscontext.h +++ b/src/plugins/platforms/ios/qioscontext.h @@ -57,18 +57,18 @@ public: QIOSContext(QOpenGLContext *context); ~QIOSContext(); - QSurfaceFormat format() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; - void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; + void swapBuffers(QPlatformSurface *surface) override; - bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; - void doneCurrent() Q_DECL_OVERRIDE; + bool makeCurrent(QPlatformSurface *surface) override; + void doneCurrent() override; - GLuint defaultFramebufferObject(QPlatformSurface *) const Q_DECL_OVERRIDE; - QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; + GLuint defaultFramebufferObject(QPlatformSurface *) const override; + QFunctionPointer getProcAddress(const char *procName) override; - bool isSharing() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; + bool isSharing() const override; + bool isValid() const override; private Q_SLOTS: void windowDestroyed(QObject *object); diff --git a/src/plugins/platforms/ios/qioseventdispatcher.h b/src/plugins/platforms/ios/qioseventdispatcher.h index c1442ed1e8..62133b9510 100644 --- a/src/plugins/platforms/ios/qioseventdispatcher.h +++ b/src/plugins/platforms/ios/qioseventdispatcher.h @@ -51,8 +51,8 @@ class QIOSEventDispatcher : public QEventDispatcherCoreFoundation public: explicit QIOSEventDispatcher(QObject *parent = 0); - bool processEvents(QEventLoop::ProcessEventsFlags flags) Q_DECL_OVERRIDE; - bool processPostedEvents() Q_DECL_OVERRIDE; + bool processEvents(QEventLoop::ProcessEventsFlags flags) override; + bool processPostedEvents() override; void handleRunLoopExit(CFRunLoopActivity activity); diff --git a/src/plugins/platforms/ios/qiosfiledialog.h b/src/plugins/platforms/ios/qiosfiledialog.h index 0b56bd20bf..5cb1b45e20 100644 --- a/src/plugins/platforms/ios/qiosfiledialog.h +++ b/src/plugins/platforms/ios/qiosfiledialog.h @@ -53,17 +53,17 @@ public: QIOSFileDialog(); ~QIOSFileDialog(); - void exec() Q_DECL_OVERRIDE; - bool defaultNameFilterDisables() const Q_DECL_OVERRIDE { return false; } - bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; - void setDirectory(const QUrl &) Q_DECL_OVERRIDE {} - QUrl directory() const Q_DECL_OVERRIDE { return QUrl(); } - void selectFile(const QUrl &) Q_DECL_OVERRIDE {} - QList selectedFiles() const Q_DECL_OVERRIDE; - void setFilter() Q_DECL_OVERRIDE {} - void selectNameFilter(const QString &) Q_DECL_OVERRIDE {} - QString selectedNameFilter() const Q_DECL_OVERRIDE { return QString(); } + void exec() override; + bool defaultNameFilterDisables() const override { return false; } + bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) override; + void hide() override; + void setDirectory(const QUrl &) override {} + QUrl directory() const override { return QUrl(); } + void selectFile(const QUrl &) override {} + QList selectedFiles() const override; + void setFilter() override {} + void selectNameFilter(const QString &) override {} + QString selectedNameFilter() const override { return QString(); } void selectedFilesChanged(QList selection); diff --git a/src/plugins/platforms/ios/qiosinputcontext.h b/src/plugins/platforms/ios/qiosinputcontext.h index 966d1a7e80..255cf8bca9 100644 --- a/src/plugins/platforms/ios/qiosinputcontext.h +++ b/src/plugins/platforms/ios/qiosinputcontext.h @@ -88,24 +88,24 @@ public: QIOSInputContext(); ~QIOSInputContext(); - bool isValid() const Q_DECL_OVERRIDE { return true; } + bool isValid() const override { return true; } - void showInputPanel() Q_DECL_OVERRIDE; - void hideInputPanel() Q_DECL_OVERRIDE; + void showInputPanel() override; + void hideInputPanel() override; - bool isInputPanelVisible() const Q_DECL_OVERRIDE; - bool isAnimating() const Q_DECL_OVERRIDE; - QRectF keyboardRect() const Q_DECL_OVERRIDE; + bool isInputPanelVisible() const override; + bool isAnimating() const override; + QRectF keyboardRect() const override; - void update(Qt::InputMethodQueries) Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - void commit() Q_DECL_OVERRIDE; + void update(Qt::InputMethodQueries) override; + void reset() override; + void commit() override; - QLocale locale() const Q_DECL_OVERRIDE; + QLocale locale() const override; void clearCurrentFocusObject(); - void setFocusObject(QObject *object) Q_DECL_OVERRIDE; + void setFocusObject(QObject *object) override; void focusWindowChanged(QWindow *focusWindow); void scrollToCursor(); diff --git a/src/plugins/platforms/ios/qiosintegration.h b/src/plugins/platforms/ios/qiosintegration.h index 54c1a1dcb7..19fe93da30 100644 --- a/src/plugins/platforms/ios/qiosintegration.h +++ b/src/plugins/platforms/ios/qiosintegration.h @@ -64,45 +64,45 @@ public: QIOSIntegration(); ~QIOSIntegration(); - bool hasCapability(Capability cap) const Q_DECL_OVERRIDE; + bool hasCapability(Capability cap) const override; - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; - QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; - QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const Q_DECL_OVERRIDE; + QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override; + QPlatformOffscreenSurface *createPlatformOffscreenSurface(QOffscreenSurface *surface) const override; - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; + QPlatformFontDatabase *fontDatabase() const override; #ifndef QT_NO_CLIPBOARD - QPlatformClipboard *clipboard() const Q_DECL_OVERRIDE; + QPlatformClipboard *clipboard() const override; #endif - QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; - QPlatformServices *services() const Q_DECL_OVERRIDE; + QPlatformInputContext *inputContext() const override; + QPlatformServices *services() const override; - QVariant styleHint(StyleHint hint) const Q_DECL_OVERRIDE; + QVariant styleHint(StyleHint hint) const override; - QStringList themeNames() const Q_DECL_OVERRIDE; - QPlatformTheme *createPlatformTheme(const QString &name) const Q_DECL_OVERRIDE; + QStringList themeNames() const override; + QPlatformTheme *createPlatformTheme(const QString &name) const override; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; - QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; + QAbstractEventDispatcher *createEventDispatcher() const override; + QPlatformNativeInterface *nativeInterface() const override; QTouchDevice *touchDevice(); #ifndef QT_NO_ACCESSIBILITY - QPlatformAccessibility *accessibility() const Q_DECL_OVERRIDE; + QPlatformAccessibility *accessibility() const override; #endif // Called from Objective-C class QIOSScreenTracker, which can't be friended void addScreen(QPlatformScreen *screen) { screenAdded(screen); } void destroyScreen(QPlatformScreen *screen) { QPlatformIntegration::destroyScreen(screen); } - void beep() const Q_DECL_OVERRIDE; + void beep() const override; static QIOSIntegration *instance(); // -- QPlatformNativeInterface -- - void *nativeResourceForWindow(const QByteArray &resource, QWindow *window) Q_DECL_OVERRIDE; + void *nativeResourceForWindow(const QByteArray &resource, QWindow *window) override; void setDebugWindowManagement(bool); bool debugWindowManagement() const; diff --git a/src/plugins/platforms/ios/qiosintegration.mm b/src/plugins/platforms/ios/qiosintegration.mm index 3bf75d8a1f..c733d99764 100644 --- a/src/plugins/platforms/ios/qiosintegration.mm +++ b/src/plugins/platforms/ios/qiosintegration.mm @@ -204,12 +204,12 @@ class QIOSOffscreenSurface : public QPlatformOffscreenSurface public: QIOSOffscreenSurface(QOffscreenSurface *offscreenSurface) : QPlatformOffscreenSurface(offscreenSurface) {} - QSurfaceFormat format() const Q_DECL_OVERRIDE + QSurfaceFormat format() const override { Q_ASSERT(offscreenSurface()); return offscreenSurface()->requestedFormat(); } - bool isValid() const Q_DECL_OVERRIDE { return true; } + bool isValid() const override { return true; } }; QPlatformOffscreenSurface *QIOSIntegration::createPlatformOffscreenSurface(QOffscreenSurface *surface) const diff --git a/src/plugins/platforms/ios/qiosmenu.h b/src/plugins/platforms/ios/qiosmenu.h index 61cadab56d..32022a3bb8 100644 --- a/src/plugins/platforms/ios/qiosmenu.h +++ b/src/plugins/platforms/ios/qiosmenu.h @@ -56,20 +56,20 @@ class QIOSMenuItem : public QPlatformMenuItem public: QIOSMenuItem(); - void setText(const QString &text) Q_DECL_OVERRIDE; - void setIcon(const QIcon &) Q_DECL_OVERRIDE {} - void setMenu(QPlatformMenu *) Q_DECL_OVERRIDE; - void setVisible(bool isVisible) Q_DECL_OVERRIDE; - void setIsSeparator(bool) Q_DECL_OVERRIDE; - void setFont(const QFont &) Q_DECL_OVERRIDE {} - void setRole(MenuRole role) Q_DECL_OVERRIDE; - void setCheckable(bool) Q_DECL_OVERRIDE {} - void setChecked(bool) Q_DECL_OVERRIDE {} + void setText(const QString &text) override; + void setIcon(const QIcon &) override {} + void setMenu(QPlatformMenu *) override; + void setVisible(bool isVisible) override; + void setIsSeparator(bool) override; + void setFont(const QFont &) override {} + void setRole(MenuRole role) override; + void setCheckable(bool) override {} + void setChecked(bool) override {} #ifndef QT_NO_SHORTCUT - void setShortcut(const QKeySequence&) Q_DECL_OVERRIDE; + void setShortcut(const QKeySequence&) override; #endif - void setEnabled(bool enabled) Q_DECL_OVERRIDE; - void setIconSize(int) Q_DECL_OVERRIDE {} + void setEnabled(bool enabled) override; + void setIconSize(int) override {} bool m_visible; QString m_text; @@ -88,22 +88,22 @@ public: QIOSMenu(); ~QIOSMenu(); - void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) Q_DECL_OVERRIDE; - void removeMenuItem(QPlatformMenuItem *menuItem) Q_DECL_OVERRIDE; - void syncMenuItem(QPlatformMenuItem *) Q_DECL_OVERRIDE; - void syncSeparatorsCollapsible(bool) Q_DECL_OVERRIDE {} + void insertMenuItem(QPlatformMenuItem *menuItem, QPlatformMenuItem *before) override; + void removeMenuItem(QPlatformMenuItem *menuItem) override; + void syncMenuItem(QPlatformMenuItem *) override; + void syncSeparatorsCollapsible(bool) override {} - void setText(const QString &) Q_DECL_OVERRIDE; - void setIcon(const QIcon &) Q_DECL_OVERRIDE {} - void setEnabled(bool enabled) Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; - void setMenuType(MenuType type) Q_DECL_OVERRIDE; + void setText(const QString &) override; + void setIcon(const QIcon &) override {} + void setEnabled(bool enabled) override; + void setVisible(bool visible) override; + void setMenuType(MenuType type) override; - void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) Q_DECL_OVERRIDE; - void dismiss() Q_DECL_OVERRIDE; + void showPopup(const QWindow *parentWindow, const QRect &targetRect, const QPlatformMenuItem *item) override; + void dismiss() override; - QPlatformMenuItem *menuItemAt(int position) const Q_DECL_OVERRIDE; - QPlatformMenuItem *menuItemForTag(quintptr tag) const Q_DECL_OVERRIDE; + QPlatformMenuItem *menuItemAt(int position) const override; + QPlatformMenuItem *menuItemForTag(quintptr tag) const override; void handleItemSelected(QIOSMenuItem *menuItem); @@ -111,7 +111,7 @@ public: static id menuActionTarget() { return m_currentMenu ? m_currentMenu->m_menuController : 0; } protected: - bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *obj, QEvent *event) override; private: bool m_enabled; diff --git a/src/plugins/platforms/ios/qiosmessagedialog.h b/src/plugins/platforms/ios/qiosmessagedialog.h index e67e10a5e1..92a4db8319 100644 --- a/src/plugins/platforms/ios/qiosmessagedialog.h +++ b/src/plugins/platforms/ios/qiosmessagedialog.h @@ -54,9 +54,9 @@ public: QIOSMessageDialog(); ~QIOSMessageDialog(); - void exec() Q_DECL_OVERRIDE; - bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; + void exec() override; + bool show(Qt::WindowFlags windowFlags, Qt::WindowModality windowModality, QWindow *parent) override; + void hide() override; private: QEventLoop m_eventLoop; diff --git a/src/plugins/platforms/ios/qiosscreen.h b/src/plugins/platforms/ios/qiosscreen.h index 9fcce42825..329fb1f9e2 100644 --- a/src/plugins/platforms/ios/qiosscreen.h +++ b/src/plugins/platforms/ios/qiosscreen.h @@ -56,17 +56,17 @@ public: QIOSScreen(UIScreen *screen); ~QIOSScreen(); - QRect geometry() const Q_DECL_OVERRIDE; - QRect availableGeometry() const Q_DECL_OVERRIDE; - int depth() const Q_DECL_OVERRIDE; - QImage::Format format() const Q_DECL_OVERRIDE; - QSizeF physicalSize() const Q_DECL_OVERRIDE; - QDpi logicalDpi() const Q_DECL_OVERRIDE; - qreal devicePixelRatio() const Q_DECL_OVERRIDE; - - Qt::ScreenOrientation nativeOrientation() const Q_DECL_OVERRIDE; - Qt::ScreenOrientation orientation() const Q_DECL_OVERRIDE; - void setOrientationUpdateMask(Qt::ScreenOrientations mask) Q_DECL_OVERRIDE; + QRect geometry() const override; + QRect availableGeometry() const override; + int depth() const override; + QImage::Format format() const override; + QSizeF physicalSize() const override; + QDpi logicalDpi() const override; + qreal devicePixelRatio() const override; + + Qt::ScreenOrientation nativeOrientation() const override; + Qt::ScreenOrientation orientation() const override; + void setOrientationUpdateMask(Qt::ScreenOrientations mask) override; QPixmap grabWindow(WId window, int x, int y, int width, int height) const override; diff --git a/src/plugins/platforms/ios/qiostheme.h b/src/plugins/platforms/ios/qiostheme.h index fc6b58178a..c917679a91 100644 --- a/src/plugins/platforms/ios/qiostheme.h +++ b/src/plugins/platforms/ios/qiostheme.h @@ -52,16 +52,16 @@ public: QIOSTheme(); ~QIOSTheme(); - const QPalette *palette(Palette type = SystemPalette) const Q_DECL_OVERRIDE; - QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; + const QPalette *palette(Palette type = SystemPalette) const override; + QVariant themeHint(ThemeHint hint) const override; - QPlatformMenuItem* createPlatformMenuItem() const Q_DECL_OVERRIDE; - QPlatformMenu* createPlatformMenu() const Q_DECL_OVERRIDE; + QPlatformMenuItem* createPlatformMenuItem() const override; + QPlatformMenu* createPlatformMenu() const override; - bool usePlatformNativeDialog(DialogType type) const Q_DECL_OVERRIDE; - QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const Q_DECL_OVERRIDE; + bool usePlatformNativeDialog(DialogType type) const override; + QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override; - const QFont *font(Font type = SystemFont) const Q_DECL_OVERRIDE; + const QFont *font(Font type = SystemFont) const override; static const char *name; diff --git a/src/plugins/platforms/ios/qioswindow.h b/src/plugins/platforms/ios/qioswindow.h index da8a6aabdc..1342d66201 100644 --- a/src/plugins/platforms/ios/qioswindow.h +++ b/src/plugins/platforms/ios/qioswindow.h @@ -60,35 +60,35 @@ public: explicit QIOSWindow(QWindow *window); ~QIOSWindow(); - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRect &rect) override; - void setWindowState(Qt::WindowStates state) Q_DECL_OVERRIDE; - void setParent(const QPlatformWindow *window) Q_DECL_OVERRIDE; - void handleContentOrientationChange(Qt::ScreenOrientation orientation) Q_DECL_OVERRIDE; - void setVisible(bool visible) Q_DECL_OVERRIDE; - void setOpacity(qreal level) Q_DECL_OVERRIDE; + void setWindowState(Qt::WindowStates state) override; + void setParent(const QPlatformWindow *window) override; + void handleContentOrientationChange(Qt::ScreenOrientation orientation) override; + void setVisible(bool visible) override; + void setOpacity(qreal level) override; - bool isExposed() const Q_DECL_OVERRIDE; - void propagateSizeHints() Q_DECL_OVERRIDE {} + bool isExposed() const override; + void propagateSizeHints() override {} - void raise() Q_DECL_OVERRIDE{ raiseOrLower(true); } - void lower() Q_DECL_OVERRIDE { raiseOrLower(false); } + void raise() override{ raiseOrLower(true); } + void lower() override { raiseOrLower(false); } bool shouldAutoActivateWindow() const; - void requestActivateWindow() Q_DECL_OVERRIDE; + void requestActivateWindow() override; - qreal devicePixelRatio() const Q_DECL_OVERRIDE; + qreal devicePixelRatio() const override; - bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE { return grab; } - bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE { return grab; } + bool setMouseGrabEnabled(bool grab) override { return grab; } + bool setKeyboardGrabEnabled(bool grab) override { return grab; } - WId winId() const Q_DECL_OVERRIDE { return WId(m_view); } + WId winId() const override { return WId(m_view); } void clearAccessibleCache(); - QSurfaceFormat format() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; - void requestUpdate() Q_DECL_OVERRIDE; + void requestUpdate() override; CAEAGLLayer *eaglLayer() const; diff --git a/src/plugins/platforms/linuxfb/main.cpp b/src/plugins/platforms/linuxfb/main.cpp index 82b916b9a9..24156b68e8 100644 --- a/src/plugins/platforms/linuxfb/main.cpp +++ b/src/plugins/platforms/linuxfb/main.cpp @@ -47,7 +47,7 @@ class QLinuxFbIntegrationPlugin : public QPlatformIntegrationPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "linuxfb.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration* QLinuxFbIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h index 9934a8cd54..22578bf980 100644 --- a/src/plugins/platforms/linuxfb/qlinuxfbintegration.h +++ b/src/plugins/platforms/linuxfb/qlinuxfbintegration.h @@ -55,19 +55,19 @@ public: QLinuxFbIntegration(const QStringList ¶mList); ~QLinuxFbIntegration(); - void initialize() Q_DECL_OVERRIDE; - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; + void initialize() override; + bool hasCapability(QPlatformIntegration::Capability cap) const override; - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QAbstractEventDispatcher *createEventDispatcher() const override; - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; - QPlatformServices *services() const Q_DECL_OVERRIDE; - QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE { return m_inputContext; } + QPlatformFontDatabase *fontDatabase() const override; + QPlatformServices *services() const override; + QPlatformInputContext *inputContext() const override { return m_inputContext; } - QPlatformNativeInterface *nativeInterface() const Q_DECL_OVERRIDE; + QPlatformNativeInterface *nativeInterface() const override; QList screens() const; diff --git a/src/plugins/platforms/minimal/main.cpp b/src/plugins/platforms/minimal/main.cpp index 29809c1843..f9a0c17509 100644 --- a/src/plugins/platforms/minimal/main.cpp +++ b/src/plugins/platforms/minimal/main.cpp @@ -48,7 +48,7 @@ class QMinimalIntegrationPlugin : public QPlatformIntegrationPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "minimal.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration *QMinimalIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/minimal/qminimalbackingstore.h b/src/plugins/platforms/minimal/qminimalbackingstore.h index 3d7aaf2b99..2119894809 100644 --- a/src/plugins/platforms/minimal/qminimalbackingstore.h +++ b/src/plugins/platforms/minimal/qminimalbackingstore.h @@ -52,9 +52,9 @@ public: QMinimalBackingStore(QWindow *window); ~QMinimalBackingStore(); - QPaintDevice *paintDevice() Q_DECL_OVERRIDE; - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; - void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override; + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; + void resize(const QSize &size, const QRegion &staticContents) override; private: QImage mImage; diff --git a/src/plugins/platforms/minimal/qminimalintegration.cpp b/src/plugins/platforms/minimal/qminimalintegration.cpp index ca33689cd7..9fc7671feb 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.cpp +++ b/src/plugins/platforms/minimal/qminimalintegration.cpp @@ -123,7 +123,7 @@ bool QMinimalIntegration::hasCapability(QPlatformIntegration::Capability cap) co class DummyFontDatabase : public QPlatformFontDatabase { public: - virtual void populateFontDatabase() Q_DECL_OVERRIDE {} + virtual void populateFontDatabase() override {} }; QPlatformFontDatabase *QMinimalIntegration::fontDatabase() const diff --git a/src/plugins/platforms/minimal/qminimalintegration.h b/src/plugins/platforms/minimal/qminimalintegration.h index eaa2f228c5..bc7b23c83c 100644 --- a/src/plugins/platforms/minimal/qminimalintegration.h +++ b/src/plugins/platforms/minimal/qminimalintegration.h @@ -51,9 +51,9 @@ public: QMinimalScreen() : mDepth(32), mFormat(QImage::Format_ARGB32_Premultiplied) {} - QRect geometry() const Q_DECL_OVERRIDE { return mGeometry; } - int depth() const Q_DECL_OVERRIDE { return mDepth; } - QImage::Format format() const Q_DECL_OVERRIDE { return mFormat; } + QRect geometry() const override { return mGeometry; } + int depth() const override { return mDepth; } + QImage::Format format() const override { return mFormat; } public: QRect mGeometry; @@ -74,12 +74,12 @@ public: explicit QMinimalIntegration(const QStringList ¶meters); ~QMinimalIntegration(); - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; + bool hasCapability(QPlatformIntegration::Capability cap) const override; + QPlatformFontDatabase *fontDatabase() const override; - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; + QAbstractEventDispatcher *createEventDispatcher() const override; unsigned options() const { return m_options; } diff --git a/src/plugins/platforms/minimalegl/main.cpp b/src/plugins/platforms/minimalegl/main.cpp index a010ed76e2..5aac71e140 100644 --- a/src/plugins/platforms/minimalegl/main.cpp +++ b/src/plugins/platforms/minimalegl/main.cpp @@ -47,7 +47,7 @@ class QMinimalEglIntegrationPlugin : public QPlatformIntegrationPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "minimalegl.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration* QMinimalEglIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/minimalegl/qminimaleglbackingstore.h b/src/plugins/platforms/minimalegl/qminimaleglbackingstore.h index 0e22298891..382f2d1404 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglbackingstore.h +++ b/src/plugins/platforms/minimalegl/qminimaleglbackingstore.h @@ -53,13 +53,13 @@ public: QMinimalEglBackingStore(QWindow *window); ~QMinimalEglBackingStore(); - QPaintDevice *paintDevice() Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override; - void beginPaint(const QRegion &) Q_DECL_OVERRIDE; - void endPaint() Q_DECL_OVERRIDE; + void beginPaint(const QRegion &) override; + void endPaint() override; - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; - void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; + void resize(const QSize &size, const QRegion &staticContents) override; private: QOpenGLContext *m_context; diff --git a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp index a716a6092a..ba1a4c27a8 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglintegration.cpp @@ -71,7 +71,7 @@ public: QWinRTEventDispatcher() {} protected: - bool hasPendingEvents() Q_DECL_OVERRIDE + bool hasPendingEvents() override { return QEventDispatcherWinRT::hasPendingEvents() || QWindowSystemInterface::windowSystemEventsQueued(); } diff --git a/src/plugins/platforms/minimalegl/qminimaleglintegration.h b/src/plugins/platforms/minimalegl/qminimaleglintegration.h index d0ab75bd3c..70a51004a6 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglintegration.h +++ b/src/plugins/platforms/minimalegl/qminimaleglintegration.h @@ -51,18 +51,18 @@ public: QMinimalEglIntegration(); ~QMinimalEglIntegration(); - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; + bool hasCapability(QPlatformIntegration::Capability cap) const override; - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; #ifndef QT_NO_OPENGL - QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; + QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override; #endif - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; + QPlatformFontDatabase *fontDatabase() const override; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QAbstractEventDispatcher *createEventDispatcher() const override; - QVariant styleHint(QPlatformIntegration::StyleHint hint) const Q_DECL_OVERRIDE; + QVariant styleHint(QPlatformIntegration::StyleHint hint) const override; private: QPlatformFontDatabase *mFontDb; diff --git a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp index 0175d2dbdd..6e122e28ce 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp +++ b/src/plugins/platforms/minimalegl/qminimaleglscreen.cpp @@ -64,7 +64,7 @@ public: { } - EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) Q_DECL_OVERRIDE + EGLSurface eglSurfaceForPlatformSurface(QPlatformSurface *surface) override { QMinimalEglWindow *window = static_cast(surface); QMinimalEglScreen *screen = static_cast(window->screen()); diff --git a/src/plugins/platforms/minimalegl/qminimaleglscreen.h b/src/plugins/platforms/minimalegl/qminimaleglscreen.h index 24098b8127..926936ae32 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglscreen.h +++ b/src/plugins/platforms/minimalegl/qminimaleglscreen.h @@ -56,9 +56,9 @@ public: QMinimalEglScreen(EGLNativeDisplayType display); ~QMinimalEglScreen(); - QRect geometry() const Q_DECL_OVERRIDE; - int depth() const Q_DECL_OVERRIDE; - QImage::Format format() const Q_DECL_OVERRIDE; + QRect geometry() const override; + int depth() const override; + QImage::Format format() const override; #ifndef QT_NO_OPENGL QPlatformOpenGLContext *platformContext() const; #endif diff --git a/src/plugins/platforms/minimalegl/qminimaleglwindow.h b/src/plugins/platforms/minimalegl/qminimaleglwindow.h index b8bfd6c8d2..098ec05e6b 100644 --- a/src/plugins/platforms/minimalegl/qminimaleglwindow.h +++ b/src/plugins/platforms/minimalegl/qminimaleglwindow.h @@ -51,8 +51,8 @@ class QMinimalEglWindow : public QPlatformWindow public: QMinimalEglWindow(QWindow *w); - void setGeometry(const QRect &) Q_DECL_OVERRIDE; - WId winId() const Q_DECL_OVERRIDE; + void setGeometry(const QRect &) override; + WId winId() const override; private: WId m_winid; diff --git a/src/plugins/platforms/offscreen/main.cpp b/src/plugins/platforms/offscreen/main.cpp index 9750c4f7ca..207db60f3a 100644 --- a/src/plugins/platforms/offscreen/main.cpp +++ b/src/plugins/platforms/offscreen/main.cpp @@ -48,7 +48,7 @@ class QOffscreenIntegrationPlugin : public QPlatformIntegrationPlugin Q_OBJECT Q_PLUGIN_METADATA(IID QPlatformIntegrationFactoryInterface_iid FILE "offscreen.json") public: - QPlatformIntegration *create(const QString&, const QStringList&) Q_DECL_OVERRIDE; + QPlatformIntegration *create(const QString&, const QStringList&) override; }; QPlatformIntegration *QOffscreenIntegrationPlugin::create(const QString& system, const QStringList& paramList) diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.cpp b/src/plugins/platforms/offscreen/qoffscreencommon.cpp index 85422071aa..f0eb69718a 100644 --- a/src/plugins/platforms/offscreen/qoffscreencommon.cpp +++ b/src/plugins/platforms/offscreen/qoffscreencommon.cpp @@ -55,8 +55,8 @@ class QOffscreenCursor : public QPlatformCursor public: QOffscreenCursor() : m_pos(10, 10) {} - QPoint pos() const Q_DECL_OVERRIDE { return m_pos; } - void setPos(const QPoint &pos) Q_DECL_OVERRIDE + QPoint pos() const override { return m_pos; } + void setPos(const QPoint &pos) override { m_pos = pos; const QWindowList wl = QGuiApplication::topLevelWindows(); @@ -82,7 +82,7 @@ public: QOffscreenScreen::windowContainingCursor = containing ? containing->handle() : 0; } #ifndef QT_NO_CURSOR - void changeCursor(QCursor *windowCursor, QWindow *window) Q_DECL_OVERRIDE + void changeCursor(QCursor *windowCursor, QWindow *window) override { Q_UNUSED(windowCursor); Q_UNUSED(window); diff --git a/src/plugins/platforms/offscreen/qoffscreencommon.h b/src/plugins/platforms/offscreen/qoffscreencommon.h index 1a9d65972d..541c07384c 100644 --- a/src/plugins/platforms/offscreen/qoffscreencommon.h +++ b/src/plugins/platforms/offscreen/qoffscreencommon.h @@ -57,12 +57,12 @@ class QOffscreenScreen : public QPlatformScreen public: QOffscreenScreen(); - QRect geometry() const Q_DECL_OVERRIDE { return m_geometry; } - int depth() const Q_DECL_OVERRIDE { return 32; } - QImage::Format format() const Q_DECL_OVERRIDE { return QImage::Format_RGB32; } - QPlatformCursor *cursor() const Q_DECL_OVERRIDE { return m_cursor.data(); } + QRect geometry() const override { return m_geometry; } + int depth() const override { return 32; } + QImage::Format format() const override { return QImage::Format_RGB32; } + QPlatformCursor *cursor() const override { return m_cursor.data(); } - QPixmap grabWindow(WId window, int x, int y, int width, int height) const Q_DECL_OVERRIDE; + QPixmap grabWindow(WId window, int x, int y, int width, int height) const override; static QPlatformWindow *windowContainingCursor; @@ -75,7 +75,7 @@ public: class QOffscreenDrag : public QPlatformDrag { public: - Qt::DropAction drag(QDrag *) Q_DECL_OVERRIDE { return Qt::IgnoreAction; } + Qt::DropAction drag(QDrag *) override { return Qt::IgnoreAction; } }; #endif @@ -85,10 +85,10 @@ public: QOffscreenBackingStore(QWindow *window); ~QOffscreenBackingStore(); - QPaintDevice *paintDevice() Q_DECL_OVERRIDE; - void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) Q_DECL_OVERRIDE; - void resize(const QSize &size, const QRegion &staticContents) Q_DECL_OVERRIDE; - bool scroll(const QRegion &area, int dx, int dy) Q_DECL_OVERRIDE; + QPaintDevice *paintDevice() override; + void flush(QWindow *window, const QRegion ®ion, const QPoint &offset) override; + void resize(const QSize &size, const QRegion &staticContents) override; + bool scroll(const QRegion &area, int dx, int dy) override; QPixmap grabWindow(WId window, const QRect &rect) const; diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration.h b/src/plugins/platforms/offscreen/qoffscreenintegration.h index 569ec8fc28..4c7df207eb 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration.h +++ b/src/plugins/platforms/offscreen/qoffscreenintegration.h @@ -54,20 +54,20 @@ public: QOffscreenIntegration(); ~QOffscreenIntegration(); - void initialize() Q_DECL_OVERRIDE; - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; + void initialize() override; + bool hasCapability(QPlatformIntegration::Capability cap) const override; - QPlatformWindow *createPlatformWindow(QWindow *window) const Q_DECL_OVERRIDE; - QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const Q_DECL_OVERRIDE; + QPlatformWindow *createPlatformWindow(QWindow *window) const override; + QPlatformBackingStore *createPlatformBackingStore(QWindow *window) const override; #ifndef QT_NO_DRAGANDDROP - QPlatformDrag *drag() const Q_DECL_OVERRIDE; + QPlatformDrag *drag() const override; #endif - QPlatformInputContext *inputContext() const Q_DECL_OVERRIDE; - QPlatformServices *services() const Q_DECL_OVERRIDE; + QPlatformInputContext *inputContext() const override; + QPlatformServices *services() const override; - QPlatformFontDatabase *fontDatabase() const Q_DECL_OVERRIDE; - QAbstractEventDispatcher *createEventDispatcher() const Q_DECL_OVERRIDE; + QPlatformFontDatabase *fontDatabase() const override; + QAbstractEventDispatcher *createEventDispatcher() const override; static QOffscreenIntegration *createOffscreenIntegration(); diff --git a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h index aaca74d2fb..5e1c6b799b 100644 --- a/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h +++ b/src/plugins/platforms/offscreen/qoffscreenintegration_x11.h @@ -55,9 +55,9 @@ class QOffscreenX11Info; class QOffscreenX11Integration : public QOffscreenIntegration { public: - bool hasCapability(QPlatformIntegration::Capability cap) const Q_DECL_OVERRIDE; + bool hasCapability(QPlatformIntegration::Capability cap) const override; - QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const Q_DECL_OVERRIDE; + QPlatformOpenGLContext *createPlatformOpenGLContext(QOpenGLContext *context) const override; private: mutable QScopedPointer m_connection; @@ -88,14 +88,14 @@ public: QOffscreenX11GLXContext(QOffscreenX11Info *x11, QOpenGLContext *context); ~QOffscreenX11GLXContext(); - bool makeCurrent(QPlatformSurface *surface) Q_DECL_OVERRIDE; - void doneCurrent() Q_DECL_OVERRIDE; - void swapBuffers(QPlatformSurface *surface) Q_DECL_OVERRIDE; - QFunctionPointer getProcAddress(const char *procName) Q_DECL_OVERRIDE; + bool makeCurrent(QPlatformSurface *surface) override; + void doneCurrent() override; + void swapBuffers(QPlatformSurface *surface) override; + QFunctionPointer getProcAddress(const char *procName) override; - QSurfaceFormat format() const Q_DECL_OVERRIDE; - bool isSharing() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; + QSurfaceFormat format() const override; + bool isSharing() const override; + bool isValid() const override; private: QScopedPointer d; diff --git a/src/plugins/platforms/offscreen/qoffscreenwindow.h b/src/plugins/platforms/offscreen/qoffscreenwindow.h index 0dced9680a..e1f37bb034 100644 --- a/src/plugins/platforms/offscreen/qoffscreenwindow.h +++ b/src/plugins/platforms/offscreen/qoffscreenwindow.h @@ -53,15 +53,15 @@ public: QOffscreenWindow(QWindow *window); ~QOffscreenWindow(); - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - void setWindowState(Qt::WindowStates states) Q_DECL_OVERRIDE; + void setGeometry(const QRect &rect) override; + void setWindowState(Qt::WindowStates states) override; - QMargins frameMargins() const Q_DECL_OVERRIDE; + QMargins frameMargins() const override; - void setVisible(bool visible) Q_DECL_OVERRIDE; - void requestActivateWindow() Q_DECL_OVERRIDE; + void setVisible(bool visible) override; + void requestActivateWindow() override; - WId winId() const Q_DECL_OVERRIDE; + WId winId() const override; static QOffscreenWindow *windowForWinId(WId id); diff --git a/src/plugins/platforms/winrt/qwinrtwindow.h b/src/plugins/platforms/winrt/qwinrtwindow.h index a8992450b9..9604b4bbaa 100644 --- a/src/plugins/platforms/winrt/qwinrtwindow.h +++ b/src/plugins/platforms/winrt/qwinrtwindow.h @@ -70,8 +70,8 @@ public: qreal devicePixelRatio() const override; void setWindowState(Qt::WindowStates state) override; - bool setMouseGrabEnabled(bool grab) Q_DECL_OVERRIDE; - bool setKeyboardGrabEnabled(bool grab) Q_DECL_OVERRIDE; + bool setMouseGrabEnabled(bool grab) override; + bool setKeyboardGrabEnabled(bool grab) override; EGLSurface eglSurface() const; void createEglSurface(EGLDisplay display, EGLConfig config); diff --git a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11_p.h b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11_p.h index 34b5d929d5..a0dd6cdf74 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11_p.h +++ b/src/plugins/platforms/xcb/nativepainting/qpaintengine_x11_p.h @@ -56,10 +56,10 @@ public: QX11PaintEngine(); ~QX11PaintEngine(); - bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; - bool end() Q_DECL_OVERRIDE; + bool begin(QPaintDevice *pdev) override; + bool end() override; - void updateState(const QPaintEngineState &state) Q_DECL_OVERRIDE; + void updateState(const QPaintEngineState &state) override; void updatePen(const QPen &pen); void updateBrush(const QBrush &brush, const QPointF &pt); @@ -68,31 +68,31 @@ public: void updateMatrix(const QTransform &matrix); void updateClipRegion_dev(const QRegion ®ion, Qt::ClipOperation op); - void drawLines(const QLine *lines, int lineCount) Q_DECL_OVERRIDE; - void drawLines(const QLineF *lines, int lineCount) Q_DECL_OVERRIDE; + void drawLines(const QLine *lines, int lineCount) override; + void drawLines(const QLineF *lines, int lineCount) override; - void drawRects(const QRect *rects, int rectCount) Q_DECL_OVERRIDE; - void drawRects(const QRectF *rects, int rectCount) Q_DECL_OVERRIDE; + void drawRects(const QRect *rects, int rectCount) override; + void drawRects(const QRectF *rects, int rectCount) override; - void drawPoints(const QPoint *points, int pointCount) Q_DECL_OVERRIDE; - void drawPoints(const QPointF *points, int pointCount) Q_DECL_OVERRIDE; + void drawPoints(const QPoint *points, int pointCount) override; + void drawPoints(const QPointF *points, int pointCount) override; - void drawEllipse(const QRect &r) Q_DECL_OVERRIDE; - void drawEllipse(const QRectF &r) Q_DECL_OVERRIDE; + void drawEllipse(const QRect &r) override; + void drawEllipse(const QRectF &r) override; - virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE; - inline void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) Q_DECL_OVERRIDE + virtual void drawPolygon(const QPointF *points, int pointCount, PolygonDrawMode mode) override; + inline void drawPolygon(const QPoint *points, int pointCount, PolygonDrawMode mode) override { QPaintEngine::drawPolygon(points, pointCount, mode); } - void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) Q_DECL_OVERRIDE; - void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) Q_DECL_OVERRIDE; - void drawPath(const QPainterPath &path) Q_DECL_OVERRIDE; - void drawTextItem(const QPointF &p, const QTextItem &textItem) Q_DECL_OVERRIDE; + void drawPixmap(const QRectF &r, const QPixmap &pm, const QRectF &sr) override; + void drawTiledPixmap(const QRectF &r, const QPixmap &pixmap, const QPointF &s) override; + void drawPath(const QPainterPath &path) override; + void drawTextItem(const QPointF &p, const QTextItem &textItem) override; void drawImage(const QRectF &r, const QImage &img, const QRectF &sr, - Qt::ImageConversionFlags flags = Qt::AutoColor) Q_DECL_OVERRIDE; + Qt::ImageConversionFlags flags = Qt::AutoColor) override; virtual Drawable handle() const; - inline Type type() const Q_DECL_OVERRIDE { return QPaintEngine::X11; } + inline Type type() const override { return QPaintEngine::X11; } QPainter::RenderHints supportedRenderHints() const; diff --git a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11_p.h b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11_p.h index 2cbd1fe3d0..098ccaf1d9 100644 --- a/src/plugins/platforms/xcb/nativepainting/qpixmap_x11_p.h +++ b/src/plugins/platforms/xcb/nativepainting/qpixmap_x11_p.h @@ -56,22 +56,22 @@ public: QX11PlatformPixmap(PixelType pixelType); ~QX11PlatformPixmap(); - QPlatformPixmap *createCompatiblePlatformPixmap() const Q_DECL_OVERRIDE; - void resize(int width, int height) Q_DECL_OVERRIDE; - void fromImage(const QImage &img, Qt::ImageConversionFlags flags) Q_DECL_OVERRIDE; - void copy(const QPlatformPixmap *data, const QRect &rect) Q_DECL_OVERRIDE; - bool scroll(int dx, int dy, const QRect &rect) Q_DECL_OVERRIDE; - int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - void fill(const QColor &fillColor) Q_DECL_OVERRIDE; - QBitmap mask() const Q_DECL_OVERRIDE; - void setMask(const QBitmap &mask) Q_DECL_OVERRIDE; - bool hasAlphaChannel() const Q_DECL_OVERRIDE; - QPixmap transformed(const QTransform &matrix, Qt::TransformationMode mode) const Q_DECL_OVERRIDE; - QImage toImage() const Q_DECL_OVERRIDE; - QImage toImage(const QRect &rect) const Q_DECL_OVERRIDE; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; - qreal devicePixelRatio() const Q_DECL_OVERRIDE; - void setDevicePixelRatio(qreal scaleFactor) Q_DECL_OVERRIDE; + QPlatformPixmap *createCompatiblePlatformPixmap() const override; + void resize(int width, int height) override; + void fromImage(const QImage &img, Qt::ImageConversionFlags flags) override; + void copy(const QPlatformPixmap *data, const QRect &rect) override; + bool scroll(int dx, int dy, const QRect &rect) override; + int metric(QPaintDevice::PaintDeviceMetric metric) const override; + void fill(const QColor &fillColor) override; + QBitmap mask() const override; + void setMask(const QBitmap &mask) override; + bool hasAlphaChannel() const override; + QPixmap transformed(const QTransform &matrix, Qt::TransformationMode mode) const override; + QImage toImage() const override; + QImage toImage(const QRect &rect) const override; + QPaintEngine *paintEngine() const override; + qreal devicePixelRatio() const override; + void setDevicePixelRatio(qreal scaleFactor) override; inline Drawable handle() const { return hd; } inline Picture x11PictureHandle() const { return picture; } diff --git a/src/plugins/platformthemes/gtk3/main.cpp b/src/plugins/platformthemes/gtk3/main.cpp index c4cd66c33b..fb1c425d8e 100644 --- a/src/plugins/platformthemes/gtk3/main.cpp +++ b/src/plugins/platformthemes/gtk3/main.cpp @@ -48,7 +48,7 @@ class QGtk3ThemePlugin : public QPlatformThemePlugin Q_PLUGIN_METADATA(IID QPlatformThemeFactoryInterface_iid FILE "gtk3.json") public: - QPlatformTheme *create(const QString &key, const QStringList ¶ms) Q_DECL_OVERRIDE; + QPlatformTheme *create(const QString &key, const QStringList ¶ms) override; }; QPlatformTheme *QGtk3ThemePlugin::create(const QString &key, const QStringList ¶ms) diff --git a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.h b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.h index ba43046e04..e78a7fc6d1 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.h +++ b/src/plugins/platformthemes/gtk3/qgtk3dialoghelpers.h @@ -63,12 +63,12 @@ public: QGtk3ColorDialogHelper(); ~QGtk3ColorDialogHelper(); - bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent) Q_DECL_OVERRIDE; - void exec() Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; + bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent) override; + void exec() override; + void hide() override; - void setCurrentColor(const QColor &color) Q_DECL_OVERRIDE; - QColor currentColor() const Q_DECL_OVERRIDE; + void setCurrentColor(const QColor &color) override; + QColor currentColor() const override; private Q_SLOTS: void onAccepted(); @@ -88,18 +88,18 @@ public: QGtk3FileDialogHelper(); ~QGtk3FileDialogHelper(); - bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent) Q_DECL_OVERRIDE; - void exec() Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; + bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent) override; + void exec() override; + void hide() override; - bool defaultNameFilterDisables() const Q_DECL_OVERRIDE; - void setDirectory(const QUrl &directory) Q_DECL_OVERRIDE; - QUrl directory() const Q_DECL_OVERRIDE; - void selectFile(const QUrl &filename) Q_DECL_OVERRIDE; - QList selectedFiles() const Q_DECL_OVERRIDE; - void setFilter() Q_DECL_OVERRIDE; - void selectNameFilter(const QString &filter) Q_DECL_OVERRIDE; - QString selectedNameFilter() const Q_DECL_OVERRIDE; + bool defaultNameFilterDisables() const override; + void setDirectory(const QUrl &directory) override; + QUrl directory() const override; + void selectFile(const QUrl &filename) override; + QList selectedFiles() const override; + void setFilter() override; + void selectNameFilter(const QString &filter) override; + QString selectedNameFilter() const override; private Q_SLOTS: void onAccepted(); @@ -128,12 +128,12 @@ public: QGtk3FontDialogHelper(); ~QGtk3FontDialogHelper(); - bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent) Q_DECL_OVERRIDE; - void exec() Q_DECL_OVERRIDE; - void hide() Q_DECL_OVERRIDE; + bool show(Qt::WindowFlags flags, Qt::WindowModality modality, QWindow *parent) override; + void exec() override; + void hide() override; - void setCurrentFont(const QFont &font) Q_DECL_OVERRIDE; - QFont currentFont() const Q_DECL_OVERRIDE; + void setCurrentFont(const QFont &font) override; + QFont currentFont() const override; private Q_SLOTS: void onAccepted(); diff --git a/src/plugins/platformthemes/gtk3/qgtk3theme.h b/src/plugins/platformthemes/gtk3/qgtk3theme.h index 52036680c6..8f03b84bb6 100644 --- a/src/plugins/platformthemes/gtk3/qgtk3theme.h +++ b/src/plugins/platformthemes/gtk3/qgtk3theme.h @@ -49,14 +49,14 @@ class QGtk3Theme : public QGnomeTheme public: QGtk3Theme(); - virtual QVariant themeHint(ThemeHint hint) const Q_DECL_OVERRIDE; - virtual QString gtkFontName() const Q_DECL_OVERRIDE; + virtual QVariant themeHint(ThemeHint hint) const override; + virtual QString gtkFontName() const override; - bool usePlatformNativeDialog(DialogType type) const Q_DECL_OVERRIDE; - QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const Q_DECL_OVERRIDE; + bool usePlatformNativeDialog(DialogType type) const override; + QPlatformDialogHelper *createPlatformDialogHelper(DialogType type) const override; - QPlatformMenu* createPlatformMenu() const Q_DECL_OVERRIDE; - QPlatformMenuItem* createPlatformMenuItem() const Q_DECL_OVERRIDE; + QPlatformMenu* createPlatformMenu() const override; + QPlatformMenuItem* createPlatformMenuItem() const override; static const char *name; }; diff --git a/src/plugins/printsupport/cups/main.cpp b/src/plugins/printsupport/cups/main.cpp index 39309a0031..cf263a7f52 100644 --- a/src/plugins/printsupport/cups/main.cpp +++ b/src/plugins/printsupport/cups/main.cpp @@ -52,7 +52,7 @@ class QCupsPrinterSupportPlugin : public QPlatformPrinterSupportPlugin public: QStringList keys() const; - QPlatformPrinterSupport *create(const QString &) Q_DECL_OVERRIDE; + QPlatformPrinterSupport *create(const QString &) override; }; QStringList QCupsPrinterSupportPlugin::keys() const diff --git a/src/plugins/printsupport/cups/qcupsprintengine_p.h b/src/plugins/printsupport/cups/qcupsprintengine_p.h index 0ebf6e7a0f..c99c48c7ea 100644 --- a/src/plugins/printsupport/cups/qcupsprintengine_p.h +++ b/src/plugins/printsupport/cups/qcupsprintengine_p.h @@ -72,8 +72,8 @@ public: virtual ~QCupsPrintEngine(); // reimplementations QPdfPrintEngine - void setProperty(PrintEnginePropertyKey key, const QVariant &value) Q_DECL_OVERRIDE; - QVariant property(PrintEnginePropertyKey key) const Q_DECL_OVERRIDE; + void setProperty(PrintEnginePropertyKey key, const QVariant &value) override; + QVariant property(PrintEnginePropertyKey key) const override; // end reimplementations QPdfPrintEngine private: @@ -87,8 +87,8 @@ public: QCupsPrintEnginePrivate(QPrinter::PrinterMode m); ~QCupsPrintEnginePrivate(); - bool openPrintDevice() Q_DECL_OVERRIDE; - void closePrintDevice() Q_DECL_OVERRIDE; + bool openPrintDevice() override; + void closePrintDevice() override; private: Q_DISABLE_COPY(QCupsPrintEnginePrivate) diff --git a/src/plugins/printsupport/cups/qcupsprintersupport_p.h b/src/plugins/printsupport/cups/qcupsprintersupport_p.h index df6507d324..42de28aec0 100644 --- a/src/plugins/printsupport/cups/qcupsprintersupport_p.h +++ b/src/plugins/printsupport/cups/qcupsprintersupport_p.h @@ -64,12 +64,12 @@ public: QCupsPrinterSupport(); ~QCupsPrinterSupport(); - QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) Q_DECL_OVERRIDE; - QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode) Q_DECL_OVERRIDE; + QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) override; + QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode) override; - QPrintDevice createPrintDevice(const QString &id) Q_DECL_OVERRIDE; - QStringList availablePrintDeviceIds() const Q_DECL_OVERRIDE; - QString defaultPrintDeviceId() const Q_DECL_OVERRIDE; + QPrintDevice createPrintDevice(const QString &id) override; + QStringList availablePrintDeviceIds() const override; + QString defaultPrintDeviceId() const override; private: QString cupsOption(int i, const QString &key) const; diff --git a/src/plugins/printsupport/cups/qppdprintdevice.h b/src/plugins/printsupport/cups/qppdprintdevice.h index fab7077ce4..3cd7518b14 100644 --- a/src/plugins/printsupport/cups/qppdprintdevice.h +++ b/src/plugins/printsupport/cups/qppdprintdevice.h @@ -69,35 +69,35 @@ public: explicit QPpdPrintDevice(const QString &id); virtual ~QPpdPrintDevice(); - bool isValid() const Q_DECL_OVERRIDE; - bool isDefault() const Q_DECL_OVERRIDE; + bool isValid() const override; + bool isDefault() const override; - QPrint::DeviceState state() const Q_DECL_OVERRIDE; + QPrint::DeviceState state() const override; - QPageSize defaultPageSize() const Q_DECL_OVERRIDE; + QPageSize defaultPageSize() const override; QMarginsF printableMargins(const QPageSize &pageSize, QPageLayout::Orientation orientation, - int resolution) const Q_DECL_OVERRIDE; + int resolution) const override; - int defaultResolution() const Q_DECL_OVERRIDE; + int defaultResolution() const override; - QPrint::InputSlot defaultInputSlot() const Q_DECL_OVERRIDE; + QPrint::InputSlot defaultInputSlot() const override; - QPrint::OutputBin defaultOutputBin() const Q_DECL_OVERRIDE; + QPrint::OutputBin defaultOutputBin() const override; - QPrint::DuplexMode defaultDuplexMode() const Q_DECL_OVERRIDE; + QPrint::DuplexMode defaultDuplexMode() const override; - QPrint::ColorMode defaultColorMode() const Q_DECL_OVERRIDE; + QPrint::ColorMode defaultColorMode() const override; protected: - void loadPageSizes() const Q_DECL_OVERRIDE; - void loadResolutions() const Q_DECL_OVERRIDE; - void loadInputSlots() const Q_DECL_OVERRIDE; - void loadOutputBins() const Q_DECL_OVERRIDE; - void loadDuplexModes() const Q_DECL_OVERRIDE; - void loadColorModes() const Q_DECL_OVERRIDE; + void loadPageSizes() const override; + void loadResolutions() const override; + void loadInputSlots() const override; + void loadOutputBins() const override; + void loadDuplexModes() const override; + void loadColorModes() const override; #ifndef QT_NO_MIMETYPE - void loadMimeTypes() const Q_DECL_OVERRIDE; + void loadMimeTypes() const override; #endif private: diff --git a/src/plugins/printsupport/windows/qwindowsprintdevice.h b/src/plugins/printsupport/windows/qwindowsprintdevice.h index d95a4316cc..6b51ee8785 100644 --- a/src/plugins/printsupport/windows/qwindowsprintdevice.h +++ b/src/plugins/printsupport/windows/qwindowsprintdevice.h @@ -64,34 +64,34 @@ public: explicit QWindowsPrintDevice(const QString &id); virtual ~QWindowsPrintDevice(); - bool isValid() const Q_DECL_OVERRIDE; - bool isDefault() const Q_DECL_OVERRIDE; + bool isValid() const override; + bool isDefault() const override; - QPrint::DeviceState state() const Q_DECL_OVERRIDE; + QPrint::DeviceState state() const override; - QPageSize defaultPageSize() const Q_DECL_OVERRIDE; + QPageSize defaultPageSize() const override; QMarginsF printableMargins(const QPageSize &pageSize, QPageLayout::Orientation orientation, - int resolution) const Q_DECL_OVERRIDE; + int resolution) const override; - int defaultResolution() const Q_DECL_OVERRIDE; + int defaultResolution() const override; - QPrint::InputSlot defaultInputSlot() const Q_DECL_OVERRIDE; + QPrint::InputSlot defaultInputSlot() const override; - QPrint::DuplexMode defaultDuplexMode() const Q_DECL_OVERRIDE; + QPrint::DuplexMode defaultDuplexMode() const override; - QPrint::ColorMode defaultColorMode() const Q_DECL_OVERRIDE; + QPrint::ColorMode defaultColorMode() const override; static QStringList availablePrintDeviceIds(); static QString defaultPrintDeviceId(); protected: - void loadPageSizes() const Q_DECL_OVERRIDE; - void loadResolutions() const Q_DECL_OVERRIDE; - void loadInputSlots() const Q_DECL_OVERRIDE; - void loadOutputBins() const Q_DECL_OVERRIDE; - void loadDuplexModes() const Q_DECL_OVERRIDE; - void loadColorModes() const Q_DECL_OVERRIDE; + void loadPageSizes() const override; + void loadResolutions() const override; + void loadInputSlots() const override; + void loadOutputBins() const override; + void loadDuplexModes() const override; + void loadColorModes() const override; private: HANDLE m_hPrinter; diff --git a/src/plugins/printsupport/windows/qwindowsprintersupport.h b/src/plugins/printsupport/windows/qwindowsprintersupport.h index 84b60a8207..c42e7aa551 100644 --- a/src/plugins/printsupport/windows/qwindowsprintersupport.h +++ b/src/plugins/printsupport/windows/qwindowsprintersupport.h @@ -50,12 +50,12 @@ public: QWindowsPrinterSupport(); ~QWindowsPrinterSupport(); - QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) Q_DECL_OVERRIDE; - QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode) Q_DECL_OVERRIDE; + QPrintEngine *createNativePrintEngine(QPrinter::PrinterMode printerMode, const QString &deviceId = QString()) override; + QPaintEngine *createPaintEngine(QPrintEngine *printEngine, QPrinter::PrinterMode) override; - QPrintDevice createPrintDevice(const QString &id) Q_DECL_OVERRIDE; - QStringList availablePrintDeviceIds() const Q_DECL_OVERRIDE; - QString defaultPrintDeviceId() const Q_DECL_OVERRIDE; + QPrintDevice createPrintDevice(const QString &id) override; + QStringList availablePrintDeviceIds() const override; + QString defaultPrintDeviceId() const override; }; QT_END_NAMESPACE diff --git a/src/plugins/sqldrivers/db2/qsql_db2.cpp b/src/plugins/sqldrivers/db2/qsql_db2.cpp index 1a9631f1eb..b457ced538 100644 --- a/src/plugins/sqldrivers/db2/qsql_db2.cpp +++ b/src/plugins/sqldrivers/db2/qsql_db2.cpp @@ -92,24 +92,24 @@ class QDB2Result: public QSqlResult public: QDB2Result(const QDB2Driver *drv); ~QDB2Result(); - bool prepare(const QString &query) Q_DECL_OVERRIDE; - bool exec() Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; + bool prepare(const QString &query) override; + bool exec() override; + QVariant handle() const override; protected: - QVariant data(int field) Q_DECL_OVERRIDE; - bool reset(const QString &query) Q_DECL_OVERRIDE; - bool fetch(int i) Q_DECL_OVERRIDE; - bool fetchNext() Q_DECL_OVERRIDE; - bool fetchFirst() Q_DECL_OVERRIDE; - bool fetchLast() Q_DECL_OVERRIDE; - bool isNull(int i) Q_DECL_OVERRIDE; - int size() Q_DECL_OVERRIDE; - int numRowsAffected() Q_DECL_OVERRIDE; - QSqlRecord record() const Q_DECL_OVERRIDE; - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; - void detachFromResultSet() Q_DECL_OVERRIDE; - bool nextResult() Q_DECL_OVERRIDE; + QVariant data(int field) override; + bool reset(const QString &query) override; + bool fetch(int i) override; + bool fetchNext() override; + bool fetchFirst() override; + bool fetchLast() override; + bool isNull(int i) override; + int size() override; + int numRowsAffected() override; + QSqlRecord record() const override; + void virtual_hook(int id, void *data) override; + void detachFromResultSet() override; + bool nextResult() override; }; class QDB2ResultPrivate: public QSqlResultPrivate diff --git a/src/plugins/sqldrivers/db2/qsql_db2_p.h b/src/plugins/sqldrivers/db2/qsql_db2_p.h index fa6d739479..79ae54ab2d 100644 --- a/src/plugins/sqldrivers/db2/qsql_db2_p.h +++ b/src/plugins/sqldrivers/db2/qsql_db2_p.h @@ -75,24 +75,24 @@ public: explicit QDB2Driver(QObject* parent = 0); QDB2Driver(Qt::HANDLE env, Qt::HANDLE con, QObject* parent = 0); ~QDB2Driver(); - bool hasFeature(DriverFeature) const Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - QSqlRecord record(const QString &tableName) const Q_DECL_OVERRIDE; - QStringList tables(QSql::TableType type) const Q_DECL_OVERRIDE; - QSqlResult *createResult() const Q_DECL_OVERRIDE; - QSqlIndex primaryIndex(const QString &tablename) const Q_DECL_OVERRIDE; - bool beginTransaction() Q_DECL_OVERRIDE; - bool commitTransaction() Q_DECL_OVERRIDE; - bool rollbackTransaction() Q_DECL_OVERRIDE; - QString formatValue(const QSqlField &field, bool trimStrings) const Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; + bool hasFeature(DriverFeature) const override; + void close() override; + QSqlRecord record(const QString &tableName) const override; + QStringList tables(QSql::TableType type) const override; + QSqlResult *createResult() const override; + QSqlIndex primaryIndex(const QString &tablename) const override; + bool beginTransaction() override; + bool commitTransaction() override; + bool rollbackTransaction() override; + QString formatValue(const QSqlField &field, bool trimStrings) const override; + QVariant handle() const override; bool open(const QString &db, const QString &user, const QString &password, const QString &host, int port, - const QString& connOpts) Q_DECL_OVERRIDE; - QString escapeIdentifier(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE; + const QString& connOpts) override; + QString escapeIdentifier(const QString &identifier, IdentifierType type) const override; private: bool setAutoCommit(bool autoCommit); diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp index c50fc7916a..218cd75c69 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase.cpp +++ b/src/plugins/sqldrivers/ibase/qsql_ibase.cpp @@ -356,16 +356,16 @@ class QIBaseResult : public QSqlCachedResult public: explicit QIBaseResult(const QIBaseDriver* db); - bool prepare(const QString &query) Q_DECL_OVERRIDE; - bool exec() Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; + bool prepare(const QString &query) override; + bool exec() override; + QVariant handle() const override; protected: - bool gotoNext(QSqlCachedResult::ValueCache& row, int rowIdx) Q_DECL_OVERRIDE; - bool reset (const QString &query) Q_DECL_OVERRIDE; - int size() Q_DECL_OVERRIDE; - int numRowsAffected() Q_DECL_OVERRIDE; - QSqlRecord record() const Q_DECL_OVERRIDE; + bool gotoNext(QSqlCachedResult::ValueCache& row, int rowIdx) override; + bool reset (const QString &query) override; + int size() override; + int numRowsAffected() override; + QSqlRecord record() const override; }; class QIBaseResultPrivate: public QSqlCachedResultPrivate diff --git a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h index c7cee41462..295f6c0cec 100644 --- a/src/plugins/sqldrivers/ibase/qsql_ibase_p.h +++ b/src/plugins/sqldrivers/ibase/qsql_ibase_p.h @@ -74,36 +74,36 @@ public: explicit QIBaseDriver(QObject *parent = 0); explicit QIBaseDriver(isc_db_handle connection, QObject *parent = 0); virtual ~QIBaseDriver(); - bool hasFeature(DriverFeature f) const Q_DECL_OVERRIDE; + bool hasFeature(DriverFeature f) const override; bool open(const QString &db, const QString &user, const QString &password, const QString &host, int port, - const QString &connOpts) Q_DECL_OVERRIDE; + const QString &connOpts) override; bool open(const QString &db, const QString &user, const QString &password, const QString &host, int port) { return open(db, user, password, host, port, QString()); } - void close() Q_DECL_OVERRIDE; - QSqlResult *createResult() const Q_DECL_OVERRIDE; - bool beginTransaction() Q_DECL_OVERRIDE; - bool commitTransaction() Q_DECL_OVERRIDE; - bool rollbackTransaction() Q_DECL_OVERRIDE; - QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE; + void close() override; + QSqlResult *createResult() const override; + bool beginTransaction() override; + bool commitTransaction() override; + bool rollbackTransaction() override; + QStringList tables(QSql::TableType) const override; - QSqlRecord record(const QString& tablename) const Q_DECL_OVERRIDE; - QSqlIndex primaryIndex(const QString &table) const Q_DECL_OVERRIDE; + QSqlRecord record(const QString& tablename) const override; + QSqlIndex primaryIndex(const QString &table) const override; - QString formatValue(const QSqlField &field, bool trimStrings) const Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; + QString formatValue(const QSqlField &field, bool trimStrings) const override; + QVariant handle() const override; - QString escapeIdentifier(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE; + QString escapeIdentifier(const QString &identifier, IdentifierType type) const override; - bool subscribeToNotification(const QString &name) Q_DECL_OVERRIDE; - bool unsubscribeFromNotification(const QString &name) Q_DECL_OVERRIDE; - QStringList subscribedToNotifications() const Q_DECL_OVERRIDE; + bool subscribeToNotification(const QString &name) override; + bool unsubscribeFromNotification(const QString &name) override; + QStringList subscribedToNotifications() const override; private Q_SLOTS: void qHandleEventNotification(void* updatedResultBuffer); diff --git a/src/plugins/sqldrivers/mysql/main.cpp b/src/plugins/sqldrivers/mysql/main.cpp index 00d9c5bb34..d8d70483ef 100644 --- a/src/plugins/sqldrivers/mysql/main.cpp +++ b/src/plugins/sqldrivers/mysql/main.cpp @@ -51,7 +51,7 @@ class QMYSQLDriverPlugin : public QSqlDriverPlugin public: QMYSQLDriverPlugin(); - QSqlDriver* create(const QString &) Q_DECL_OVERRIDE; + QSqlDriver* create(const QString &) override; }; QMYSQLDriverPlugin::QMYSQLDriverPlugin() diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp index 3dc0e73af5..3fa5f65ddc 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql.cpp +++ b/src/plugins/sqldrivers/mysql/qsql_mysql.cpp @@ -175,26 +175,26 @@ public: explicit QMYSQLResult(const QMYSQLDriver *db); ~QMYSQLResult(); - QVariant handle() const Q_DECL_OVERRIDE; + QVariant handle() const override; protected: void cleanup(); - bool fetch(int i) Q_DECL_OVERRIDE; - bool fetchNext() Q_DECL_OVERRIDE; - bool fetchLast() Q_DECL_OVERRIDE; - bool fetchFirst() Q_DECL_OVERRIDE; - QVariant data(int field) Q_DECL_OVERRIDE; - bool isNull(int field) Q_DECL_OVERRIDE; - bool reset (const QString& query) Q_DECL_OVERRIDE; - int size() Q_DECL_OVERRIDE; - int numRowsAffected() Q_DECL_OVERRIDE; - QVariant lastInsertId() const Q_DECL_OVERRIDE; - QSqlRecord record() const Q_DECL_OVERRIDE; - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; - bool nextResult() Q_DECL_OVERRIDE; + bool fetch(int i) override; + bool fetchNext() override; + bool fetchLast() override; + bool fetchFirst() override; + QVariant data(int field) override; + bool isNull(int field) override; + bool reset (const QString& query) override; + int size() override; + int numRowsAffected() override; + QVariant lastInsertId() const override; + QSqlRecord record() const override; + void virtual_hook(int id, void *data) override; + bool nextResult() override; #if MYSQL_VERSION_ID >= 40108 - bool prepare(const QString &stmt) Q_DECL_OVERRIDE; - bool exec() Q_DECL_OVERRIDE; + bool prepare(const QString &stmt) override; + bool exec() override; #endif }; diff --git a/src/plugins/sqldrivers/mysql/qsql_mysql_p.h b/src/plugins/sqldrivers/mysql/qsql_mysql_p.h index 7641f9aa34..48b04fb1f5 100644 --- a/src/plugins/sqldrivers/mysql/qsql_mysql_p.h +++ b/src/plugins/sqldrivers/mysql/qsql_mysql_p.h @@ -78,29 +78,29 @@ public: explicit QMYSQLDriver(QObject *parent=0); explicit QMYSQLDriver(MYSQL *con, QObject * parent=0); ~QMYSQLDriver(); - bool hasFeature(DriverFeature f) const Q_DECL_OVERRIDE; + bool hasFeature(DriverFeature f) const override; bool open(const QString & db, const QString & user, const QString & password, const QString & host, int port, - const QString& connOpts) Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - QSqlResult *createResult() const Q_DECL_OVERRIDE; - QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE; - QSqlIndex primaryIndex(const QString& tablename) const Q_DECL_OVERRIDE; - QSqlRecord record(const QString& tablename) const Q_DECL_OVERRIDE; + const QString& connOpts) override; + void close() override; + QSqlResult *createResult() const override; + QStringList tables(QSql::TableType) const override; + QSqlIndex primaryIndex(const QString& tablename) const override; + QSqlRecord record(const QString& tablename) const override; QString formatValue(const QSqlField &field, - bool trimStrings) const Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; - QString escapeIdentifier(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE; + bool trimStrings) const override; + QVariant handle() const override; + QString escapeIdentifier(const QString &identifier, IdentifierType type) const override; - bool isIdentifierEscaped(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE; + bool isIdentifierEscaped(const QString &identifier, IdentifierType type) const override; protected: - bool beginTransaction() Q_DECL_OVERRIDE; - bool commitTransaction() Q_DECL_OVERRIDE; - bool rollbackTransaction() Q_DECL_OVERRIDE; + bool beginTransaction() override; + bool commitTransaction() override; + bool rollbackTransaction() override; private: void init(); }; diff --git a/src/plugins/sqldrivers/oci/qsql_oci.cpp b/src/plugins/sqldrivers/oci/qsql_oci.cpp index 32d3681a17..b6c74b355d 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci.cpp +++ b/src/plugins/sqldrivers/oci/qsql_oci.cpp @@ -193,19 +193,19 @@ class QOCIResult: public QSqlCachedResult public: QOCIResult(const QOCIDriver *db); ~QOCIResult(); - bool prepare(const QString &query) Q_DECL_OVERRIDE; - bool exec() Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; + bool prepare(const QString &query) override; + bool exec() override; + QVariant handle() const override; protected: - bool gotoNext(ValueCache &values, int index) Q_DECL_OVERRIDE; - bool reset(const QString &query) Q_DECL_OVERRIDE; - int size() Q_DECL_OVERRIDE; - int numRowsAffected() Q_DECL_OVERRIDE; - QSqlRecord record() const Q_DECL_OVERRIDE; - QVariant lastInsertId() const Q_DECL_OVERRIDE; - bool execBatch(bool arrayBind = false) Q_DECL_OVERRIDE; - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + bool gotoNext(ValueCache &values, int index) override; + bool reset(const QString &query) override; + int size() override; + int numRowsAffected() override; + QSqlRecord record() const override; + QVariant lastInsertId() const override; + bool execBatch(bool arrayBind = false) override; + void virtual_hook(int id, void *data) override; }; class QOCIResultPrivate: public QSqlCachedResultPrivate diff --git a/src/plugins/sqldrivers/oci/qsql_oci_p.h b/src/plugins/sqldrivers/oci/qsql_oci_p.h index 69911f4bee..295c131f1a 100644 --- a/src/plugins/sqldrivers/oci/qsql_oci_p.h +++ b/src/plugins/sqldrivers/oci/qsql_oci_p.h @@ -84,21 +84,21 @@ public: const QString &password, const QString &host, int port, - const QString &connOpts) Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - QSqlResult *createResult() const Q_DECL_OVERRIDE; - QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE; - QSqlRecord record(const QString &tablename) const Q_DECL_OVERRIDE; - QSqlIndex primaryIndex(const QString& tablename) const Q_DECL_OVERRIDE; + const QString &connOpts) override; + void close() override; + QSqlResult *createResult() const override; + QStringList tables(QSql::TableType) const override; + QSqlRecord record(const QString &tablename) const override; + QSqlIndex primaryIndex(const QString& tablename) const override; QString formatValue(const QSqlField &field, - bool trimStrings) const Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; - QString escapeIdentifier(const QString &identifier, IdentifierType) const Q_DECL_OVERRIDE; + bool trimStrings) const override; + QVariant handle() const override; + QString escapeIdentifier(const QString &identifier, IdentifierType) const override; protected: - bool beginTransaction() Q_DECL_OVERRIDE; - bool commitTransaction() Q_DECL_OVERRIDE; - bool rollbackTransaction() Q_DECL_OVERRIDE; + bool beginTransaction() override; + bool commitTransaction() override; + bool rollbackTransaction() override; }; QT_END_NAMESPACE diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp index c32a29c5e7..4a4183c7a3 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc.cpp +++ b/src/plugins/sqldrivers/odbc/qsql_odbc.cpp @@ -163,27 +163,27 @@ public: QODBCResult(const QODBCDriver *db); virtual ~QODBCResult(); - bool prepare(const QString &query) Q_DECL_OVERRIDE; - bool exec() Q_DECL_OVERRIDE; + bool prepare(const QString &query) override; + bool exec() override; - QVariant lastInsertId() const Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; + QVariant lastInsertId() const override; + QVariant handle() const override; protected: - bool fetchNext() Q_DECL_OVERRIDE; - bool fetchFirst() Q_DECL_OVERRIDE; - bool fetchLast() Q_DECL_OVERRIDE; - bool fetchPrevious() Q_DECL_OVERRIDE; - bool fetch(int i) Q_DECL_OVERRIDE; - bool reset(const QString &query) Q_DECL_OVERRIDE; - QVariant data(int field) Q_DECL_OVERRIDE; - bool isNull(int field) Q_DECL_OVERRIDE; - int size() Q_DECL_OVERRIDE; - int numRowsAffected() Q_DECL_OVERRIDE; - QSqlRecord record() const Q_DECL_OVERRIDE; - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; - void detachFromResultSet() Q_DECL_OVERRIDE; - bool nextResult() Q_DECL_OVERRIDE; + bool fetchNext() override; + bool fetchFirst() override; + bool fetchLast() override; + bool fetchPrevious() override; + bool fetch(int i) override; + bool reset(const QString &query) override; + QVariant data(int field) override; + bool isNull(int field) override; + int size() override; + int numRowsAffected() override; + QSqlRecord record() const override; + void virtual_hook(int id, void *data) override; + void detachFromResultSet() override; + bool nextResult() override; }; class QODBCResultPrivate: public QSqlResultPrivate diff --git a/src/plugins/sqldrivers/odbc/qsql_odbc_p.h b/src/plugins/sqldrivers/odbc/qsql_odbc_p.h index f4ce8bc243..ea0aa6fc8b 100644 --- a/src/plugins/sqldrivers/odbc/qsql_odbc_p.h +++ b/src/plugins/sqldrivers/odbc/qsql_odbc_p.h @@ -92,30 +92,30 @@ public: explicit QODBCDriver(QObject *parent=0); QODBCDriver(SQLHANDLE env, SQLHANDLE con, QObject * parent=0); virtual ~QODBCDriver(); - bool hasFeature(DriverFeature f) const Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - QSqlResult *createResult() const Q_DECL_OVERRIDE; - QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE; - QSqlRecord record(const QString &tablename) const Q_DECL_OVERRIDE; - QSqlIndex primaryIndex(const QString &tablename) const Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; + bool hasFeature(DriverFeature f) const override; + void close() override; + QSqlResult *createResult() const override; + QStringList tables(QSql::TableType) const override; + QSqlRecord record(const QString &tablename) const override; + QSqlIndex primaryIndex(const QString &tablename) const override; + QVariant handle() const override; QString formatValue(const QSqlField &field, - bool trimStrings) const Q_DECL_OVERRIDE; + bool trimStrings) const override; bool open(const QString &db, const QString &user, const QString &password, const QString &host, int port, - const QString &connOpts) Q_DECL_OVERRIDE; + const QString &connOpts) override; - QString escapeIdentifier(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE; + QString escapeIdentifier(const QString &identifier, IdentifierType type) const override; - bool isIdentifierEscaped(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE; + bool isIdentifierEscaped(const QString &identifier, IdentifierType type) const override; protected: - bool beginTransaction() Q_DECL_OVERRIDE; - bool commitTransaction() Q_DECL_OVERRIDE; - bool rollbackTransaction() Q_DECL_OVERRIDE; + bool beginTransaction() override; + bool commitTransaction() override; + bool rollbackTransaction() override; private: bool endTrans(); diff --git a/src/plugins/sqldrivers/psql/main.cpp b/src/plugins/sqldrivers/psql/main.cpp index 7657fcbfdf..c5d546f6ff 100644 --- a/src/plugins/sqldrivers/psql/main.cpp +++ b/src/plugins/sqldrivers/psql/main.cpp @@ -51,7 +51,7 @@ class QPSQLDriverPlugin : public QSqlDriverPlugin public: QPSQLDriverPlugin(); - QSqlDriver* create(const QString &) Q_DECL_OVERRIDE; + QSqlDriver* create(const QString &) override; }; QPSQLDriverPlugin::QPSQLDriverPlugin() diff --git a/src/plugins/sqldrivers/psql/qsql_psql.cpp b/src/plugins/sqldrivers/psql/qsql_psql.cpp index a3aa0f6593..7699bede27 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql.cpp +++ b/src/plugins/sqldrivers/psql/qsql_psql.cpp @@ -135,23 +135,23 @@ public: QPSQLResult(const QPSQLDriver *db); ~QPSQLResult(); - QVariant handle() const Q_DECL_OVERRIDE; - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + QVariant handle() const override; + void virtual_hook(int id, void *data) override; protected: void cleanup(); - bool fetch(int i) Q_DECL_OVERRIDE; - bool fetchFirst() Q_DECL_OVERRIDE; - bool fetchLast() Q_DECL_OVERRIDE; - QVariant data(int i) Q_DECL_OVERRIDE; - bool isNull(int field) Q_DECL_OVERRIDE; - bool reset (const QString &query) Q_DECL_OVERRIDE; - int size() Q_DECL_OVERRIDE; - int numRowsAffected() Q_DECL_OVERRIDE; - QSqlRecord record() const Q_DECL_OVERRIDE; - QVariant lastInsertId() const Q_DECL_OVERRIDE; - bool prepare(const QString &query) Q_DECL_OVERRIDE; - bool exec() Q_DECL_OVERRIDE; + bool fetch(int i) override; + bool fetchFirst() override; + bool fetchLast() override; + QVariant data(int i) override; + bool isNull(int field) override; + bool reset (const QString &query) override; + int size() override; + int numRowsAffected() override; + QSqlRecord record() const override; + QVariant lastInsertId() const override; + bool prepare(const QString &query) override; + bool exec() override; }; class QPSQLDriverPrivate : public QSqlDriverPrivate @@ -236,7 +236,7 @@ public: preparedQueriesEnabled(false) { } - QString fieldSerial(int i) const Q_DECL_OVERRIDE { return QLatin1Char('$') + QString::number(i + 1); } + QString fieldSerial(int i) const override { return QLatin1Char('$') + QString::number(i + 1); } void deallocatePreparedStmt(); PGresult *result; diff --git a/src/plugins/sqldrivers/psql/qsql_psql_p.h b/src/plugins/sqldrivers/psql/qsql_psql_p.h index 8468b9af93..3ff38f3c48 100644 --- a/src/plugins/sqldrivers/psql/qsql_psql_p.h +++ b/src/plugins/sqldrivers/psql/qsql_psql_p.h @@ -90,34 +90,34 @@ public: explicit QPSQLDriver(QObject *parent=0); explicit QPSQLDriver(PGconn *conn, QObject *parent=0); ~QPSQLDriver(); - bool hasFeature(DriverFeature f) const Q_DECL_OVERRIDE; + bool hasFeature(DriverFeature f) const override; bool open(const QString & db, const QString & user, const QString & password, const QString & host, int port, - const QString& connOpts) Q_DECL_OVERRIDE; - bool isOpen() const Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - QSqlResult *createResult() const Q_DECL_OVERRIDE; - QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE; - QSqlIndex primaryIndex(const QString& tablename) const Q_DECL_OVERRIDE; - QSqlRecord record(const QString& tablename) const Q_DECL_OVERRIDE; + const QString& connOpts) override; + bool isOpen() const override; + void close() override; + QSqlResult *createResult() const override; + QStringList tables(QSql::TableType) const override; + QSqlIndex primaryIndex(const QString& tablename) const override; + QSqlRecord record(const QString& tablename) const override; Protocol protocol() const; - QVariant handle() const Q_DECL_OVERRIDE; + QVariant handle() const override; - QString escapeIdentifier(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE; - QString formatValue(const QSqlField &field, bool trimStrings) const Q_DECL_OVERRIDE; + QString escapeIdentifier(const QString &identifier, IdentifierType type) const override; + QString formatValue(const QSqlField &field, bool trimStrings) const override; - bool subscribeToNotification(const QString &name) Q_DECL_OVERRIDE; - bool unsubscribeFromNotification(const QString &name) Q_DECL_OVERRIDE; - QStringList subscribedToNotifications() const Q_DECL_OVERRIDE; + bool subscribeToNotification(const QString &name) override; + bool unsubscribeFromNotification(const QString &name) override; + QStringList subscribedToNotifications() const override; protected: - bool beginTransaction() Q_DECL_OVERRIDE; - bool commitTransaction() Q_DECL_OVERRIDE; - bool rollbackTransaction() Q_DECL_OVERRIDE; + bool beginTransaction() override; + bool commitTransaction() override; + bool rollbackTransaction() override; private Q_SLOTS: void _q_handleNotification(int); diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp index e9f5ee9508..e1ddd4b25e 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite.cpp @@ -123,19 +123,19 @@ class QSQLiteResult : public QSqlCachedResult public: explicit QSQLiteResult(const QSQLiteDriver* db); ~QSQLiteResult(); - QVariant handle() const Q_DECL_OVERRIDE; + QVariant handle() const override; protected: - bool gotoNext(QSqlCachedResult::ValueCache& row, int idx) Q_DECL_OVERRIDE; - bool reset(const QString &query) Q_DECL_OVERRIDE; - bool prepare(const QString &query) Q_DECL_OVERRIDE; - bool exec() Q_DECL_OVERRIDE; - int size() Q_DECL_OVERRIDE; - int numRowsAffected() Q_DECL_OVERRIDE; - QVariant lastInsertId() const Q_DECL_OVERRIDE; - QSqlRecord record() const Q_DECL_OVERRIDE; - void detachFromResultSet() Q_DECL_OVERRIDE; - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + bool gotoNext(QSqlCachedResult::ValueCache& row, int idx) override; + bool reset(const QString &query) override; + bool prepare(const QString &query) override; + bool exec() override; + int size() override; + int numRowsAffected() override; + QVariant lastInsertId() const override; + QSqlRecord record() const override; + void detachFromResultSet() override; + void virtual_hook(int id, void *data) override; }; class QSQLiteDriverPrivate : public QSqlDriverPrivate diff --git a/src/plugins/sqldrivers/sqlite/qsql_sqlite_p.h b/src/plugins/sqldrivers/sqlite/qsql_sqlite_p.h index ca969a4b53..61be4c937f 100644 --- a/src/plugins/sqldrivers/sqlite/qsql_sqlite_p.h +++ b/src/plugins/sqldrivers/sqlite/qsql_sqlite_p.h @@ -75,28 +75,28 @@ public: explicit QSQLiteDriver(QObject *parent = 0); explicit QSQLiteDriver(sqlite3 *connection, QObject *parent = 0); ~QSQLiteDriver(); - bool hasFeature(DriverFeature f) const Q_DECL_OVERRIDE; + bool hasFeature(DriverFeature f) const override; bool open(const QString & db, const QString & user, const QString & password, const QString & host, int port, - const QString & connOpts) Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - QSqlResult *createResult() const Q_DECL_OVERRIDE; - bool beginTransaction() Q_DECL_OVERRIDE; - bool commitTransaction() Q_DECL_OVERRIDE; - bool rollbackTransaction() Q_DECL_OVERRIDE; - QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE; + const QString & connOpts) override; + void close() override; + QSqlResult *createResult() const override; + bool beginTransaction() override; + bool commitTransaction() override; + bool rollbackTransaction() override; + QStringList tables(QSql::TableType) const override; - QSqlRecord record(const QString& tablename) const Q_DECL_OVERRIDE; - QSqlIndex primaryIndex(const QString &table) const Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; - QString escapeIdentifier(const QString &identifier, IdentifierType) const Q_DECL_OVERRIDE; + QSqlRecord record(const QString& tablename) const override; + QSqlIndex primaryIndex(const QString &table) const override; + QVariant handle() const override; + QString escapeIdentifier(const QString &identifier, IdentifierType) const override; - bool subscribeToNotification(const QString &name) Q_DECL_OVERRIDE; - bool unsubscribeFromNotification(const QString &name) Q_DECL_OVERRIDE; - QStringList subscribedToNotifications() const Q_DECL_OVERRIDE; + bool subscribeToNotification(const QString &name) override; + bool unsubscribeFromNotification(const QString &name) override; + QStringList subscribedToNotifications() const override; private Q_SLOTS: void handleNotification(const QString &tableName, qint64 rowid); }; diff --git a/src/plugins/sqldrivers/sqlite/smain.cpp b/src/plugins/sqldrivers/sqlite/smain.cpp index 2ad466a61e..092813990c 100644 --- a/src/plugins/sqldrivers/sqlite/smain.cpp +++ b/src/plugins/sqldrivers/sqlite/smain.cpp @@ -51,7 +51,7 @@ class QSQLiteDriverPlugin : public QSqlDriverPlugin public: QSQLiteDriverPlugin(); - QSqlDriver* create(const QString &) Q_DECL_OVERRIDE; + QSqlDriver* create(const QString &) override; }; QSQLiteDriverPlugin::QSQLiteDriverPlugin() diff --git a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp index 93f47e3f13..9745c5ebc6 100644 --- a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp +++ b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2.cpp @@ -107,16 +107,16 @@ class QSQLite2Result : public QSqlCachedResult public: explicit QSQLite2Result(const QSQLite2Driver* db); ~QSQLite2Result(); - QVariant handle() const Q_DECL_OVERRIDE; + QVariant handle() const override; protected: - bool gotoNext(QSqlCachedResult::ValueCache &row, int idx) Q_DECL_OVERRIDE; - bool reset(const QString &query) Q_DECL_OVERRIDE; - int size() Q_DECL_OVERRIDE; - int numRowsAffected() Q_DECL_OVERRIDE; - QSqlRecord record() const Q_DECL_OVERRIDE; - void detachFromResultSet() Q_DECL_OVERRIDE; - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; + bool gotoNext(QSqlCachedResult::ValueCache &row, int idx) override; + bool reset(const QString &query) override; + int size() override; + int numRowsAffected() override; + QSqlRecord record() const override; + void detachFromResultSet() override; + void virtual_hook(int id, void *data) override; }; class QSQLite2ResultPrivate: public QSqlCachedResultPrivate diff --git a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2_p.h b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2_p.h index 83b248ec6a..48c64536f1 100644 --- a/src/plugins/sqldrivers/sqlite2/qsql_sqlite2_p.h +++ b/src/plugins/sqldrivers/sqlite2/qsql_sqlite2_p.h @@ -79,29 +79,29 @@ public: explicit QSQLite2Driver(QObject *parent = 0); explicit QSQLite2Driver(sqlite *connection, QObject *parent = 0); ~QSQLite2Driver(); - bool hasFeature(DriverFeature f) const Q_DECL_OVERRIDE; + bool hasFeature(DriverFeature f) const override; bool open(const QString &db, const QString &user, const QString &password, const QString &host, int port, - const QString &connOpts) Q_DECL_OVERRIDE; + const QString &connOpts) override; bool open(const QString &db, const QString &user, const QString &password, const QString &host, int port) { return open(db, user, password, host, port, QString()); } - void close() Q_DECL_OVERRIDE; - QSqlResult *createResult() const Q_DECL_OVERRIDE; - bool beginTransaction() Q_DECL_OVERRIDE; - bool commitTransaction() Q_DECL_OVERRIDE; - bool rollbackTransaction() Q_DECL_OVERRIDE; - QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE; + void close() override; + QSqlResult *createResult() const override; + bool beginTransaction() override; + bool commitTransaction() override; + bool rollbackTransaction() override; + QStringList tables(QSql::TableType) const override; - QSqlRecord record(const QString &tablename) const Q_DECL_OVERRIDE; - QSqlIndex primaryIndex(const QString &table) const Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; - QString escapeIdentifier(const QString &identifier, IdentifierType) const Q_DECL_OVERRIDE; + QSqlRecord record(const QString &tablename) const override; + QSqlIndex primaryIndex(const QString &table) const override; + QVariant handle() const override; + QString escapeIdentifier(const QString &identifier, IdentifierType) const override; }; QT_END_NAMESPACE diff --git a/src/plugins/sqldrivers/tds/qsql_tds.cpp b/src/plugins/sqldrivers/tds/qsql_tds.cpp index 670198af81..5fc34da407 100644 --- a/src/plugins/sqldrivers/tds/qsql_tds.cpp +++ b/src/plugins/sqldrivers/tds/qsql_tds.cpp @@ -163,15 +163,15 @@ class QTDSResult : public QSqlCachedResult public: explicit QTDSResult(const QTDSDriver* db); ~QTDSResult(); - QVariant handle() const Q_DECL_OVERRIDE; + QVariant handle() const override; protected: void cleanup(); - bool reset(const QString &query) Q_DECL_OVERRIDE; - int size() Q_DECL_OVERRIDE; - int numRowsAffected() Q_DECL_OVERRIDE; - bool gotoNext(QSqlCachedResult::ValueCache &values, int index) Q_DECL_OVERRIDE; - QSqlRecord record() const Q_DECL_OVERRIDE; + bool reset(const QString &query) override; + int size() override; + int numRowsAffected() override; + bool gotoNext(QSqlCachedResult::ValueCache &values, int index) override; + QSqlRecord record() const override; }; class QTDSResultPrivate: public QSqlCachedResultPrivate diff --git a/src/plugins/sqldrivers/tds/qsql_tds_p.h b/src/plugins/sqldrivers/tds/qsql_tds_p.h index d0914455a2..948e3c7024 100644 --- a/src/plugins/sqldrivers/tds/qsql_tds_p.h +++ b/src/plugins/sqldrivers/tds/qsql_tds_p.h @@ -88,29 +88,29 @@ public: explicit QTDSDriver(QObject* parent = 0); QTDSDriver(LOGINREC* rec, const QString& host, const QString &db, QObject* parent = 0); ~QTDSDriver(); - bool hasFeature(DriverFeature f) const Q_DECL_OVERRIDE; + bool hasFeature(DriverFeature f) const override; bool open(const QString &db, const QString &user, const QString &password, const QString &host, int port, - const QString &connOpts) Q_DECL_OVERRIDE; - void close() Q_DECL_OVERRIDE; - QStringList tables(QSql::TableType) const Q_DECL_OVERRIDE; - QSqlResult *createResult() const Q_DECL_OVERRIDE; - QSqlRecord record(const QString &tablename) const Q_DECL_OVERRIDE; - QSqlIndex primaryIndex(const QString &tablename) const Q_DECL_OVERRIDE; + const QString &connOpts) override; + void close() override; + QStringList tables(QSql::TableType) const override; + QSqlResult *createResult() const override; + QSqlRecord record(const QString &tablename) const override; + QSqlIndex primaryIndex(const QString &tablename) const override; QString formatValue(const QSqlField &field, - bool trimStrings) const Q_DECL_OVERRIDE; - QVariant handle() const Q_DECL_OVERRIDE; + bool trimStrings) const override; + QVariant handle() const override; - QString escapeIdentifier(const QString &identifier, IdentifierType type) const Q_DECL_OVERRIDE; + QString escapeIdentifier(const QString &identifier, IdentifierType type) const override; protected: - bool beginTransaction() Q_DECL_OVERRIDE; - bool commitTransaction() Q_DECL_OVERRIDE; - bool rollbackTransaction() Q_DECL_OVERRIDE; + bool beginTransaction() override; + bool commitTransaction() override; + bool rollbackTransaction() override; private: void init(); }; diff --git a/src/printsupport/dialogs/qpagesetupdialog.h b/src/printsupport/dialogs/qpagesetupdialog.h index 3bd752a413..61edcc3370 100644 --- a/src/printsupport/dialogs/qpagesetupdialog.h +++ b/src/printsupport/dialogs/qpagesetupdialog.h @@ -62,14 +62,14 @@ public: ~QPageSetupDialog(); #if defined(Q_OS_MAC) || defined(Q_OS_WIN) - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; #endif - int exec() Q_DECL_OVERRIDE; + int exec() override; using QDialog::open; void open(QObject *receiver, const char *member); - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; QPrinter *printer(); }; diff --git a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp index b4ad718646..84f8258902 100644 --- a/src/printsupport/dialogs/qpagesetupdialog_unix.cpp +++ b/src/printsupport/dialogs/qpagesetupdialog_unix.cpp @@ -117,7 +117,7 @@ public: } protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE + void paintEvent(QPaintEvent *) override { QSize pageSize = m_pageLayout.fullRectPoints().size(); QSizeF scaledSize = pageSize.scaled(width() - 10, height() - 10, Qt::KeepAspectRatio); diff --git a/src/printsupport/dialogs/qprintdialog.h b/src/printsupport/dialogs/qprintdialog.h index 5b81440a3c..20ef1c7fed 100644 --- a/src/printsupport/dialogs/qprintdialog.h +++ b/src/printsupport/dialogs/qprintdialog.h @@ -63,11 +63,11 @@ public: explicit QPrintDialog(QWidget *parent = Q_NULLPTR); ~QPrintDialog(); - int exec() Q_DECL_OVERRIDE; + int exec() override; #if defined (Q_OS_UNIX) && !defined(Q_OS_MAC) - virtual void accept() Q_DECL_OVERRIDE; + virtual void accept() override; #endif - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; void setOption(PrintDialogOption option, bool on = true); bool testOption(PrintDialogOption option) const; @@ -75,7 +75,7 @@ public: PrintDialogOptions options() const; #if defined(Q_OS_UNIX) || defined(Q_OS_WIN) - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; #endif using QDialog::open; diff --git a/src/printsupport/dialogs/qprintdialog_unix.cpp b/src/printsupport/dialogs/qprintdialog_unix.cpp index 51c8a593a1..91a6d47578 100644 --- a/src/printsupport/dialogs/qprintdialog_unix.cpp +++ b/src/printsupport/dialogs/qprintdialog_unix.cpp @@ -215,7 +215,7 @@ public: void setupPrinter(); void updateWidgets(); - virtual void setTabs(const QList &tabs) Q_DECL_OVERRIDE; + virtual void setTabs(const QList &tabs) override; Ui::QPrintSettingsOutput options; QUnixPrintWidget *top; diff --git a/src/printsupport/dialogs/qprintpreviewdialog.cpp b/src/printsupport/dialogs/qprintpreviewdialog.cpp index dbcbaf3ce5..171c4f5a23 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.cpp +++ b/src/printsupport/dialogs/qprintpreviewdialog.cpp @@ -79,7 +79,7 @@ class QPrintPreviewMainWindow : public QMainWindow { public: QPrintPreviewMainWindow(QWidget *parent) : QMainWindow(parent) {} - QMenu *createPopupMenu() Q_DECL_OVERRIDE { return 0; } + QMenu *createPopupMenu() override { return 0; } }; class ZoomFactorValidator : public QDoubleValidator @@ -90,7 +90,7 @@ public: ZoomFactorValidator(qreal bottom, qreal top, int decimals, QObject *parent) : QDoubleValidator(bottom, top, decimals, parent) {} - State validate(QString &input, int &pos) const Q_DECL_OVERRIDE + State validate(QString &input, int &pos) const override { bool replacePercent = false; if (input.endsWith(QLatin1Char('%'))) { @@ -123,13 +123,13 @@ public: } protected: - void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE + void focusInEvent(QFocusEvent *e) override { origText = text(); QLineEdit::focusInEvent(e); } - void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE + void focusOutEvent(QFocusEvent *e) override { if (isModified() && !hasAcceptableInput()) setText(origText); diff --git a/src/printsupport/dialogs/qprintpreviewdialog.h b/src/printsupport/dialogs/qprintpreviewdialog.h index 3b8f8a1171..6f9de92050 100644 --- a/src/printsupport/dialogs/qprintpreviewdialog.h +++ b/src/printsupport/dialogs/qprintpreviewdialog.h @@ -68,8 +68,8 @@ public: QPrinter *printer(); - void setVisible(bool visible) Q_DECL_OVERRIDE; - void done(int result) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; + void done(int result) override; Q_SIGNALS: void paintRequested(QPrinter *printer); diff --git a/src/printsupport/kernel/qprintengine_pdf_p.h b/src/printsupport/kernel/qprintengine_pdf_p.h index e9e81bdf68..bb01a2e9e1 100644 --- a/src/printsupport/kernel/qprintengine_pdf_p.h +++ b/src/printsupport/kernel/qprintengine_pdf_p.h @@ -87,18 +87,18 @@ public: virtual ~QPdfPrintEngine(); // reimplementations QPaintEngine - bool begin(QPaintDevice *pdev) Q_DECL_OVERRIDE; - bool end() Q_DECL_OVERRIDE; + bool begin(QPaintDevice *pdev) override; + bool end() override; // end reimplementations QPaintEngine // reimplementations QPrintEngine - bool abort() Q_DECL_OVERRIDE {return false;} - QPrinter::PrinterState printerState() const Q_DECL_OVERRIDE {return state;} + bool abort() override {return false;} + QPrinter::PrinterState printerState() const override {return state;} - bool newPage() Q_DECL_OVERRIDE; - int metric(QPaintDevice::PaintDeviceMetric) const Q_DECL_OVERRIDE; - virtual void setProperty(PrintEnginePropertyKey key, const QVariant &value) Q_DECL_OVERRIDE; - virtual QVariant property(PrintEnginePropertyKey key) const Q_DECL_OVERRIDE; + bool newPage() override; + int metric(QPaintDevice::PaintDeviceMetric) const override; + virtual void setProperty(PrintEnginePropertyKey key, const QVariant &value) override; + virtual QVariant property(PrintEnginePropertyKey key) const override; // end reimplementations QPrintEngine QPrinter::PrinterState state; diff --git a/src/printsupport/kernel/qprinter.cpp b/src/printsupport/kernel/qprinter.cpp index 3135836ce7..dd0fa8639b 100644 --- a/src/printsupport/kernel/qprinter.cpp +++ b/src/printsupport/kernel/qprinter.cpp @@ -231,7 +231,7 @@ public: virtual ~QPrinterPagedPaintDevicePrivate() {} - bool setPageLayout(const QPageLayout &newPageLayout) Q_DECL_OVERRIDE + bool setPageLayout(const QPageLayout &newPageLayout) override { if (pd->paintEngine->type() != QPaintEngine::Pdf && pd->printEngine->printerState() == QPrinter::Active) { @@ -248,7 +248,7 @@ public: return pageLayout().isEquivalentTo(newPageLayout); } - bool setPageSize(const QPageSize &pageSize) Q_DECL_OVERRIDE + bool setPageSize(const QPageSize &pageSize) override { if (pd->paintEngine->type() != QPaintEngine::Pdf && pd->printEngine->printerState() == QPrinter::Active) { @@ -266,7 +266,7 @@ public: return pageLayout().pageSize().isEquivalentTo(pageSize); } - bool setPageOrientation(QPageLayout::Orientation orientation) Q_DECL_OVERRIDE + bool setPageOrientation(QPageLayout::Orientation orientation) override { // Set the print engine value pd->setProperty(QPrintEngine::PPK_Orientation, orientation); @@ -277,12 +277,12 @@ public: return pageLayout().orientation() == orientation; } - bool setPageMargins(const QMarginsF &margins) Q_DECL_OVERRIDE + bool setPageMargins(const QMarginsF &margins) override { return setPageMargins(margins, pageLayout().units()); } - bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units) Q_DECL_OVERRIDE + bool setPageMargins(const QMarginsF &margins, QPageLayout::Unit units) override { // Try to set print engine margins QPair pair = qMakePair(margins, units); @@ -294,7 +294,7 @@ public: return pageLayout().margins() == margins && pageLayout().units() == units; } - QPageLayout pageLayout() const Q_DECL_OVERRIDE + QPageLayout pageLayout() const override { return pd->printEngine->property(QPrintEngine::PPK_QPageLayout).value(); } diff --git a/src/printsupport/kernel/qprinter.h b/src/printsupport/kernel/qprinter.h index bfe2d346ae..28dca78a63 100644 --- a/src/printsupport/kernel/qprinter.h +++ b/src/printsupport/kernel/qprinter.h @@ -72,7 +72,7 @@ public: explicit QPrinter(const QPrinterInfo& printer, PrinterMode mode = ScreenResolution); ~QPrinter(); - int devType() const Q_DECL_OVERRIDE; + int devType() const override; enum Orientation { Portrait, Landscape }; @@ -170,10 +170,10 @@ public: void setOrientation(Orientation); Orientation orientation() const; - void setPageSize(PageSize) Q_DECL_OVERRIDE; + void setPageSize(PageSize) override; PageSize pageSize() const; - void setPageSizeMM(const QSizeF &size) Q_DECL_OVERRIDE; + void setPageSizeMM(const QSizeF &size) override; void setPaperSize(PaperSize); PaperSize paperSize() const; @@ -237,12 +237,12 @@ public: QString printerSelectionOption() const; void setPrinterSelectionOption(const QString &); - bool newPage() Q_DECL_OVERRIDE; + bool newPage() override; bool abort(); PrinterState printerState() const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; QPrintEngine *printEngine() const; void setFromTo(int fromPage, int toPage); @@ -252,13 +252,13 @@ public: void setPrintRange(PrintRange range); PrintRange printRange() const; - void setMargins(const Margins &m) Q_DECL_OVERRIDE; + void setMargins(const Margins &m) override; void setPageMargins(qreal left, qreal top, qreal right, qreal bottom, Unit unit); void getPageMargins(qreal *left, qreal *top, qreal *right, qreal *bottom, Unit unit) const; protected: - int metric(PaintDeviceMetric) const Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric) const override; void setEngines(QPrintEngine *printEngine, QPaintEngine *paintEngine); private: diff --git a/src/printsupport/widgets/qprintpreviewwidget.cpp b/src/printsupport/widgets/qprintpreviewwidget.cpp index b28e693612..352a234065 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.cpp +++ b/src/printsupport/widgets/qprintpreviewwidget.cpp @@ -64,13 +64,13 @@ public: setCacheMode(DeviceCoordinateCache); } - QRectF boundingRect() const Q_DECL_OVERRIDE + QRectF boundingRect() const override { return brect; } inline int pageNumber() const { return pageNum; } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *item, QWidget *widget) override; private: int pageNum; @@ -156,7 +156,7 @@ signals: void resized(); protected: - void resizeEvent(QResizeEvent* e) Q_DECL_OVERRIDE + void resizeEvent(QResizeEvent* e) override { { const QSignalBlocker blocker(verticalScrollBar()); // Don't change page, QTBUG-14517 @@ -165,7 +165,7 @@ protected: emit resized(); } - void showEvent(QShowEvent* e) Q_DECL_OVERRIDE + void showEvent(QShowEvent* e) override { QGraphicsView::showEvent(e); emit resized(); diff --git a/src/printsupport/widgets/qprintpreviewwidget.h b/src/printsupport/widgets/qprintpreviewwidget.h index 8735d06072..d6b5929d52 100644 --- a/src/printsupport/widgets/qprintpreviewwidget.h +++ b/src/printsupport/widgets/qprintpreviewwidget.h @@ -80,7 +80,7 @@ public: ZoomMode zoomMode() const; int currentPage() const; int pageCount() const; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; public Q_SLOTS: void print(); diff --git a/src/sql/kernel/qsqlcachedresult_p.h b/src/sql/kernel/qsqlcachedresult_p.h index 9bcfd49f1a..543a902554 100644 --- a/src/sql/kernel/qsqlcachedresult_p.h +++ b/src/sql/kernel/qsqlcachedresult_p.h @@ -78,20 +78,20 @@ protected: virtual bool gotoNext(ValueCache &values, int index) = 0; - QVariant data(int i) Q_DECL_OVERRIDE; - bool isNull(int i) Q_DECL_OVERRIDE; - bool fetch(int i) Q_DECL_OVERRIDE; - bool fetchNext() Q_DECL_OVERRIDE; - bool fetchPrevious() Q_DECL_OVERRIDE; - bool fetchFirst() Q_DECL_OVERRIDE; - bool fetchLast() Q_DECL_OVERRIDE; + QVariant data(int i) override; + bool isNull(int i) override; + bool fetch(int i) override; + bool fetchNext() override; + bool fetchPrevious() override; + bool fetchFirst() override; + bool fetchLast() override; int colCount() const; ValueCache &cache(); - void virtual_hook(int id, void *data) Q_DECL_OVERRIDE; - void detachFromResultSet() Q_DECL_OVERRIDE; - void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy) Q_DECL_OVERRIDE; + void virtual_hook(int id, void *data) override; + void detachFromResultSet() override; + void setNumericalPrecisionPolicy(QSql::NumericalPrecisionPolicy policy) override; private: bool cacheNext(); }; diff --git a/src/sql/kernel/qsqldatabase.h b/src/sql/kernel/qsqldatabase.h index 0b4aca8cdd..684b9c04a1 100644 --- a/src/sql/kernel/qsqldatabase.h +++ b/src/sql/kernel/qsqldatabase.h @@ -64,7 +64,7 @@ template class QSqlDriverCreator : public QSqlDriverCreatorBase { public: - QSqlDriver *createObject() const Q_DECL_OVERRIDE { return new T; } + QSqlDriver *createObject() const override { return new T; } }; class Q_SQL_EXPORT QSqlDatabase diff --git a/src/sql/kernel/qsqlnulldriver_p.h b/src/sql/kernel/qsqlnulldriver_p.h index 92d8d30485..7a40199d71 100644 --- a/src/sql/kernel/qsqlnulldriver_p.h +++ b/src/sql/kernel/qsqlnulldriver_p.h @@ -66,27 +66,27 @@ public: { QSqlResult::setLastError( QSqlError(QLatin1String("Driver not loaded"), QLatin1String("Driver not loaded"), QSqlError::ConnectionError)); } protected: - inline QVariant data(int) Q_DECL_OVERRIDE { return QVariant(); } - inline bool reset (const QString&) Q_DECL_OVERRIDE { return false; } - inline bool fetch(int) Q_DECL_OVERRIDE { return false; } - inline bool fetchFirst() Q_DECL_OVERRIDE { return false; } - inline bool fetchLast() Q_DECL_OVERRIDE { return false; } - inline bool isNull(int) Q_DECL_OVERRIDE { return false; } - inline int size() Q_DECL_OVERRIDE { return -1; } - inline int numRowsAffected() Q_DECL_OVERRIDE { return 0; } + inline QVariant data(int) override { return QVariant(); } + inline bool reset (const QString&) override { return false; } + inline bool fetch(int) override { return false; } + inline bool fetchFirst() override { return false; } + inline bool fetchLast() override { return false; } + inline bool isNull(int) override { return false; } + inline int size() override { return -1; } + inline int numRowsAffected() override { return 0; } - inline void setAt(int) Q_DECL_OVERRIDE {} - inline void setActive(bool) Q_DECL_OVERRIDE {} - inline void setLastError(const QSqlError&) Q_DECL_OVERRIDE {} - inline void setQuery(const QString&) Q_DECL_OVERRIDE {} - inline void setSelect(bool) Q_DECL_OVERRIDE {} - inline void setForwardOnly(bool) Q_DECL_OVERRIDE {} + inline void setAt(int) override {} + inline void setActive(bool) override {} + inline void setLastError(const QSqlError&) override {} + inline void setQuery(const QString&) override {} + inline void setSelect(bool) override {} + inline void setForwardOnly(bool) override {} - inline bool exec() Q_DECL_OVERRIDE { return false; } - inline bool prepare(const QString&) Q_DECL_OVERRIDE { return false; } - inline bool savePrepare(const QString&) Q_DECL_OVERRIDE { return false; } - inline void bindValue(int, const QVariant&, QSql::ParamType) Q_DECL_OVERRIDE {} - inline void bindValue(const QString&, const QVariant&, QSql::ParamType) Q_DECL_OVERRIDE {} + inline bool exec() override { return false; } + inline bool prepare(const QString&) override { return false; } + inline bool savePrepare(const QString&) override { return false; } + inline void bindValue(int, const QVariant&, QSql::ParamType) override {} + inline void bindValue(const QString&, const QVariant&, QSql::ParamType) override {} }; class QSqlNullDriver : public QSqlDriver @@ -95,16 +95,16 @@ public: inline QSqlNullDriver(): QSqlDriver() { QSqlDriver::setLastError( QSqlError(QLatin1String("Driver not loaded"), QLatin1String("Driver not loaded"), QSqlError::ConnectionError)); } - inline bool hasFeature(DriverFeature) const Q_DECL_OVERRIDE { return false; } - inline bool open(const QString &, const QString &, const QString &, const QString &, int, const QString&) Q_DECL_OVERRIDE + inline bool hasFeature(DriverFeature) const override { return false; } + inline bool open(const QString &, const QString &, const QString &, const QString &, int, const QString&) override { return false; } - inline void close() Q_DECL_OVERRIDE {} - inline QSqlResult *createResult() const Q_DECL_OVERRIDE { return new QSqlNullResult(this); } + inline void close() override {} + inline QSqlResult *createResult() const override { return new QSqlNullResult(this); } protected: - inline void setOpen(bool) Q_DECL_OVERRIDE {} - inline void setOpenError(bool) Q_DECL_OVERRIDE {} - inline void setLastError(const QSqlError&) Q_DECL_OVERRIDE {} + inline void setOpen(bool) override {} + inline void setOpenError(bool) override {} + inline void setLastError(const QSqlError&) override {} }; QT_END_NAMESPACE diff --git a/src/sql/models/qsqlrelationaltablemodel.cpp b/src/sql/models/qsqlrelationaltablemodel.cpp index 9d6daa2634..8220fea39a 100644 --- a/src/sql/models/qsqlrelationaltablemodel.cpp +++ b/src/sql/models/qsqlrelationaltablemodel.cpp @@ -156,7 +156,7 @@ class QRelatedTableModel : public QSqlTableModel { public: QRelatedTableModel(QRelation *rel, QObject *parent = 0, QSqlDatabase db = QSqlDatabase()); - bool select() Q_DECL_OVERRIDE; + bool select() override; private: bool firstSelect; QRelation *relation; @@ -268,12 +268,12 @@ public: {} QString fullyQualifiedFieldName(const QString &tableName, const QString &fieldName) const; - int nameToIndex(const QString &name) const Q_DECL_OVERRIDE; + int nameToIndex(const QString &name) const override; mutable QVector relations; QSqlRecord baseRec; // the record without relations void clearChanges(); - void clearCache() Q_DECL_OVERRIDE; - void revertCachedRow(int row) Q_DECL_OVERRIDE; + void clearCache() override; + void revertCachedRow(int row) override; void translateFieldNames(QSqlRecord &values) const; QSqlRelationalTableModel::JoinMode joinMode; diff --git a/src/sql/models/qsqlrelationaltablemodel.h b/src/sql/models/qsqlrelationaltablemodel.h index f8b08b089f..5175b8f0dd 100644 --- a/src/sql/models/qsqlrelationaltablemodel.h +++ b/src/sql/models/qsqlrelationaltablemodel.h @@ -92,27 +92,27 @@ public: QSqlDatabase db = QSqlDatabase()); virtual ~QSqlRelationalTableModel(); - QVariant data(const QModelIndex &item, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &item, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &item, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &item, const QVariant &value, int role = Qt::EditRole) override; + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; - void clear() Q_DECL_OVERRIDE; - bool select() Q_DECL_OVERRIDE; + void clear() override; + bool select() override; - void setTable(const QString &tableName) Q_DECL_OVERRIDE; + void setTable(const QString &tableName) override; virtual void setRelation(int column, const QSqlRelation &relation); QSqlRelation relation(int column) const; virtual QSqlTableModel *relationModel(int column) const; void setJoinMode( QSqlRelationalTableModel::JoinMode joinMode ); public Q_SLOTS: - void revertRow(int row) Q_DECL_OVERRIDE; + void revertRow(int row) override; protected: - QString selectStatement() const Q_DECL_OVERRIDE; - bool updateRowInTable(int row, const QSqlRecord &values) Q_DECL_OVERRIDE; - bool insertRowIntoTable(const QSqlRecord &values) Q_DECL_OVERRIDE; - QString orderByClause() const Q_DECL_OVERRIDE; + QString selectStatement() const override; + bool updateRowInTable(int row, const QSqlRecord &values) override; + bool insertRowIntoTable(const QSqlRecord &values) override; + QString orderByClause() const override; private: Q_DECLARE_PRIVATE(QSqlRelationalTableModel) diff --git a/src/sql/models/qsqltablemodel.h b/src/sql/models/qsqltablemodel.h index 6a62c6993d..bf5835129b 100644 --- a/src/sql/models/qsqltablemodel.h +++ b/src/sql/models/qsqltablemodel.h @@ -66,19 +66,19 @@ public: virtual void setTable(const QString &tableName); QString tableName() const; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; QSqlRecord record() const; QSqlRecord record(int row) const; - QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &idx, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; bool isDirty() const; bool isDirty(const QModelIndex &index) const; - void clear() Q_DECL_OVERRIDE; + void clear() override; virtual void setEditStrategy(EditStrategy strategy); EditStrategy editStrategy() const; @@ -87,17 +87,17 @@ public: QSqlDatabase database() const; int fieldIndex(const QString &fieldName) const; - void sort(int column, Qt::SortOrder order) Q_DECL_OVERRIDE; + void sort(int column, Qt::SortOrder order) override; virtual void setSort(int column, Qt::SortOrder order); QString filter() const; virtual void setFilter(const QString &filter); - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; bool insertRecord(int row, const QSqlRecord &record); bool setRecord(int row, const QSqlRecord &record); @@ -108,8 +108,8 @@ public Q_SLOTS: virtual bool select(); virtual bool selectRow(int row); - bool submit() Q_DECL_OVERRIDE; - void revert() Q_DECL_OVERRIDE; + bool submit() override; + void revert() override; bool submitAll(); void revertAll(); @@ -132,7 +132,7 @@ protected: void setPrimaryKey(const QSqlIndex &key); void setQuery(const QSqlQuery &query); - QModelIndex indexInQuery(const QModelIndex &item) const Q_DECL_OVERRIDE; + QModelIndex indexInQuery(const QModelIndex &item) const override; QSqlRecord primaryValues(int row) const; }; diff --git a/src/testlib/qbenchmarkperfevents_p.h b/src/testlib/qbenchmarkperfevents_p.h index 085dc620d7..86ba556549 100644 --- a/src/testlib/qbenchmarkperfevents_p.h +++ b/src/testlib/qbenchmarkperfevents_p.h @@ -60,16 +60,16 @@ class QBenchmarkPerfEventsMeasurer : public QBenchmarkMeasurerBase public: QBenchmarkPerfEventsMeasurer(); ~QBenchmarkPerfEventsMeasurer(); - virtual void init() Q_DECL_OVERRIDE; - virtual void start() Q_DECL_OVERRIDE; - virtual qint64 checkpoint() Q_DECL_OVERRIDE; - virtual qint64 stop() Q_DECL_OVERRIDE; - virtual bool isMeasurementAccepted(qint64 measurement) Q_DECL_OVERRIDE; - virtual int adjustIterationCount(int suggestion) Q_DECL_OVERRIDE; - virtual int adjustMedianCount(int suggestion) Q_DECL_OVERRIDE; - virtual bool repeatCount() Q_DECL_OVERRIDE { return 1; } - virtual bool needsWarmupIteration() Q_DECL_OVERRIDE { return true; } - virtual QTest::QBenchmarkMetric metricType() Q_DECL_OVERRIDE; + virtual void init() override; + virtual void start() override; + virtual qint64 checkpoint() override; + virtual qint64 stop() override; + virtual bool isMeasurementAccepted(qint64 measurement) override; + virtual int adjustIterationCount(int suggestion) override; + virtual int adjustMedianCount(int suggestion) override; + virtual bool repeatCount() override { return 1; } + virtual bool needsWarmupIteration() override { return true; } + virtual QTest::QBenchmarkMetric metricType() override; static bool isAvailable(); static QTest::QBenchmarkMetric metricForEvent(quint32 type, quint64 event_id); diff --git a/src/testlib/qcsvbenchmarklogger_p.h b/src/testlib/qcsvbenchmarklogger_p.h index f321494e8a..5840aee0f5 100644 --- a/src/testlib/qcsvbenchmarklogger_p.h +++ b/src/testlib/qcsvbenchmarklogger_p.h @@ -61,18 +61,18 @@ public: QCsvBenchmarkLogger(const char *filename); ~QCsvBenchmarkLogger(); - void startLogging() Q_DECL_OVERRIDE; - void stopLogging() Q_DECL_OVERRIDE; + void startLogging() override; + void stopLogging() override; - void enterTestFunction(const char *function) Q_DECL_OVERRIDE; - void leaveTestFunction() Q_DECL_OVERRIDE; + void enterTestFunction(const char *function) override; + void leaveTestFunction() override; void addIncident(IncidentTypes type, const char *description, - const char *file = 0, int line = 0) Q_DECL_OVERRIDE; - void addBenchmarkResult(const QBenchmarkResult &result) Q_DECL_OVERRIDE; + const char *file = 0, int line = 0) override; + void addBenchmarkResult(const QBenchmarkResult &result) override; void addMessage(MessageTypes type, const QString &message, - const char *file = 0, int line = 0) Q_DECL_OVERRIDE; + const char *file = 0, int line = 0) override; }; QT_END_NAMESPACE diff --git a/src/testlib/qsignalspy.h b/src/testlib/qsignalspy.h index 6b1b7e6922..f05dd95565 100644 --- a/src/testlib/qsignalspy.h +++ b/src/testlib/qsignalspy.h @@ -151,7 +151,7 @@ public: return count() > origCount; } - int qt_metacall(QMetaObject::Call call, int methodId, void **a) Q_DECL_OVERRIDE + int qt_metacall(QMetaObject::Call call, int methodId, void **a) override { methodId = QObject::qt_metacall(call, methodId, a); if (methodId < 0) diff --git a/src/testlib/qxctestlogger_p.h b/src/testlib/qxctestlogger_p.h index 2bbd5ad296..1b641f18af 100644 --- a/src/testlib/qxctestlogger_p.h +++ b/src/testlib/qxctestlogger_p.h @@ -65,21 +65,21 @@ class QXcodeTestLogger : public QAbstractTestLogger { public: QXcodeTestLogger(); - ~QXcodeTestLogger() Q_DECL_OVERRIDE; + ~QXcodeTestLogger() override; - void startLogging() Q_DECL_OVERRIDE; - void stopLogging() Q_DECL_OVERRIDE; + void startLogging() override; + void stopLogging() override; - void enterTestFunction(const char *function) Q_DECL_OVERRIDE; - void leaveTestFunction() Q_DECL_OVERRIDE; + void enterTestFunction(const char *function) override; + void leaveTestFunction() override; void addIncident(IncidentTypes type, const char *description, - const char *file = 0, int line = 0) Q_DECL_OVERRIDE; + const char *file = 0, int line = 0) override; void addMessage(MessageTypes type, const QString &message, - const char *file = 0, int line = 0) Q_DECL_OVERRIDE; + const char *file = 0, int line = 0) override; - void addBenchmarkResult(const QBenchmarkResult &result) Q_DECL_OVERRIDE; + void addBenchmarkResult(const QBenchmarkResult &result) override; static bool canLogTestProgress(); static int parseCommandLineArgument(const char *argument); diff --git a/src/tools/uic/cpp/cppwritedeclaration.h b/src/tools/uic/cpp/cppwritedeclaration.h index ca2122293c..f83bfe8f50 100644 --- a/src/tools/uic/cpp/cppwritedeclaration.h +++ b/src/tools/uic/cpp/cppwritedeclaration.h @@ -45,13 +45,13 @@ struct WriteDeclaration : public TreeWalker { WriteDeclaration(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; - void acceptButtonGroup(const DomButtonGroup *buttonGroup) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptLayout(DomLayout *node) override; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; + void acceptButtonGroup(const DomButtonGroup *buttonGroup) override; private: Uic *m_uic; diff --git a/src/tools/uic/cpp/cppwriteincludes.h b/src/tools/uic/cpp/cppwriteincludes.h index 0d9c293efc..f91e1cf8ff 100644 --- a/src/tools/uic/cpp/cppwriteincludes.h +++ b/src/tools/uic/cpp/cppwriteincludes.h @@ -49,23 +49,23 @@ struct WriteIncludes : public TreeWalker { WriteIncludes(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptProperty(DomProperty *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; + void acceptLayout(DomLayout *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptProperty(DomProperty *node) override; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; // // include hints // - void acceptIncludes(DomIncludes *node) Q_DECL_OVERRIDE; - void acceptInclude(DomInclude *node) Q_DECL_OVERRIDE; + void acceptIncludes(DomIncludes *node) override; + void acceptInclude(DomInclude *node) override; private: void add(const QString &className, bool determineHeader = true, const QString &header = QString(), bool global = false); diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h index b26f51875d..64cbde13f7 100644 --- a/src/tools/uic/cpp/cppwriteinitialization.h +++ b/src/tools/uic/cpp/cppwriteinitialization.h @@ -93,41 +93,41 @@ struct WriteInitialization : public TreeWalker // // widgets // - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; - void acceptSpacer(DomSpacer *node) Q_DECL_OVERRIDE; - void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; + void acceptLayout(DomLayout *node) override; + void acceptSpacer(DomSpacer *node) override; + void acceptLayoutItem(DomLayoutItem *node) override; // // actions // - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; - void acceptActionRef(DomActionRef *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; + void acceptActionRef(DomActionRef *node) override; // // tab stops // - void acceptTabStops(DomTabStops *tabStops) Q_DECL_OVERRIDE; + void acceptTabStops(DomTabStops *tabStops) override; // // custom widgets // - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; // // layout defaults/functions // - void acceptLayoutDefault(DomLayoutDefault *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutDefault(node); } - void acceptLayoutFunction(DomLayoutFunction *node) Q_DECL_OVERRIDE { m_LayoutDefaultHandler.acceptLayoutFunction(node); } + void acceptLayoutDefault(DomLayoutDefault *node) override { m_LayoutDefaultHandler.acceptLayoutDefault(node); } + void acceptLayoutFunction(DomLayoutFunction *node) override { m_LayoutDefaultHandler.acceptLayoutFunction(node); } // // signal/slot connections // - void acceptConnection(DomConnection *connection) Q_DECL_OVERRIDE; + void acceptConnection(DomConnection *connection) override; enum { Use43UiFile = 0, diff --git a/src/tools/uic/customwidgetsinfo.h b/src/tools/uic/customwidgetsinfo.h index 3ce27d546c..944ed59215 100644 --- a/src/tools/uic/customwidgetsinfo.h +++ b/src/tools/uic/customwidgetsinfo.h @@ -43,10 +43,10 @@ class CustomWidgetsInfo : public TreeWalker public: CustomWidgetsInfo(); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; - void acceptCustomWidgets(DomCustomWidgets *node) Q_DECL_OVERRIDE; - void acceptCustomWidget(DomCustomWidget *node) Q_DECL_OVERRIDE; + void acceptCustomWidgets(DomCustomWidgets *node) override; + void acceptCustomWidget(DomCustomWidget *node) override; inline QStringList customWidgets() const { return m_customWidgets.keys(); } diff --git a/src/tools/uic/databaseinfo.h b/src/tools/uic/databaseinfo.h index c313681278..bebf139c5a 100644 --- a/src/tools/uic/databaseinfo.h +++ b/src/tools/uic/databaseinfo.h @@ -42,8 +42,8 @@ class DatabaseInfo : public TreeWalker public: DatabaseInfo(); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; inline QStringList connections() const { return m_connections; } diff --git a/src/tools/uic/validator.h b/src/tools/uic/validator.h index e0a99b47ef..f7f7401991 100644 --- a/src/tools/uic/validator.h +++ b/src/tools/uic/validator.h @@ -43,14 +43,14 @@ struct Validator : public TreeWalker { Validator(Uic *uic); - void acceptUI(DomUI *node) Q_DECL_OVERRIDE; - void acceptWidget(DomWidget *node) Q_DECL_OVERRIDE; + void acceptUI(DomUI *node) override; + void acceptWidget(DomWidget *node) override; - void acceptLayoutItem(DomLayoutItem *node) Q_DECL_OVERRIDE; - void acceptLayout(DomLayout *node) Q_DECL_OVERRIDE; + void acceptLayoutItem(DomLayoutItem *node) override; + void acceptLayout(DomLayout *node) override; - void acceptActionGroup(DomActionGroup *node) Q_DECL_OVERRIDE; - void acceptAction(DomAction *node) Q_DECL_OVERRIDE; + void acceptActionGroup(DomActionGroup *node) override; + void acceptAction(DomAction *node) override; private: Driver *m_driver; diff --git a/src/widgets/accessible/complexwidgets.cpp b/src/widgets/accessible/complexwidgets.cpp index efbca0331d..94ad011533 100644 --- a/src/widgets/accessible/complexwidgets.cpp +++ b/src/widgets/accessible/complexwidgets.cpp @@ -89,16 +89,16 @@ public: : m_parent(parent), m_index(index) {} - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE { + void *interface_cast(QAccessible::InterfaceType t) override { if (t == QAccessible::ActionInterface) { return static_cast(this); } return 0; } - QObject *object() const Q_DECL_OVERRIDE { return 0; } - QAccessible::Role role() const Q_DECL_OVERRIDE { return QAccessible::PageTab; } - QAccessible::State state() const Q_DECL_OVERRIDE { + QObject *object() const override { return 0; } + QAccessible::Role role() const override { return QAccessible::PageTab; } + QAccessible::State state() const override { if (!isValid()) { QAccessible::State s; s.invalid = true; @@ -106,7 +106,7 @@ public: } return parent()->state(); } - QRect rect() const Q_DECL_OVERRIDE { + QRect rect() const override { if (!isValid()) return QRect(); @@ -116,13 +116,13 @@ public: return rec; } - bool isValid() const Q_DECL_OVERRIDE { return m_parent.data() && m_parent->count() > m_index; } + bool isValid() const override { return m_parent.data() && m_parent->count() > m_index; } - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return 0; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return 0; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE + QString text(QAccessible::Text t) const override { if (!isValid()) return QString(); @@ -152,26 +152,26 @@ public: return str; } - void setText(QAccessible::Text, const QString &) Q_DECL_OVERRIDE {} + void setText(QAccessible::Text, const QString &) override {} - QAccessibleInterface *parent() const Q_DECL_OVERRIDE { + QAccessibleInterface *parent() const override { return QAccessible::queryAccessibleInterface(m_parent.data()); } - QAccessibleInterface *child(int) const Q_DECL_OVERRIDE { return 0; } + QAccessibleInterface *child(int) const override { return 0; } // action interface - QStringList actionNames() const Q_DECL_OVERRIDE + QStringList actionNames() const override { return QStringList(pressAction()); } - void doAction(const QString &actionName) Q_DECL_OVERRIDE + void doAction(const QString &actionName) override { if (isValid() && actionName == pressAction()) m_parent->setCurrentIndex(m_index); } - QStringList keyBindingsForAction(const QString &) const Q_DECL_OVERRIDE + QStringList keyBindingsForAction(const QString &) const override { return QStringList(); } diff --git a/src/widgets/accessible/complexwidgets_p.h b/src/widgets/accessible/complexwidgets_p.h index 6f5c950631..c842490603 100644 --- a/src/widgets/accessible/complexwidgets_p.h +++ b/src/widgets/accessible/complexwidgets_p.h @@ -85,11 +85,11 @@ public: Undefined }; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + bool isValid() const override; + QAccessibleInterface *childAt(int x, int y) const override; //protected: QAbstractScrollArea *abstractScrollArea() const; @@ -114,11 +114,11 @@ public: explicit QAccessibleTabBar(QWidget *w); ~QAccessibleTabBar(); - int childCount() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + int childCount() const override; + QString text(QAccessible::Text t) const override; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + QAccessibleInterface* child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; protected: QTabBar *tabBar() const; @@ -132,18 +132,18 @@ class QAccessibleComboBox : public QAccessibleWidget public: explicit QAccessibleComboBox(QWidget *w); - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QAccessibleInterface* child(int index) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *childAt(int x, int y) const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QAccessibleInterface* child(int index) const override; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - QString localizedActionDescription(const QString &actionName) const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + QString localizedActionDescription(const QString &actionName) const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; protected: QComboBox *comboBox() const; diff --git a/src/widgets/accessible/itemviews_p.h b/src/widgets/accessible/itemviews_p.h index 72841b8a0f..61d0387f9c 100644 --- a/src/widgets/accessible/itemviews_p.h +++ b/src/widgets/accessible/itemviews_p.h @@ -71,48 +71,48 @@ class QAccessibleTable :public QAccessibleTableInterface, public QAccessibleObje { public: explicit QAccessibleTable(QWidget *w); - bool isValid() const Q_DECL_OVERRIDE; + bool isValid() const override; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; + QAccessible::Role role() const override; + QAccessible::State state() const override; + QString text(QAccessible::Text t) const override; + QRect rect() const override; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE; + QAccessibleInterface *childAt(int x, int y) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *) const override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // table interface - virtual QAccessibleInterface *cellAt(int row, int column) const Q_DECL_OVERRIDE; - virtual QAccessibleInterface *caption() const Q_DECL_OVERRIDE; - virtual QAccessibleInterface *summary() const Q_DECL_OVERRIDE; - virtual QString columnDescription(int column) const Q_DECL_OVERRIDE; - virtual QString rowDescription(int row) const Q_DECL_OVERRIDE; - virtual int columnCount() const Q_DECL_OVERRIDE; - virtual int rowCount() const Q_DECL_OVERRIDE; + virtual QAccessibleInterface *cellAt(int row, int column) const override; + virtual QAccessibleInterface *caption() const override; + virtual QAccessibleInterface *summary() const override; + virtual QString columnDescription(int column) const override; + virtual QString rowDescription(int row) const override; + virtual int columnCount() const override; + virtual int rowCount() const override; // selection - virtual int selectedCellCount() const Q_DECL_OVERRIDE; - virtual int selectedColumnCount() const Q_DECL_OVERRIDE; - virtual int selectedRowCount() const Q_DECL_OVERRIDE; - virtual QList selectedCells() const Q_DECL_OVERRIDE; - virtual QList selectedColumns() const Q_DECL_OVERRIDE; - virtual QList selectedRows() const Q_DECL_OVERRIDE; - virtual bool isColumnSelected(int column) const Q_DECL_OVERRIDE; - virtual bool isRowSelected(int row) const Q_DECL_OVERRIDE; - virtual bool selectRow(int row) Q_DECL_OVERRIDE; - virtual bool selectColumn(int column) Q_DECL_OVERRIDE; - virtual bool unselectRow(int row) Q_DECL_OVERRIDE; - virtual bool unselectColumn(int column) Q_DECL_OVERRIDE; + virtual int selectedCellCount() const override; + virtual int selectedColumnCount() const override; + virtual int selectedRowCount() const override; + virtual QList selectedCells() const override; + virtual QList selectedColumns() const override; + virtual QList selectedRows() const override; + virtual bool isColumnSelected(int column) const override; + virtual bool isRowSelected(int row) const override; + virtual bool selectRow(int row) override; + virtual bool selectColumn(int column) override; + virtual bool unselectRow(int row) override; + virtual bool unselectColumn(int column) override; QAbstractItemView *view() const; - void modelChange(QAccessibleTableModelChangeEvent *event) Q_DECL_OVERRIDE; + void modelChange(QAccessibleTableModelChangeEvent *event) override; protected: inline QAccessible::Role cellRole() const { @@ -153,19 +153,19 @@ public: {} - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *childAt(int x, int y) const override; + int childCount() const override; + QAccessibleInterface *child(int index) const override; - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE; + int indexOfChild(const QAccessibleInterface *) const override; - int rowCount() const Q_DECL_OVERRIDE; + int rowCount() const override; // table interface - QAccessibleInterface *cellAt(int row, int column) const Q_DECL_OVERRIDE; - QString rowDescription(int row) const Q_DECL_OVERRIDE; - bool isRowSelected(int row) const Q_DECL_OVERRIDE; - bool selectRow(int row) Q_DECL_OVERRIDE; + QAccessibleInterface *cellAt(int row, int column) const override; + QString rowDescription(int row) const override; + bool isRowSelected(int row) const override; + bool selectRow(int row) override; private: QModelIndex indexFromLogical(int row, int column = 0) const; @@ -179,37 +179,37 @@ class QAccessibleTableCell: public QAccessibleInterface, public QAccessibleTable public: QAccessibleTableCell(QAbstractItemView *view, const QModelIndex &m_index, QAccessible::Role role); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; - QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; } - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; + QObject *object() const override { return Q_NULLPTR; } + QAccessible::Role role() const override; + QAccessible::State state() const override; + QRect rect() const override; + bool isValid() const override; - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return Q_NULLPTR; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int) const override; // cell interface - virtual int columnExtent() const Q_DECL_OVERRIDE; - virtual QList columnHeaderCells() const Q_DECL_OVERRIDE; - virtual int columnIndex() const Q_DECL_OVERRIDE; - virtual int rowExtent() const Q_DECL_OVERRIDE; - virtual QList rowHeaderCells() const Q_DECL_OVERRIDE; - virtual int rowIndex() const Q_DECL_OVERRIDE; - virtual bool isSelected() const Q_DECL_OVERRIDE; - virtual QAccessibleInterface* table() const Q_DECL_OVERRIDE; + virtual int columnExtent() const override; + virtual QList columnHeaderCells() const override; + virtual int columnIndex() const override; + virtual int rowExtent() const override; + virtual QList rowHeaderCells() const override; + virtual int rowIndex() const override; + virtual bool isSelected() const override; + virtual QAccessibleInterface* table() const override; //action interface - virtual QStringList actionNames() const Q_DECL_OVERRIDE; - virtual void doAction(const QString &actionName) Q_DECL_OVERRIDE; - virtual QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + virtual QStringList actionNames() const override; + virtual void doAction(const QString &actionName) override; + virtual QStringList keyBindingsForAction(const QString &actionName) const override; private: QHeaderView *verticalHeader() const; @@ -234,21 +234,21 @@ public: // For header cells, pass the header view in addition QAccessibleTableHeaderCell(QAbstractItemView *view, int index, Qt::Orientation orientation); - QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; } - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; + QObject *object() const override { return Q_NULLPTR; } + QAccessible::Role role() const override; + QAccessible::State state() const override; + QRect rect() const override; + bool isValid() const override; - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return Q_NULLPTR; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; private: QHeaderView *headerView() const; @@ -273,23 +273,23 @@ public: :view(view_) {} - QObject *object() const Q_DECL_OVERRIDE { return Q_NULLPTR; } - QAccessible::Role role() const Q_DECL_OVERRIDE { return QAccessible::Pane; } - QAccessible::State state() const Q_DECL_OVERRIDE { return QAccessible::State(); } - QRect rect() const Q_DECL_OVERRIDE { return QRect(); } - bool isValid() const Q_DECL_OVERRIDE { return true; } + QObject *object() const override { return Q_NULLPTR; } + QAccessible::Role role() const override { return QAccessible::Pane; } + QAccessible::State state() const override { return QAccessible::State(); } + QRect rect() const override { return QRect(); } + bool isValid() const override { return true; } - QAccessibleInterface *childAt(int, int) const Q_DECL_OVERRIDE { return Q_NULLPTR; } - int childCount() const Q_DECL_OVERRIDE { return 0; } - int indexOfChild(const QAccessibleInterface *) const Q_DECL_OVERRIDE { return -1; } + QAccessibleInterface *childAt(int, int) const override { return Q_NULLPTR; } + int childCount() const override { return 0; } + int indexOfChild(const QAccessibleInterface *) const override { return -1; } - QString text(QAccessible::Text) const Q_DECL_OVERRIDE { return QString(); } - void setText(QAccessible::Text, const QString &) Q_DECL_OVERRIDE {} + QString text(QAccessible::Text) const override { return QString(); } + void setText(QAccessible::Text, const QString &) override {} - QAccessibleInterface *parent() const Q_DECL_OVERRIDE { + QAccessibleInterface *parent() const override { return QAccessible::queryAccessibleInterface(view); } - QAccessibleInterface *child(int) const Q_DECL_OVERRIDE { + QAccessibleInterface *child(int) const override { return Q_NULLPTR; } diff --git a/src/widgets/accessible/qaccessiblemenu_p.h b/src/widgets/accessible/qaccessiblemenu_p.h index 52afeb5a04..4372ae4dcc 100644 --- a/src/widgets/accessible/qaccessiblemenu_p.h +++ b/src/widgets/accessible/qaccessiblemenu_p.h @@ -69,14 +69,14 @@ class QAccessibleMenu : public QAccessibleWidget public: explicit QAccessibleMenu(QWidget *w); - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *childAt(int x, int y) const override; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - int indexOfChild( const QAccessibleInterface *child ) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; + QAccessibleInterface *child(int index) const override; + QAccessibleInterface *parent() const override; + int indexOfChild( const QAccessibleInterface *child ) const override; protected: QMenu *menu() const; @@ -88,10 +88,10 @@ class QAccessibleMenuBar : public QAccessibleWidget public: explicit QAccessibleMenuBar(QWidget *w); - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int childCount() const override; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + int indexOfChild(const QAccessibleInterface *child) const override; protected: QMenuBar *menuBar() const; @@ -105,28 +105,28 @@ public: explicit QAccessibleMenuItem(QWidget *owner, QAction *w); ~QAccessibleMenuItem(); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - bool isValid() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface * child) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *childAt(int x, int y) const override; + bool isValid() const override; + int indexOfChild(const QAccessibleInterface * child) const override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - QObject * object() const Q_DECL_OVERRIDE; - QWindow *window() const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; + QObject * object() const override; + QWindow *window() const override; - QRect rect() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString & text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QRect rect() const override; + QAccessible::Role role() const override; + void setText(QAccessible::Text t, const QString & text) override; + QAccessible::State state() const override; + QString text(QAccessible::Text t) const override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; QWidget *owner() const; protected: diff --git a/src/widgets/accessible/qaccessiblewidget.h b/src/widgets/accessible/qaccessiblewidget.h index e09c3ff489..63789a595f 100644 --- a/src/widgets/accessible/qaccessiblewidget.h +++ b/src/widgets/accessible/qaccessiblewidget.h @@ -54,32 +54,32 @@ class Q_WIDGETS_EXPORT QAccessibleWidget : public QAccessibleObject, public QAcc { public: explicit QAccessibleWidget(QWidget *o, QAccessible::Role r = QAccessible::Client, const QString& name = QString()); - bool isValid() const Q_DECL_OVERRIDE; + bool isValid() const override; - QWindow *window() const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QVector > relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE; - QAccessibleInterface *focusChild() const Q_DECL_OVERRIDE; + QWindow *window() const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QVector > relations(QAccessible::Relation match = QAccessible::AllRelations) const override; + QAccessibleInterface *focusChild() const override; - QRect rect() const Q_DECL_OVERRIDE; + QRect rect() const override; - QAccessibleInterface *parent() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *parent() const override; + QAccessibleInterface *child(int index) const override; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; + QAccessible::State state() const override; - QColor foregroundColor() const Q_DECL_OVERRIDE; - QColor backgroundColor() const Q_DECL_OVERRIDE; + QColor foregroundColor() const override; + QColor backgroundColor() const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; protected: ~QAccessibleWidget(); QWidget *widget() const; diff --git a/src/widgets/accessible/qaccessiblewidgets_p.h b/src/widgets/accessible/qaccessiblewidgets_p.h index 050930243d..e663d70de6 100644 --- a/src/widgets/accessible/qaccessiblewidgets_p.h +++ b/src/widgets/accessible/qaccessiblewidgets_p.h @@ -85,40 +85,40 @@ class QAccessibleTextWidget : public QAccessibleWidget, public: QAccessibleTextWidget(QWidget *o, QAccessible::Role r = QAccessible::EditableText, const QString &name = QString()); - QAccessible::State state() const Q_DECL_OVERRIDE; + QAccessible::State state() const override; // QAccessibleTextInterface // selection - void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - int selectionCount() const Q_DECL_OVERRIDE; - void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE; - void removeSelection(int selectionIndex) Q_DECL_OVERRIDE; - void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE; + void selection(int selectionIndex, int *startOffset, int *endOffset) const override; + int selectionCount() const override; + void addSelection(int startOffset, int endOffset) override; + void removeSelection(int selectionIndex) override; + void setSelection(int selectionIndex, int startOffset, int endOffset) override; // cursor - int cursorPosition() const Q_DECL_OVERRIDE; - void setCursorPosition(int position) Q_DECL_OVERRIDE; + int cursorPosition() const override; + void setCursorPosition(int position) override; // text - QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE; + QString text(int startOffset, int endOffset) const override; QString textBeforeOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - int characterCount() const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; + int characterCount() const override; // character <-> geometry - QRect characterRect(int offset) const Q_DECL_OVERRIDE; - int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE; + QRect characterRect(int offset) const override; + int offsetAtPoint(const QPoint &point) const override; - QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + QString attributes(int offset, int *startOffset, int *endOffset) const override; // QAccessibleEditableTextInterface - void deleteText(int startOffset, int endOffset) Q_DECL_OVERRIDE; - void insertText(int offset, const QString &text) Q_DECL_OVERRIDE; - void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE; + void deleteText(int startOffset, int endOffset) override; + void insertText(int offset, const QString &text) override; + void replaceText(int startOffset, int endOffset, const QString &text) override; using QAccessibleWidget::text; @@ -138,25 +138,25 @@ class QAccessiblePlainTextEdit : public QAccessibleTextWidget public: explicit QAccessiblePlainTextEdit(QWidget *o); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessible::State state() const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleTextInterface - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + void scrollToSubstring(int startIndex, int endIndex) override; using QAccessibleTextWidget::text; protected: QPlainTextEdit *plainTextEdit() const; - QPoint scrollBarPosition() const Q_DECL_OVERRIDE; - QTextCursor textCursor() const Q_DECL_OVERRIDE; - void setTextCursor(const QTextCursor &textCursor) Q_DECL_OVERRIDE; - QTextDocument *textDocument() const Q_DECL_OVERRIDE; - QWidget *viewport() const Q_DECL_OVERRIDE; + QPoint scrollBarPosition() const override; + QTextCursor textCursor() const override; + void setTextCursor(const QTextCursor &textCursor) override; + QTextDocument *textDocument() const override; + QWidget *viewport() const override; }; class QAccessibleTextEdit : public QAccessibleTextWidget @@ -164,25 +164,25 @@ class QAccessibleTextEdit : public QAccessibleTextWidget public: explicit QAccessibleTextEdit(QWidget *o); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessible::State state() const override; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleTextInterface - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + void scrollToSubstring(int startIndex, int endIndex) override; using QAccessibleTextWidget::text; protected: QTextEdit *textEdit() const; - QPoint scrollBarPosition() const Q_DECL_OVERRIDE; - QTextCursor textCursor() const Q_DECL_OVERRIDE; - void setTextCursor(const QTextCursor &textCursor) Q_DECL_OVERRIDE; - QTextDocument *textDocument() const Q_DECL_OVERRIDE; - QWidget *viewport() const Q_DECL_OVERRIDE; + QPoint scrollBarPosition() const override; + QTextCursor textCursor() const override; + void setTextCursor(const QTextCursor &textCursor) override; + QTextDocument *textDocument() const override; + QWidget *viewport() const override; }; #endif // QT_NO_TEXTEDIT #endif //QT_NO_CURSOR @@ -192,10 +192,10 @@ class QAccessibleStackedWidget : public QAccessibleWidget public: explicit QAccessibleStackedWidget(QWidget *widget); - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *childAt(int x, int y) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QAccessibleInterface *child(int index) const override; protected: QStackedWidget *stackedWidget() const; @@ -222,9 +222,9 @@ class QAccessibleMdiArea : public QAccessibleWidget public: explicit QAccessibleMdiArea(QWidget *widget); - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; protected: QMdiArea *mdiArea() const; @@ -235,13 +235,13 @@ class QAccessibleMdiSubWindow : public QAccessibleWidget public: explicit QAccessibleMdiSubWindow(QWidget *widget); - QString text(QAccessible::Text textType) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text textType, const QString &text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text textType) const override; + void setText(QAccessible::Text textType, const QString &text) override; + QAccessible::State state() const override; + int childCount() const override; + QAccessibleInterface *child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QRect rect() const override; protected: QMdiSubWindow *mdiSubWindow() const; @@ -262,7 +262,7 @@ class QAccessibleTextBrowser : public QAccessibleTextEdit public: explicit QAccessibleTextBrowser(QWidget *widget); - QAccessible::Role role() const Q_DECL_OVERRIDE; + QAccessible::Role role() const override; }; #endif // QT_CONFIG(textbrowser) && QT_NO_CURSOR @@ -272,10 +272,10 @@ class QAccessibleCalendarWidget : public QAccessibleWidget public: explicit QAccessibleCalendarWidget(QWidget *widget); - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; protected: QCalendarWidget *calendarWidget() const; @@ -291,11 +291,11 @@ class QAccessibleDockWidget: public QAccessibleWidget { public: explicit QAccessibleDockWidget(QWidget *widget); - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - QRect rect () const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int indexOfChild(const QAccessibleInterface *child) const override; + int childCount() const override; + QRect rect () const override; + QString text(QAccessible::Text t) const override; QDockWidget *dockWidget() const; protected: @@ -310,10 +310,10 @@ class QAccessibleMainWindow : public QAccessibleWidget public: explicit QAccessibleMainWindow(QWidget *widget); - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *iface) const Q_DECL_OVERRIDE; - QAccessibleInterface *childAt(int x, int y) const Q_DECL_OVERRIDE; + QAccessibleInterface *child(int index) const override; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *iface) const override; + QAccessibleInterface *childAt(int x, int y) const override; QMainWindow *mainWindow() const; }; diff --git a/src/widgets/accessible/rangecontrols_p.h b/src/widgets/accessible/rangecontrols_p.h index 49f57fa1c6..41c3747c05 100644 --- a/src/widgets/accessible/rangecontrols_p.h +++ b/src/widgets/accessible/rangecontrols_p.h @@ -78,41 +78,41 @@ public: explicit QAccessibleAbstractSpinBox(QWidget *w); virtual ~QAccessibleAbstractSpinBox(); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleValueInterface - QVariant currentValue() const Q_DECL_OVERRIDE; - void setCurrentValue(const QVariant &value) Q_DECL_OVERRIDE; - QVariant maximumValue() const Q_DECL_OVERRIDE; - QVariant minimumValue() const Q_DECL_OVERRIDE; - QVariant minimumStepSize() const Q_DECL_OVERRIDE; + QVariant currentValue() const override; + void setCurrentValue(const QVariant &value) override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; // QAccessibleTextInterface - void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE; - QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - int cursorPosition() const Q_DECL_OVERRIDE; - QRect characterRect(int offset) const Q_DECL_OVERRIDE; - int selectionCount() const Q_DECL_OVERRIDE; - int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE; - void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE; + void addSelection(int startOffset, int endOffset) override; + QString attributes(int offset, int *startOffset, int *endOffset) const override; + int cursorPosition() const override; + QRect characterRect(int offset) const override; + int selectionCount() const override; + int offsetAtPoint(const QPoint &point) const override; + void selection(int selectionIndex, int *startOffset, int *endOffset) const override; + QString text(int startOffset, int endOffset) const override; QString textBeforeOffset (int offset, QAccessible::TextBoundaryType boundaryType, - int *endOffset, int *startOffset) const Q_DECL_OVERRIDE; + int *endOffset, int *startOffset) const override; QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - void removeSelection(int selectionIndex) Q_DECL_OVERRIDE; - void setCursorPosition(int position) Q_DECL_OVERRIDE; - void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE; - int characterCount() const Q_DECL_OVERRIDE; - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; + void removeSelection(int selectionIndex) override; + void setCursorPosition(int position) override; + void setSelection(int selectionIndex, int startOffset, int endOffset) override; + int characterCount() const override; + void scrollToSubstring(int startIndex, int endIndex) override; // QAccessibleEditableTextInterface - void deleteText(int startOffset, int endOffset) Q_DECL_OVERRIDE; - void insertText(int offset, const QString &text) Q_DECL_OVERRIDE; - void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE; + void deleteText(int startOffset, int endOffset) override; + void insertText(int offset, const QString &text) override; + void replaceText(int startOffset, int endOffset, const QString &text) override; protected: QAbstractSpinBox *abstractSpinBox() const; @@ -135,7 +135,7 @@ class QAccessibleDoubleSpinBox : public QAccessibleAbstractSpinBox public: explicit QAccessibleDoubleSpinBox(QWidget *widget); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; using QAccessibleAbstractSpinBox::text; protected: @@ -148,14 +148,14 @@ class QAccessibleAbstractSlider: public QAccessibleWidget, public QAccessibleVal { public: explicit QAccessibleAbstractSlider(QWidget *w, QAccessible::Role r = QAccessible::Slider); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleValueInterface - QVariant currentValue() const Q_DECL_OVERRIDE; - void setCurrentValue(const QVariant &value) Q_DECL_OVERRIDE; - QVariant maximumValue() const Q_DECL_OVERRIDE; - QVariant minimumValue() const Q_DECL_OVERRIDE; - QVariant minimumStepSize() const Q_DECL_OVERRIDE; + QVariant currentValue() const override; + void setCurrentValue(const QVariant &value) override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; protected: QAbstractSlider *abstractSlider() const; @@ -167,7 +167,7 @@ class QAccessibleScrollBar : public QAccessibleAbstractSlider { public: explicit QAccessibleScrollBar(QWidget *w); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; protected: QScrollBar *scrollBar() const; @@ -179,7 +179,7 @@ class QAccessibleSlider : public QAccessibleAbstractSlider { public: explicit QAccessibleSlider(QWidget *w); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; protected: QSlider *slider() const; @@ -192,7 +192,7 @@ class QAccessibleDial : public QAccessibleAbstractSlider public: explicit QAccessibleDial(QWidget *w); - QString text(QAccessible::Text textType) const Q_DECL_OVERRIDE; + QString text(QAccessible::Text textType) const override; protected: QDial *dial() const; diff --git a/src/widgets/accessible/simplewidgets_p.h b/src/widgets/accessible/simplewidgets_p.h index c25aa31425..08ce1a9d77 100644 --- a/src/widgets/accessible/simplewidgets_p.h +++ b/src/widgets/accessible/simplewidgets_p.h @@ -72,14 +72,14 @@ class QAccessibleButton : public QAccessibleWidget public: QAccessibleButton(QWidget *w); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - QRect rect() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::State state() const override; + QRect rect() const override; + QAccessible::Role role() const override; - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &actionName) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &actionName) const override; protected: QAbstractButton *button() const; @@ -92,15 +92,15 @@ class QAccessibleToolButton : public QAccessibleButton public: QAccessibleToolButton(QWidget *w); - QAccessible::State state() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; + QAccessible::State state() const override; + QAccessible::Role role() const override; - int childCount() const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int index) const Q_DECL_OVERRIDE; + int childCount() const override; + QAccessibleInterface *child(int index) const override; // QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; protected: QToolButton *toolButton() const; @@ -114,16 +114,16 @@ class QAccessibleDisplay : public QAccessibleWidget, public QAccessibleImageInte public: explicit QAccessibleDisplay(QWidget *w, QAccessible::Role role = QAccessible::StaticText); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + QAccessible::Role role() const override; - QVector >relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + QVector >relations(QAccessible::Relation match = QAccessible::AllRelations) const override; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleImageInterface - QString imageDescription() const Q_DECL_OVERRIDE; - QSize imageSize() const Q_DECL_OVERRIDE; - QPoint imagePosition() const Q_DECL_OVERRIDE; + QString imageDescription() const override; + QSize imageSize() const override; + QPoint imagePosition() const override; }; #if QT_CONFIG(groupbox) @@ -132,16 +132,16 @@ class QAccessibleGroupBox : public QAccessibleWidget public: explicit QAccessibleGroupBox(QWidget *w); - QAccessible::State state() const Q_DECL_OVERRIDE; - QAccessible::Role role() const Q_DECL_OVERRIDE; - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; + QAccessible::State state() const override; + QAccessible::Role role() const override; + QString text(QAccessible::Text t) const override; - QVector >relations(QAccessible::Relation match = QAccessible::AllRelations) const Q_DECL_OVERRIDE; + QVector >relations(QAccessible::Relation match = QAccessible::AllRelations) const override; //QAccessibleActionInterface - QStringList actionNames() const Q_DECL_OVERRIDE; - void doAction(const QString &actionName) Q_DECL_OVERRIDE; - QStringList keyBindingsForAction(const QString &) const Q_DECL_OVERRIDE; + QStringList actionNames() const override; + void doAction(const QString &actionName) override; + QStringList keyBindingsForAction(const QString &) const override; private: QGroupBox *groupBox() const; @@ -154,36 +154,36 @@ class QAccessibleLineEdit : public QAccessibleWidget, public QAccessibleTextInte public: explicit QAccessibleLineEdit(QWidget *o, const QString &name = QString()); - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE; - void setText(QAccessible::Text t, const QString &text) Q_DECL_OVERRIDE; - QAccessible::State state() const Q_DECL_OVERRIDE; - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + QString text(QAccessible::Text t) const override; + void setText(QAccessible::Text t, const QString &text) override; + QAccessible::State state() const override; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleTextInterface - void addSelection(int startOffset, int endOffset) Q_DECL_OVERRIDE; - QString attributes(int offset, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - int cursorPosition() const Q_DECL_OVERRIDE; - QRect characterRect(int offset) const Q_DECL_OVERRIDE; - int selectionCount() const Q_DECL_OVERRIDE; - int offsetAtPoint(const QPoint &point) const Q_DECL_OVERRIDE; - void selection(int selectionIndex, int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - QString text(int startOffset, int endOffset) const Q_DECL_OVERRIDE; + void addSelection(int startOffset, int endOffset) override; + QString attributes(int offset, int *startOffset, int *endOffset) const override; + int cursorPosition() const override; + QRect characterRect(int offset) const override; + int selectionCount() const override; + int offsetAtPoint(const QPoint &point) const override; + void selection(int selectionIndex, int *startOffset, int *endOffset) const override; + QString text(int startOffset, int endOffset) const override; QString textBeforeOffset (int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAfterOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; QString textAtOffset(int offset, QAccessible::TextBoundaryType boundaryType, - int *startOffset, int *endOffset) const Q_DECL_OVERRIDE; - void removeSelection(int selectionIndex) Q_DECL_OVERRIDE; - void setCursorPosition(int position) Q_DECL_OVERRIDE; - void setSelection(int selectionIndex, int startOffset, int endOffset) Q_DECL_OVERRIDE; - int characterCount() const Q_DECL_OVERRIDE; - void scrollToSubstring(int startIndex, int endIndex) Q_DECL_OVERRIDE; + int *startOffset, int *endOffset) const override; + void removeSelection(int selectionIndex) override; + void setCursorPosition(int position) override; + void setSelection(int selectionIndex, int startOffset, int endOffset) override; + int characterCount() const override; + void scrollToSubstring(int startIndex, int endIndex) override; // QAccessibleEditableTextInterface - void deleteText(int startOffset, int endOffset) Q_DECL_OVERRIDE; - void insertText(int offset, const QString &text) Q_DECL_OVERRIDE; - void replaceText(int startOffset, int endOffset, const QString &text) Q_DECL_OVERRIDE; + void deleteText(int startOffset, int endOffset) override; + void insertText(int offset, const QString &text) override; + void replaceText(int startOffset, int endOffset, const QString &text) override; protected: QLineEdit *lineEdit() const; friend class QAccessibleAbstractSpinBox; @@ -195,14 +195,14 @@ class QAccessibleProgressBar : public QAccessibleDisplay, public QAccessibleValu { public: explicit QAccessibleProgressBar(QWidget *o); - void *interface_cast(QAccessible::InterfaceType t) Q_DECL_OVERRIDE; + void *interface_cast(QAccessible::InterfaceType t) override; // QAccessibleValueInterface - QVariant currentValue() const Q_DECL_OVERRIDE; - QVariant maximumValue() const Q_DECL_OVERRIDE; - QVariant minimumValue() const Q_DECL_OVERRIDE; - QVariant minimumStepSize() const Q_DECL_OVERRIDE; - void setCurrentValue(const QVariant &) Q_DECL_OVERRIDE {} + QVariant currentValue() const override; + QVariant maximumValue() const override; + QVariant minimumValue() const override; + QVariant minimumStepSize() const override; + void setCurrentValue(const QVariant &) override {} protected: QProgressBar *progressBar() const; @@ -214,9 +214,9 @@ class QAccessibleWindowContainer : public QAccessibleWidget { public: QAccessibleWindowContainer(QWidget *w); - int childCount() const Q_DECL_OVERRIDE; - int indexOfChild(const QAccessibleInterface *child) const Q_DECL_OVERRIDE; - QAccessibleInterface *child(int i) const Q_DECL_OVERRIDE; + int childCount() const override; + int indexOfChild(const QAccessibleInterface *child) const override; + QAccessibleInterface *child(int i) const override; private: QWindowContainer *container() const; diff --git a/src/widgets/dialogs/qcolordialog.cpp b/src/widgets/dialogs/qcolordialog.cpp index 9465575b3b..8cc0812125 100644 --- a/src/widgets/dialogs/qcolordialog.cpp +++ b/src/widgets/dialogs/qcolordialog.cpp @@ -132,7 +132,7 @@ public: bool handleColorPickingMouseButtonRelease(QMouseEvent *e); bool handleColorPickingKeyPress(QKeyEvent *e); - bool canBeNativeDialog() const Q_DECL_OVERRIDE; + bool canBeNativeDialog() const override; QWellArray *custom; QWellArray *standard; @@ -165,8 +165,8 @@ public: #endif private: - virtual void initHelper(QPlatformDialogHelper *h) Q_DECL_OVERRIDE; - virtual void helperPrepareShow(QPlatformDialogHelper *h) Q_DECL_OVERRIDE; + virtual void initHelper(QPlatformDialogHelper *h) override; + virtual void helperPrepareShow(QPlatformDialogHelper *h) override; }; //////////// QWellArray BEGIN @@ -190,7 +190,7 @@ public: virtual void setCurrent(int row, int col); virtual void setSelected(int row, int col); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; inline int cellWidth() const { return cellw; } @@ -240,12 +240,12 @@ protected: virtual void paintCell(QPainter *, int row, int col, const QRect&); virtual void paintCellContents(QPainter *, int row, int col, const QRect&); - void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent*) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent*) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void keyPressEvent(QKeyEvent*) override; + void focusInEvent(QFocusEvent*) override; + void focusOutEvent(QFocusEvent*) override; + void paintEvent(QPaintEvent *) override; private: Q_DISABLE_COPY(QWellArray) @@ -493,7 +493,7 @@ class QColorPickingEventFilter : public QObject { public: explicit QColorPickingEventFilter(QColorDialogPrivate *dp, QObject *parent = 0) : QObject(parent), m_dp(dp) {} - bool eventFilter(QObject *, QEvent *event) Q_DECL_OVERRIDE + bool eventFilter(QObject *, QEvent *event) override { switch (event->type()) { case QEvent::MouseMove: @@ -584,15 +584,15 @@ public: { setSizePolicy(QSizePolicy(QSizePolicy::Minimum, QSizePolicy::Minimum)); } protected: - void paintCellContents(QPainter *, int row, int col, const QRect&) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void paintCellContents(QPainter *, int row, int col, const QRect&) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *e) override; + void dragLeaveEvent(QDragLeaveEvent *e) override; + void dragMoveEvent(QDragMoveEvent *e) override; + void dropEvent(QDropEvent *e) override; #endif private: @@ -706,11 +706,11 @@ signals: void newCol(int h, int s); protected: - QSize sizeHint() const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + void paintEvent(QPaintEvent*) override; + void mouseMoveEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void resizeEvent(QResizeEvent *) override; private: int hue; @@ -743,9 +743,9 @@ signals: void newHsv(int h, int s, int v); protected: - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent*) override; + void mouseMoveEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; private: enum { foff = 3, coff = 4 }; //frame and contents offset @@ -1065,14 +1065,14 @@ signals: void colorDropped(QRgb); protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *e) override; + void dragLeaveEvent(QDragLeaveEvent *e) override; + void dropEvent(QDropEvent *e) override; #endif private: diff --git a/src/widgets/dialogs/qcolordialog.h b/src/widgets/dialogs/qcolordialog.h index a27cfaf953..daad20710c 100644 --- a/src/widgets/dialogs/qcolordialog.h +++ b/src/widgets/dialogs/qcolordialog.h @@ -85,7 +85,7 @@ public: using QDialog::open; void open(QObject *receiver, const char *member); - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; static QColor getColor(const QColor &initial = Qt::white, QWidget *parent = Q_NULLPTR, @@ -106,8 +106,8 @@ Q_SIGNALS: void colorSelected(const QColor &color); protected: - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void done(int result) Q_DECL_OVERRIDE; + void changeEvent(QEvent *event) override; + void done(int result) override; private: Q_DISABLE_COPY(QColorDialog) diff --git a/src/widgets/dialogs/qerrormessage.cpp b/src/widgets/dialogs/qerrormessage.cpp index 39035b743d..fd68f19680 100644 --- a/src/widgets/dialogs/qerrormessage.cpp +++ b/src/widgets/dialogs/qerrormessage.cpp @@ -95,8 +95,8 @@ public: QErrorMessageTextView(QWidget *parent) : QTextEdit(parent) { setReadOnly(true); } - virtual QSize minimumSizeHint() const Q_DECL_OVERRIDE; - virtual QSize sizeHint() const Q_DECL_OVERRIDE; + virtual QSize minimumSizeHint() const override; + virtual QSize sizeHint() const override; }; } // unnamed namespace diff --git a/src/widgets/dialogs/qerrormessage.h b/src/widgets/dialogs/qerrormessage.h index 4cb1fad845..8b350eefee 100644 --- a/src/widgets/dialogs/qerrormessage.h +++ b/src/widgets/dialogs/qerrormessage.h @@ -65,8 +65,8 @@ public Q_SLOTS: void showMessage(const QString &message, const QString &type); protected: - void done(int) Q_DECL_OVERRIDE; - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + void done(int) override; + void changeEvent(QEvent *e) override; private: Q_DISABLE_COPY(QErrorMessage) diff --git a/src/widgets/dialogs/qfiledialog.h b/src/widgets/dialogs/qfiledialog.h index b9092e036d..9f331101d1 100644 --- a/src/widgets/dialogs/qfiledialog.h +++ b/src/widgets/dialogs/qfiledialog.h @@ -190,7 +190,7 @@ public: using QDialog::open; void open(QObject *receiver, const char *member); - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; Q_SIGNALS: void fileSelected(const QString &file); @@ -266,9 +266,9 @@ public: protected: QFileDialog(const QFileDialogArgs &args); - void done(int result) Q_DECL_OVERRIDE; - void accept() Q_DECL_OVERRIDE; - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + void done(int result) override; + void accept() override; + void changeEvent(QEvent *e) override; private: Q_DECLARE_PRIVATE(QFileDialog) diff --git a/src/widgets/dialogs/qfiledialog_p.h b/src/widgets/dialogs/qfiledialog_p.h index f7a3c6b091..db54bd39cb 100644 --- a/src/widgets/dialogs/qfiledialog_p.h +++ b/src/widgets/dialogs/qfiledialog_p.h @@ -252,7 +252,7 @@ public: // setVisible_sys returns true if it ends up showing a native // dialog. Returning false means that a non-native dialog must be // used instead. - bool canBeNativeDialog() const Q_DECL_OVERRIDE; + bool canBeNativeDialog() const override; inline bool usingWidgets() const; inline void setDirectory_sys(const QUrl &directory); @@ -284,9 +284,9 @@ public: ~QFileDialogPrivate(); private: - virtual void initHelper(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - virtual void helperPrepareShow(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - virtual void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) Q_DECL_OVERRIDE; + virtual void initHelper(QPlatformDialogHelper *) override; + virtual void helperPrepareShow(QPlatformDialogHelper *) override; + virtual void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override; Q_DISABLE_COPY(QFileDialogPrivate) }; @@ -296,7 +296,7 @@ class QFileDialogLineEdit : public QLineEdit public: QFileDialogLineEdit(QWidget *parent = 0) : QLineEdit(parent), d_ptr(0){} void setFileDialogPrivate(QFileDialogPrivate *d_pointer) {d_ptr = d_pointer; } - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) override; bool hideOnEsc; private: QFileDialogPrivate *d_ptr; @@ -307,10 +307,10 @@ class QFileDialogComboBox : public QComboBox public: QFileDialogComboBox(QWidget *parent = 0) : QComboBox(parent), urlModel(0) {} void setFileDialogPrivate(QFileDialogPrivate *d_pointer); - void showPopup() Q_DECL_OVERRIDE; + void showPopup() override; void setHistory(const QStringList &paths); QStringList history() const { return m_history; } - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; private: QUrlModel *urlModel; @@ -323,9 +323,9 @@ class QFileDialogListView : public QListView public: QFileDialogListView(QWidget *parent = 0); void setFileDialogPrivate(QFileDialogPrivate *d_pointer); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) override; private: QFileDialogPrivate *d_ptr; }; @@ -335,10 +335,10 @@ class QFileDialogTreeView : public QTreeView public: QFileDialogTreeView(QWidget *parent); void setFileDialogPrivate(QFileDialogPrivate *d_pointer); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *e) override; private: QFileDialogPrivate *d_ptr; }; diff --git a/src/widgets/dialogs/qfileinfogatherer_p.h b/src/widgets/dialogs/qfileinfogatherer_p.h index 52578126de..1e97cc3558 100644 --- a/src/widgets/dialogs/qfileinfogatherer_p.h +++ b/src/widgets/dialogs/qfileinfogatherer_p.h @@ -185,7 +185,7 @@ private Q_SLOTS: void driveRemoved(); private: - void run() Q_DECL_OVERRIDE; + void run() override; // called by run(): void getFileInfos(const QString &path, const QStringList &files); void fetch(const QFileInfo &info, QElapsedTimer &base, bool &firstTime, QVector > &updatedFiles, const QString &path); diff --git a/src/widgets/dialogs/qfilesystemmodel.h b/src/widgets/dialogs/qfilesystemmodel.h index a5f23c9220..5862006e60 100644 --- a/src/widgets/dialogs/qfilesystemmodel.h +++ b/src/widgets/dialogs/qfilesystemmodel.h @@ -78,33 +78,33 @@ public: explicit QFileSystemModel(QObject *parent = Q_NULLPTR); ~QFileSystemModel(); - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; QModelIndex index(const QString &path, int column = 0) const; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; + QModelIndex parent(const QModelIndex &child) const override; using QObject::parent; - QModelIndex sibling(int row, int column, const QModelIndex &idx) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - bool canFetchMore(const QModelIndex &parent) const Q_DECL_OVERRIDE; - void fetchMore(const QModelIndex &parent) Q_DECL_OVERRIDE; + QModelIndex sibling(int row, int column, const QModelIndex &idx) const override; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; + bool canFetchMore(const QModelIndex &parent) const override; + void fetchMore(const QModelIndex &parent) override; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; QVariant myComputer(int role = Qt::DisplayRole) const; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; - void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; - QStringList mimeTypes() const Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; + Qt::DropActions supportedDropActions() const override; // QFileSystemModel specific API QModelIndex setRootPath(const QString &path); @@ -145,8 +145,8 @@ public: protected: QFileSystemModel(QFileSystemModelPrivate &, QObject *parent = Q_NULLPTR); - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; + bool event(QEvent *event) override; private: Q_DECLARE_PRIVATE(QFileSystemModel) diff --git a/src/widgets/dialogs/qfontdialog.cpp b/src/widgets/dialogs/qfontdialog.cpp index 587e31d8c5..5f912c582f 100644 --- a/src/widgets/dialogs/qfontdialog.cpp +++ b/src/widgets/dialogs/qfontdialog.cpp @@ -84,7 +84,7 @@ public: int row = QListView::currentIndex().row(); return row < 0 ? QString() : model()->stringList().at(row); } - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE { + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override { QListView::currentChanged(current, previous); if (current.isValid()) emit highlighted(current.row()); diff --git a/src/widgets/dialogs/qfontdialog.h b/src/widgets/dialogs/qfontdialog.h index 3fb3997b85..c5a20340e1 100644 --- a/src/widgets/dialogs/qfontdialog.h +++ b/src/widgets/dialogs/qfontdialog.h @@ -89,7 +89,7 @@ public: using QDialog::open; void open(QObject *receiver, const char *member); - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; static QFont getFont(bool *ok, QWidget *parent = Q_NULLPTR); static QFont getFont(bool *ok, const QFont &initial, QWidget *parent = Q_NULLPTR, const QString &title = QString(), @@ -100,9 +100,9 @@ Q_SIGNALS: void fontSelected(const QFont &font); protected: - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void done(int result) Q_DECL_OVERRIDE; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + void changeEvent(QEvent *event) override; + void done(int result) override; + bool eventFilter(QObject *object, QEvent *event) override; private: Q_DISABLE_COPY(QFontDialog) diff --git a/src/widgets/dialogs/qfontdialog_p.h b/src/widgets/dialogs/qfontdialog_p.h index ae923d94ed..202247a3b4 100644 --- a/src/widgets/dialogs/qfontdialog_p.h +++ b/src/widgets/dialogs/qfontdialog_p.h @@ -141,12 +141,12 @@ public: QPointer receiverToDisconnectOnClose; QByteArray memberToDisconnectOnClose; - bool canBeNativeDialog() const Q_DECL_OVERRIDE; + bool canBeNativeDialog() const override; void _q_runNativeAppModalPanel(); private: - virtual void initHelper(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - virtual void helperPrepareShow(QPlatformDialogHelper *) Q_DECL_OVERRIDE; + virtual void initHelper(QPlatformDialogHelper *) override; + virtual void helperPrepareShow(QPlatformDialogHelper *) override; }; QT_END_NAMESPACE diff --git a/src/widgets/dialogs/qfscompleter_p.h b/src/widgets/dialogs/qfscompleter_p.h index ce0612f293..3b829d4a52 100644 --- a/src/widgets/dialogs/qfscompleter_p.h +++ b/src/widgets/dialogs/qfscompleter_p.h @@ -71,8 +71,8 @@ public: setCaseSensitivity(Qt::CaseInsensitive); #endif } - QString pathFromIndex(const QModelIndex &index) const Q_DECL_OVERRIDE; - QStringList splitPath(const QString& path) const Q_DECL_OVERRIDE; + QString pathFromIndex(const QModelIndex &index) const override; + QStringList splitPath(const QString& path) const override; QAbstractProxyModel *proxyModel; QFileSystemModel *sourceModel; diff --git a/src/widgets/dialogs/qinputdialog.cpp b/src/widgets/dialogs/qinputdialog.cpp index 4c0f22ae97..757b53e5ad 100644 --- a/src/widgets/dialogs/qinputdialog.cpp +++ b/src/widgets/dialogs/qinputdialog.cpp @@ -115,7 +115,7 @@ private slots: void notifyTextChanged() { emit textChanged(hasAcceptableInput()); } private: - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE { + void keyPressEvent(QKeyEvent *event) override { if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) { #ifndef QT_NO_PROPERTIES setProperty("value", property("value")); @@ -126,7 +126,7 @@ private: notifyTextChanged(); } - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE { + void mousePressEvent(QMouseEvent *event) override { QSpinBox::mousePressEvent(event); notifyTextChanged(); } @@ -150,7 +150,7 @@ private slots: void notifyTextChanged() { emit textChanged(hasAcceptableInput()); } private: - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE { + void keyPressEvent(QKeyEvent *event) override { if ((event->key() == Qt::Key_Return || event->key() == Qt::Key_Enter) && !hasAcceptableInput()) { #ifndef QT_NO_PROPERTIES setProperty("value", property("value")); @@ -161,7 +161,7 @@ private: notifyTextChanged(); } - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE { + void mousePressEvent(QMouseEvent *event) override { QDoubleSpinBox::mousePressEvent(event); notifyTextChanged(); } diff --git a/src/widgets/dialogs/qinputdialog.h b/src/widgets/dialogs/qinputdialog.h index e41d442498..5c97a425b7 100644 --- a/src/widgets/dialogs/qinputdialog.h +++ b/src/widgets/dialogs/qinputdialog.h @@ -154,10 +154,10 @@ public: using QDialog::open; void open(QObject *receiver, const char *member); - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; + QSize sizeHint() const override; - void setVisible(bool visible) Q_DECL_OVERRIDE; + void setVisible(bool visible) override; static QString getText(QWidget *parent, const QString &title, const QString &label, QLineEdit::EchoMode echo = QLineEdit::Normal, @@ -206,7 +206,7 @@ Q_SIGNALS: void doubleValueSelected(double value); public: - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; private: Q_DISABLE_COPY(QInputDialog) diff --git a/src/widgets/dialogs/qmessagebox.cpp b/src/widgets/dialogs/qmessagebox.cpp index 0693f4bea8..4debdc114b 100644 --- a/src/widgets/dialogs/qmessagebox.cpp +++ b/src/widgets/dialogs/qmessagebox.cpp @@ -94,7 +94,7 @@ public: public: TextEdit(QWidget *parent=0) : QTextEdit(parent) { } #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent * e) Q_DECL_OVERRIDE + void contextMenuEvent(QContextMenuEvent * e) override { QMenu *menu = createStandardContextMenu(); menu->setAttribute(Qt::WA_DeleteOnClose); @@ -169,7 +169,7 @@ public: void setLabel(DetailButtonLabel lbl) { setText(label(lbl)); } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { ensurePolished(); QStyleOptionButton opt; @@ -255,9 +255,9 @@ public: QByteArray signalToDisconnectOnClose; QSharedPointer options; private: - void initHelper(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - void helperPrepareShow(QPlatformDialogHelper *) Q_DECL_OVERRIDE; - void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) Q_DECL_OVERRIDE; + void initHelper(QPlatformDialogHelper *) override; + void helperPrepareShow(QPlatformDialogHelper *) override; + void helperDone(QDialog::DialogCode, QPlatformDialogHelper *) override; }; void QMessageBoxPrivate::init(const QString &title, const QString &text) diff --git a/src/widgets/dialogs/qmessagebox.h b/src/widgets/dialogs/qmessagebox.h index 6d5179602b..56f156c616 100644 --- a/src/widgets/dialogs/qmessagebox.h +++ b/src/widgets/dialogs/qmessagebox.h @@ -290,12 +290,12 @@ public Q_SLOTS: #endif protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void resizeEvent(QResizeEvent *event) override; + void showEvent(QShowEvent *event) override; + void closeEvent(QCloseEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void changeEvent(QEvent *event) override; private: Q_PRIVATE_SLOT(d_func(), void _q_buttonClicked(QAbstractButton *)) diff --git a/src/widgets/dialogs/qprogressdialog.h b/src/widgets/dialogs/qprogressdialog.h index 902a4de5d2..f6dcfdb2e9 100644 --- a/src/widgets/dialogs/qprogressdialog.h +++ b/src/widgets/dialogs/qprogressdialog.h @@ -85,7 +85,7 @@ public: int value() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; QString labelText() const; int minimumDuration() const; @@ -113,10 +113,10 @@ Q_SIGNALS: void canceled(); protected: - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *event) override; + void closeEvent(QCloseEvent *event) override; + void changeEvent(QEvent *event) override; + void showEvent(QShowEvent *event) override; protected Q_SLOTS: void forceShow(); diff --git a/src/widgets/dialogs/qsidebar_p.h b/src/widgets/dialogs/qsidebar_p.h index 17d576e54d..58ac3569d5 100644 --- a/src/widgets/dialogs/qsidebar_p.h +++ b/src/widgets/dialogs/qsidebar_p.h @@ -69,7 +69,7 @@ class QSideBarDelegate : public QStyledItemDelegate public: QSideBarDelegate(QWidget *parent = 0) : QStyledItemDelegate(parent) {} void initStyleOption(QStyleOptionViewItem *option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; }; class Q_AUTOTEST_EXPORT QUrlModel : public QStandardItemModel @@ -84,14 +84,14 @@ public: QUrlModel(QObject *parent = 0); - QStringList mimeTypes() const Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; #ifndef QT_NO_DRAGANDDROP bool canDrop(QDragEnterEvent *event); - bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; + bool dropMimeData(const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent) override; #endif - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole) Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role=Qt::EditRole) override; void setUrls(const QList &list); void addUrls(const QList &urls, int row = -1, bool move = true); @@ -131,7 +131,7 @@ public: void setModelAndUrls(QFileSystemModel *model, const QList &newUrls); ~QSidebar(); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; void setUrls(const QList &list) { urlModel->setUrls(list); } void addUrls(const QList &list, int row) { urlModel->addUrls(list, row); } @@ -140,10 +140,10 @@ public: void selectUrl(const QUrl &url); protected: - bool event(QEvent * e) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent * e) override; + void focusInEvent(QFocusEvent *event) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) override; #endif private Q_SLOTS: diff --git a/src/widgets/dialogs/qwizard.cpp b/src/widgets/dialogs/qwizard.cpp index 3d9b6a3d62..f5dfe76c39 100644 --- a/src/widgets/dialogs/qwizard.cpp +++ b/src/widgets/dialogs/qwizard.cpp @@ -294,7 +294,7 @@ public: Qt::TextFormat titleFormat, Qt::TextFormat subTitleFormat); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; #if QT_CONFIG(style_windowsvista) private: bool vistaDisabled() const; @@ -450,7 +450,7 @@ public: m_layout->addWidget(m_sideWidget); } - QSize minimumSizeHint() const Q_DECL_OVERRIDE { + QSize minimumSizeHint() const override { if (pixmap() && !pixmap()->isNull()) return pixmap()->size(); return QFrame::minimumSizeHint(); diff --git a/src/widgets/dialogs/qwizard.h b/src/widgets/dialogs/qwizard.h index 4d03bf91d4..1850d9e967 100644 --- a/src/widgets/dialogs/qwizard.h +++ b/src/widgets/dialogs/qwizard.h @@ -168,8 +168,8 @@ public: void setDefaultProperty(const char *className, const char *property, const char *changedSignal); - void setVisible(bool visible) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + void setVisible(bool visible) override; + QSize sizeHint() const override; Q_SIGNALS: void currentIdChanged(int id); @@ -184,13 +184,13 @@ public Q_SLOTS: void restart(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void paintEvent(QPaintEvent *event) override; #if defined(Q_OS_WIN) || defined(Q_CLANG_QDOC) - bool nativeEvent(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; + bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; #endif - void done(int result) Q_DECL_OVERRIDE; + void done(int result) override; virtual void initializePage(int id); virtual void cleanupPage(int id); diff --git a/src/widgets/effects/qgraphicseffect.h b/src/widgets/effects/qgraphicseffect.h index 78d025ded5..ec5cf886a6 100644 --- a/src/widgets/effects/qgraphicseffect.h +++ b/src/widgets/effects/qgraphicseffect.h @@ -144,7 +144,7 @@ Q_SIGNALS: void strengthChanged(qreal strength); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsColorizeEffect) @@ -170,7 +170,7 @@ public: QGraphicsBlurEffect(QObject *parent = Q_NULLPTR); ~QGraphicsBlurEffect(); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; qreal blurRadius() const; BlurHints blurHints() const; @@ -183,7 +183,7 @@ Q_SIGNALS: void blurHintsChanged(BlurHints hints); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsBlurEffect) @@ -205,7 +205,7 @@ public: QGraphicsDropShadowEffect(QObject *parent = Q_NULLPTR); ~QGraphicsDropShadowEffect(); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; QPointF offset() const; inline qreal xOffset() const @@ -241,7 +241,7 @@ Q_SIGNALS: void colorChanged(const QColor &color); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsDropShadowEffect) @@ -270,7 +270,7 @@ Q_SIGNALS: void opacityMaskChanged(const QBrush &mask); protected: - void draw(QPainter *painter) Q_DECL_OVERRIDE; + void draw(QPainter *painter) override; private: Q_DECLARE_PRIVATE(QGraphicsOpacityEffect) diff --git a/src/widgets/effects/qpixmapfilter_p.h b/src/widgets/effects/qpixmapfilter_p.h index 399a835142..0f582bde60 100644 --- a/src/widgets/effects/qpixmapfilter_p.h +++ b/src/widgets/effects/qpixmapfilter_p.h @@ -105,8 +105,8 @@ public: void setConvolutionKernel(const qreal *matrix, int rows, int columns); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; - void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; + void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; private: friend class QGLPixmapConvolutionFilter; @@ -133,8 +133,8 @@ public: qreal radius() const; QGraphicsBlurEffect::BlurHints blurHints() const; - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; - void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; + void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; private: friend class QGLPixmapBlurFilter; @@ -157,7 +157,7 @@ public: void setStrength(qreal strength); qreal strength() const; - void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const Q_DECL_OVERRIDE; + void draw(QPainter *painter, const QPointF &dest, const QPixmap &src, const QRectF &srcRect = QRectF()) const override; }; class QPixmapDropShadowFilterPrivate; @@ -171,8 +171,8 @@ public: QPixmapDropShadowFilter(QObject *parent = 0); ~QPixmapDropShadowFilter(); - QRectF boundingRectFor(const QRectF &rect) const Q_DECL_OVERRIDE; - void draw(QPainter *p, const QPointF &pos, const QPixmap &px, const QRectF &src = QRectF()) const Q_DECL_OVERRIDE; + QRectF boundingRectFor(const QRectF &rect) const override; + void draw(QPainter *p, const QPointF &pos, const QPixmap &px, const QRectF &src = QRectF()) const override; qreal blurRadius() const; void setBlurRadius(qreal radius); diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout.h b/src/widgets/graphicsview/qgraphicsanchorlayout.h index 01dc30718a..34c6e12c16 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout.h @@ -97,14 +97,14 @@ public: qreal horizontalSpacing() const; qreal verticalSpacing() const; - void removeAt(int index) Q_DECL_OVERRIDE; - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - QGraphicsLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; + void removeAt(int index) override; + void setGeometry(const QRectF &rect) override; + int count() const override; + QGraphicsLayoutItem *itemAt(int index) const override; - void invalidate() Q_DECL_OVERRIDE; + void invalidate() override; protected: - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; private: Q_DISABLE_COPY(QGraphicsAnchorLayout) diff --git a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h index e785b486bb..6b2408b2eb 100644 --- a/src/widgets/graphicsview/qgraphicsanchorlayout_p.h +++ b/src/widgets/graphicsview/qgraphicsanchorlayout_p.h @@ -198,7 +198,7 @@ struct SequentialAnchorData : public AnchorData #endif } - virtual void updateChildrenSizes() Q_DECL_OVERRIDE; + virtual void updateChildrenSizes() override; void calculateSizeHints(); QVector m_children; // list of vertices in the sequence @@ -226,7 +226,7 @@ struct ParallelAnchorData : public AnchorData #endif } - virtual void updateChildrenSizes() Q_DECL_OVERRIDE; + virtual void updateChildrenSizes() override; bool calculateSizeHints(); bool secondForward() const { diff --git a/src/widgets/graphicsview/qgraphicsgridlayout.h b/src/widgets/graphicsview/qgraphicsgridlayout.h index fb9bc2e32c..c20a931617 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayout.h +++ b/src/widgets/graphicsview/qgraphicsgridlayout.h @@ -106,16 +106,16 @@ public: QGraphicsLayoutItem *itemAt(int row, int column) const; // inherited from QGraphicsLayout - int count() const Q_DECL_OVERRIDE; - QGraphicsLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - void removeAt(int index) Q_DECL_OVERRIDE; + int count() const override; + QGraphicsLayoutItem *itemAt(int index) const override; + void removeAt(int index) override; void removeItem(QGraphicsLayoutItem *item); - void invalidate() Q_DECL_OVERRIDE; + void invalidate() override; // inherited from QGraphicsLayoutItem - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + void setGeometry(const QRectF &rect) override; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; // #### //QRect cellRect(int row, int column, int rowSpan = 1, int columnSpan = 1) const; diff --git a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h index d797f784b8..370df9eed7 100644 --- a/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h +++ b/src/widgets/graphicsview/qgraphicsgridlayoutengine_p.h @@ -71,35 +71,35 @@ public: Qt::Alignment alignment = 0) : QGridLayoutItem(row, columns, rowSpan, columnSpan, alignment), q_layoutItem(item) {} - virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const Q_DECL_OVERRIDE + virtual QLayoutPolicy::Policy sizePolicy(Qt::Orientation orientation) const override { QSizePolicy sizePolicy(q_layoutItem->sizePolicy()); return (QLayoutPolicy::Policy)((orientation == Qt::Horizontal) ? sizePolicy.horizontalPolicy() : sizePolicy.verticalPolicy()); } - virtual QLayoutPolicy::ControlTypes controlTypes(LayoutSide) const Q_DECL_OVERRIDE + virtual QLayoutPolicy::ControlTypes controlTypes(LayoutSide) const override { const QSizePolicy::ControlType ct = q_layoutItem->sizePolicy().controlType(); return (QLayoutPolicy::ControlTypes)ct; } - virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const Q_DECL_OVERRIDE + virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint) const override { return q_layoutItem->effectiveSizeHint(which, constraint); } bool isHidden() const; - virtual bool isIgnored() const Q_DECL_OVERRIDE; + virtual bool isIgnored() const override; - virtual void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE + virtual void setGeometry(const QRectF &rect) override { q_layoutItem->setGeometry(rect); } - virtual bool hasDynamicConstraint() const Q_DECL_OVERRIDE; - virtual Qt::Orientation dynamicConstraintOrientation() const Q_DECL_OVERRIDE; + virtual bool hasDynamicConstraint() const override; + virtual Qt::Orientation dynamicConstraintOrientation() const override; QGraphicsLayoutItem *layoutItem() const { return q_layoutItem; } diff --git a/src/widgets/graphicsview/qgraphicsitem.h b/src/widgets/graphicsview/qgraphicsitem.h index 11d872f6e6..c291f94c78 100644 --- a/src/widgets/graphicsview/qgraphicsitem.h +++ b/src/widgets/graphicsview/qgraphicsitem.h @@ -588,7 +588,7 @@ Q_SIGNALS: protected: QGraphicsObject(QGraphicsItemPrivate &dd, QGraphicsItem *parent); - bool event(QEvent *ev) Q_DECL_OVERRIDE; + bool event(QEvent *ev) override; private: friend class QGraphicsItem; @@ -609,8 +609,8 @@ public: QBrush brush() const; void setBrush(const QBrush &brush); - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; protected: QAbstractGraphicsShapeItem(QAbstractGraphicsShapeItemPrivate &dd, @@ -632,22 +632,22 @@ public: QPainterPath path() const; void setPath(const QPainterPath &path); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 2 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsPathItem) @@ -667,22 +667,22 @@ public: void setRect(const QRectF &rect); inline void setRect(qreal x, qreal y, qreal w, qreal h); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 3 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsRectItem) @@ -711,22 +711,22 @@ public: int spanAngle() const; void setSpanAngle(int angle); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 4 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsEllipseItem) @@ -751,22 +751,22 @@ public: Qt::FillRule fillRule() const; void setFillRule(Qt::FillRule rule); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 5 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsPolygonItem) @@ -790,22 +790,22 @@ public: inline void setLine(qreal x1, qreal y1, qreal x2, qreal y2) { setLine(QLineF(x1, y1, x2, y2)); } - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 6 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsLineItem) @@ -836,25 +836,25 @@ public: void setOffset(const QPointF &offset); inline void setOffset(qreal x, qreal y); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 7 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; ShapeMode shapeMode() const; void setShapeMode(ShapeMode mode); protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsPixmapItem) @@ -890,17 +890,17 @@ public: void setDefaultTextColor(const QColor &c); QColor defaultTextColor() const; - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 8 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; void setTextWidth(qreal width); qreal textWidth() const; @@ -927,30 +927,30 @@ Q_SIGNALS: void linkHovered(const QString &); protected: - bool sceneEvent(QEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void dragEnterEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; - void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void hoverMoveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - - QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; - - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool sceneEvent(QEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; + void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override; + void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) override; + void dragMoveEvent(QGraphicsSceneDragDropEvent *event) override; + void dropEvent(QGraphicsSceneDragDropEvent *event) override; + void inputMethodEvent(QInputMethodEvent *event) override; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + + QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; + + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsTextItem) @@ -975,22 +975,22 @@ public: void setFont(const QFont &font); QFont font() const; - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; - bool contains(const QPointF &point) const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; + bool contains(const QPointF &point) const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 9 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; protected: - bool supportsExtension(Extension extension) const Q_DECL_OVERRIDE; - void setExtension(Extension extension, const QVariant &variant) Q_DECL_OVERRIDE; - QVariant extension(const QVariant &variant) const Q_DECL_OVERRIDE; + bool supportsExtension(Extension extension) const override; + void setExtension(Extension extension, const QVariant &variant) override; + QVariant extension(const QVariant &variant) const override; private: Q_DISABLE_COPY(QGraphicsSimpleTextItem) @@ -1007,14 +1007,14 @@ public: void addToGroup(QGraphicsItem *item); void removeFromGroup(QGraphicsItem *item); - QRectF boundingRect() const Q_DECL_OVERRIDE; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; - bool isObscuredBy(const QGraphicsItem *item) const Q_DECL_OVERRIDE; - QPainterPath opaqueArea() const Q_DECL_OVERRIDE; + bool isObscuredBy(const QGraphicsItem *item) const override; + QPainterPath opaqueArea() const override; enum { Type = 10 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; private: Q_DISABLE_COPY(QGraphicsItemGroup) diff --git a/src/widgets/graphicsview/qgraphicsitem_p.h b/src/widgets/graphicsview/qgraphicsitem_p.h index 86414263a7..bae38473f9 100644 --- a/src/widgets/graphicsview/qgraphicsitem_p.h +++ b/src/widgets/graphicsview/qgraphicsitem_p.h @@ -595,28 +595,28 @@ public: : QGraphicsEffectSourcePrivate(), item(i), info(0) {} - void detach() Q_DECL_OVERRIDE + void detach() override { item->d_ptr->graphicsEffect = 0; item->prepareGeometryChange(); } - const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE + const QGraphicsItem *graphicsItem() const override { return item; } - const QWidget *widget() const Q_DECL_OVERRIDE + const QWidget *widget() const override { return 0; } - void update() Q_DECL_OVERRIDE { + void update() override { item->d_ptr->updateDueToGraphicsEffect = true; item->update(); item->d_ptr->updateDueToGraphicsEffect = false; } - void effectBoundingRectChanged() Q_DECL_OVERRIDE + void effectBoundingRectChanged() override { item->prepareGeometryChange(); } - bool isPixmap() const Q_DECL_OVERRIDE + bool isPixmap() const override { return item->type() == QGraphicsPixmapItem::Type && !(item->flags() & QGraphicsItem::ItemIsSelectable) @@ -624,10 +624,10 @@ public: //|| (item->d_ptr->isObject && qobject_cast(q_func())); } - const QStyleOption *styleOption() const Q_DECL_OVERRIDE + const QStyleOption *styleOption() const override { return info ? info->option : 0; } - QRect deviceRect() const Q_DECL_OVERRIDE + QRect deviceRect() const override { if (!info || !info->widget) { qWarning("QGraphicsEffectSource::deviceRect: Not yet implemented, lacking device context"); @@ -636,11 +636,11 @@ public: return info->widget->rect(); } - QRectF boundingRect(Qt::CoordinateSystem system) const Q_DECL_OVERRIDE; - void draw(QPainter *) Q_DECL_OVERRIDE; + QRectF boundingRect(Qt::CoordinateSystem system) const override; + void draw(QPainter *) override; QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset, - QGraphicsEffect::PixmapPadMode mode) const Q_DECL_OVERRIDE; + QGraphicsEffect::PixmapPadMode mode) const override; QRect paddedEffectRect(Qt::CoordinateSystem system, QGraphicsEffect::PixmapPadMode mode, const QRectF &sourceRect, bool *unpadded = 0) const; QGraphicsItem *item; diff --git a/src/widgets/graphicsview/qgraphicslayout.h b/src/widgets/graphicsview/qgraphicslayout.h index bbe45bbdd6..60c9a35037 100644 --- a/src/widgets/graphicsview/qgraphicslayout.h +++ b/src/widgets/graphicsview/qgraphicslayout.h @@ -58,12 +58,12 @@ public: ~QGraphicsLayout(); void setContentsMargins(qreal left, qreal top, qreal right, qreal bottom); - void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const Q_DECL_OVERRIDE; + void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const override; void activate(); bool isActivated() const; virtual void invalidate(); - virtual void updateGeometry() Q_DECL_OVERRIDE; + virtual void updateGeometry() override; virtual void widgetEvent(QEvent *e); diff --git a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h index 3463ae71bf..7886de432c 100644 --- a/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h +++ b/src/widgets/graphicsview/qgraphicslayoutstyleinfo_p.h @@ -70,17 +70,17 @@ public: virtual qreal combinedLayoutSpacing(QLayoutPolicy::ControlTypes controls1, QLayoutPolicy::ControlTypes controls2, - Qt::Orientation orientation) const Q_DECL_OVERRIDE; + Qt::Orientation orientation) const override; virtual qreal perItemSpacing(QLayoutPolicy::ControlType control1, QLayoutPolicy::ControlType control2, - Qt::Orientation orientation) const Q_DECL_OVERRIDE; + Qt::Orientation orientation) const override; - virtual qreal spacing(Qt::Orientation orientation) const Q_DECL_OVERRIDE; + virtual qreal spacing(Qt::Orientation orientation) const override; - virtual qreal windowMargin(Qt::Orientation orientation) const Q_DECL_OVERRIDE; + virtual qreal windowMargin(Qt::Orientation orientation) const override; - virtual void invalidate() Q_DECL_OVERRIDE + virtual void invalidate() override { m_style = 0; QAbstractLayoutStyleInfo::invalidate(); diff --git a/src/widgets/graphicsview/qgraphicslinearlayout.h b/src/widgets/graphicsview/qgraphicslinearlayout.h index 8186eea987..a46ec660e7 100644 --- a/src/widgets/graphicsview/qgraphicslinearlayout.h +++ b/src/widgets/graphicsview/qgraphicslinearlayout.h @@ -67,7 +67,7 @@ public: void insertStretch(int index, int stretch = 1); void removeItem(QGraphicsLayoutItem *item); - void removeAt(int index) Q_DECL_OVERRIDE; + void removeAt(int index) override; void setSpacing(qreal spacing); qreal spacing() const; @@ -80,13 +80,13 @@ public: void setAlignment(QGraphicsLayoutItem *item, Qt::Alignment alignment); Qt::Alignment alignment(QGraphicsLayoutItem *item) const; - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRectF &rect) override; - int count() const Q_DECL_OVERRIDE; - QGraphicsLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; + int count() const override; + QGraphicsLayoutItem *itemAt(int index) const override; - void invalidate() Q_DECL_OVERRIDE; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; + void invalidate() override; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; #if 0 // ### Q5SizePolicy::ControlTypes controlTypes(LayoutSide side) const; diff --git a/src/widgets/graphicsview/qgraphicsproxywidget.h b/src/widgets/graphicsview/qgraphicsproxywidget.h index fd6369a1fd..bb06ac3c16 100644 --- a/src/widgets/graphicsview/qgraphicsproxywidget.h +++ b/src/widgets/graphicsview/qgraphicsproxywidget.h @@ -61,63 +61,63 @@ public: QRectF subWidgetRect(const QWidget *widget) const; - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRectF &rect) override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget) override; enum { Type = 12 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; QGraphicsProxyWidget *createProxyForChildWidget(QWidget *child); protected: - QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool eventFilter(QObject *object, QEvent *event) override; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QGraphicsSceneContextMenuEvent *event) override; #endif #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QGraphicsSceneDragDropEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QGraphicsSceneDragDropEvent *event) override; + void dragLeaveEvent(QGraphicsSceneDragDropEvent *event) override; + void dragMoveEvent(QGraphicsSceneDragDropEvent *event) override; + void dropEvent(QGraphicsSceneDragDropEvent *event) override; #endif - void hoverEnterEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void hoverMoveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - void grabMouseEvent(QEvent *event) Q_DECL_OVERRIDE; - void ungrabMouseEvent(QEvent *event) Q_DECL_OVERRIDE; + void hoverEnterEvent(QGraphicsSceneHoverEvent *event) override; + void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; + void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + void grabMouseEvent(QEvent *event) override; + void ungrabMouseEvent(QEvent *event) override; - void mouseMoveEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) Q_DECL_OVERRIDE; + void mouseMoveEvent(QGraphicsSceneMouseEvent *event) override; + void mousePressEvent(QGraphicsSceneMouseEvent *event) override; + void mouseReleaseEvent(QGraphicsSceneMouseEvent *event) override; + void mouseDoubleClickEvent(QGraphicsSceneMouseEvent *event) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QGraphicsSceneWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QGraphicsSceneWheelEvent *event) override; #endif - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + bool focusNextPrevChild(bool next) override; - QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; - void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; + void inputMethodEvent(QInputMethodEvent *event) override; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; - void resizeEvent(QGraphicsSceneResizeEvent *event) Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; + void resizeEvent(QGraphicsSceneResizeEvent *event) override; protected Q_SLOTS: QGraphicsProxyWidget *newProxyWidget(const QWidget *); diff --git a/src/widgets/graphicsview/qgraphicsscene.h b/src/widgets/graphicsview/qgraphicsscene.h index d515585067..071f83aeb6 100644 --- a/src/widgets/graphicsview/qgraphicsscene.h +++ b/src/widgets/graphicsview/qgraphicsscene.h @@ -261,8 +261,8 @@ public Q_SLOTS: void clear(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool eventFilter(QObject *watched, QEvent *event) override; virtual void contextMenuEvent(QGraphicsSceneContextMenuEvent *event); virtual void dragEnterEvent(QGraphicsSceneDragDropEvent *event); virtual void dragMoveEvent(QGraphicsSceneDragDropEvent *event); diff --git a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp index 81d2953d8f..75eb50a3ac 100644 --- a/src/widgets/graphicsview/qgraphicsscene_bsp.cpp +++ b/src/widgets/graphicsview/qgraphicsscene_bsp.cpp @@ -49,7 +49,7 @@ class QGraphicsSceneInsertItemBspTreeVisitor : public QGraphicsSceneBspTreeVisit public: QGraphicsItem *item; - void visit(QList *items) Q_DECL_OVERRIDE + void visit(QList *items) override { items->prepend(item); } }; @@ -58,7 +58,7 @@ class QGraphicsSceneRemoveItemBspTreeVisitor : public QGraphicsSceneBspTreeVisit public: QGraphicsItem *item; - void visit(QList *items) Q_DECL_OVERRIDE + void visit(QList *items) override { items->removeAll(item); } }; @@ -68,7 +68,7 @@ public: QList *foundItems; bool onlyTopLevelItems; - void visit(QList *items) Q_DECL_OVERRIDE + void visit(QList *items) override { for (int i = 0; i < items->size(); ++i) { QGraphicsItem *item = items->at(i); diff --git a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h index 8e78407762..b6387a2c56 100644 --- a/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenebsptreeindex_p.h @@ -77,25 +77,25 @@ public: QGraphicsSceneBspTreeIndex(QGraphicsScene *scene = 0); ~QGraphicsSceneBspTreeIndex(); - QList estimateItems(const QRectF &rect, Qt::SortOrder order) const Q_DECL_OVERRIDE; - QList estimateTopLevelItems(const QRectF &rect, Qt::SortOrder order) const Q_DECL_OVERRIDE; - QList items(Qt::SortOrder order = Qt::DescendingOrder) const Q_DECL_OVERRIDE; + QList estimateItems(const QRectF &rect, Qt::SortOrder order) const override; + QList estimateTopLevelItems(const QRectF &rect, Qt::SortOrder order) const override; + QList items(Qt::SortOrder order = Qt::DescendingOrder) const override; int bspTreeDepth() const; void setBspTreeDepth(int depth); protected Q_SLOTS: - void updateSceneRect(const QRectF &rect) Q_DECL_OVERRIDE; + void updateSceneRect(const QRectF &rect) override; protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void clear() Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void clear() override; - void addItem(QGraphicsItem *item) Q_DECL_OVERRIDE; - void removeItem(QGraphicsItem *item) Q_DECL_OVERRIDE; - void prepareBoundingRectChange(const QGraphicsItem *item) Q_DECL_OVERRIDE; + void addItem(QGraphicsItem *item) override; + void removeItem(QGraphicsItem *item) override; + void prepareBoundingRectChange(const QGraphicsItem *item) override; - void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const void *const value) Q_DECL_OVERRIDE; + void itemChange(const QGraphicsItem *item, QGraphicsItem::GraphicsItemChange change, const void *const value) override; private : Q_DECLARE_PRIVATE(QGraphicsSceneBspTreeIndex) diff --git a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h index a59a8ac1b0..07d5d80ef1 100644 --- a/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h +++ b/src/widgets/graphicsview/qgraphicsscenelinearindex_p.h @@ -70,10 +70,10 @@ public: QGraphicsSceneLinearIndex(QGraphicsScene *scene = 0) : QGraphicsSceneIndex(scene), m_numSortedElements(0) { } - QList items(Qt::SortOrder order = Qt::DescendingOrder) const Q_DECL_OVERRIDE + QList items(Qt::SortOrder order = Qt::DescendingOrder) const override { Q_UNUSED(order); return m_items; } - virtual QList estimateItems(const QRectF &rect, Qt::SortOrder order) const Q_DECL_OVERRIDE + virtual QList estimateItems(const QRectF &rect, Qt::SortOrder order) const override { Q_UNUSED(rect); Q_UNUSED(order); @@ -81,16 +81,16 @@ public: } protected : - virtual void clear() Q_DECL_OVERRIDE + virtual void clear() override { m_items.clear(); m_numSortedElements = 0; } - virtual void addItem(QGraphicsItem *item) Q_DECL_OVERRIDE + virtual void addItem(QGraphicsItem *item) override { m_items << item; } - virtual void removeItem(QGraphicsItem *item) Q_DECL_OVERRIDE + virtual void removeItem(QGraphicsItem *item) override { // Sort m_items if needed if (m_numSortedElements < m_items.size()) diff --git a/src/widgets/graphicsview/qgraphicstransform.h b/src/widgets/graphicsview/qgraphicstransform.h index ceeb314c86..4c0535f419 100644 --- a/src/widgets/graphicsview/qgraphicstransform.h +++ b/src/widgets/graphicsview/qgraphicstransform.h @@ -100,7 +100,7 @@ public: qreal zScale() const; void setZScale(qreal); - void applyTo(QMatrix4x4 *matrix) const Q_DECL_OVERRIDE; + void applyTo(QMatrix4x4 *matrix) const override; Q_SIGNALS: void originChanged(); @@ -136,7 +136,7 @@ public: void setAxis(const QVector3D &axis); void setAxis(Qt::Axis axis); - void applyTo(QMatrix4x4 *matrix) const Q_DECL_OVERRIDE; + void applyTo(QMatrix4x4 *matrix) const override; Q_SIGNALS: void originChanged(); diff --git a/src/widgets/graphicsview/qgraphicsview.h b/src/widgets/graphicsview/qgraphicsview.h index a9e4efefaf..20273ad068 100644 --- a/src/widgets/graphicsview/qgraphicsview.h +++ b/src/widgets/graphicsview/qgraphicsview.h @@ -118,7 +118,7 @@ public: QGraphicsView(QGraphicsScene *scene, QWidget *parent = Q_NULLPTR); ~QGraphicsView(); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; QPainter::RenderHints renderHints() const; void setRenderHint(QPainter::RenderHint hint, bool enabled = true); @@ -214,7 +214,7 @@ public: inline QPoint mapFromScene(qreal x, qreal y) const; inline QPolygon mapFromScene(qreal x, qreal y, qreal w, qreal h) const; - QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; QBrush backgroundBrush() const; void setBackgroundBrush(const QBrush &brush); @@ -233,39 +233,39 @@ Q_SIGNALS: #endif protected Q_SLOTS: - void setupViewport(QWidget *widget) Q_DECL_OVERRIDE; + void setupViewport(QWidget *widget) override; protected: QGraphicsView(QGraphicsViewPrivate &, QWidget *parent = Q_NULLPTR); - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool viewportEvent(QEvent *event) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) override; #endif #if QT_CONFIG(draganddrop) - void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dropEvent(QDropEvent *event) override; #endif - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; + bool focusNextPrevChild(bool next) override; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void keyReleaseEvent(QKeyEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) override; #endif - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void scrollContentsBy(int dx, int dy) override; + void showEvent(QShowEvent *event) override; + void inputMethodEvent(QInputMethodEvent *event) override; virtual void drawBackground(QPainter *painter, const QRectF &rect); virtual void drawForeground(QPainter *painter, const QRectF &rect); diff --git a/src/widgets/graphicsview/qgraphicswidget.h b/src/widgets/graphicsview/qgraphicswidget.h index 831511d14a..f71e2f8149 100644 --- a/src/widgets/graphicsview/qgraphicswidget.h +++ b/src/widgets/graphicsview/qgraphicswidget.h @@ -106,12 +106,12 @@ public: inline void resize(qreal w, qreal h) { resize(QSizeF(w, h)); } QSizeF size() const; - void setGeometry(const QRectF &rect) Q_DECL_OVERRIDE; + void setGeometry(const QRectF &rect) override; inline void setGeometry(qreal x, qreal y, qreal w, qreal h); inline QRectF rect() const { return QRectF(QPointF(), size()); } void setContentsMargins(qreal left, qreal top, qreal right, qreal bottom); - void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const Q_DECL_OVERRIDE; + void getContentsMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const override; void setWindowFrameMargins(qreal left, qreal top, qreal right, qreal bottom); void getWindowFrameMargins(qreal *left, qreal *top, qreal *right, qreal *bottom) const; @@ -161,12 +161,12 @@ public: enum { Type = 11 }; - int type() const Q_DECL_OVERRIDE; + int type() const override; - void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) Q_DECL_OVERRIDE; + void paint(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR) override; virtual void paintWindowFrame(QPainter *painter, const QStyleOptionGraphicsItem *option, QWidget *widget = Q_NULLPTR); - QRectF boundingRect() const Q_DECL_OVERRIDE; - QPainterPath shape() const Q_DECL_OVERRIDE; + QRectF boundingRect() const override; + QPainterPath shape() const override; #if 0 void dumpFocusChain(); @@ -184,28 +184,28 @@ public Q_SLOTS: protected: virtual void initStyleOption(QStyleOption *option) const; - QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const Q_DECL_OVERRIDE; - void updateGeometry() Q_DECL_OVERRIDE; + QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const override; + void updateGeometry() override; // Notification - QVariant itemChange(GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE; + QVariant itemChange(GraphicsItemChange change, const QVariant &value) override; virtual QVariant propertyChange(const QString &propertyName, const QVariant &value); // Scene events - bool sceneEvent(QEvent *event) Q_DECL_OVERRIDE; + bool sceneEvent(QEvent *event) override; virtual bool windowFrameEvent(QEvent *e); virtual Qt::WindowFrameSection windowFrameSectionAt(const QPointF& pos) const; // Base event handlers - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; //virtual void actionEvent(QActionEvent *event); virtual void changeEvent(QEvent *event); virtual void closeEvent(QCloseEvent *event); //void create(WId window = 0, bool initializeWindow = true, bool destroyOldWindow = true); //void destroy(bool destroyWindow = true, bool destroySubWindows = true); - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; virtual bool focusNextPrevChild(bool next); - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; + void focusOutEvent(QFocusEvent *event) override; virtual void hideEvent(QHideEvent *event); //virtual int metric(PaintDeviceMetric m ) const; virtual void moveEvent(QGraphicsSceneMoveEvent *event); @@ -214,8 +214,8 @@ protected: virtual void resizeEvent(QGraphicsSceneResizeEvent *event); virtual void showEvent(QShowEvent *event); //virtual void tabletEvent(QTabletEvent *event); - virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; - virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) Q_DECL_OVERRIDE; + virtual void hoverMoveEvent(QGraphicsSceneHoverEvent *event) override; + virtual void hoverLeaveEvent(QGraphicsSceneHoverEvent *event) override; virtual void grabMouseEvent(QEvent *event); virtual void ungrabMouseEvent(QEvent *event); virtual void grabKeyboardEvent(QEvent *event); diff --git a/src/widgets/graphicsview/qgraphicswidget_p.h b/src/widgets/graphicsview/qgraphicswidget_p.h index 0fb9fbba07..505a2a24c0 100644 --- a/src/widgets/graphicsview/qgraphicswidget_p.h +++ b/src/widgets/graphicsview/qgraphicswidget_p.h @@ -94,13 +94,13 @@ public: QPalette palette; uint inheritedPaletteResolveMask; void setPalette_helper(const QPalette &palette); - void resolvePalette(uint inheritedMask) Q_DECL_OVERRIDE; + void resolvePalette(uint inheritedMask) override; void updatePalette(const QPalette &palette); QPalette naturalWidgetPalette() const; QFont font; uint inheritedFontResolveMask; void setFont_helper(const QFont &font); - void resolveFont(uint inheritedMask) Q_DECL_OVERRIDE; + void resolveFont(uint inheritedMask) override; void updateFont(const QFont &font); QFont naturalWidgetFont() const; @@ -115,13 +115,13 @@ public: bool hasDecoration() const; // Private Properties - qreal width() const Q_DECL_OVERRIDE; - void setWidth(qreal) Q_DECL_OVERRIDE; - void resetWidth() Q_DECL_OVERRIDE; + qreal width() const override; + void setWidth(qreal) override; + void resetWidth() override; - qreal height() const Q_DECL_OVERRIDE; - void setHeight(qreal) Q_DECL_OVERRIDE; - void resetHeight() Q_DECL_OVERRIDE; + qreal height() const override; + void setHeight(qreal) override; + void resetHeight() override; void setGeometryFromSetPos(); // State diff --git a/src/widgets/itemviews/qabstractitemview.h b/src/widgets/itemviews/qabstractitemview.h index 6a007da348..676b6cb21e 100644 --- a/src/widgets/itemviews/qabstractitemview.h +++ b/src/widgets/itemviews/qabstractitemview.h @@ -225,7 +225,7 @@ public: QAbstractItemDelegate *itemDelegate(const QModelIndex &index) const; - virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const Q_DECL_OVERRIDE; + virtual QVariant inputMethodQuery(Qt::InputMethodQuery query) const override; using QAbstractScrollArea::update; @@ -327,32 +327,32 @@ protected: void stopAutoScroll(); void doAutoScroll(); - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + bool focusNextPrevChild(bool next) override; + bool event(QEvent *event) override; + bool viewportEvent(QEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragMoveEvent(QDragMoveEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dropEvent(QDropEvent *event) override; #endif - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; - void inputMethodEvent(QInputMethodEvent *event) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *event) override; + void focusOutEvent(QFocusEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void timerEvent(QTimerEvent *event) override; + void inputMethodEvent(QInputMethodEvent *event) override; #ifndef QT_NO_DRAGANDDROP enum DropIndicatorPosition { OnItem, AboveItem, BelowItem, OnViewport }; DropIndicatorPosition dropIndicatorPosition() const; #endif - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; private: Q_DECLARE_PRIVATE(QAbstractItemView) diff --git a/src/widgets/itemviews/qcolumnview.h b/src/widgets/itemviews/qcolumnview.h index 42eac7426a..4f34406b21 100644 --- a/src/widgets/itemviews/qcolumnview.h +++ b/src/widgets/itemviews/qcolumnview.h @@ -62,14 +62,14 @@ public: ~QColumnView(); // QAbstractItemView overloads - QModelIndex indexAt(const QPoint &point) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; - void setSelectionModel(QItemSelectionModel * selectionModel) Q_DECL_OVERRIDE; - void setRootIndex(const QModelIndex &index) Q_DECL_OVERRIDE; - void selectAll() Q_DECL_OVERRIDE; + QModelIndex indexAt(const QPoint &point) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; + QSize sizeHint() const override; + QRect visualRect(const QModelIndex &index) const override; + void setModel(QAbstractItemModel *model) override; + void setSelectionModel(QItemSelectionModel * selectionModel) override; + void setRootIndex(const QModelIndex &index) override; + void selectAll() override; // QColumnView functions void setResizeGripsVisible(bool visible); @@ -85,18 +85,18 @@ protected: QColumnView(QColumnViewPrivate &dd, QWidget *parent = Q_NULLPTR); // QAbstractItemView overloads - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void setSelection(const QRect & rect, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; - void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE; + bool isIndexHidden(const QModelIndex &index) const override; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; + void resizeEvent(QResizeEvent *event) override; + void setSelection(const QRect & rect, QItemSelectionModel::SelectionFlags command) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; + int horizontalOffset() const override; + int verticalOffset() const override; + void rowsInserted(const QModelIndex &parent, int start, int end) override; + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; // QColumnView functions - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + void scrollContentsBy(int dx, int dy) override; virtual QAbstractItemView* createColumn(const QModelIndex &rootIndex); void initializeColumn(QAbstractItemView *column) const; diff --git a/src/widgets/itemviews/qcolumnview_p.h b/src/widgets/itemviews/qcolumnview_p.h index fa276075fe..850ab02747 100644 --- a/src/widgets/itemviews/qcolumnview_p.h +++ b/src/widgets/itemviews/qcolumnview_p.h @@ -80,7 +80,7 @@ public: setMinimumWidth(previewWidget->minimumWidth()); } - void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE{ + void resizeEvent(QResizeEvent * event) override{ if (!previewWidget) return; previewWidget->resize( @@ -96,7 +96,7 @@ public: QAbstractScrollArea::resizeEvent(event); } - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE + void scrollContentsBy(int dx, int dy) override { if (!previewWidget) return; @@ -106,36 +106,36 @@ public: QAbstractItemView::scrollContentsBy(dx, dy); } - QRect visualRect(const QModelIndex &) const Q_DECL_OVERRIDE + QRect visualRect(const QModelIndex &) const override { return QRect(); } - void scrollTo(const QModelIndex &, ScrollHint) Q_DECL_OVERRIDE + void scrollTo(const QModelIndex &, ScrollHint) override { } - QModelIndex indexAt(const QPoint &) const Q_DECL_OVERRIDE + QModelIndex indexAt(const QPoint &) const override { return QModelIndex(); } - QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) Q_DECL_OVERRIDE + QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) override { return QModelIndex(); } - int horizontalOffset () const Q_DECL_OVERRIDE { + int horizontalOffset () const override { return 0; } - int verticalOffset () const Q_DECL_OVERRIDE { + int verticalOffset () const override { return 0; } - QRegion visualRegionForSelection(const QItemSelection &) const Q_DECL_OVERRIDE + QRegion visualRegionForSelection(const QItemSelection &) const override { return QRegion(); } - bool isIndexHidden(const QModelIndex &) const Q_DECL_OVERRIDE + bool isIndexHidden(const QModelIndex &) const override { return false; } - void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) Q_DECL_OVERRIDE + void setSelection(const QRect &, QItemSelectionModel::SelectionFlags) override { } private: @@ -163,7 +163,7 @@ public: void _q_gripMoved(int offset); void _q_changeCurrentColumn(); void _q_clicked(const QModelIndex &index); - void _q_columnsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; + void _q_columnsInserted(const QModelIndex &parent, int start, int end) override; QList columns; QVector columnSizes; // used during init and corner moving @@ -188,7 +188,7 @@ public: void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; }; QT_END_NAMESPACE diff --git a/src/widgets/itemviews/qcolumnviewgrip_p.h b/src/widgets/itemviews/qcolumnviewgrip_p.h index 16c0aefada..7e2793074b 100644 --- a/src/widgets/itemviews/qcolumnviewgrip_p.h +++ b/src/widgets/itemviews/qcolumnviewgrip_p.h @@ -74,11 +74,11 @@ public: protected: QColumnViewGrip(QColumnViewGripPrivate &, QWidget *parent = 0, Qt::WindowFlags f = 0); - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; private: Q_DECLARE_PRIVATE(QColumnViewGrip) diff --git a/src/widgets/itemviews/qdirmodel.h b/src/widgets/itemviews/qdirmodel.h index 30810cf4f6..30486c2e67 100644 --- a/src/widgets/itemviews/qdirmodel.h +++ b/src/widgets/itemviews/qdirmodel.h @@ -70,27 +70,27 @@ public: explicit QDirModel(QObject *parent = Q_NULLPTR); ~QDirModel(); - QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex &child) const override; - int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; + int rowCount(const QModelIndex &parent = QModelIndex()) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role = Qt::EditRole) override; - QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role = Qt::DisplayRole) const override; - bool hasChildren(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + bool hasChildren(const QModelIndex &index = QModelIndex()) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; - void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) Q_DECL_OVERRIDE; + void sort(int column, Qt::SortOrder order = Qt::AscendingOrder) override; - QStringList mimeTypes() const Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; + Qt::DropActions supportedDropActions() const override; // QDirModel specific API diff --git a/src/widgets/itemviews/qheaderview.h b/src/widgets/itemviews/qheaderview.h index ec4500d81e..91217a69a3 100644 --- a/src/widgets/itemviews/qheaderview.h +++ b/src/widgets/itemviews/qheaderview.h @@ -77,13 +77,13 @@ public: explicit QHeaderView(Qt::Orientation orientation, QWidget *parent = Q_NULLPTR); virtual ~QHeaderView(); - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; Qt::Orientation orientation() const; int offset() const; int length() const; - QSize sizeHint() const Q_DECL_OVERRIDE; - void setVisible(bool v) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + void setVisible(bool v) override; int sectionSizeHint(int logicalIndex) const; int visualIndexAt(int position) const; @@ -172,7 +172,7 @@ public: Qt::Alignment defaultAlignment() const; void setDefaultAlignment(Qt::Alignment alignment); - void doItemsLayout() Q_DECL_OVERRIDE; + void doItemsLayout() override; bool sectionsMoved() const; bool sectionsHidden() const; @@ -181,7 +181,7 @@ public: bool restoreState(const QByteArray &state); #endif - void reset() Q_DECL_OVERRIDE; + void reset() override; public Q_SLOTS: void setOffset(int offset); @@ -213,36 +213,36 @@ protected: void initializeSections(); void initializeSections(int start, int end); - void currentChanged(const QModelIndex ¤t, const QModelIndex &old) Q_DECL_OVERRIDE; + void currentChanged(const QModelIndex ¤t, const QModelIndex &old) override; - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - bool viewportEvent(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseDoubleClickEvent(QMouseEvent *e) override; + bool viewportEvent(QEvent *e) override; virtual void paintSection(QPainter *painter, const QRect &rect, int logicalIndex) const; virtual QSize sectionSizeFromContents(int logicalIndex) const; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; - void updateGeometries() Q_DECL_OVERRIDE; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + int horizontalOffset() const override; + int verticalOffset() const override; + void updateGeometries() override; + void scrollContentsBy(int dx, int dy) override; - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()) Q_DECL_OVERRIDE; - void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()) override; + void rowsInserted(const QModelIndex &parent, int start, int end) override; - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint) Q_DECL_OVERRIDE; + QRect visualRect(const QModelIndex &index) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint) override; - QModelIndex indexAt(const QPoint &p) const Q_DECL_OVERRIDE; - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; + QModelIndex indexAt(const QPoint &p) const override; + bool isIndexHidden(const QModelIndex &index) const override; - QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) Q_DECL_OVERRIDE; - void setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags flags) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; + QModelIndex moveCursor(CursorAction, Qt::KeyboardModifiers) override; + void setSelection(const QRect& rect, QItemSelectionModel::SelectionFlags flags) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; void initStyleOption(QStyleOptionHeader *option) const; friend class QTableView; diff --git a/src/widgets/itemviews/qitemdelegate.h b/src/widgets/itemviews/qitemdelegate.h index 21594327ef..d15e15b5e4 100644 --- a/src/widgets/itemviews/qitemdelegate.h +++ b/src/widgets/itemviews/qitemdelegate.h @@ -68,21 +68,21 @@ public: // painting void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; // editing QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; - void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE; - void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const Q_DECL_OVERRIDE; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; + void setModelData(QWidget *editor, QAbstractItemModel *model, const QModelIndex &index) const override; void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; // editor factory QItemEditorFactory *itemEditorFactory() const; @@ -105,9 +105,9 @@ protected: QRect rect(const QStyleOptionViewItem &option, const QModelIndex &index, int role) const; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; bool editorEvent(QEvent *event, QAbstractItemModel *model, - const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE; + const QStyleOptionViewItem &option, const QModelIndex &index) override; QStyleOptionViewItem setOptions(const QModelIndex &index, const QStyleOptionViewItem &option) const; diff --git a/src/widgets/itemviews/qitemeditorfactory.cpp b/src/widgets/itemviews/qitemeditorfactory.cpp index 54b7c6666f..b1e9af1f0f 100644 --- a/src/widgets/itemviews/qitemeditorfactory.cpp +++ b/src/widgets/itemviews/qitemeditorfactory.cpp @@ -229,8 +229,8 @@ class QDefaultItemEditorFactory : public QItemEditorFactory { public: inline QDefaultItemEditorFactory() {} - QWidget *createEditor(int userType, QWidget *parent) const Q_DECL_OVERRIDE; - QByteArray valuePropertyName(int) const Q_DECL_OVERRIDE; + QWidget *createEditor(int userType, QWidget *parent) const override; + QByteArray valuePropertyName(int) const override; }; QWidget *QDefaultItemEditorFactory::createEditor(int userType, QWidget *parent) const diff --git a/src/widgets/itemviews/qitemeditorfactory_p.h b/src/widgets/itemviews/qitemeditorfactory_p.h index 409ecc684f..1b7718192c 100644 --- a/src/widgets/itemviews/qitemeditorfactory_p.h +++ b/src/widgets/itemviews/qitemeditorfactory_p.h @@ -74,7 +74,7 @@ public: } protected: - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + void changeEvent(QEvent *e) override; public Q_SLOTS: void resizeToContents(); diff --git a/src/widgets/itemviews/qlistview.h b/src/widgets/itemviews/qlistview.h index 66ec9b18b1..1a59b7b54a 100644 --- a/src/widgets/itemviews/qlistview.h +++ b/src/widgets/itemviews/qlistview.h @@ -125,13 +125,13 @@ public: void setSelectionRectVisible(bool show); bool isSelectionRectVisible() const; - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) Q_DECL_OVERRIDE; - QModelIndex indexAt(const QPoint &p) const Q_DECL_OVERRIDE; + QRect visualRect(const QModelIndex &index) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; + QModelIndex indexAt(const QPoint &p) const override; - void doItemsLayout() Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; - void setRootIndex(const QModelIndex &index) Q_DECL_OVERRIDE; + void doItemsLayout() override; + void reset() override; + void setRootIndex(const QModelIndex &index) override; Q_SIGNALS: void indexesMoved(const QModelIndexList &indexes); @@ -139,53 +139,53 @@ Q_SIGNALS: protected: QListView(QListViewPrivate &, QWidget *parent = Q_NULLPTR); - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + void scrollContentsBy(int dx, int dy) override; void resizeContents(int width, int height); QSize contentsSize() const; - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()) Q_DECL_OVERRIDE; - void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; - void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()) override; + void rowsInserted(const QModelIndex &parent, int start, int end) override; + void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; + void mouseMoveEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *e) override; #endif - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; + void resizeEvent(QResizeEvent *e) override; #ifndef QT_NO_DRAGANDDROP - void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE; - void startDrag(Qt::DropActions supportedActions) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent *e) override; + void dragLeaveEvent(QDragLeaveEvent *e) override; + void dropEvent(QDropEvent *e) override; + void startDrag(Qt::DropActions supportedActions) override; #endif // QT_NO_DRAGANDDROP - QStyleOptionViewItem viewOptions() const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + QStyleOptionViewItem viewOptions() const override; + void paintEvent(QPaintEvent *e) override; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; + int horizontalOffset() const override; + int verticalOffset() const override; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; QRect rectForIndex(const QModelIndex &index) const; void setPositionForIndex(const QPoint &position, const QModelIndex &index); - void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; - QModelIndexList selectedIndexes() const Q_DECL_OVERRIDE; + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; + QModelIndexList selectedIndexes() const override; - void updateGeometries() Q_DECL_OVERRIDE; + void updateGeometries() override; - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; + bool isIndexHidden(const QModelIndex &index) const override; - void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) Q_DECL_OVERRIDE; - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE; + void selectionChanged(const QItemSelection &selected, const QItemSelection &deselected) override; + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; private: int visualIndex(const QModelIndex &index) const; diff --git a/src/widgets/itemviews/qlistwidget.h b/src/widgets/itemviews/qlistwidget.h index 3416bf83a7..4fa542c8b8 100644 --- a/src/widgets/itemviews/qlistwidget.h +++ b/src/widgets/itemviews/qlistwidget.h @@ -207,7 +207,7 @@ public: explicit QListWidget(QWidget *parent = Q_NULLPTR); ~QListWidget(); - void setSelectionModel(QItemSelectionModel *selectionModel) Q_DECL_OVERRIDE; + void setSelectionModel(QItemSelectionModel *selectionModel) override; QListWidgetItem *item(int row) const; int row(const QListWidgetItem *item) const; @@ -257,7 +257,7 @@ public: protected: #endif #if QT_CONFIG(draganddrop) - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent *event) override; #endif public Q_SLOTS: void scrollToItem(const QListWidgetItem *item, QAbstractItemView::ScrollHint hint = EnsureVisible); @@ -278,7 +278,7 @@ Q_SIGNALS: void itemSelectionChanged(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual QStringList mimeTypes() const; #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) virtual QMimeData *mimeData(const QList &items) const; @@ -304,7 +304,7 @@ protected: QListWidgetItem *itemFromIndex(const QModelIndex &index) const; private: - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; Qt::SortOrder sortOrder() const; Q_DECLARE_PRIVATE(QListWidget) diff --git a/src/widgets/itemviews/qstyleditemdelegate.h b/src/widgets/itemviews/qstyleditemdelegate.h index f3b7c4d1f4..7fd07b8a59 100644 --- a/src/widgets/itemviews/qstyleditemdelegate.h +++ b/src/widgets/itemviews/qstyleditemdelegate.h @@ -63,23 +63,23 @@ public: // painting void paint(QPainter *painter, - const QStyleOptionViewItem &option, const QModelIndex &index) const Q_DECL_OVERRIDE; + const QStyleOptionViewItem &option, const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; // editing QWidget *createEditor(QWidget *parent, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; - void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE; + void setEditorData(QWidget *editor, const QModelIndex &index) const override; void setModelData(QWidget *editor, QAbstractItemModel *model, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; void updateEditorGeometry(QWidget *editor, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; // editor factory QItemEditorFactory *itemEditorFactory() const; @@ -91,9 +91,9 @@ protected: virtual void initStyleOption(QStyleOptionViewItem *option, const QModelIndex &index) const; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; bool editorEvent(QEvent *event, QAbstractItemModel *model, - const QStyleOptionViewItem &option, const QModelIndex &index) Q_DECL_OVERRIDE; + const QStyleOptionViewItem &option, const QModelIndex &index) override; private: Q_DECLARE_PRIVATE(QStyledItemDelegate) diff --git a/src/widgets/itemviews/qtableview.cpp b/src/widgets/itemviews/qtableview.cpp index 2d5813198c..d42ed0ad19 100644 --- a/src/widgets/itemviews/qtableview.cpp +++ b/src/widgets/itemviews/qtableview.cpp @@ -585,7 +585,7 @@ class QTableCornerButton : public QAbstractButton Q_OBJECT public: QTableCornerButton(QWidget *parent) : QAbstractButton(parent) {} - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE { + void paintEvent(QPaintEvent*) override { QStyleOptionHeader opt; opt.init(this); QStyle::State state = QStyle::State_None; diff --git a/src/widgets/itemviews/qtableview.h b/src/widgets/itemviews/qtableview.h index 75f2e7b44c..ac43ebd11a 100644 --- a/src/widgets/itemviews/qtableview.h +++ b/src/widgets/itemviews/qtableview.h @@ -65,10 +65,10 @@ public: explicit QTableView(QWidget *parent = Q_NULLPTR); ~QTableView(); - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; - void setRootIndex(const QModelIndex &index) Q_DECL_OVERRIDE; - void setSelectionModel(QItemSelectionModel *selectionModel) Q_DECL_OVERRIDE; - void doItemsLayout() Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; + void setRootIndex(const QModelIndex &index) override; + void setSelectionModel(QItemSelectionModel *selectionModel) override; + void doItemsLayout() override; QHeaderView *horizontalHeader() const; QHeaderView *verticalHeader() const; @@ -109,9 +109,9 @@ public: bool isCornerButtonEnabled() const; #endif - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) Q_DECL_OVERRIDE; - QModelIndex indexAt(const QPoint &p) const Q_DECL_OVERRIDE; + QRect visualRect(const QModelIndex &index) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; + QModelIndex indexAt(const QPoint &p) const override; void setSpan(int row, int column, int rowSpan, int columnSpan); int rowSpan(int row, int column) const; @@ -144,37 +144,37 @@ protected Q_SLOTS: protected: QTableView(QTableViewPrivate &, QWidget *parent); - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + void scrollContentsBy(int dx, int dy) override; - QStyleOptionViewItem viewOptions() const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + QStyleOptionViewItem viewOptions() const override; + void paintEvent(QPaintEvent *e) override; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; + int horizontalOffset() const override; + int verticalOffset() const override; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; - void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; - QModelIndexList selectedIndexes() const Q_DECL_OVERRIDE; + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; + QModelIndexList selectedIndexes() const override; - void updateGeometries() Q_DECL_OVERRIDE; + void updateGeometries() override; - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; - int sizeHintForRow(int row) const Q_DECL_OVERRIDE; - int sizeHintForColumn(int column) const Q_DECL_OVERRIDE; + int sizeHintForRow(int row) const override; + int sizeHintForColumn(int column) const override; - void verticalScrollbarAction(int action) Q_DECL_OVERRIDE; - void horizontalScrollbarAction(int action) Q_DECL_OVERRIDE; + void verticalScrollbarAction(int action) override; + void horizontalScrollbarAction(int action) override; - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; + bool isIndexHidden(const QModelIndex &index) const override; void selectionChanged(const QItemSelection &selected, - const QItemSelection &deselected) Q_DECL_OVERRIDE; + const QItemSelection &deselected) override; void currentChanged(const QModelIndex ¤t, - const QModelIndex &previous) Q_DECL_OVERRIDE; + const QModelIndex &previous) override; private: friend class QAccessibleItemView; diff --git a/src/widgets/itemviews/qtablewidget.h b/src/widgets/itemviews/qtablewidget.h index fa51546b50..3e713a68e1 100644 --- a/src/widgets/itemviews/qtablewidget.h +++ b/src/widgets/itemviews/qtablewidget.h @@ -318,7 +318,7 @@ Q_SIGNALS: void currentCellChanged(int currentRow, int currentColumn, int previousRow, int previousColumn); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual QStringList mimeTypes() const; #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) virtual QMimeData *mimeData(const QList &items) const; @@ -343,10 +343,10 @@ protected: protected: #if QT_CONFIG(draganddrop) - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent *event) override; #endif private: - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; Q_DECLARE_PRIVATE(QTableWidget) Q_DISABLE_COPY(QTableWidget) diff --git a/src/widgets/itemviews/qtreeview.h b/src/widgets/itemviews/qtreeview.h index e9bc8189f8..c7b659839a 100644 --- a/src/widgets/itemviews/qtreeview.h +++ b/src/widgets/itemviews/qtreeview.h @@ -71,9 +71,9 @@ public: explicit QTreeView(QWidget *parent = Q_NULLPTR); ~QTreeView(); - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; - void setRootIndex(const QModelIndex &index) Q_DECL_OVERRIDE; - void setSelectionModel(QItemSelectionModel *selectionModel) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; + void setRootIndex(const QModelIndex &index) override; + void setSelectionModel(QItemSelectionModel *selectionModel) override; QHeaderView *header() const; void setHeader(QHeaderView *header); @@ -132,21 +132,21 @@ public: void setTreePosition(int logicalIndex); int treePosition() const; - void keyboardSearch(const QString &search) Q_DECL_OVERRIDE; + void keyboardSearch(const QString &search) override; - QRect visualRect(const QModelIndex &index) const Q_DECL_OVERRIDE; - void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) Q_DECL_OVERRIDE; - QModelIndex indexAt(const QPoint &p) const Q_DECL_OVERRIDE; + QRect visualRect(const QModelIndex &index) const override; + void scrollTo(const QModelIndex &index, ScrollHint hint = EnsureVisible) override; + QModelIndex indexAt(const QPoint &p) const override; QModelIndex indexAbove(const QModelIndex &index) const; QModelIndex indexBelow(const QModelIndex &index) const; - void doItemsLayout() Q_DECL_OVERRIDE; - void reset() Q_DECL_OVERRIDE; + void doItemsLayout() override; + void reset() override; void sortByColumn(int column, Qt::SortOrder order); - void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()) Q_DECL_OVERRIDE; - void selectAll() Q_DECL_OVERRIDE; + void dataChanged(const QModelIndex &topLeft, const QModelIndex &bottomRight, const QVector &roles = QVector()) override; + void selectAll() override; Q_SIGNALS: void expanded(const QModelIndex &index); @@ -169,24 +169,24 @@ protected Q_SLOTS: void columnMoved(); void reexpand(); void rowsRemoved(const QModelIndex &parent, int first, int last); - void verticalScrollbarValueChanged(int value) Q_DECL_OVERRIDE; + void verticalScrollbarValueChanged(int value) override; protected: QTreeView(QTreeViewPrivate &dd, QWidget *parent = Q_NULLPTR); - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; - void rowsInserted(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; - void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) Q_DECL_OVERRIDE; + void scrollContentsBy(int dx, int dy) override; + void rowsInserted(const QModelIndex &parent, int start, int end) override; + void rowsAboutToBeRemoved(const QModelIndex &parent, int start, int end) override; - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; - int horizontalOffset() const Q_DECL_OVERRIDE; - int verticalOffset() const Q_DECL_OVERRIDE; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; + int horizontalOffset() const override; + int verticalOffset() const override; - void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) Q_DECL_OVERRIDE; - QRegion visualRegionForSelection(const QItemSelection &selection) const Q_DECL_OVERRIDE; - QModelIndexList selectedIndexes() const Q_DECL_OVERRIDE; + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags command) override; + QRegion visualRegionForSelection(const QItemSelection &selection) const override; + QModelIndexList selectedIndexes() const override; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *event) override; + void paintEvent(QPaintEvent *event) override; void drawTree(QPainter *painter, const QRegion ®ion) const; virtual void drawRow(QPainter *painter, @@ -196,30 +196,30 @@ protected: const QRect &rect, const QModelIndex &index) const; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void keyPressEvent(QKeyEvent *event) override; #ifndef QT_NO_DRAGANDDROP - void dragMoveEvent(QDragMoveEvent *event) Q_DECL_OVERRIDE; + void dragMoveEvent(QDragMoveEvent *event) override; #endif - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; + bool viewportEvent(QEvent *event) override; - void updateGeometries() Q_DECL_OVERRIDE; + void updateGeometries() override; - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; - int sizeHintForColumn(int column) const Q_DECL_OVERRIDE; + int sizeHintForColumn(int column) const override; int indexRowSizeHint(const QModelIndex &index) const; int rowHeight(const QModelIndex &index) const; - void horizontalScrollbarAction(int action) Q_DECL_OVERRIDE; + void horizontalScrollbarAction(int action) override; - bool isIndexHidden(const QModelIndex &index) const Q_DECL_OVERRIDE; + bool isIndexHidden(const QModelIndex &index) const override; void selectionChanged(const QItemSelection &selected, - const QItemSelection &deselected) Q_DECL_OVERRIDE; - void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) Q_DECL_OVERRIDE; + const QItemSelection &deselected) override; + void currentChanged(const QModelIndex ¤t, const QModelIndex &previous) override; private: friend class ::tst_QTreeView; diff --git a/src/widgets/itemviews/qtreewidget.h b/src/widgets/itemviews/qtreewidget.h index 424ab597af..29ecf19e48 100644 --- a/src/widgets/itemviews/qtreewidget.h +++ b/src/widgets/itemviews/qtreewidget.h @@ -324,7 +324,7 @@ public: QTreeWidgetItem *itemAbove(const QTreeWidgetItem *item) const; QTreeWidgetItem *itemBelow(const QTreeWidgetItem *item) const; - void setSelectionModel(QItemSelectionModel *selectionModel) Q_DECL_OVERRIDE; + void setSelectionModel(QItemSelectionModel *selectionModel) override; public Q_SLOTS: void scrollToItem(const QTreeWidgetItem *item, @@ -346,7 +346,7 @@ Q_SIGNALS: void itemSelectionChanged(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual QStringList mimeTypes() const; #if QT_VERSION >= QT_VERSION_CHECK(6,0,0) virtual QMimeData *mimeData(const QList &items) const; @@ -372,10 +372,10 @@ protected: protected: #if QT_CONFIG(draganddrop) - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; + void dropEvent(QDropEvent *event) override; #endif private: - void setModel(QAbstractItemModel *model) Q_DECL_OVERRIDE; + void setModel(QAbstractItemModel *model) override; Q_DECLARE_PRIVATE(QTreeWidget) Q_DISABLE_COPY(QTreeWidget) diff --git a/src/widgets/itemviews/qtreewidget_p.h b/src/widgets/itemviews/qtreewidget_p.h index 7aa4daefc0..f4625842ef 100644 --- a/src/widgets/itemviews/qtreewidget_p.h +++ b/src/widgets/itemviews/qtreewidget_p.h @@ -91,24 +91,24 @@ public: void itemChanged(QTreeWidgetItem *item); QModelIndex index(const QTreeWidgetItem *item, int column) const; - QModelIndex index(int row, int column, const QModelIndex &parent) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &parent) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex &parent) const override; + QModelIndex parent(const QModelIndex &child) const override; + int rowCount(const QModelIndex &parent) const override; + int columnCount(const QModelIndex &parent = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent) const override; - QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; - bool setData(const QModelIndex &index, const QVariant &value, int role) Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; + bool setData(const QModelIndex &index, const QVariant &value, int role) override; - QMap itemData(const QModelIndex &index) const Q_DECL_OVERRIDE; + QMap itemData(const QModelIndex &index) const override; - QVariant headerData(int section, Qt::Orientation orientation, int role) const Q_DECL_OVERRIDE; + QVariant headerData(int section, Qt::Orientation orientation, int role) const override; bool setHeaderData(int section, Qt::Orientation orientation, const QVariant &value, - int role) Q_DECL_OVERRIDE; + int role) override; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + Qt::ItemFlags flags(const QModelIndex &index) const override; - void sort(int column, Qt::SortOrder order) Q_DECL_OVERRIDE; + void sort(int column, Qt::SortOrder order) override; void ensureSorted(int column, Qt::SortOrder order, int start, int end, const QModelIndex &parent); static bool itemLessThan(const QPair &left, @@ -120,17 +120,17 @@ public: const QList::iterator &end, Qt::SortOrder order, QTreeWidgetItem *item); - bool insertRows(int row, int count, const QModelIndex &) Q_DECL_OVERRIDE; - bool insertColumns(int column, int count, const QModelIndex &) Q_DECL_OVERRIDE; + bool insertRows(int row, int count, const QModelIndex &) override; + bool insertColumns(int column, int count, const QModelIndex &) override; - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE; + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override; // dnd - QStringList mimeTypes() const Q_DECL_OVERRIDE; - QMimeData *mimeData(const QModelIndexList &indexes) const Q_DECL_OVERRIDE; + QStringList mimeTypes() const override; + QMimeData *mimeData(const QModelIndexList &indexes) const override; bool dropMimeData(const QMimeData *data, Qt::DropAction action, - int row, int column, const QModelIndex &parent) Q_DECL_OVERRIDE; - Qt::DropActions supportedDropActions() const Q_DECL_OVERRIDE; + int row, int column, const QModelIndex &parent) override; + Qt::DropActions supportedDropActions() const override; QMimeData *internalMimeData() const; @@ -145,7 +145,7 @@ protected: void beginRemoveItems(QTreeWidgetItem *parent, int row, int count); void endRemoveItems(); void sortItems(QList *items, int column, Qt::SortOrder order); - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; private: QTreeWidgetItem *rootItem; diff --git a/src/widgets/kernel/qaction.h b/src/widgets/kernel/qaction.h index ca127ef51a..ed26558d56 100644 --- a/src/widgets/kernel/qaction.h +++ b/src/widgets/kernel/qaction.h @@ -180,7 +180,7 @@ public: #endif protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; QAction(QActionPrivate &dd, QObject *parent); public Q_SLOTS: diff --git a/src/widgets/kernel/qapplication.h b/src/widgets/kernel/qapplication.h index 396d0c9474..a147ecafb4 100644 --- a/src/widgets/kernel/qapplication.h +++ b/src/widgets/kernel/qapplication.h @@ -177,7 +177,7 @@ public: #endif static int exec(); - bool notify(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool notify(QObject *, QEvent *) override; #ifdef QT_KEYPAD_NAVIGATION static Q_DECL_DEPRECATED void setKeypadNavigationEnabled(bool); @@ -201,8 +201,8 @@ public Q_SLOTS: static void aboutQt(); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; - bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + bool compressEvent(QEvent *, QObject *receiver, QPostEventList *) override; private: Q_DISABLE_COPY(QApplication) diff --git a/src/widgets/kernel/qapplication_p.h b/src/widgets/kernel/qapplication_p.h index 5dca2e85f1..e83d6e5820 100644 --- a/src/widgets/kernel/qapplication_p.h +++ b/src/widgets/kernel/qapplication_p.h @@ -106,11 +106,11 @@ public: QApplicationPrivate(int &argc, char **argv, int flags); ~QApplicationPrivate(); - virtual void notifyLayoutDirectionChange() Q_DECL_OVERRIDE; - virtual void notifyActiveWindowChange(QWindow *) Q_DECL_OVERRIDE; + virtual void notifyLayoutDirectionChange() override; + virtual void notifyActiveWindowChange(QWindow *) override; - virtual bool shouldQuit() Q_DECL_OVERRIDE; - bool tryCloseAllWindows() Q_DECL_OVERRIDE; + virtual bool shouldQuit() override; + bool tryCloseAllWindows() override; #if 0 // Used to be included in Qt4 for Q_WS_X11 #ifndef QT_NO_SETTINGS @@ -122,13 +122,13 @@ public: static QString desktopStyleKey(); - void createEventDispatcher() Q_DECL_OVERRIDE; + void createEventDispatcher() override; static void dispatchEnterLeave(QWidget *enter, QWidget *leave, const QPointF &globalPosF); - void notifyWindowIconChanged() Q_DECL_OVERRIDE; + void notifyWindowIconChanged() override; //modality - bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const Q_DECL_OVERRIDE; + bool isWindowBlocked(QWindow *window, QWindow **blockingWindow = 0) const override; static bool isBlockedByModal(QWidget *widget); static bool modalState(); static bool tryModalHelper(QWidget *widget, QWidget **rettop = 0); @@ -158,7 +158,7 @@ public: #endif static bool inPopupMode(); - bool popupActive() Q_DECL_OVERRIDE { return inPopupMode(); } + bool popupActive() override { return inPopupMode(); } void closePopup(QWidget *popup); void openPopup(QWidget *popup); static void setFocusWidget(QWidget *focus, Qt::FocusReason reason); @@ -183,9 +183,9 @@ public: static QPalette *set_pal; protected: - void notifyThemeChanged() Q_DECL_OVERRIDE; + void notifyThemeChanged() override; #ifndef QT_NO_DRAGANDDROP - void notifyDragStarted(const QDrag *) Q_DECL_OVERRIDE; + void notifyDragStarted(const QDrag *) override; #endif // QT_NO_DRAGANDDROP public: @@ -284,7 +284,7 @@ public: ulong timestamp); static void translateTouchCancel(QTouchDevice *device, ulong timestamp); - QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const Q_DECL_OVERRIDE; + QPixmap applyQIconStyleHelper(QIcon::Mode mode, const QPixmap& base) const override; private: static QApplicationPrivate *self; static bool tryCloseAllWidgetWindows(QWindowList *processedWindows); diff --git a/src/widgets/kernel/qboxlayout.cpp b/src/widgets/kernel/qboxlayout.cpp index 588cec2b95..a368f379ad 100644 --- a/src/widgets/kernel/qboxlayout.cpp +++ b/src/widgets/kernel/qboxlayout.cpp @@ -124,7 +124,7 @@ public: void calcHfw(int); void effectiveMargins(int *left, int *top, int *right, int *bottom) const; - QLayoutItem* replaceAt(int index, QLayoutItem*) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem*) override; }; QBoxLayoutPrivate::~QBoxLayoutPrivate() diff --git a/src/widgets/kernel/qboxlayout.h b/src/widgets/kernel/qboxlayout.h index 9c7d0e593f..9a0d993d5f 100644 --- a/src/widgets/kernel/qboxlayout.h +++ b/src/widgets/kernel/qboxlayout.h @@ -74,7 +74,7 @@ public: void addWidget(QWidget *, int stretch = 0, Qt::Alignment alignment = Qt::Alignment()); void addLayout(QLayout *layout, int stretch = 0); void addStrut(int); - void addItem(QLayoutItem *) Q_DECL_OVERRIDE; + void addItem(QLayoutItem *) override; void insertSpacing(int index, int size); void insertStretch(int index, int stretch = 0); @@ -91,20 +91,20 @@ public: void setStretch(int index, int stretch); int stretch(int index) const; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; + bool hasHeightForWidth() const override; + int heightForWidth(int) const override; + int minimumHeightForWidth(int) const override; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - void setGeometry(const QRect&) Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + void invalidate() override; + QLayoutItem *itemAt(int) const override; + QLayoutItem *takeAt(int) override; + int count() const override; + void setGeometry(const QRect&) override; private: Q_DISABLE_COPY(QBoxLayout) diff --git a/src/widgets/kernel/qdesktopwidget.h b/src/widgets/kernel/qdesktopwidget.h index 64e1c568eb..2fb41cb208 100644 --- a/src/widgets/kernel/qdesktopwidget.h +++ b/src/widgets/kernel/qdesktopwidget.h @@ -87,7 +87,7 @@ Q_SIGNALS: void primaryScreenChanged(); protected: - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *e) override; private: Q_DISABLE_COPY(QDesktopWidget) diff --git a/src/widgets/kernel/qformlayout.cpp b/src/widgets/kernel/qformlayout.cpp index 868ac17b6f..8a5b863bb5 100644 --- a/src/widgets/kernel/qformlayout.cpp +++ b/src/widgets/kernel/qformlayout.cpp @@ -224,7 +224,7 @@ public: int hSpacing; int vSpacing; - QLayoutItem* replaceAt(int index, QLayoutItem*) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem*) override; }; QFormLayoutPrivate::QFormLayoutPrivate() diff --git a/src/widgets/kernel/qformlayout.h b/src/widgets/kernel/qformlayout.h index 5ec27433d3..309993d9ad 100644 --- a/src/widgets/kernel/qformlayout.h +++ b/src/widgets/kernel/qformlayout.h @@ -142,19 +142,19 @@ public: QWidget *labelForField(QLayout *field) const; // reimplemented from QLayout - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + + void setGeometry(const QRect &rect) override; + QSize minimumSize() const override; + QSize sizeHint() const override; + void invalidate() override; + + bool hasHeightForWidth() const override; + int heightForWidth(int width) const override; + Qt::Orientations expandingDirections() const override; + int count() const override; int rowCount() const; diff --git a/src/widgets/kernel/qgridlayout.cpp b/src/widgets/kernel/qgridlayout.cpp index 29df38f19c..db8ef89477 100644 --- a/src/widgets/kernel/qgridlayout.cpp +++ b/src/widgets/kernel/qgridlayout.cpp @@ -170,7 +170,7 @@ public: } return 0; } - QLayoutItem* replaceAt(int index, QLayoutItem *newitem) Q_DECL_OVERRIDE + QLayoutItem* replaceAt(int index, QLayoutItem *newitem) override { if (!newitem) return 0; diff --git a/src/widgets/kernel/qgridlayout.h b/src/widgets/kernel/qgridlayout.h index 51dd65d181..0283ec2028 100644 --- a/src/widgets/kernel/qgridlayout.h +++ b/src/widgets/kernel/qgridlayout.h @@ -66,9 +66,9 @@ public: ~QGridLayout(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; void setHorizontalSpacing(int spacing); int horizontalSpacing() const; @@ -92,12 +92,12 @@ public: QRect cellRect(int row, int column) const; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - int minimumHeightForWidth(int) const Q_DECL_OVERRIDE; + bool hasHeightForWidth() const override; + int heightForWidth(int) const override; + int minimumHeightForWidth(int) const override; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + void invalidate() override; inline void addWidget(QWidget *w) { QLayout::addWidget(w); } void addWidget(QWidget *, int row, int column, Qt::Alignment = Qt::Alignment()); @@ -108,11 +108,11 @@ public: void setOriginCorner(Qt::Corner); Qt::Corner originCorner() const; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; + QLayoutItem *itemAt(int index) const override; QLayoutItem *itemAtPosition(int row, int column) const; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; - void setGeometry(const QRect&) Q_DECL_OVERRIDE; + QLayoutItem *takeAt(int index) override; + int count() const override; + void setGeometry(const QRect&) override; void addItem(QLayoutItem *item, int row, int column, int rowSpan = 1, int columnSpan = 1, Qt::Alignment = Qt::Alignment()); @@ -120,7 +120,7 @@ public: void getItemPosition(int idx, int *row, int *column, int *rowSpan, int *columnSpan) const; protected: - void addItem(QLayoutItem *) Q_DECL_OVERRIDE; + void addItem(QLayoutItem *) override; private: Q_DISABLE_COPY(QGridLayout) diff --git a/src/widgets/kernel/qlayout.h b/src/widgets/kernel/qlayout.h index 2de12b4f99..abadf2e69d 100644 --- a/src/widgets/kernel/qlayout.h +++ b/src/widgets/kernel/qlayout.h @@ -104,8 +104,8 @@ public: QWidget *parentWidget() const; - void invalidate() Q_DECL_OVERRIDE; - QRect geometry() const Q_DECL_OVERRIDE; + void invalidate() override; + QRect geometry() const override; bool activate(); void update(); @@ -115,16 +115,16 @@ public: void removeWidget(QWidget *w); void removeItem(QLayoutItem *); - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - virtual void setGeometry(const QRect&) Q_DECL_OVERRIDE; + Qt::Orientations expandingDirections() const override; + QSize minimumSize() const override; + QSize maximumSize() const override; + virtual void setGeometry(const QRect&) override; virtual QLayoutItem *itemAt(int index) const = 0; virtual QLayoutItem *takeAt(int index) = 0; virtual int indexOf(QWidget *) const; virtual int count() const = 0; - bool isEmpty() const Q_DECL_OVERRIDE; - QSizePolicy::ControlTypes controlTypes() const Q_DECL_OVERRIDE; + bool isEmpty() const override; + QSizePolicy::ControlTypes controlTypes() const override; // ### Qt 6 make this function virtual QLayoutItem *replaceWidget(QWidget *from, QWidget *to, Qt::FindChildOptions options = Qt::FindChildrenRecursively); @@ -133,7 +133,7 @@ public: QSize totalMinimumSize() const; QSize totalMaximumSize() const; QSize totalSizeHint() const; - QLayout *layout() Q_DECL_OVERRIDE; + QLayout *layout() override; void setEnabled(bool); bool isEnabled() const; @@ -143,7 +143,7 @@ public: protected: void widgetEvent(QEvent *); - void childEvent(QChildEvent *e) Q_DECL_OVERRIDE; + void childEvent(QChildEvent *e) override; void addChildLayout(QLayout *l); void addChildWidget(QWidget *w); bool adoptLayout(QLayout *layout); diff --git a/src/widgets/kernel/qopenglwidget.cpp b/src/widgets/kernel/qopenglwidget.cpp index 5bc408a8cd..07588d2ee2 100644 --- a/src/widgets/kernel/qopenglwidget.cpp +++ b/src/widgets/kernel/qopenglwidget.cpp @@ -536,8 +536,8 @@ public: : QOpenGLPaintDevicePrivate(QSize()), w(widget) { } - void beginPaint() Q_DECL_OVERRIDE; - void endPaint() Q_DECL_OVERRIDE; + void beginPaint() override; + void endPaint() override; QOpenGLWidget *w; }; @@ -547,7 +547,7 @@ class QOpenGLWidgetPaintDevice : public QOpenGLPaintDevice public: QOpenGLWidgetPaintDevice(QOpenGLWidget *widget) : QOpenGLPaintDevice(*new QOpenGLWidgetPaintDevicePrivate(widget)) { } - void ensureActiveTarget() Q_DECL_OVERRIDE; + void ensureActiveTarget() override; }; class QOpenGLWidgetPrivate : public QWidgetPrivate @@ -576,8 +576,8 @@ public: void reset(); void recreateFbo(); - GLuint textureId() const Q_DECL_OVERRIDE; - QPlatformTextureList::Flags textureListFlags() Q_DECL_OVERRIDE; + GLuint textureId() const override; + QPlatformTextureList::Flags textureListFlags() override; void initialize(); void invokeUserPaint(); @@ -585,14 +585,14 @@ public: void invalidateFbo(); - QImage grabFramebuffer() Q_DECL_OVERRIDE; - void beginBackingStorePainting() Q_DECL_OVERRIDE { inBackingStorePaint = true; } - void endBackingStorePainting() Q_DECL_OVERRIDE { inBackingStorePaint = false; } - void beginCompose() Q_DECL_OVERRIDE; - void endCompose() Q_DECL_OVERRIDE; - void initializeViewportFramebuffer() Q_DECL_OVERRIDE; - void resizeViewportFramebuffer() Q_DECL_OVERRIDE; - void resolveSamples() Q_DECL_OVERRIDE; + QImage grabFramebuffer() override; + void beginBackingStorePainting() override { inBackingStorePaint = true; } + void endBackingStorePainting() override { inBackingStorePaint = false; } + void beginCompose() override; + void endCompose() override; + void initializeViewportFramebuffer() override; + void resizeViewportFramebuffer() override; + void resolveSamples() override; QOpenGLContext *context; QOpenGLFramebufferObject *fbo; diff --git a/src/widgets/kernel/qopenglwidget.h b/src/widgets/kernel/qopenglwidget.h index c0a6e41522..f2d01c75d2 100644 --- a/src/widgets/kernel/qopenglwidget.h +++ b/src/widgets/kernel/qopenglwidget.h @@ -96,13 +96,13 @@ protected: virtual void resizeGL(int w, int h); virtual void paintGL(); - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + bool event(QEvent *e) override; - int metric(QPaintDevice::PaintDeviceMetric metric) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *p) const Q_DECL_OVERRIDE; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + int metric(QPaintDevice::PaintDeviceMetric metric) const override; + QPaintDevice *redirected(QPoint *p) const override; + QPaintEngine *paintEngine() const override; private: Q_DISABLE_COPY(QOpenGLWidget) diff --git a/src/widgets/kernel/qshortcut.h b/src/widgets/kernel/qshortcut.h index 22c667c9c1..bbf53bdbfd 100644 --- a/src/widgets/kernel/qshortcut.h +++ b/src/widgets/kernel/qshortcut.h @@ -91,7 +91,7 @@ Q_SIGNALS: void activatedAmbiguously(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; }; #endif // QT_NO_SHORTCUT diff --git a/src/widgets/kernel/qstackedlayout.cpp b/src/widgets/kernel/qstackedlayout.cpp index b8b6f4302d..7430d833db 100644 --- a/src/widgets/kernel/qstackedlayout.cpp +++ b/src/widgets/kernel/qstackedlayout.cpp @@ -51,7 +51,7 @@ class QStackedLayoutPrivate : public QLayoutPrivate Q_DECLARE_PUBLIC(QStackedLayout) public: QStackedLayoutPrivate() : index(-1), stackingMode(QStackedLayout::StackOne) {} - QLayoutItem* replaceAt(int index, QLayoutItem *newitem) Q_DECL_OVERRIDE; + QLayoutItem* replaceAt(int index, QLayoutItem *newitem) override; QList list; int index; QStackedLayout::StackingMode stackingMode; diff --git a/src/widgets/kernel/qstackedlayout.h b/src/widgets/kernel/qstackedlayout.h index 6f5eded1f0..966ee2aae4 100644 --- a/src/widgets/kernel/qstackedlayout.h +++ b/src/widgets/kernel/qstackedlayout.h @@ -75,20 +75,20 @@ public: int currentIndex() const; using QLayout::widget; QWidget *widget(int) const; - int count() const Q_DECL_OVERRIDE; + int count() const override; StackingMode stackingMode() const; void setStackingMode(StackingMode stackingMode); // abstract virtual functions: - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int) Q_DECL_OVERRIDE; - void setGeometry(const QRect &rect) Q_DECL_OVERRIDE; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QSize sizeHint() const override; + QSize minimumSize() const override; + QLayoutItem *itemAt(int) const override; + QLayoutItem *takeAt(int) override; + void setGeometry(const QRect &rect) override; + bool hasHeightForWidth() const override; + int heightForWidth(int width) const override; Q_SIGNALS: void widgetRemoved(int index); diff --git a/src/widgets/kernel/qstandardgestures_p.h b/src/widgets/kernel/qstandardgestures_p.h index 9b2cffaa9a..6de09361fe 100644 --- a/src/widgets/kernel/qstandardgestures_p.h +++ b/src/widgets/kernel/qstandardgestures_p.h @@ -64,9 +64,9 @@ class QPanGestureRecognizer : public QGestureRecognizer public: explicit QPanGestureRecognizer(int pointCount = 2) : m_pointCount(pointCount) {} - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; private: const int m_pointCount; @@ -77,9 +77,9 @@ class QPinchGestureRecognizer : public QGestureRecognizer public: QPinchGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QSwipeGestureRecognizer : public QGestureRecognizer @@ -87,9 +87,9 @@ class QSwipeGestureRecognizer : public QGestureRecognizer public: QSwipeGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QTapGestureRecognizer : public QGestureRecognizer @@ -97,9 +97,9 @@ class QTapGestureRecognizer : public QGestureRecognizer public: QTapGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; class QTapAndHoldGestureRecognizer : public QGestureRecognizer @@ -107,9 +107,9 @@ class QTapAndHoldGestureRecognizer : public QGestureRecognizer public: QTapAndHoldGestureRecognizer(); - QGesture *create(QObject *target) Q_DECL_OVERRIDE; - QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void reset(QGesture *state) Q_DECL_OVERRIDE; + QGesture *create(QObject *target) override; + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event) override; + void reset(QGesture *state) override; }; QT_END_NAMESPACE diff --git a/src/widgets/kernel/qtooltip.cpp b/src/widgets/kernel/qtooltip.cpp index 813b64b2dd..12badcee3d 100644 --- a/src/widgets/kernel/qtooltip.cpp +++ b/src/widgets/kernel/qtooltip.cpp @@ -123,7 +123,7 @@ public: ~QTipLabel(); static QTipLabel *instance; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; QBasicTimer hideTimer, expireTimer; @@ -139,10 +139,10 @@ public: static int getTipScreen(const QPoint &pos, QWidget *w); protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void resizeEvent(QResizeEvent *e) override; #ifndef QT_NO_STYLE_STYLESHEET public slots: diff --git a/src/widgets/kernel/qwhatsthis.cpp b/src/widgets/kernel/qwhatsthis.cpp index 91d2b503e0..96d0cf61c4 100644 --- a/src/widgets/kernel/qwhatsthis.cpp +++ b/src/widgets/kernel/qwhatsthis.cpp @@ -145,12 +145,12 @@ public: static QWhatsThat *instance; protected: - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent*) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *e) override; + void mousePressEvent(QMouseEvent*) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; + void keyPressEvent(QKeyEvent*) override; + void paintEvent(QPaintEvent*) override; private: QPointerwidget; @@ -365,7 +365,7 @@ class QWhatsThisPrivate : public QObject QWhatsThisPrivate(); ~QWhatsThisPrivate(); static QWhatsThisPrivate *instance; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; QPointer action; static void say(QWidget *, const QString &, int x = 0, int y = 0); static void notifyToplevels(QEvent *e); diff --git a/src/widgets/kernel/qwidget.h b/src/widgets/kernel/qwidget.h index 732af4de09..25d08993fb 100644 --- a/src/widgets/kernel/qwidget.h +++ b/src/widgets/kernel/qwidget.h @@ -214,7 +214,7 @@ public: explicit QWidget(QWidget* parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); ~QWidget(); - int devType() const Q_DECL_OVERRIDE; + int devType() const override; WId winId() const; void createWinId(); // internal, going away @@ -578,7 +578,7 @@ public: void setAttribute(Qt::WidgetAttribute, bool on = true); inline bool testAttribute(Qt::WidgetAttribute) const; - QPaintEngine *paintEngine() const Q_DECL_OVERRIDE; + QPaintEngine *paintEngine() const override; void ensurePolished() const; @@ -608,7 +608,7 @@ Q_SIGNALS: protected: // Event handlers - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; virtual void mousePressEvent(QMouseEvent *event); virtual void mouseReleaseEvent(QMouseEvent *event); virtual void mouseDoubleClickEvent(QMouseEvent *event); @@ -650,10 +650,10 @@ protected: // Misc. protected functions virtual void changeEvent(QEvent *); - int metric(PaintDeviceMetric) const Q_DECL_OVERRIDE; - void initPainter(QPainter *painter) const Q_DECL_OVERRIDE; - QPaintDevice *redirected(QPoint *offset) const Q_DECL_OVERRIDE; - QPainter *sharedPainter() const Q_DECL_OVERRIDE; + int metric(PaintDeviceMetric) const override; + void initPainter(QPainter *painter) const override; + QPaintDevice *redirected(QPoint *offset) const override; + QPainter *sharedPainter() const override; virtual void inputMethodEvent(QInputMethodEvent *); public: diff --git a/src/widgets/kernel/qwidget_p.h b/src/widgets/kernel/qwidget_p.h index f1eefd68dd..57da51dcba 100644 --- a/src/widgets/kernel/qwidget_p.h +++ b/src/widgets/kernel/qwidget_p.h @@ -902,26 +902,26 @@ public: : QGraphicsEffectSourcePrivate(), m_widget(widget), context(0), updateDueToGraphicsEffect(false) {} - void detach() Q_DECL_OVERRIDE + void detach() override { m_widget->d_func()->graphicsEffect = 0; } - const QGraphicsItem *graphicsItem() const Q_DECL_OVERRIDE + const QGraphicsItem *graphicsItem() const override { return 0; } - const QWidget *widget() const Q_DECL_OVERRIDE + const QWidget *widget() const override { return m_widget; } - void update() Q_DECL_OVERRIDE + void update() override { updateDueToGraphicsEffect = true; m_widget->update(); updateDueToGraphicsEffect = false; } - bool isPixmap() const Q_DECL_OVERRIDE + bool isPixmap() const override { return false; } - void effectBoundingRectChanged() Q_DECL_OVERRIDE + void effectBoundingRectChanged() override { // ### This function should take a rect parameter; then we can avoid // updating too much on the parent widget. @@ -931,16 +931,16 @@ public: update(); } - const QStyleOption *styleOption() const Q_DECL_OVERRIDE + const QStyleOption *styleOption() const override { return 0; } - QRect deviceRect() const Q_DECL_OVERRIDE + QRect deviceRect() const override { return m_widget->window()->rect(); } - QRectF boundingRect(Qt::CoordinateSystem system) const Q_DECL_OVERRIDE; - void draw(QPainter *p) Q_DECL_OVERRIDE; + QRectF boundingRect(Qt::CoordinateSystem system) const override; + void draw(QPainter *p) override; QPixmap pixmap(Qt::CoordinateSystem system, QPoint *offset, - QGraphicsEffect::PixmapPadMode mode) const Q_DECL_OVERRIDE; + QGraphicsEffect::PixmapPadMode mode) const override; QWidget *m_widget; QWidgetPaintContext *context; diff --git a/src/widgets/kernel/qwidgetaction.h b/src/widgets/kernel/qwidgetaction.h index 3da691a430..4769332a23 100644 --- a/src/widgets/kernel/qwidgetaction.h +++ b/src/widgets/kernel/qwidgetaction.h @@ -66,8 +66,8 @@ public: void releaseWidget(QWidget *widget); protected: - virtual bool event(QEvent *) Q_DECL_OVERRIDE; - virtual bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + virtual bool event(QEvent *) override; + virtual bool eventFilter(QObject *, QEvent *) override; virtual QWidget *createWidget(QWidget *parent); virtual void deleteWidget(QWidget *widget); QList createdWidgets() const; diff --git a/src/widgets/kernel/qwidgetwindow.cpp b/src/widgets/kernel/qwidgetwindow.cpp index d30154410c..bf0e6bac73 100644 --- a/src/widgets/kernel/qwidgetwindow.cpp +++ b/src/widgets/kernel/qwidgetwindow.cpp @@ -78,7 +78,7 @@ public: QWindowPrivate::setVisible(visible); } - QWindow *eventReceiver() Q_DECL_OVERRIDE { + QWindow *eventReceiver() override { Q_Q(QWidgetWindow); QWindow *w = q; while (w->parent() && qobject_cast(w) && qobject_cast(w->parent())) { @@ -87,7 +87,7 @@ public: return w; } - void clearFocusObject() Q_DECL_OVERRIDE + void clearFocusObject() override { Q_Q(QWidgetWindow); QWidget *widget = q->widget(); @@ -95,7 +95,7 @@ public: widget->focusWidget()->clearFocus(); } - QRectF closestAcceptableGeometry(const QRectF &rect) const Q_DECL_OVERRIDE; + QRectF closestAcceptableGeometry(const QRectF &rect) const override; }; QRectF QWidgetWindowPrivate::closestAcceptableGeometry(const QRectF &rect) const diff --git a/src/widgets/kernel/qwidgetwindow_p.h b/src/widgets/kernel/qwidgetwindow_p.h index be3f808a22..d0f1d55c2a 100644 --- a/src/widgets/kernel/qwidgetwindow_p.h +++ b/src/widgets/kernel/qwidgetwindow_p.h @@ -75,13 +75,13 @@ public: QWidget *widget() const { return m_widget; } #ifndef QT_NO_ACCESSIBILITY - QAccessibleInterface *accessibleRoot() const Q_DECL_OVERRIDE; + QAccessibleInterface *accessibleRoot() const override; #endif - QObject *focusObject() const Q_DECL_OVERRIDE; + QObject *focusObject() const override; void setNativeWindowVisibility(bool visible); protected: - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; void handleCloseEvent(QCloseEvent *); void handleEnterLeaveEvent(QEvent *); @@ -102,7 +102,7 @@ protected: #endif void handleExposeEvent(QExposeEvent *); void handleWindowStateChangedEvent(QWindowStateChangeEvent *event); - bool nativeEvent(const QByteArray &eventType, void *message, long *result) Q_DECL_OVERRIDE; + bool nativeEvent(const QByteArray &eventType, void *message, long *result) override; #if QT_CONFIG(tabletevent) void handleTabletEvent(QTabletEvent *); #endif diff --git a/src/widgets/kernel/qwindowcontainer_p.h b/src/widgets/kernel/qwindowcontainer_p.h index 1d838c8dd6..a8754232a8 100644 --- a/src/widgets/kernel/qwindowcontainer_p.h +++ b/src/widgets/kernel/qwindowcontainer_p.h @@ -75,7 +75,7 @@ public: static void parentWasLowered(QWidget *parent); protected: - bool event(QEvent *ev) Q_DECL_OVERRIDE; + bool event(QEvent *ev) override; private slots: void focusWindowChanged(QWindow *focusWindow); diff --git a/src/widgets/statemachine/qbasickeyeventtransition_p.h b/src/widgets/statemachine/qbasickeyeventtransition_p.h index d3b90f6104..5007b79739 100644 --- a/src/widgets/statemachine/qbasickeyeventtransition_p.h +++ b/src/widgets/statemachine/qbasickeyeventtransition_p.h @@ -80,8 +80,8 @@ public: void setModifierMask(Qt::KeyboardModifiers modifiers); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *) override; private: Q_DISABLE_COPY(QBasicKeyEventTransition) diff --git a/src/widgets/statemachine/qbasicmouseeventtransition_p.h b/src/widgets/statemachine/qbasicmouseeventtransition_p.h index d6d37eb03e..93d2a5ec61 100644 --- a/src/widgets/statemachine/qbasicmouseeventtransition_p.h +++ b/src/widgets/statemachine/qbasicmouseeventtransition_p.h @@ -83,8 +83,8 @@ public: void setHitTestPath(const QPainterPath &path); protected: - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; - void onTransition(QEvent *) Q_DECL_OVERRIDE; + bool eventTest(QEvent *event) override; + void onTransition(QEvent *) override; private: Q_DISABLE_COPY(QBasicMouseEventTransition) diff --git a/src/widgets/statemachine/qkeyeventtransition.h b/src/widgets/statemachine/qkeyeventtransition.h index 23ce3c40be..b8c4a99710 100644 --- a/src/widgets/statemachine/qkeyeventtransition.h +++ b/src/widgets/statemachine/qkeyeventtransition.h @@ -66,8 +66,8 @@ public: void setModifierMask(Qt::KeyboardModifiers modifiers); protected: - void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) override; + bool eventTest(QEvent *event) override; private: Q_DISABLE_COPY(QKeyEventTransition) diff --git a/src/widgets/statemachine/qmouseeventtransition.h b/src/widgets/statemachine/qmouseeventtransition.h index 3f40224d8c..49fc156a51 100644 --- a/src/widgets/statemachine/qmouseeventtransition.h +++ b/src/widgets/statemachine/qmouseeventtransition.h @@ -70,8 +70,8 @@ public: void setHitTestPath(const QPainterPath &path); protected: - void onTransition(QEvent *event) Q_DECL_OVERRIDE; - bool eventTest(QEvent *event) Q_DECL_OVERRIDE; + void onTransition(QEvent *event) override; + bool eventTest(QEvent *event) override; private: Q_DISABLE_COPY(QMouseEventTransition) diff --git a/src/widgets/styles/qcommonstyle.h b/src/widgets/styles/qcommonstyle.h index ed880a150f..96a26edf7d 100644 --- a/src/widgets/styles/qcommonstyle.h +++ b/src/widgets/styles/qcommonstyle.h @@ -56,40 +56,40 @@ public: ~QCommonStyle(); void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *w = Q_NULLPTR) const override; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *w = Q_NULLPTR) const override; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const override; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *w = Q_NULLPTR) const override; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QPoint &pt, const QWidget *w = Q_NULLPTR) const override; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, - const QWidget *w = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *w = Q_NULLPTR) const override; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const override; - int pixelMetric(PixelMetric m, const QStyleOption *opt = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + int pixelMetric(PixelMetric m, const QStyleOption *opt = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const override; int styleHint(StyleHint sh, const QStyleOption *opt = Q_NULLPTR, const QWidget *w = Q_NULLPTR, - QStyleHintReturn *shret = Q_NULLPTR) const Q_DECL_OVERRIDE; + QStyleHintReturn *shret = Q_NULLPTR) const override; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *widget = Q_NULLPTR) const override; QPixmap standardPixmap(StandardPixmap sp, const QStyleOption *opt = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *widget = Q_NULLPTR) const override; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, - const QStyleOption *opt) const Q_DECL_OVERRIDE; + const QStyleOption *opt) const override; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *widget = Q_NULLPTR) const override; - void polish(QPalette &) Q_DECL_OVERRIDE; - void polish(QApplication *app) Q_DECL_OVERRIDE; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *application) Q_DECL_OVERRIDE; + void polish(QPalette &) override; + void polish(QApplication *app) override; + void polish(QWidget *widget) override; + void unpolish(QWidget *widget) override; + void unpolish(QApplication *application) override; protected: QCommonStyle(QCommonStylePrivate &dd); diff --git a/src/widgets/styles/qfusionstyle_p.h b/src/widgets/styles/qfusionstyle_p.h index 10f76045d5..e67e792727 100644 --- a/src/widgets/styles/qfusionstyle_p.h +++ b/src/widgets/styles/qfusionstyle_p.h @@ -69,41 +69,41 @@ public: QFusionStyle(); ~QFusionStyle(); - QPalette standardPalette () const Q_DECL_OVERRIDE; + QPalette standardPalette () const override; void drawPrimitive(PrimitiveElement elem, const QStyleOption *option, - QPainter *painter, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget = 0) const override; void drawControl(ControlElement ce, const QStyleOption *option, QPainter *painter, - const QWidget *widget) const Q_DECL_OVERRIDE; - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget) const override; + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override; void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, - QPainter *painter, const QWidget *widget) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget) const override; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override; QSize sizeFromContents(ContentsType type, const QStyleOption *option, - const QSize &size, const QWidget *widget) const Q_DECL_OVERRIDE; + const QSize &size, const QWidget *widget) const override; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QPoint &pt, const QWidget *w = 0) const override; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, - SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE; + SubControl sc, const QWidget *widget) const override; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, - const QStyleOption *opt) const Q_DECL_OVERRIDE; + const QStyleOption *opt) const override; int styleHint(StyleHint hint, const QStyleOption *option = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE; - QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + QStyleHintReturn *returnData = 0) const override; + QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const override; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; void drawItemPixmap(QPainter *painter, const QRect &rect, - int alignment, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + int alignment, const QPixmap &pixmap) const override; void drawItemText(QPainter *painter, const QRect &rect, int flags, const QPalette &pal, bool enabled, - const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const Q_DECL_OVERRIDE; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void polish(QApplication *app) Q_DECL_OVERRIDE; - void polish(QPalette &pal) Q_DECL_OVERRIDE; - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *app) Q_DECL_OVERRIDE; + const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const override; + void polish(QWidget *widget) override; + void polish(QApplication *app) override; + void polish(QPalette &pal) override; + void unpolish(QWidget *widget) override; + void unpolish(QApplication *app) override; protected: QFusionStyle(QFusionStylePrivate &dd); diff --git a/src/widgets/styles/qpixmapstyle_p.h b/src/widgets/styles/qpixmapstyle_p.h index 618d6d2f50..6ec42eec34 100644 --- a/src/widgets/styles/qpixmapstyle_p.h +++ b/src/widgets/styles/qpixmapstyle_p.h @@ -136,34 +136,34 @@ public: QPixmapStyle(); ~QPixmapStyle(); - void polish(QApplication *application) Q_DECL_OVERRIDE; - void polish(QPalette &palette) Q_DECL_OVERRIDE; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *application) Q_DECL_OVERRIDE; - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; + void polish(QApplication *application) override; + void polish(QPalette &palette) override; + void polish(QWidget *widget) override; + void unpolish(QApplication *application) override; + void unpolish(QWidget *widget) override; void drawPrimitive(PrimitiveElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget = Q_NULLPTR) const override; void drawControl(ControlElement element, const QStyleOption *option, - QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget = Q_NULLPTR) const override; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *option, - QPainter *painter, const QWidget *widget=0) const Q_DECL_OVERRIDE; + QPainter *painter, const QWidget *widget=0) const override; QSize sizeFromContents(ContentsType type, const QStyleOption *option, - const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QSize &contentsSize, const QWidget *widget = Q_NULLPTR) const override; QRect subElementRect(SubElement element, const QStyleOption *option, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *widget = Q_NULLPTR) const override; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *option, - SubControl sc, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + SubControl sc, const QWidget *widget = Q_NULLPTR) const override; int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, - const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + const QWidget *widget = Q_NULLPTR) const override; int styleHint(StyleHint hint, const QStyleOption *option, - const QWidget *widget, QStyleHintReturn *returnData) const Q_DECL_OVERRIDE; + const QWidget *widget, QStyleHintReturn *returnData) const override; SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, - const QPoint &pos, const QWidget *widget) const Q_DECL_OVERRIDE; + const QPoint &pos, const QWidget *widget) const override; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *watched, QEvent *event) override; void addDescriptor(ControlDescriptor control, const QString &fileName, QMargins margins = QMargins(), diff --git a/src/widgets/styles/qproxystyle.h b/src/widgets/styles/qproxystyle.h index 20a0f12868..99cde75bb9 100644 --- a/src/widgets/styles/qproxystyle.h +++ b/src/widgets/styles/qproxystyle.h @@ -61,40 +61,40 @@ public: QStyle *baseStyle() const; void setBaseStyle(QStyle *style); - void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + void drawPrimitive(PrimitiveElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const override; + void drawControl(ControlElement element, const QStyleOption *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const override; + void drawComplexControl(ComplexControl control, const QStyleOptionComplex *option, QPainter *painter, const QWidget *widget = Q_NULLPTR) const override; void drawItemText(QPainter *painter, const QRect &rect, int flags, const QPalette &pal, bool enabled, - const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const Q_DECL_OVERRIDE; - virtual void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + const QString &text, QPalette::ColorRole textRole = QPalette::NoRole) const override; + virtual void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const override; - QSize sizeFromContents(ContentsType type, const QStyleOption *option, const QSize &size, const QWidget *widget) const Q_DECL_OVERRIDE; + QSize sizeFromContents(ContentsType type, const QStyleOption *option, const QSize &size, const QWidget *widget) const override; - QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE; - QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE; - QRect itemTextRect(const QFontMetrics &fm, const QRect &r, int flags, bool enabled, const QString &text) const Q_DECL_OVERRIDE; - QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + QRect subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const override; + QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const override; + QRect itemTextRect(const QFontMetrics &fm, const QRect &r, int flags, bool enabled, const QString &text) const override; + QRect itemPixmapRect(const QRect &r, int flags, const QPixmap &pixmap) const override; - SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - int styleHint(StyleHint hint, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR, QStyleHintReturn *returnData = Q_NULLPTR) const Q_DECL_OVERRIDE; - int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + SubControl hitTestComplexControl(ComplexControl control, const QStyleOptionComplex *option, const QPoint &pos, const QWidget *widget = Q_NULLPTR) const override; + int styleHint(StyleHint hint, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR, QStyleHintReturn *returnData = Q_NULLPTR) const override; + int pixelMetric(PixelMetric metric, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const override; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, - Qt::Orientation orientation, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; + Qt::Orientation orientation, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const override; - QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const Q_DECL_OVERRIDE; - QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const Q_DECL_OVERRIDE; - QPalette standardPalette() const Q_DECL_OVERRIDE; + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = Q_NULLPTR, const QWidget *widget = Q_NULLPTR) const override; + QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget = Q_NULLPTR) const override; + QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const override; + QPalette standardPalette() const override; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void polish(QPalette &pal) Q_DECL_OVERRIDE; - void polish(QApplication *app) Q_DECL_OVERRIDE; + void polish(QWidget *widget) override; + void polish(QPalette &pal) override; + void polish(QApplication *app) override; - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *app) Q_DECL_OVERRIDE; + void unpolish(QWidget *widget) override; + void unpolish(QApplication *app) override; protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: Q_DISABLE_COPY(QProxyStyle) diff --git a/src/widgets/styles/qstyleanimation_p.h b/src/widgets/styles/qstyleanimation_p.h index bb1ab9d877..a2ad4a91da 100644 --- a/src/widgets/styles/qstyleanimation_p.h +++ b/src/widgets/styles/qstyleanimation_p.h @@ -70,7 +70,7 @@ public: QObject *target() const; - int duration() const Q_DECL_OVERRIDE; + int duration() const override; void setDuration(int duration); int delay() const; @@ -97,7 +97,7 @@ public Q_SLOTS: protected: virtual bool isUpdateNeeded() const; - virtual void updateCurrentTime(int time) Q_DECL_OVERRIDE; + virtual void updateCurrentTime(int time) override; private: int _delay; @@ -121,7 +121,7 @@ public: void setSpeed(int speed); protected: - bool isUpdateNeeded() const Q_DECL_OVERRIDE; + bool isUpdateNeeded() const override; private: int _speed; @@ -144,7 +144,7 @@ public: qreal currentValue() const; protected: - bool isUpdateNeeded() const Q_DECL_OVERRIDE; + bool isUpdateNeeded() const override; private: qreal _start; @@ -170,7 +170,7 @@ public: QImage currentImage() const; protected: - virtual void updateCurrentTime(int time) Q_DECL_OVERRIDE; + virtual void updateCurrentTime(int time) override; private: Type _type; @@ -194,7 +194,7 @@ public: void setActive(bool active); private slots: - void updateCurrentTime(int time) Q_DECL_OVERRIDE; + void updateCurrentTime(int time) override; private: Mode _mode; diff --git a/src/widgets/styles/qstylesheetstyle.cpp b/src/widgets/styles/qstylesheetstyle.cpp index fa964a09b8..c3e25cfd1b 100644 --- a/src/widgets/styles/qstylesheetstyle.cpp +++ b/src/widgets/styles/qstylesheetstyle.cpp @@ -1451,7 +1451,7 @@ class QStyleSheetStyleSelector : public StyleSelector public: QStyleSheetStyleSelector() { } - QStringList nodeNames(NodePtr node) const Q_DECL_OVERRIDE + QStringList nodeNames(NodePtr node) const override { if (isNullNode(node)) return QStringList(); @@ -1467,7 +1467,7 @@ public: } while (metaObject != 0); return result; } - QString attribute(NodePtr node, const QString& name) const Q_DECL_OVERRIDE + QString attribute(NodePtr node, const QString& name) const override { if (isNullNode(node)) return QString(); @@ -1504,7 +1504,7 @@ public: cache[name] = valueStr; return valueStr; } - bool nodeNameEquals(NodePtr node, const QString& nodeName) const Q_DECL_OVERRIDE + bool nodeNameEquals(NodePtr node, const QString& nodeName) const override { if (isNullNode(node)) return false; @@ -1527,19 +1527,19 @@ public: } while (metaObject != 0); return false; } - bool hasAttributes(NodePtr) const Q_DECL_OVERRIDE + bool hasAttributes(NodePtr) const override { return true; } - QStringList nodeIds(NodePtr node) const Q_DECL_OVERRIDE + QStringList nodeIds(NodePtr node) const override { return isNullNode(node) ? QStringList() : QStringList(OBJECT_PTR(node)->objectName()); } - bool isNullNode(NodePtr node) const Q_DECL_OVERRIDE + bool isNullNode(NodePtr node) const override { return node.ptr == 0; } - NodePtr parentNode(NodePtr node) const Q_DECL_OVERRIDE + NodePtr parentNode(NodePtr node) const override { NodePtr n; n.ptr = isNullNode(node) ? 0 : parentObject(OBJECT_PTR(node)); return n; } - NodePtr previousSiblingNode(NodePtr) const Q_DECL_OVERRIDE + NodePtr previousSiblingNode(NodePtr) const override { NodePtr n; n.ptr = 0; return n; } - NodePtr duplicateNode(NodePtr node) const Q_DECL_OVERRIDE + NodePtr duplicateNode(NodePtr node) const override { return node; } - void freeNode(NodePtr) const Q_DECL_OVERRIDE + void freeNode(NodePtr) const override { } private: diff --git a/src/widgets/styles/qstylesheetstyle_p.h b/src/widgets/styles/qstylesheetstyle_p.h index 2d302305bd..042abf5c22 100644 --- a/src/widgets/styles/qstylesheetstyle_p.h +++ b/src/widgets/styles/qstylesheetstyle_p.h @@ -82,48 +82,48 @@ public: ~QStyleSheetStyle(); void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; - void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; + void drawItemPixmap(QPainter *painter, const QRect &rect, int alignment, const QPixmap &pixmap) const override; void drawItemText(QPainter *painter, const QRect& rect, int alignment, const QPalette &pal, - bool enabled, const QString& text, QPalette::ColorRole textRole = QPalette::NoRole) const Q_DECL_OVERRIDE; + bool enabled, const QString& text, QPalette::ColorRole textRole = QPalette::NoRole) const override; void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, - const QStyleOption *option) const Q_DECL_OVERRIDE; + const QStyleOption *option) const override; SubControl hitTestComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, - const QPoint &pt, const QWidget *w = 0) const Q_DECL_OVERRIDE; - QRect itemPixmapRect(const QRect &rect, int alignment, const QPixmap &pixmap) const Q_DECL_OVERRIDE; + const QPoint &pt, const QWidget *w = 0) const override; + QRect itemPixmapRect(const QRect &rect, int alignment, const QPixmap &pixmap) const override; QRect itemTextRect(const QFontMetrics &metrics, const QRect &rect, int alignment, bool enabled, - const QString &text) const Q_DECL_OVERRIDE; - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; - void polish(QWidget *widget) Q_DECL_OVERRIDE; - void polish(QApplication *app) Q_DECL_OVERRIDE; - void polish(QPalette &pal) Q_DECL_OVERRIDE; + const QString &text) const override; + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override; + void polish(QWidget *widget) override; + void polish(QApplication *app) override; + void polish(QPalette &pal) override; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *widget = 0) const Q_DECL_OVERRIDE; - QPalette standardPalette() const Q_DECL_OVERRIDE; + const QSize &contentsSize, const QWidget *widget = 0) const override; + QPalette standardPalette() const override; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *opt = 0, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *option = 0, - const QWidget *w = 0 ) const Q_DECL_OVERRIDE; + const QWidget *w = 0 ) const override; int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option = 0, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; int styleHint(StyleHint sh, const QStyleOption *opt = 0, const QWidget *w = 0, - QStyleHintReturn *shret = 0) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + QStyleHintReturn *shret = 0) const override; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override; QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; // These functions are called from QApplication/QWidget. Be careful. QStyle *baseStyle() const; void repolish(QWidget *widget); void repolish(QApplication *app); - void unpolish(QWidget *widget) Q_DECL_OVERRIDE; - void unpolish(QApplication *app) Q_DECL_OVERRIDE; + void unpolish(QWidget *widget) override; + void unpolish(QApplication *app) override; QStyle *base; void ref() { ++refcount; } @@ -136,7 +136,7 @@ public: bool styleSheetPalette(const QWidget* w, const QStyleOption* opt, QPalette* pal); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: int refcount; diff --git a/src/widgets/styles/qwindowsstyle_p.h b/src/widgets/styles/qwindowsstyle_p.h index 12a682f330..7993b9f1c6 100644 --- a/src/widgets/styles/qwindowsstyle_p.h +++ b/src/widgets/styles/qwindowsstyle_p.h @@ -68,37 +68,37 @@ public: QWindowsStyle(); ~QWindowsStyle(); - void polish(QApplication*) Q_DECL_OVERRIDE; - void unpolish(QApplication*) Q_DECL_OVERRIDE; + void polish(QApplication*) override; + void unpolish(QApplication*) override; - void polish(QWidget*) Q_DECL_OVERRIDE; - void unpolish(QWidget*) Q_DECL_OVERRIDE; + void polish(QWidget*) override; + void unpolish(QWidget*) override; - void polish(QPalette &) Q_DECL_OVERRIDE; + void polish(QPalette &) override; void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; - QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; + QRect subElementRect(SubElement r, const QStyleOption *opt, const QWidget *widget = 0) const override; void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, - const QWidget *w = 0) const Q_DECL_OVERRIDE; + const QWidget *w = 0) const override; QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, - const QSize &contentsSize, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QSize &contentsSize, const QWidget *widget = 0) const override; - int pixelMetric(PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE; + int pixelMetric(PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0) const override; int styleHint(StyleHint hint, const QStyleOption *opt = 0, const QWidget *widget = 0, - QStyleHintReturn *returnData = 0) const Q_DECL_OVERRIDE; + QStyleHintReturn *returnData = 0) const override; QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option = 0, - const QWidget *widget = 0) const Q_DECL_OVERRIDE; + const QWidget *widget = 0) const override; protected: - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; QWindowsStyle(QWindowsStylePrivate &dd); private: diff --git a/src/widgets/util/qcompleter.h b/src/widgets/util/qcompleter.h index 33e6540264..5f6085de83 100644 --- a/src/widgets/util/qcompleter.h +++ b/src/widgets/util/qcompleter.h @@ -143,8 +143,8 @@ public: virtual QStringList splitPath(const QString &path) const; protected: - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; + bool event(QEvent *) override; Q_SIGNALS: void activated(const QString &text); diff --git a/src/widgets/util/qcompleter_p.h b/src/widgets/util/qcompleter_p.h index 3cb7c59b6d..dbc57ba905 100644 --- a/src/widgets/util/qcompleter_p.h +++ b/src/widgets/util/qcompleter_p.h @@ -174,7 +174,7 @@ class QSortedModelEngine : public QCompletionEngine { public: QSortedModelEngine(QCompleterPrivate *c) : QCompletionEngine(c) { } - QMatchData filter(const QString&, const QModelIndex&, int) Q_DECL_OVERRIDE; + QMatchData filter(const QString&, const QModelIndex&, int) override; QIndexMapper indexHint(QString, const QModelIndex&, Qt::SortOrder); Qt::SortOrder sortOrder(const QModelIndex&) const; }; @@ -184,8 +184,8 @@ class QUnsortedModelEngine : public QCompletionEngine public: QUnsortedModelEngine(QCompleterPrivate *c) : QCompletionEngine(c) { } - void filterOnDemand(int) Q_DECL_OVERRIDE; - QMatchData filter(const QString&, const QModelIndex&, int) Q_DECL_OVERRIDE; + void filterOnDemand(int) override; + QMatchData filter(const QString&, const QModelIndex&, int) override; private: int buildIndices(const QString& str, const QModelIndex& parent, int n, const QIndexMapper& iv, QMatchData* m); @@ -196,7 +196,7 @@ class QCompleterItemDelegate : public QItemDelegate public: QCompleterItemDelegate(QAbstractItemView *view) : QItemDelegate(view), view(view) { } - void paint(QPainter *p, const QStyleOptionViewItem& opt, const QModelIndex& idx) const Q_DECL_OVERRIDE { + void paint(QPainter *p, const QStyleOptionViewItem& opt, const QModelIndex& idx) const override { QStyleOptionViewItem optCopy = opt; optCopy.showDecorationSelected = true; if (view->currentIndex() == idx) @@ -225,16 +225,16 @@ public: bool setCurrentRow(int row); QModelIndex currentIndex(bool) const; - QModelIndex index(int row, int column, const QModelIndex & = QModelIndex()) const Q_DECL_OVERRIDE; - int rowCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; - int columnCount(const QModelIndex &index = QModelIndex()) const Q_DECL_OVERRIDE; - bool hasChildren(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - QModelIndex parent(const QModelIndex & = QModelIndex()) const Q_DECL_OVERRIDE { return QModelIndex(); } - QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + QModelIndex index(int row, int column, const QModelIndex & = QModelIndex()) const override; + int rowCount(const QModelIndex &index = QModelIndex()) const override; + int columnCount(const QModelIndex &index = QModelIndex()) const override; + bool hasChildren(const QModelIndex &parent = QModelIndex()) const override; + QModelIndex parent(const QModelIndex & = QModelIndex()) const override { return QModelIndex(); } + QVariant data(const QModelIndex& index, int role = Qt::DisplayRole) const override; - void setSourceModel(QAbstractItemModel *sourceModel) Q_DECL_OVERRIDE; - QModelIndex mapToSource(const QModelIndex& proxyIndex) const Q_DECL_OVERRIDE; - QModelIndex mapFromSource(const QModelIndex& sourceIndex) const Q_DECL_OVERRIDE; + void setSourceModel(QAbstractItemModel *sourceModel) override; + QModelIndex mapToSource(const QModelIndex& proxyIndex) const override; + QModelIndex mapFromSource(const QModelIndex& sourceIndex) const override; QCompleterPrivate *c; QScopedPointer engine; diff --git a/src/widgets/util/qflickgesture.cpp b/src/widgets/util/qflickgesture.cpp index 549b130c9d..b59fe0d504 100644 --- a/src/widgets/util/qflickgesture.cpp +++ b/src/widgets/util/qflickgesture.cpp @@ -256,7 +256,7 @@ public: } protected: - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE + void timerEvent(QTimerEvent *e) override { if (e->timerId() == pressDelayTimer) { if (pressDelayEvent && mouseTarget) { diff --git a/src/widgets/util/qscroller.cpp b/src/widgets/util/qscroller.cpp index d8ac686fb9..a49dbe427e 100644 --- a/src/widgets/util/qscroller.cpp +++ b/src/widgets/util/qscroller.cpp @@ -198,7 +198,7 @@ public: : QAbstractAnimation(_d), d(_d), ignoreUpdate(false), skip(0) { } - int duration() const Q_DECL_OVERRIDE + int duration() const override { return -1; } @@ -214,7 +214,7 @@ public: } protected: - void updateCurrentTime(int /*currentTime*/) Q_DECL_OVERRIDE + void updateCurrentTime(int /*currentTime*/) override { if (!ignoreUpdate) { if (++skip >= d->frameRateSkip()) { diff --git a/src/widgets/util/qsystemtrayicon.h b/src/widgets/util/qsystemtrayicon.h index 918dd0478e..b68cd63ddf 100644 --- a/src/widgets/util/qsystemtrayicon.h +++ b/src/widgets/util/qsystemtrayicon.h @@ -110,7 +110,7 @@ Q_SIGNALS: void messageClicked(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; private: Q_DISABLE_COPY(QSystemTrayIcon) diff --git a/src/widgets/util/qsystemtrayicon_p.h b/src/widgets/util/qsystemtrayicon_p.h index 3f5cab40be..6dd1f7300a 100644 --- a/src/widgets/util/qsystemtrayicon_p.h +++ b/src/widgets/util/qsystemtrayicon_p.h @@ -124,10 +124,10 @@ private: void balloon(const QPoint&, int, bool); protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void resizeEvent(QResizeEvent *) override; + void mousePressEvent(QMouseEvent *e) override; + void timerEvent(QTimerEvent *e) override; private: QSystemTrayIcon *trayIcon; diff --git a/src/widgets/util/qsystemtrayicon_x11.cpp b/src/widgets/util/qsystemtrayicon_x11.cpp index fd9fdfb507..8d31e96e43 100644 --- a/src/widgets/util/qsystemtrayicon_x11.cpp +++ b/src/widgets/util/qsystemtrayicon_x11.cpp @@ -85,12 +85,12 @@ public: QRect globalGeometry() const; protected: - virtual void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual void mouseDoubleClickEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual bool event(QEvent *) Q_DECL_OVERRIDE; - virtual void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - virtual void moveEvent(QMoveEvent *) Q_DECL_OVERRIDE; + virtual void mousePressEvent(QMouseEvent *ev) override; + virtual void mouseDoubleClickEvent(QMouseEvent *ev) override; + virtual bool event(QEvent *) override; + virtual void paintEvent(QPaintEvent *) override; + virtual void resizeEvent(QResizeEvent *) override; + virtual void moveEvent(QMoveEvent *) override; private slots: void systemTrayWindowChanged(QScreen *screen); diff --git a/src/widgets/util/qundoview.cpp b/src/widgets/util/qundoview.cpp index b56aa42aed..31f6c0dff2 100644 --- a/src/widgets/util/qundoview.cpp +++ b/src/widgets/util/qundoview.cpp @@ -59,11 +59,11 @@ public: QUndoStack *stack() const; virtual QModelIndex index(int row, int column, - const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual QModelIndex parent(const QModelIndex &child) const Q_DECL_OVERRIDE; - virtual int rowCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual int columnCount(const QModelIndex &parent = QModelIndex()) const Q_DECL_OVERRIDE; - virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const Q_DECL_OVERRIDE; + const QModelIndex &parent = QModelIndex()) const override; + virtual QModelIndex parent(const QModelIndex &child) const override; + virtual int rowCount(const QModelIndex &parent = QModelIndex()) const override; + virtual int columnCount(const QModelIndex &parent = QModelIndex()) const override; + virtual QVariant data(const QModelIndex &index, int role = Qt::DisplayRole) const override; QModelIndex selectedIndex() const; QItemSelectionModel *selectionModel() const; diff --git a/src/widgets/widgets/qabstractbutton.h b/src/widgets/widgets/qabstractbutton.h index 4e438bd851..c78772435a 100644 --- a/src/widgets/widgets/qabstractbutton.h +++ b/src/widgets/widgets/qabstractbutton.h @@ -126,21 +126,21 @@ Q_SIGNALS: void toggled(bool checked); protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE = 0; + void paintEvent(QPaintEvent *e) override = 0; virtual bool hitButton(const QPoint &pos) const; virtual void checkStateSet(); virtual void nextCheckState(); - bool event(QEvent *e) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void mouseMoveEvent(QMouseEvent *e) override; + void focusInEvent(QFocusEvent *e) override; + void focusOutEvent(QFocusEvent *e) override; + void changeEvent(QEvent *e) override; + void timerEvent(QTimerEvent *e) override; protected: diff --git a/src/widgets/widgets/qabstractscrollarea.h b/src/widgets/widgets/qabstractscrollarea.h index 193fabce56..ad7581a393 100644 --- a/src/widgets/widgets/qabstractscrollarea.h +++ b/src/widgets/widgets/qabstractscrollarea.h @@ -91,9 +91,9 @@ public: void setViewport(QWidget *widget); QSize maximumViewportSize() const; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; virtual void setupViewport(QWidget *viewport); @@ -106,30 +106,30 @@ protected: void setViewportMargins(const QMargins &margins); QMargins viewportMargins() const; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; + bool event(QEvent *) override; virtual bool viewportEvent(QEvent *); - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void resizeEvent(QResizeEvent *) override; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *) override; #endif #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *) override; #endif #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *) override; + void dragMoveEvent(QDragMoveEvent *) override; + void dragLeaveEvent(QDragLeaveEvent *) override; + void dropEvent(QDropEvent *) override; #endif - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *) override; virtual void scrollContentsBy(int dx, int dy); diff --git a/src/widgets/widgets/qabstractscrollarea_p.h b/src/widgets/widgets/qabstractscrollarea_p.h index a3af77b11b..588407bc4a 100644 --- a/src/widgets/widgets/qabstractscrollarea_p.h +++ b/src/widgets/widgets/qabstractscrollarea_p.h @@ -124,7 +124,7 @@ class QAbstractScrollAreaFilter : public QObject public: QAbstractScrollAreaFilter(QAbstractScrollAreaPrivate *p) : d(p) { setObjectName(QLatin1String("qt_abstractscrollarea_filter")); } - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE + bool eventFilter(QObject *o, QEvent *e) override { return (o == d->viewport ? d->viewportEvent(e) : false); } private: QAbstractScrollAreaPrivate *d; diff --git a/src/widgets/widgets/qabstractslider.h b/src/widgets/widgets/qabstractslider.h index d26d6a879c..5586edb4cc 100644 --- a/src/widgets/widgets/qabstractslider.h +++ b/src/widgets/widgets/qabstractslider.h @@ -131,7 +131,7 @@ Q_SIGNALS: void actionTriggered(int action); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; void setRepeatAction(SliderAction action, int thresholdTime = 500, int repeatTime = 50); SliderAction repeatAction() const; @@ -144,12 +144,12 @@ protected: }; virtual void sliderChange(SliderChange change); - void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *ev) override; + void timerEvent(QTimerEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *e) override; #endif - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + void changeEvent(QEvent *e) override; protected: diff --git a/src/widgets/widgets/qcalendarwidget.cpp b/src/widgets/widgets/qcalendarwidget.cpp index 94911d1cb1..2394b738ea 100644 --- a/src/widgets/widgets/qcalendarwidget.cpp +++ b/src/widgets/widgets/qcalendarwidget.cpp @@ -115,11 +115,11 @@ class QCalendarDayValidator : public QCalendarDateSectionValidator public: QCalendarDayValidator(); - virtual Section handleKey(int key) Q_DECL_OVERRIDE; - virtual QDate applyToDate(const QDate &date) const Q_DECL_OVERRIDE; - virtual void setDate(const QDate &date) Q_DECL_OVERRIDE; - virtual QString text() const Q_DECL_OVERRIDE; - virtual QString text(const QDate &date, int repeat) const Q_DECL_OVERRIDE; + virtual Section handleKey(int key) override; + virtual QDate applyToDate(const QDate &date) const override; + virtual void setDate(const QDate &date) override; + virtual QString text() const override; + virtual QString text(const QDate &date, int repeat) const override; private: int m_pos; int m_day; @@ -223,11 +223,11 @@ class QCalendarMonthValidator : public QCalendarDateSectionValidator public: QCalendarMonthValidator(); - virtual Section handleKey(int key) Q_DECL_OVERRIDE; - virtual QDate applyToDate(const QDate &date) const Q_DECL_OVERRIDE; - virtual void setDate(const QDate &date) Q_DECL_OVERRIDE; - virtual QString text() const Q_DECL_OVERRIDE; - virtual QString text(const QDate &date, int repeat) const Q_DECL_OVERRIDE; + virtual Section handleKey(int key) override; + virtual QDate applyToDate(const QDate &date) const override; + virtual void setDate(const QDate &date) override; + virtual QString text() const override; + virtual QString text(const QDate &date, int repeat) const override; private: int m_pos; int m_month; @@ -333,11 +333,11 @@ class QCalendarYearValidator : public QCalendarDateSectionValidator public: QCalendarYearValidator(); - virtual Section handleKey(int key) Q_DECL_OVERRIDE; - virtual QDate applyToDate(const QDate &date) const Q_DECL_OVERRIDE; - virtual void setDate(const QDate &date) Q_DECL_OVERRIDE; - virtual QString text() const Q_DECL_OVERRIDE; - virtual QString text(const QDate &date, int repeat) const Q_DECL_OVERRIDE; + virtual Section handleKey(int key) override; + virtual QDate applyToDate(const QDate &date) const override; + virtual void setDate(const QDate &date) override; + virtual QString text() const override; + virtual QString text(const QDate &date, int repeat) const override; private: int pow10(int n); int m_pos; @@ -654,8 +654,8 @@ public: void setDate(const QDate &date); - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; + void timerEvent(QTimerEvent *e) override; signals: void dateChanged(const QDate &date); @@ -861,32 +861,32 @@ class QCalendarModel : public QAbstractTableModel public: QCalendarModel(QObject *parent = 0); - int rowCount(const QModelIndex &) const Q_DECL_OVERRIDE + int rowCount(const QModelIndex &) const override { return RowCount + m_firstRow; } - int columnCount(const QModelIndex &) const Q_DECL_OVERRIDE + int columnCount(const QModelIndex &) const override { return ColumnCount + m_firstColumn; } - QVariant data(const QModelIndex &index, int role) const Q_DECL_OVERRIDE; - Qt::ItemFlags flags(const QModelIndex &index) const Q_DECL_OVERRIDE; + QVariant data(const QModelIndex &index, int role) const override; + Qt::ItemFlags flags(const QModelIndex &index) const override; - bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE + bool insertRows(int row, int count, const QModelIndex &parent = QModelIndex()) override { beginInsertRows(parent, row, row + count - 1); endInsertRows(); return true; } - bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE + bool insertColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override { beginInsertColumns(parent, column, column + count - 1); endInsertColumns(); return true; } - bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE + bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()) override { beginRemoveRows(parent, row, row + count - 1); endRemoveRows(); return true; } - bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) Q_DECL_OVERRIDE + bool removeColumns(int column, int count, const QModelIndex &parent = QModelIndex()) override { beginRemoveColumns(parent, column, column + count - 1); endRemoveColumns(); @@ -947,7 +947,7 @@ public: void internalUpdate() { updateGeometries(); } void setReadOnly(bool enable); - virtual void keyboardSearch(const QString & search) Q_DECL_OVERRIDE { Q_UNUSED(search) } + virtual void keyboardSearch(const QString & search) override { Q_UNUSED(search) } signals: void showDate(const QDate &date); @@ -955,16 +955,16 @@ signals: void clicked(const QDate &date); void editingFinished(); protected: - QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + QModelIndex moveCursor(CursorAction cursorAction, Qt::KeyboardModifiers modifiers) override; + void mouseDoubleClickEvent(QMouseEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) override; #endif - void keyPressEvent(QKeyEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *event) override; + bool event(QEvent *event) override; QDate handleMouseEvent(QMouseEvent *event); public: @@ -1563,7 +1563,7 @@ public: : QItemDelegate(parent), calendarWidgetPrivate(w) { } virtual void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; void paintCell(QPainter *painter, const QRect &rect, const QDate &date) const; private: @@ -1579,7 +1579,7 @@ public: : QToolButton(parent) { } protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE + void paintEvent(QPaintEvent *e) override { Q_UNUSED(e) @@ -1607,7 +1607,7 @@ class QPrevNextCalButton : public QToolButton public: QPrevNextCalButton(QWidget *parent) : QToolButton(parent) {} protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE { + void paintEvent(QPaintEvent *) override { QStylePainter painter(this); QStyleOptionToolButton opt; initStyleOption(&opt); diff --git a/src/widgets/widgets/qcalendarwidget.h b/src/widgets/widgets/qcalendarwidget.h index 29e2ff698b..165b9bf366 100644 --- a/src/widgets/widgets/qcalendarwidget.h +++ b/src/widgets/widgets/qcalendarwidget.h @@ -92,8 +92,8 @@ public: explicit QCalendarWidget(QWidget *parent = Q_NULLPTR); ~QCalendarWidget(); - virtual QSize sizeHint() const Q_DECL_OVERRIDE; - virtual QSize minimumSizeHint() const Q_DECL_OVERRIDE; + virtual QSize sizeHint() const override; + virtual QSize minimumSizeHint() const override; QDate selectedDate() const; @@ -138,11 +138,11 @@ public: void setDateEditAcceptDelay(int delay); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool eventFilter(QObject *watched, QEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent * event) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent * event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool eventFilter(QObject *watched, QEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void resizeEvent(QResizeEvent * event) override; + void keyPressEvent(QKeyEvent * event) override; virtual void paintCell(QPainter *painter, const QRect &rect, const QDate &date) const; void updateCell(const QDate &date); diff --git a/src/widgets/widgets/qcheckbox.h b/src/widgets/widgets/qcheckbox.h index 8543c4c86f..44dd001ebe 100644 --- a/src/widgets/widgets/qcheckbox.h +++ b/src/widgets/widgets/qcheckbox.h @@ -62,8 +62,8 @@ public: explicit QCheckBox(const QString &text, QWidget *parent = Q_NULLPTR); ~QCheckBox(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void setTristate(bool y = true); bool isTristate() const; @@ -75,12 +75,12 @@ Q_SIGNALS: void stateChanged(int); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - bool hitButton(const QPoint &pos) const Q_DECL_OVERRIDE; - void checkStateSet() Q_DECL_OVERRIDE; - void nextCheckState() Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + bool hitButton(const QPoint &pos) const override; + void checkStateSet() override; + void nextCheckState() override; + void paintEvent(QPaintEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; void initStyleOption(QStyleOptionButton *option) const; diff --git a/src/widgets/widgets/qcombobox.h b/src/widgets/widgets/qcombobox.h index a6aac6f8aa..14b07ee0c7 100644 --- a/src/widgets/widgets/qcombobox.h +++ b/src/widgets/widgets/qcombobox.h @@ -195,14 +195,14 @@ public: QAbstractItemView *view() const; void setView(QAbstractItemView *itemView); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; virtual void showPopup(); virtual void hidePopup(); - bool event(QEvent *event) Q_DECL_OVERRIDE; - QVariant inputMethodQuery(Qt::InputMethodQuery) const Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + QVariant inputMethodQuery(Qt::InputMethodQuery) const override; Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, const QVariant &argument) const; public Q_SLOTS: @@ -223,24 +223,24 @@ Q_SIGNALS: void currentTextChanged(const QString &); protected: - void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - void changeEvent(QEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *e) override; + void focusOutEvent(QFocusEvent *e) override; + void changeEvent(QEvent *e) override; + void resizeEvent(QResizeEvent *e) override; + void paintEvent(QPaintEvent *e) override; + void showEvent(QShowEvent *e) override; + void hideEvent(QHideEvent *e) override; + void mousePressEvent(QMouseEvent *e) override; + void mouseReleaseEvent(QMouseEvent *e) override; + void keyPressEvent(QKeyEvent *e) override; + void keyReleaseEvent(QKeyEvent *e) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *e) override; #endif #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *e) override; #endif // QT_NO_CONTEXTMENU - void inputMethodEvent(QInputMethodEvent *) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent *) override; void initStyleOption(QStyleOptionComboBox *option) const; diff --git a/src/widgets/widgets/qcommandlinkbutton.h b/src/widgets/widgets/qcommandlinkbutton.h index d8215a256e..796ce9e4b5 100644 --- a/src/widgets/widgets/qcommandlinkbutton.h +++ b/src/widgets/widgets/qcommandlinkbutton.h @@ -67,11 +67,11 @@ public: void setDescription(const QString &description); protected: - QSize sizeHint() const Q_DECL_OVERRIDE; - int heightForWidth(int) const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + int heightForWidth(int) const override; + QSize minimumSizeHint() const override; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; private: Q_DISABLE_COPY(QCommandLinkButton) diff --git a/src/widgets/widgets/qdatetimeedit_p.h b/src/widgets/widgets/qdatetimeedit_p.h index 5ac5a9db6a..1ebc98dedf 100644 --- a/src/widgets/widgets/qdatetimeedit_p.h +++ b/src/widgets/widgets/qdatetimeedit_p.h @@ -80,25 +80,25 @@ public: void clearSection(int index); // Override QAbstractSpinBoxPrivate: - void emitSignals(EmitPolicy ep, const QVariant &old) Q_DECL_OVERRIDE; - QString textFromValue(const QVariant &f) const Q_DECL_OVERRIDE; - QVariant valueFromText(const QString &f) const Q_DECL_OVERRIDE; - void _q_editorCursorPositionChanged(int oldpos, int newpos) Q_DECL_OVERRIDE; - void interpret(EmitPolicy ep) Q_DECL_OVERRIDE; - void clearCache() const Q_DECL_OVERRIDE; - QStyle::SubControl newHoverControl(const QPoint &pos) Q_DECL_OVERRIDE; - void updateEditFieldGeometry() Q_DECL_OVERRIDE; - QVariant getZeroVariant() const Q_DECL_OVERRIDE; - void setRange(const QVariant &min, const QVariant &max) Q_DECL_OVERRIDE; - void updateEdit() Q_DECL_OVERRIDE; + void emitSignals(EmitPolicy ep, const QVariant &old) override; + QString textFromValue(const QVariant &f) const override; + QVariant valueFromText(const QString &f) const override; + void _q_editorCursorPositionChanged(int oldpos, int newpos) override; + void interpret(EmitPolicy ep) override; + void clearCache() const override; + QStyle::SubControl newHoverControl(const QPoint &pos) override; + void updateEditFieldGeometry() override; + QVariant getZeroVariant() const override; + void setRange(const QVariant &min, const QVariant &max) override; + void updateEdit() override; // Override QDateTimeParser: - QString displayText() const Q_DECL_OVERRIDE { return edit->text(); } - QDateTime getMinimum() const Q_DECL_OVERRIDE { return minimum.toDateTime(); } - QDateTime getMaximum() const Q_DECL_OVERRIDE { return maximum.toDateTime(); } - QLocale locale() const Q_DECL_OVERRIDE { return q_func()->locale(); } - QString getAmPmText(AmPm ap, Case cs) const Q_DECL_OVERRIDE; - int cursorPosition() const Q_DECL_OVERRIDE { return edit ? edit->cursorPosition() : -1; } + QString displayText() const override { return edit->text(); } + QDateTime getMinimum() const override { return minimum.toDateTime(); } + QDateTime getMaximum() const override { return maximum.toDateTime(); } + QLocale locale() const override { return q_func()->locale(); } + QString getAmPmText(AmPm ap, Case cs) const override; + int cursorPosition() const override { return edit ? edit->cursorPosition() : -1; } int absoluteIndex(QDateTimeEdit::Section s, int index) const; int absoluteIndex(const SectionNode &s) const; diff --git a/src/widgets/widgets/qdial.cpp b/src/widgets/widgets/qdial.cpp index c08c820127..25d57970bf 100644 --- a/src/widgets/widgets/qdial.cpp +++ b/src/widgets/widgets/qdial.cpp @@ -79,7 +79,7 @@ public: int valueFromPoint(const QPoint &) const; double angle(const QPoint &, const QPoint &) const; void init(); - virtual int bound(int val) const Q_DECL_OVERRIDE; + virtual int bound(int val) const override; }; void QDialPrivate::init() diff --git a/src/widgets/widgets/qdial.h b/src/widgets/widgets/qdial.h index ed753d86b0..63164060a9 100644 --- a/src/widgets/widgets/qdial.h +++ b/src/widgets/widgets/qdial.h @@ -73,23 +73,23 @@ public: qreal notchTarget() const; bool notchesVisible() const; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; public Q_SLOTS: void setNotchesVisible(bool visible); void setWrapping(bool on); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *re) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *pe) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void resizeEvent(QResizeEvent *re) override; + void paintEvent(QPaintEvent *pe) override; - void mousePressEvent(QMouseEvent *me) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *me) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *me) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *me) override; + void mouseReleaseEvent(QMouseEvent *me) override; + void mouseMoveEvent(QMouseEvent *me) override; - void sliderChange(SliderChange change) Q_DECL_OVERRIDE; + void sliderChange(SliderChange change) override; void initStyleOption(QStyleOptionSlider *option) const; diff --git a/src/widgets/widgets/qdialogbuttonbox.h b/src/widgets/widgets/qdialogbuttonbox.h index 02d14dee7c..7858a65721 100644 --- a/src/widgets/widgets/qdialogbuttonbox.h +++ b/src/widgets/widgets/qdialogbuttonbox.h @@ -151,8 +151,8 @@ Q_SIGNALS: void rejected(); protected: - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void changeEvent(QEvent *event) override; + bool event(QEvent *event) override; private: Q_DISABLE_COPY(QDialogButtonBox) diff --git a/src/widgets/widgets/qdockwidget.cpp b/src/widgets/widgets/qdockwidget.cpp index 36d7ab3421..065d169890 100644 --- a/src/widgets/widgets/qdockwidget.cpp +++ b/src/widgets/widgets/qdockwidget.cpp @@ -120,13 +120,13 @@ class QDockWidgetTitleButton : public QAbstractButton public: QDockWidgetTitleButton(QDockWidget *dockWidget); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override; + QSize minimumSizeHint() const override { return sizeHint(); } - void enterEvent(QEvent *event) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void enterEvent(QEvent *event) override; + void leaveEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; }; diff --git a/src/widgets/widgets/qdockwidget.h b/src/widgets/widgets/qdockwidget.h index b53fa19a03..d6becd4404 100644 --- a/src/widgets/widgets/qdockwidget.h +++ b/src/widgets/widgets/qdockwidget.h @@ -113,10 +113,10 @@ Q_SIGNALS: void dockLocationChanged(Qt::DockWidgetArea area); protected: - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void changeEvent(QEvent *event) override; + void closeEvent(QCloseEvent *event) override; + void paintEvent(QPaintEvent *event) override; + bool event(QEvent *event) override; void initStyleOption(QStyleOptionDockWidget *option) const; private: diff --git a/src/widgets/widgets/qdockwidget_p.h b/src/widgets/widgets/qdockwidget_p.h index 2c16176c37..e35fd17fc2 100644 --- a/src/widgets/widgets/qdockwidget_p.h +++ b/src/widgets/widgets/qdockwidget_p.h @@ -135,18 +135,18 @@ class Q_WIDGETS_EXPORT QDockWidgetLayout : public QLayout public: QDockWidgetLayout(QWidget *parent = 0); ~QDockWidgetLayout(); - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + int count() const override; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize maximumSize() const override; + QSize minimumSize() const override; + QSize sizeHint() const override; QSize sizeFromContent(const QSize &content, bool floating) const; - void setGeometry(const QRect &r) Q_DECL_OVERRIDE; + void setGeometry(const QRect &r) override; enum Role { Content, CloseButton, FloatButton, TitleBar, RoleCount }; QWidget *widgetForRole(Role r) const; @@ -178,9 +178,9 @@ class QDockWidgetItem : public QWidgetItem { public: QDockWidgetItem(QDockWidget *dockWidget); - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize maximumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize minimumSize() const override; + QSize maximumSize() const override; + QSize sizeHint() const override; private: inline QLayoutItem *dockWidgetChildItem() const; diff --git a/src/widgets/widgets/qeffects.cpp b/src/widgets/widgets/qeffects.cpp index 4dc5939bfb..effc1afeee 100644 --- a/src/widgets/widgets/qeffects.cpp +++ b/src/widgets/widgets/qeffects.cpp @@ -72,10 +72,10 @@ public: void run(int time); protected: - void paintEvent(QPaintEvent* e) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent*) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent* e) override; + void closeEvent(QCloseEvent*) override; void alphaBlend(); - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; protected slots: void render(); @@ -349,8 +349,8 @@ public: void run(int time); protected: - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent*) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent*) override; + void closeEvent(QCloseEvent*) override; private slots: void scroll(); diff --git a/src/widgets/widgets/qfocusframe.h b/src/widgets/widgets/qfocusframe.h index a1fc6d345d..a1f1c55644 100644 --- a/src/widgets/widgets/qfocusframe.h +++ b/src/widgets/widgets/qfocusframe.h @@ -60,10 +60,10 @@ public: QWidget *widget() const; protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; + void paintEvent(QPaintEvent *) override; void initStyleOption(QStyleOption *option) const; private: diff --git a/src/widgets/widgets/qfontcombobox.cpp b/src/widgets/widgets/qfontcombobox.cpp index 1c56c19c8f..49f1223d9c 100644 --- a/src/widgets/widgets/qfontcombobox.cpp +++ b/src/widgets/widgets/qfontcombobox.cpp @@ -189,10 +189,10 @@ public: // painting void paint(QPainter *painter, const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; QSize sizeHint(const QStyleOptionViewItem &option, - const QModelIndex &index) const Q_DECL_OVERRIDE; + const QModelIndex &index) const override; const QIcon truetype; const QIcon bitmap; diff --git a/src/widgets/widgets/qfontcombobox.h b/src/widgets/widgets/qfontcombobox.h index 1e4555ce2d..e70054fcb6 100644 --- a/src/widgets/widgets/qfontcombobox.h +++ b/src/widgets/widgets/qfontcombobox.h @@ -78,7 +78,7 @@ public: FontFilters fontFilters() const; QFont currentFont() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; public Q_SLOTS: void setCurrentFont(const QFont &f); @@ -87,7 +87,7 @@ Q_SIGNALS: void currentFontChanged(const QFont &f); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: Q_DISABLE_COPY(QFontComboBox) diff --git a/src/widgets/widgets/qframe.h b/src/widgets/widgets/qframe.h index 986915a28f..a401e72733 100644 --- a/src/widgets/widgets/qframe.h +++ b/src/widgets/widgets/qframe.h @@ -69,7 +69,7 @@ public: int frameWidth() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; enum Shape { NoFrame = 0, // no frame @@ -108,9 +108,9 @@ public: void setFrameRect(const QRect &); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; + void changeEvent(QEvent *) override; void drawFrame(QPainter *); diff --git a/src/widgets/widgets/qgroupbox.h b/src/widgets/widgets/qgroupbox.h index 668dc03f3d..8ca4f55c5e 100644 --- a/src/widgets/widgets/qgroupbox.h +++ b/src/widgets/widgets/qgroupbox.h @@ -69,7 +69,7 @@ public: Qt::Alignment alignment() const; void setAlignment(int alignment); - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize minimumSizeHint() const override; bool isFlat() const; void setFlat(bool flat); @@ -85,15 +85,15 @@ Q_SIGNALS: void toggled(bool); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void childEvent(QChildEvent *event) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *event) Q_DECL_OVERRIDE; - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void childEvent(QChildEvent *event) override; + void resizeEvent(QResizeEvent *event) override; + void paintEvent(QPaintEvent *event) override; + void focusInEvent(QFocusEvent *event) override; + void changeEvent(QEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; void initStyleOption(QStyleOptionGroupBox *option) const; diff --git a/src/widgets/widgets/qkeysequenceedit.h b/src/widgets/widgets/qkeysequenceedit.h index 81339a9852..ca25ada15f 100644 --- a/src/widgets/widgets/qkeysequenceedit.h +++ b/src/widgets/widgets/qkeysequenceedit.h @@ -72,10 +72,10 @@ Q_SIGNALS: protected: QKeySequenceEdit(QKeySequenceEditPrivate &d, QWidget *parent, Qt::WindowFlags f); - bool event(QEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void keyReleaseEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void keyReleaseEvent(QKeyEvent *) override; + void timerEvent(QTimerEvent *) override; private: Q_DISABLE_COPY(QKeySequenceEdit) diff --git a/src/widgets/widgets/qlabel.h b/src/widgets/widgets/qlabel.h index 469254a145..7fc78e625b 100644 --- a/src/widgets/widgets/qlabel.h +++ b/src/widgets/widgets/qlabel.h @@ -97,13 +97,13 @@ public: bool hasScaledContents() const; void setScaledContents(bool); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; #ifndef QT_NO_SHORTCUT void setBuddy(QWidget *); QWidget *buddy() const; #endif - int heightForWidth(int) const Q_DECL_OVERRIDE; + int heightForWidth(int) const override; bool openExternalLinks() const; void setOpenExternalLinks(bool open); @@ -134,19 +134,19 @@ Q_SIGNALS: void linkHovered(const QString& link); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void keyPressEvent(QKeyEvent *ev) override; + void paintEvent(QPaintEvent *) override; + void changeEvent(QEvent *) override; + void mousePressEvent(QMouseEvent *ev) override; + void mouseMoveEvent(QMouseEvent *ev) override; + void mouseReleaseEvent(QMouseEvent *ev) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *ev) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *ev) override; #endif // QT_NO_CONTEXTMENU - void focusInEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *ev) override; + void focusOutEvent(QFocusEvent *ev) override; + bool focusNextPrevChild(bool next) override; private: diff --git a/src/widgets/widgets/qlcdnumber.h b/src/widgets/widgets/qlcdnumber.h index 28fd530e6e..75b10f2cb7 100644 --- a/src/widgets/widgets/qlcdnumber.h +++ b/src/widgets/widgets/qlcdnumber.h @@ -88,7 +88,7 @@ public: double value() const; int intValue() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; public Q_SLOTS: void display(const QString &str); @@ -104,8 +104,8 @@ Q_SIGNALS: void overflow(); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; public: diff --git a/src/widgets/widgets/qlineedit.h b/src/widgets/widgets/qlineedit.h index d84eeedaf6..310b8fc3a3 100644 --- a/src/widgets/widgets/qlineedit.h +++ b/src/widgets/widgets/qlineedit.h @@ -129,8 +129,8 @@ public: QCompleter *completer() const; #endif - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; int cursorPosition() const; void setCursorPosition(int); @@ -210,31 +210,31 @@ Q_SIGNALS: void selectionChanged(); protected: - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseDoubleClickEvent(QMouseEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; + void paintEvent(QPaintEvent *) override; #ifndef QT_NO_DRAGANDDROP - void dragEnterEvent(QDragEnterEvent *) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *) override; + void dragMoveEvent(QDragMoveEvent *e) override; + void dragLeaveEvent(QDragLeaveEvent *e) override; + void dropEvent(QDropEvent *) override; #endif - void changeEvent(QEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *) override; #endif - void inputMethodEvent(QInputMethodEvent *) Q_DECL_OVERRIDE; + void inputMethodEvent(QInputMethodEvent *) override; void initStyleOption(QStyleOptionFrame *option) const; public: - QVariant inputMethodQuery(Qt::InputMethodQuery) const Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery) const override; Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery property, QVariant argument) const; - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; protected: QRect cursorRect() const; diff --git a/src/widgets/widgets/qlineedit_p.h b/src/widgets/widgets/qlineedit_p.h index 92bdd4ad60..0dcf1c04c8 100644 --- a/src/widgets/widgets/qlineedit_p.h +++ b/src/widgets/widgets/qlineedit_p.h @@ -91,8 +91,8 @@ public: #endif protected: - void actionEvent(QActionEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void actionEvent(QActionEvent *e) override; + void paintEvent(QPaintEvent *event) override; private slots: void updateCursor(); diff --git a/src/widgets/widgets/qmainwindow.h b/src/widgets/widgets/qmainwindow.h index e0592d2c3f..0c104fe7ff 100644 --- a/src/widgets/widgets/qmainwindow.h +++ b/src/widgets/widgets/qmainwindow.h @@ -204,9 +204,9 @@ Q_SIGNALS: protected: #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) override; #endif - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; private: Q_DECLARE_PRIVATE(QMainWindow) diff --git a/src/widgets/widgets/qmainwindowlayout.cpp b/src/widgets/widgets/qmainwindowlayout.cpp index da5f00efe0..3444c7a5bb 100644 --- a/src/widgets/widgets/qmainwindowlayout.cpp +++ b/src/widgets/widgets/qmainwindowlayout.cpp @@ -203,14 +203,14 @@ public: layoutState.deleteAllLayoutItems(); } - void addItem(QLayoutItem*) Q_DECL_OVERRIDE { Q_UNREACHABLE(); } - int count() const Q_DECL_OVERRIDE { return 0; } - QLayoutItem* itemAt(int index) const Q_DECL_OVERRIDE + void addItem(QLayoutItem*) override { Q_UNREACHABLE(); } + int count() const override { return 0; } + QLayoutItem* itemAt(int index) const override { int x = 0; return layoutState.itemAt(&x, index); } - QLayoutItem* takeAt(int index) Q_DECL_OVERRIDE + QLayoutItem* takeAt(int index) override { int x = 0; QLayoutItem *ret = layoutState.takeAt(&x, index); @@ -226,22 +226,22 @@ public: } return ret; } - QSize sizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override { int fw = frameWidth(); return layoutState.sizeHint() + QSize(fw, fw); } - QSize minimumSize() const Q_DECL_OVERRIDE + QSize minimumSize() const override { int fw = frameWidth(); return layoutState.minimumSize() + QSize(fw, fw); } - QSize maximumSize() const Q_DECL_OVERRIDE + QSize maximumSize() const override { int fw = frameWidth(); return layoutState.maximumSize() + QSize(fw, fw); } - void setGeometry(const QRect&r) Q_DECL_OVERRIDE + void setGeometry(const QRect&r) override { groupWindow()->destroyOrHideIfEmpty(); QDockAreaLayoutInfo *li = dockAreaLayoutInfo(); @@ -1659,9 +1659,9 @@ class QMainWindowTabBar : public QTabBar public: QMainWindowTabBar(QMainWindow *parent); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent*) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent*) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void mouseReleaseEvent(QMouseEvent*) override; + void mouseMoveEvent(QMouseEvent*) override; }; diff --git a/src/widgets/widgets/qmainwindowlayout_p.h b/src/widgets/widgets/qmainwindowlayout_p.h index 2ffc367da1..275345f15d 100644 --- a/src/widgets/widgets/qmainwindowlayout_p.h +++ b/src/widgets/widgets/qmainwindowlayout_p.h @@ -345,8 +345,8 @@ public: QList currentGapPos; protected: - bool event(QEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + void paintEvent(QPaintEvent*) override; private: QSize m_removedFrameSize; @@ -358,9 +358,9 @@ class QDockWidgetGroupWindowItem : public QWidgetItem { public: explicit QDockWidgetGroupWindowItem(QDockWidgetGroupWindow *parent) : QWidgetItem(parent) {} - QSize minimumSize() const Q_DECL_OVERRIDE { return lay()->minimumSize(); } - QSize maximumSize() const Q_DECL_OVERRIDE { return lay()->maximumSize(); } - QSize sizeHint() const Q_DECL_OVERRIDE { return lay()->sizeHint(); } + QSize minimumSize() const override { return lay()->minimumSize(); } + QSize maximumSize() const override { return lay()->maximumSize(); } + QSize sizeHint() const override { return lay()->sizeHint(); } private: QLayout *lay() const { return const_cast(this)->widget()->layout(); } @@ -533,17 +533,17 @@ public: // QLayout interface - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - void setGeometry(const QRect &r) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + void setGeometry(const QRect &r) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + int count() const override; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSize() const override; mutable QSize szHint; mutable QSize minSize; - void invalidate() Q_DECL_OVERRIDE; + void invalidate() override; // animations diff --git a/src/widgets/widgets/qmdiarea.cpp b/src/widgets/widgets/qmdiarea.cpp index 43158fa1fd..fe742d1ac8 100644 --- a/src/widgets/widgets/qmdiarea.cpp +++ b/src/widgets/widgets/qmdiarea.cpp @@ -569,9 +569,9 @@ public: QMdiAreaTabBar(QWidget *parent) : QTabBar(parent) {} protected: - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *event) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *event) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *event) override; #endif private: diff --git a/src/widgets/widgets/qmdiarea.h b/src/widgets/widgets/qmdiarea.h index acc59296b6..f58e510487 100644 --- a/src/widgets/widgets/qmdiarea.h +++ b/src/widgets/widgets/qmdiarea.h @@ -91,8 +91,8 @@ public: QMdiArea(QWidget *parent = Q_NULLPTR); ~QMdiArea(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; QMdiSubWindow *currentSubWindow() const; QMdiSubWindow *activeSubWindow() const; @@ -144,18 +144,18 @@ public Q_SLOTS: void activatePreviousSubWindow(); protected Q_SLOTS: - void setupViewport(QWidget *viewport) Q_DECL_OVERRIDE; + void setupViewport(QWidget *viewport) override; protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *paintEvent) Q_DECL_OVERRIDE; - void childEvent(QChildEvent *childEvent) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *timerEvent) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *showEvent) Q_DECL_OVERRIDE; - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + bool eventFilter(QObject *object, QEvent *event) override; + void paintEvent(QPaintEvent *paintEvent) override; + void childEvent(QChildEvent *childEvent) override; + void resizeEvent(QResizeEvent *resizeEvent) override; + void timerEvent(QTimerEvent *timerEvent) override; + void showEvent(QShowEvent *showEvent) override; + bool viewportEvent(QEvent *event) override; + void scrollContentsBy(int dx, int dy) override; private: Q_DISABLE_COPY(QMdiArea) diff --git a/src/widgets/widgets/qmdiarea_p.h b/src/widgets/widgets/qmdiarea_p.h index 10b5de6840..8a648eb9dc 100644 --- a/src/widgets/widgets/qmdiarea_p.h +++ b/src/widgets/widgets/qmdiarea_p.h @@ -88,8 +88,8 @@ class RegularTiler : public Rearranger // Rearranges widgets according to a regular tiling pattern // covering the entire domain. // Both positions and sizes may change. - void rearrange(QList &widgets, const QRect &domain) const Q_DECL_OVERRIDE; - Type type() const Q_DECL_OVERRIDE { return Rearranger::RegularTiler; } + void rearrange(QList &widgets, const QRect &domain) const override; + Type type() const override { return Rearranger::RegularTiler; } }; class SimpleCascader : public Rearranger @@ -97,8 +97,8 @@ class SimpleCascader : public Rearranger // Rearranges widgets according to a simple, regular cascading pattern. // Widgets are resized to minimumSize. // Both positions and sizes may change. - void rearrange(QList &widgets, const QRect &domain) const Q_DECL_OVERRIDE; - Type type() const Q_DECL_OVERRIDE { return Rearranger::SimpleCascader; } + void rearrange(QList &widgets, const QRect &domain) const override; + Type type() const override { return Rearranger::SimpleCascader; } }; class IconTiler : public Rearranger @@ -106,8 +106,8 @@ class IconTiler : public Rearranger // Rearranges icons (assumed to be the same size) according to a regular // tiling pattern filling up the domain from the bottom. // Only positions may change. - void rearrange(QList &widgets, const QRect &domain) const Q_DECL_OVERRIDE; - Type type() const Q_DECL_OVERRIDE { return Rearranger::IconTiler; } + void rearrange(QList &widgets, const QRect &domain) const override; + Type type() const override { return Rearranger::IconTiler; } }; class Placer @@ -122,7 +122,7 @@ public: class MinOverlapPlacer : public Placer { - QPoint place(const QSize &size, const QVector &rects, const QRect &domain) const Q_DECL_OVERRIDE; + QPoint place(const QSize &size, const QVector &rects, const QRect &domain) const override; static int accumulatedOverlap(const QRect &source, const QVector &rects); static QRect findMinOverlapRect(const QVector &source, const QVector &rects); static QVector getCandidatePlacements(const QSize &size, const QVector &rects, const QRect &domain); @@ -206,7 +206,7 @@ public: bool lastWindowAboutToBeDestroyed() const; void setChildActivationEnabled(bool enable = true, bool onlyNextActivationEvent = false) const; QRect resizeToMinimumTileSize(const QSize &minSubWindowSize, int subWindowCount); - void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) Q_DECL_OVERRIDE; // reimp + void scrollBarPolicyChanged(Qt::Orientation, Qt::ScrollBarPolicy) override; // reimp QMdiSubWindow *nextVisibleSubWindow(int increaseFactor, QMdiArea::WindowOrder, int removed = -1, int fromIndex = -1) const; void highlightNextSubWindow(int increaseFactor); diff --git a/src/widgets/widgets/qmdisubwindow.cpp b/src/widgets/widgets/qmdisubwindow.cpp index 498744e81e..b3ec3df481 100644 --- a/src/widgets/widgets/qmdisubwindow.cpp +++ b/src/widgets/widgets/qmdisubwindow.cpp @@ -369,18 +369,18 @@ class ControlLabel : public QWidget public: ControlLabel(QMdiSubWindow *subWindow, QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; signals: void _q_clicked(); void _q_doubleClicked(); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *paintEvent) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void paintEvent(QPaintEvent *paintEvent) override; + void mousePressEvent(QMouseEvent *mouseEvent) override; + void mouseDoubleClickEvent(QMouseEvent *mouseEvent) override; + void mouseReleaseEvent(QMouseEvent *mouseEvent) override; private: QPixmap label; @@ -500,7 +500,7 @@ class ControllerWidget : public QWidget Q_OBJECT public: ControllerWidget(QMdiSubWindow *subWindow, QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; void setControlVisible(QMdiSubWindowPrivate::WindowStateAction action, bool visible); inline bool hasVisibleControls() const { @@ -515,12 +515,12 @@ signals: void _q_close(); protected: - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void mouseReleaseEvent(QMouseEvent *event) override; + void mouseMoveEvent(QMouseEvent *event) override; + void leaveEvent(QEvent *event) override; + bool event(QEvent *event) override; private: QStyle::SubControl activeControl; diff --git a/src/widgets/widgets/qmdisubwindow.h b/src/widgets/widgets/qmdisubwindow.h index 875c9a22c8..5fdfe9cfbf 100644 --- a/src/widgets/widgets/qmdisubwindow.h +++ b/src/widgets/widgets/qmdisubwindow.h @@ -70,8 +70,8 @@ public: QMdiSubWindow(QWidget *parent = Q_NULLPTR, Qt::WindowFlags flags = Qt::WindowFlags()); ~QMdiSubWindow(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void setWidget(QWidget *widget); QWidget *widget() const; @@ -108,28 +108,28 @@ public Q_SLOTS: void showShaded(); protected: - bool eventFilter(QObject *object, QEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *showEvent) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *hideEvent) Q_DECL_OVERRIDE; - void changeEvent(QEvent *changeEvent) Q_DECL_OVERRIDE; - void closeEvent(QCloseEvent *closeEvent) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *leaveEvent) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *resizeEvent) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *timerEvent) Q_DECL_OVERRIDE; - void moveEvent(QMoveEvent *moveEvent) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *paintEvent) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseDoubleClickEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *keyEvent) Q_DECL_OVERRIDE; + bool eventFilter(QObject *object, QEvent *event) override; + bool event(QEvent *event) override; + void showEvent(QShowEvent *showEvent) override; + void hideEvent(QHideEvent *hideEvent) override; + void changeEvent(QEvent *changeEvent) override; + void closeEvent(QCloseEvent *closeEvent) override; + void leaveEvent(QEvent *leaveEvent) override; + void resizeEvent(QResizeEvent *resizeEvent) override; + void timerEvent(QTimerEvent *timerEvent) override; + void moveEvent(QMoveEvent *moveEvent) override; + void paintEvent(QPaintEvent *paintEvent) override; + void mousePressEvent(QMouseEvent *mouseEvent) override; + void mouseDoubleClickEvent(QMouseEvent *mouseEvent) override; + void mouseReleaseEvent(QMouseEvent *mouseEvent) override; + void mouseMoveEvent(QMouseEvent *mouseEvent) override; + void keyPressEvent(QKeyEvent *keyEvent) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *contextMenuEvent) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *contextMenuEvent) override; #endif - void focusInEvent(QFocusEvent *focusInEvent) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *focusOutEvent) Q_DECL_OVERRIDE; - void childEvent(QChildEvent *childEvent) Q_DECL_OVERRIDE; + void focusInEvent(QFocusEvent *focusInEvent) override; + void focusOutEvent(QFocusEvent *focusOutEvent) override; + void childEvent(QChildEvent *childEvent) override; private: Q_DISABLE_COPY(QMdiSubWindow) diff --git a/src/widgets/widgets/qmdisubwindow_p.h b/src/widgets/widgets/qmdisubwindow_p.h index 71fcc38378..044c244ab4 100644 --- a/src/widgets/widgets/qmdisubwindow_p.h +++ b/src/widgets/widgets/qmdisubwindow_p.h @@ -267,7 +267,7 @@ public: void setFocusWidget(); bool restoreFocus(); void storeFocusWidget(); - void setWindowFlags(Qt::WindowFlags windowFlags) Q_DECL_OVERRIDE; + void setWindowFlags(Qt::WindowFlags windowFlags) override; void setVisible(WindowStateAction, bool visible = true); #ifndef QT_NO_ACTION void setEnabled(WindowStateAction, bool enable = true); diff --git a/src/widgets/widgets/qmenu.cpp b/src/widgets/widgets/qmenu.cpp index 0355bb44f7..079ad70ae9 100644 --- a/src/widgets/widgets/qmenu.cpp +++ b/src/widgets/widgets/qmenu.cpp @@ -114,7 +114,7 @@ class QTornOffMenu : public QMenu q->setFixedSize(size); } - QVector > calcCausedStack() const Q_DECL_OVERRIDE { return causedStack; } + QVector > calcCausedStack() const override { return causedStack; } QPointer causedMenu; QVector > causedStack; bool initialized; @@ -160,7 +160,7 @@ public: } else if (act->type() == QEvent::ActionRemoved) removeAction(act->action()); } - void actionEvent(QActionEvent *e) Q_DECL_OVERRIDE + void actionEvent(QActionEvent *e) override { Q_D(QTornOffMenu); QMenu::actionEvent(e); diff --git a/src/widgets/widgets/qmenu.h b/src/widgets/widgets/qmenu.h index 61849790cf..56b8e011b9 100644 --- a/src/widgets/widgets/qmenu.h +++ b/src/widgets/widgets/qmenu.h @@ -195,7 +195,7 @@ public: static QAction *exec(QList actions, const QPoint &pos, QAction *at = Q_NULLPTR, QWidget *parent = Q_NULLPTR); #endif - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; QRect actionGeometry(QAction *) const; QAction *actionAt(const QPoint &) const; @@ -232,22 +232,22 @@ Q_SIGNALS: protected: int columnCount() const; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *) override; #endif - void enterEvent(QEvent *) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void actionEvent(QActionEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; + void hideEvent(QHideEvent *) override; + void paintEvent(QPaintEvent *) override; + void actionEvent(QActionEvent *) override; + void timerEvent(QTimerEvent *) override; + bool event(QEvent *) override; + bool focusNextPrevChild(bool next) override; void initStyleOption(QStyleOptionMenuItem *option, const QAction *action) const; private Q_SLOTS: diff --git a/src/widgets/widgets/qmenu_p.h b/src/widgets/widgets/qmenu_p.h index 574c71c31e..444c799a64 100644 --- a/src/widgets/widgets/qmenu_p.h +++ b/src/widgets/widgets/qmenu_p.h @@ -463,7 +463,7 @@ public: enum Type { ScrollUp, ScrollDown }; ScrollerTearOffItem(Type type, QMenuPrivate *mPrivate, QWidget *parent = Q_NULLPTR, Qt::WindowFlags f = Qt::WindowFlags()); - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; void updateScrollerRects(const QRect &rect); private: diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 5284c16ab0..af0b22b82c 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -76,8 +76,8 @@ class QMenuBarExtension : public QToolButton public: explicit QMenuBarExtension(QWidget *parent); - QSize sizeHint() const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + void paintEvent(QPaintEvent *) override; }; QMenuBarExtension::QMenuBarExtension(QWidget *parent) diff --git a/src/widgets/widgets/qplaintextedit.h b/src/widgets/widgets/qplaintextedit.h index 09e714fd3c..d2f0af5dcc 100644 --- a/src/widgets/widgets/qplaintextedit.h +++ b/src/widgets/widgets/qplaintextedit.h @@ -192,7 +192,7 @@ public: void print(QPagedPaintDevice *printer) const; int blockCount() const; - QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery property) const override; Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; public Q_SLOTS: @@ -234,43 +234,43 @@ Q_SIGNALS: void modificationChanged(bool); protected: - virtual bool event(QEvent *e) Q_DECL_OVERRIDE; - virtual void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - virtual void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - virtual void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + virtual bool event(QEvent *e) override; + virtual void timerEvent(QTimerEvent *e) override; + virtual void keyPressEvent(QKeyEvent *e) override; + virtual void keyReleaseEvent(QKeyEvent *e) override; + virtual void resizeEvent(QResizeEvent *e) override; + virtual void paintEvent(QPaintEvent *e) override; + virtual void mousePressEvent(QMouseEvent *e) override; + virtual void mouseMoveEvent(QMouseEvent *e) override; + virtual void mouseReleaseEvent(QMouseEvent *e) override; + virtual void mouseDoubleClickEvent(QMouseEvent *e) override; + virtual bool focusNextPrevChild(bool next) override; #ifndef QT_NO_CONTEXTMENU - virtual void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE; + virtual void contextMenuEvent(QContextMenuEvent *e) override; #endif #ifndef QT_NO_DRAGANDDROP - virtual void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE; - virtual void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - virtual void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; - virtual void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE; + virtual void dragEnterEvent(QDragEnterEvent *e) override; + virtual void dragLeaveEvent(QDragLeaveEvent *e) override; + virtual void dragMoveEvent(QDragMoveEvent *e) override; + virtual void dropEvent(QDropEvent *e) override; #endif - virtual void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - virtual void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - virtual void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + virtual void focusInEvent(QFocusEvent *e) override; + virtual void focusOutEvent(QFocusEvent *e) override; + virtual void showEvent(QShowEvent *) override; + virtual void changeEvent(QEvent *e) override; #if QT_CONFIG(wheelevent) - virtual void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + virtual void wheelEvent(QWheelEvent *e) override; #endif virtual QMimeData *createMimeDataFromSelection() const; virtual bool canInsertFromMimeData(const QMimeData *source) const; virtual void insertFromMimeData(const QMimeData *source); - virtual void inputMethodEvent(QInputMethodEvent *) Q_DECL_OVERRIDE; + virtual void inputMethodEvent(QInputMethodEvent *) override; QPlainTextEdit(QPlainTextEditPrivate &dd, QWidget *parent); - virtual void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + virtual void scrollContentsBy(int dx, int dy) override; virtual void doSetTextCursor(const QTextCursor &cursor); QTextBlock firstVisibleBlock() const; @@ -303,14 +303,14 @@ public: QPlainTextDocumentLayout(QTextDocument *document); ~QPlainTextDocumentLayout(); - void draw(QPainter *, const PaintContext &) Q_DECL_OVERRIDE; - int hitTest(const QPointF &, Qt::HitTestAccuracy ) const Q_DECL_OVERRIDE; + void draw(QPainter *, const PaintContext &) override; + int hitTest(const QPointF &, Qt::HitTestAccuracy ) const override; - int pageCount() const Q_DECL_OVERRIDE; - QSizeF documentSize() const Q_DECL_OVERRIDE; + int pageCount() const override; + QSizeF documentSize() const override; - QRectF frameBoundingRect(QTextFrame *) const Q_DECL_OVERRIDE; - QRectF blockBoundingRect(const QTextBlock &block) const Q_DECL_OVERRIDE; + QRectF frameBoundingRect(QTextFrame *) const override; + QRectF blockBoundingRect(const QTextBlock &block) const override; void ensureBlockLayout(const QTextBlock &block) const; @@ -320,7 +320,7 @@ public: void requestUpdate(); protected: - void documentChanged(int from, int /*charsRemoved*/, int charsAdded) Q_DECL_OVERRIDE; + void documentChanged(int from, int /*charsRemoved*/, int charsAdded) override; private: diff --git a/src/widgets/widgets/qplaintextedit_p.h b/src/widgets/widgets/qplaintextedit_p.h index 2484f9a33c..207745b566 100644 --- a/src/widgets/widgets/qplaintextedit_p.h +++ b/src/widgets/widgets/qplaintextedit_p.h @@ -82,19 +82,19 @@ public: QPlainTextEditControl(QPlainTextEdit *parent); - QMimeData *createMimeDataFromSelection() const Q_DECL_OVERRIDE; - bool canInsertFromMimeData(const QMimeData *source) const Q_DECL_OVERRIDE; - void insertFromMimeData(const QMimeData *source) Q_DECL_OVERRIDE; - int hitTest(const QPointF &point, Qt::HitTestAccuracy = Qt::FuzzyHit) const Q_DECL_OVERRIDE; - QRectF blockBoundingRect(const QTextBlock &block) const Q_DECL_OVERRIDE; - QString anchorAt(const QPointF &pos) const Q_DECL_OVERRIDE; + QMimeData *createMimeDataFromSelection() const override; + bool canInsertFromMimeData(const QMimeData *source) const override; + void insertFromMimeData(const QMimeData *source) override; + int hitTest(const QPointF &point, Qt::HitTestAccuracy = Qt::FuzzyHit) const override; + QRectF blockBoundingRect(const QTextBlock &block) const override; + QString anchorAt(const QPointF &pos) const override; inline QRectF cursorRect(const QTextCursor &cursor) const { QRectF r = QWidgetTextControl::cursorRect(cursor); r.setLeft(qMax(r.left(), (qreal) 0.)); return r; } inline QRectF cursorRect() { return cursorRect(textCursor()); } - void ensureCursorVisible() Q_DECL_OVERRIDE { + void ensureCursorVisible() override { textEdit->ensureCursorVisible(); emit microFocusChanged(); } @@ -104,7 +104,7 @@ public: int topBlock; QTextBlock firstVisibleBlock() const; - QVariant loadResource(int type, const QUrl &name) Q_DECL_OVERRIDE { + QVariant loadResource(int type, const QUrl &name) override { return textEdit->loadResource(type, name); } diff --git a/src/widgets/widgets/qprogressbar.h b/src/widgets/widgets/qprogressbar.h index e0f5e9084b..48b5a69fee 100644 --- a/src/widgets/widgets/qprogressbar.h +++ b/src/widgets/widgets/qprogressbar.h @@ -83,8 +83,8 @@ public: Qt::Alignment alignment() const; void setAlignment(Qt::Alignment alignment); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; Qt::Orientation orientation() const; @@ -109,8 +109,8 @@ Q_SIGNALS: void valueChanged(int value); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; void initStyleOption(QStyleOptionProgressBar *option) const; private: diff --git a/src/widgets/widgets/qpushbutton.h b/src/widgets/widgets/qpushbutton.h index ea9baa8ccb..019adb0004 100644 --- a/src/widgets/widgets/qpushbutton.h +++ b/src/widgets/widgets/qpushbutton.h @@ -66,8 +66,8 @@ public: QPushButton(const QIcon& icon, const QString &text, QWidget *parent = Q_NULLPTR); ~QPushButton(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; bool autoDefault() const; void setAutoDefault(bool); @@ -88,11 +88,11 @@ public Q_SLOTS: #endif protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void focusInEvent(QFocusEvent *) Q_DECL_OVERRIDE; - void focusOutEvent(QFocusEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void focusInEvent(QFocusEvent *) override; + void focusOutEvent(QFocusEvent *) override; void initStyleOption(QStyleOptionButton *option) const; QPushButton(QPushButtonPrivate &dd, QWidget* parent = Q_NULLPTR); diff --git a/src/widgets/widgets/qradiobutton.h b/src/widgets/widgets/qradiobutton.h index 137ae01380..41a3526777 100644 --- a/src/widgets/widgets/qradiobutton.h +++ b/src/widgets/widgets/qradiobutton.h @@ -60,14 +60,14 @@ public: explicit QRadioButton(const QString &text, QWidget *parent = Q_NULLPTR); ~QRadioButton(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - bool hitButton(const QPoint &) const Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + bool hitButton(const QPoint &) const override; + void paintEvent(QPaintEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; void initStyleOption(QStyleOptionButton *button) const; diff --git a/src/widgets/widgets/qrubberband.h b/src/widgets/widgets/qrubberband.h index a05eb0d543..6f7ffea44f 100644 --- a/src/widgets/widgets/qrubberband.h +++ b/src/widgets/widgets/qrubberband.h @@ -73,12 +73,12 @@ public: { resize(s.width(), s.height()); } protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void moveEvent(QMoveEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void paintEvent(QPaintEvent *) override; + void changeEvent(QEvent *) override; + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *) override; + void moveEvent(QMoveEvent *) override; void initStyleOption(QStyleOptionRubberBand *option) const; private: diff --git a/src/widgets/widgets/qscrollarea.h b/src/widgets/widgets/qscrollarea.h index 92ce287566..c7c2fc31b8 100644 --- a/src/widgets/widgets/qscrollarea.h +++ b/src/widgets/widgets/qscrollarea.h @@ -67,9 +67,9 @@ public: bool widgetResizable() const; void setWidgetResizable(bool resizable); - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; - bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + bool focusNextPrevChild(bool next) override; Qt::Alignment alignment() const; void setAlignment(Qt::Alignment); @@ -79,12 +79,12 @@ public: protected: QScrollArea(QScrollAreaPrivate &dd, QWidget *parent = Q_NULLPTR); - bool event(QEvent *) Q_DECL_OVERRIDE; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + bool eventFilter(QObject *, QEvent *) override; + void resizeEvent(QResizeEvent *) override; + void scrollContentsBy(int dx, int dy) override; - QSize viewportSizeHint() const Q_DECL_OVERRIDE; + QSize viewportSizeHint() const override; private: Q_DECLARE_PRIVATE(QScrollArea) diff --git a/src/widgets/widgets/qscrollbar.h b/src/widgets/widgets/qscrollbar.h index 22b9bfcddb..d54e7a58bc 100644 --- a/src/widgets/widgets/qscrollbar.h +++ b/src/widgets/widgets/qscrollbar.h @@ -60,21 +60,21 @@ public: explicit QScrollBar(Qt::Orientation, QWidget *parent = Q_NULLPTR); ~QScrollBar(); - QSize sizeHint() const Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + bool event(QEvent *event) override; protected: #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *) override; #endif - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent*) Q_DECL_OVERRIDE; - void sliderChange(SliderChange change) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void hideEvent(QHideEvent*) override; + void sliderChange(SliderChange change) override; #ifndef QT_NO_CONTEXTMENU - void contextMenuEvent(QContextMenuEvent *) Q_DECL_OVERRIDE; + void contextMenuEvent(QContextMenuEvent *) override; #endif void initStyleOption(QStyleOptionSlider *option) const; diff --git a/src/widgets/widgets/qsizegrip.h b/src/widgets/widgets/qsizegrip.h index 831b146dd2..70a2f88492 100644 --- a/src/widgets/widgets/qsizegrip.h +++ b/src/widgets/widgets/qsizegrip.h @@ -55,19 +55,19 @@ public: explicit QSizeGrip(QWidget *parent); ~QSizeGrip(); - QSize sizeHint() const Q_DECL_OVERRIDE; - void setVisible(bool) Q_DECL_OVERRIDE; + QSize sizeHint() const override; + void setVisible(bool) override; protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *mouseEvent) Q_DECL_OVERRIDE; - void moveEvent(QMoveEvent *moveEvent) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *showEvent) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *hideEvent) Q_DECL_OVERRIDE; - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *mouseEvent) override; + void moveEvent(QMoveEvent *moveEvent) override; + void showEvent(QShowEvent *showEvent) override; + void hideEvent(QHideEvent *hideEvent) override; + bool eventFilter(QObject *, QEvent *) override; + bool event(QEvent *) override; public: diff --git a/src/widgets/widgets/qslider.h b/src/widgets/widgets/qslider.h index 001863c18d..c4a3f54479 100644 --- a/src/widgets/widgets/qslider.h +++ b/src/widgets/widgets/qslider.h @@ -74,8 +74,8 @@ public: ~QSlider(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void setTickPosition(TickPosition position); TickPosition tickPosition() const; @@ -83,13 +83,13 @@ public: void setTickInterval(int ti); int tickInterval() const; - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; protected: - void paintEvent(QPaintEvent *ev) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *ev) override; + void mousePressEvent(QMouseEvent *ev) override; + void mouseReleaseEvent(QMouseEvent *ev) override; + void mouseMoveEvent(QMouseEvent *ev) override; void initStyleOption(QStyleOptionSlider *option) const; diff --git a/src/widgets/widgets/qspinbox.cpp b/src/widgets/widgets/qspinbox.cpp index 508cb05cfc..89a0f70e90 100644 --- a/src/widgets/widgets/qspinbox.cpp +++ b/src/widgets/widgets/qspinbox.cpp @@ -63,10 +63,10 @@ class QSpinBoxPrivate : public QAbstractSpinBoxPrivate Q_DECLARE_PUBLIC(QSpinBox) public: QSpinBoxPrivate(); - void emitSignals(EmitPolicy ep, const QVariant &) Q_DECL_OVERRIDE; + void emitSignals(EmitPolicy ep, const QVariant &) override; - virtual QVariant valueFromText(const QString &n) const Q_DECL_OVERRIDE; - virtual QString textFromValue(const QVariant &n) const Q_DECL_OVERRIDE; + virtual QVariant valueFromText(const QString &n) const override; + virtual QString textFromValue(const QVariant &n) const override; QVariant validateAndInterpret(QString &input, int &pos, QValidator::State &state) const; @@ -84,10 +84,10 @@ class QDoubleSpinBoxPrivate : public QAbstractSpinBoxPrivate Q_DECLARE_PUBLIC(QDoubleSpinBox) public: QDoubleSpinBoxPrivate(); - void emitSignals(EmitPolicy ep, const QVariant &) Q_DECL_OVERRIDE; + void emitSignals(EmitPolicy ep, const QVariant &) override; - virtual QVariant valueFromText(const QString &n) const Q_DECL_OVERRIDE; - virtual QString textFromValue(const QVariant &n) const Q_DECL_OVERRIDE; + virtual QVariant valueFromText(const QString &n) const override; + virtual QString textFromValue(const QVariant &n) const override; QVariant validateAndInterpret(QString &input, int &pos, QValidator::State &state) const; double round(double input) const; diff --git a/src/widgets/widgets/qsplashscreen.h b/src/widgets/widgets/qsplashscreen.h index 1971b8bacf..8bdf4e7749 100644 --- a/src/widgets/widgets/qsplashscreen.h +++ b/src/widgets/widgets/qsplashscreen.h @@ -73,9 +73,9 @@ Q_SIGNALS: void messageChanged(const QString &message); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual void drawContents(QPainter *painter); - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; + void mousePressEvent(QMouseEvent *) override; private: Q_DISABLE_COPY(QSplashScreen) diff --git a/src/widgets/widgets/qsplitter.h b/src/widgets/widgets/qsplitter.h index bc4d7bca39..444920a633 100644 --- a/src/widgets/widgets/qsplitter.h +++ b/src/widgets/widgets/qsplitter.h @@ -84,8 +84,8 @@ public: bool opaqueResize() const; void refresh(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; QList sizes() const; void setSizes(const QList &list); @@ -111,12 +111,12 @@ Q_SIGNALS: protected: virtual QSplitterHandle *createHandle(); - void childEvent(QChildEvent *) Q_DECL_OVERRIDE; + void childEvent(QChildEvent *) override; - bool event(QEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + void resizeEvent(QResizeEvent *) override; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; void moveSplitter(int pos, int index); void setRubberBand(int position); int closestLegalPosition(int, int); @@ -145,15 +145,15 @@ public: bool opaqueResize() const; QSplitter *splitter() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; protected: - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + void mouseMoveEvent(QMouseEvent *) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void resizeEvent(QResizeEvent *) override; + bool event(QEvent *) override; void moveSplitter(int p); int closestLegalPosition(int p); diff --git a/src/widgets/widgets/qstackedwidget.h b/src/widgets/widgets/qstackedwidget.h index 36088ae033..7f684cf60e 100644 --- a/src/widgets/widgets/qstackedwidget.h +++ b/src/widgets/widgets/qstackedwidget.h @@ -80,7 +80,7 @@ Q_SIGNALS: void widgetRemoved(int index); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; private: Q_DISABLE_COPY(QStackedWidget) diff --git a/src/widgets/widgets/qstatusbar.h b/src/widgets/widgets/qstatusbar.h index 9ac637931c..7cc739ff34 100644 --- a/src/widgets/widgets/qstatusbar.h +++ b/src/widgets/widgets/qstatusbar.h @@ -79,14 +79,14 @@ Q_SIGNALS: void messageChanged(const QString &text); protected: - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *) override; + void paintEvent(QPaintEvent *) override; + void resizeEvent(QResizeEvent *) override; // ### Qt 6: consider making reformat() and hideOrShow() private void reformat(); void hideOrShow(); - bool event(QEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; private: Q_DISABLE_COPY(QStatusBar) diff --git a/src/widgets/widgets/qtabbar.h b/src/widgets/widgets/qtabbar.h index ebcd1094ef..d602a8fc30 100644 --- a/src/widgets/widgets/qtabbar.h +++ b/src/widgets/widgets/qtabbar.h @@ -136,8 +136,8 @@ public: int currentIndex() const; int count() const; - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; void setDrawBase(bool drawTheBase); bool drawBase() const; @@ -194,20 +194,20 @@ protected: virtual void tabRemoved(int index); virtual void tabLayoutChange(); - bool event(QEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void mousePressEvent (QMouseEvent *) Q_DECL_OVERRIDE; - void mouseMoveEvent (QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent (QMouseEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *) override; + void resizeEvent(QResizeEvent *) override; + void showEvent(QShowEvent *) override; + void hideEvent(QHideEvent *) override; + void paintEvent(QPaintEvent *) override; + void mousePressEvent (QMouseEvent *) override; + void mouseMoveEvent (QMouseEvent *) override; + void mouseReleaseEvent (QMouseEvent *) override; #if QT_CONFIG(wheelevent) - void wheelEvent(QWheelEvent *event) Q_DECL_OVERRIDE; + void wheelEvent(QWheelEvent *event) override; #endif - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + void keyPressEvent(QKeyEvent *) override; + void changeEvent(QEvent *) override; + void timerEvent(QTimerEvent *event) override; void initStyleOption(QStyleOptionTab *option, int tabIndex) const; #ifndef QT_NO_ACCESSIBILITY diff --git a/src/widgets/widgets/qtabbar_p.h b/src/widgets/widgets/qtabbar_p.h index 195ff79c5d..b4c95da7a7 100644 --- a/src/widgets/widgets/qtabbar_p.h +++ b/src/widgets/widgets/qtabbar_p.h @@ -75,7 +75,7 @@ public: void setPixmap(const QPixmap &pixmap); protected: - void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *e) override; private: QPixmap m_pixmap; @@ -142,9 +142,9 @@ public: TabBarAnimation(Tab *t, QTabBarPrivate *_priv) : tab(t), priv(_priv) { setEasingCurve(QEasingCurve::InOutQuad); } - void updateCurrentValue(const QVariant ¤t) Q_DECL_OVERRIDE; + void updateCurrentValue(const QVariant ¤t) override; - void updateState(State, State newState) Q_DECL_OVERRIDE; + void updateState(State, State newState) override; private: //these are needed for the callbacks Tab *tab; @@ -278,12 +278,12 @@ class CloseButton : public QAbstractButton public: explicit CloseButton(QWidget *parent = 0); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE + QSize sizeHint() const override; + QSize minimumSizeHint() const override { return sizeHint(); } - void enterEvent(QEvent *event) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; + void enterEvent(QEvent *event) override; + void leaveEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; }; QT_END_NAMESPACE diff --git a/src/widgets/widgets/qtabwidget.h b/src/widgets/widgets/qtabwidget.h index b80fdba1fb..17667f2f8a 100644 --- a/src/widgets/widgets/qtabwidget.h +++ b/src/widgets/widgets/qtabwidget.h @@ -120,10 +120,10 @@ public: TabShape tabShape() const; void setTabShape(TabShape s); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; - int heightForWidth(int width) const Q_DECL_OVERRIDE; - bool hasHeightForWidth() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; + int heightForWidth(int width) const override; + bool hasHeightForWidth() const override; void setCornerWidget(QWidget * w, Qt::Corner corner = Qt::TopRightCorner); QWidget * cornerWidget(Qt::Corner corner = Qt::TopRightCorner) const; @@ -161,13 +161,13 @@ protected: virtual void tabInserted(int index); virtual void tabRemoved(int index); - void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE; - void keyPressEvent(QKeyEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *) override; + void resizeEvent(QResizeEvent *) override; + void keyPressEvent(QKeyEvent *) override; + void paintEvent(QPaintEvent *) override; void setTabBar(QTabBar *); - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - bool event(QEvent *) Q_DECL_OVERRIDE; + void changeEvent(QEvent *) override; + bool event(QEvent *) override; void initStyleOption(QStyleOptionTabWidgetFrame *option) const; diff --git a/src/widgets/widgets/qtextbrowser.cpp b/src/widgets/widgets/qtextbrowser.cpp index 0797120960..fa4dd14c92 100644 --- a/src/widgets/widgets/qtextbrowser.cpp +++ b/src/widgets/widgets/qtextbrowser.cpp @@ -135,7 +135,7 @@ public: void setSource(const QUrl &url); // re-imlemented from QTextEditPrivate - virtual QUrl resolveUrl(const QUrl &url) const Q_DECL_OVERRIDE; + virtual QUrl resolveUrl(const QUrl &url) const override; inline QUrl resolveUrl(const QString &url) const { return resolveUrl(QUrl(url)); } diff --git a/src/widgets/widgets/qtextbrowser.h b/src/widgets/widgets/qtextbrowser.h index f36c86bc86..7eaa584a68 100644 --- a/src/widgets/widgets/qtextbrowser.h +++ b/src/widgets/widgets/qtextbrowser.h @@ -71,7 +71,7 @@ public: QStringList searchPaths() const; void setSearchPaths(const QStringList &paths); - virtual QVariant loadResource(int type, const QUrl &name) Q_DECL_OVERRIDE; + virtual QVariant loadResource(int type, const QUrl &name) override; bool isBackwardAvailable() const; bool isForwardAvailable() const; @@ -104,14 +104,14 @@ Q_SIGNALS: void anchorClicked(const QUrl &); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - virtual void keyPressEvent(QKeyEvent *ev) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QMouseEvent *ev) Q_DECL_OVERRIDE; - virtual void focusOutEvent(QFocusEvent *ev) Q_DECL_OVERRIDE; - virtual bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; - virtual void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + virtual void keyPressEvent(QKeyEvent *ev) override; + virtual void mouseMoveEvent(QMouseEvent *ev) override; + virtual void mousePressEvent(QMouseEvent *ev) override; + virtual void mouseReleaseEvent(QMouseEvent *ev) override; + virtual void focusOutEvent(QFocusEvent *ev) override; + virtual bool focusNextPrevChild(bool next) override; + virtual void paintEvent(QPaintEvent *e) override; private: Q_DISABLE_COPY(QTextBrowser) diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 6ea67d385e..3b92b9b57e 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -85,19 +85,19 @@ class QTextEditControl : public QWidgetTextControl public: inline QTextEditControl(QObject *parent) : QWidgetTextControl(parent) {} - virtual QMimeData *createMimeDataFromSelection() const Q_DECL_OVERRIDE { + virtual QMimeData *createMimeDataFromSelection() const override { QTextEdit *ed = qobject_cast(parent()); if (!ed) return QWidgetTextControl::createMimeDataFromSelection(); return ed->createMimeDataFromSelection(); } - virtual bool canInsertFromMimeData(const QMimeData *source) const Q_DECL_OVERRIDE { + virtual bool canInsertFromMimeData(const QMimeData *source) const override { QTextEdit *ed = qobject_cast(parent()); if (!ed) return QWidgetTextControl::canInsertFromMimeData(source); return ed->canInsertFromMimeData(source); } - virtual void insertFromMimeData(const QMimeData *source) Q_DECL_OVERRIDE { + virtual void insertFromMimeData(const QMimeData *source) override { QTextEdit *ed = qobject_cast(parent()); if (!ed) QWidgetTextControl::insertFromMimeData(source); diff --git a/src/widgets/widgets/qtextedit.h b/src/widgets/widgets/qtextedit.h index a3e5bd2a8a..9543243c1b 100644 --- a/src/widgets/widgets/qtextedit.h +++ b/src/widgets/widgets/qtextedit.h @@ -218,7 +218,7 @@ public: void print(QPagedPaintDevice *printer) const; - QVariant inputMethodQuery(Qt::InputMethodQuery property) const Q_DECL_OVERRIDE; + QVariant inputMethodQuery(Qt::InputMethodQuery property) const override; Q_INVOKABLE QVariant inputMethodQuery(Qt::InputMethodQuery query, QVariant argument) const; public Q_SLOTS: @@ -272,43 +272,43 @@ Q_SIGNALS: void cursorPositionChanged(); protected: - virtual bool event(QEvent *e) Q_DECL_OVERRIDE; - virtual void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; - virtual void keyPressEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - virtual void keyReleaseEvent(QKeyEvent *e) Q_DECL_OVERRIDE; - virtual void resizeEvent(QResizeEvent *e) Q_DECL_OVERRIDE; - virtual void paintEvent(QPaintEvent *e) Q_DECL_OVERRIDE; - virtual void mousePressEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual void mouseMoveEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual void mouseReleaseEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual void mouseDoubleClickEvent(QMouseEvent *e) Q_DECL_OVERRIDE; - virtual bool focusNextPrevChild(bool next) Q_DECL_OVERRIDE; + virtual bool event(QEvent *e) override; + virtual void timerEvent(QTimerEvent *e) override; + virtual void keyPressEvent(QKeyEvent *e) override; + virtual void keyReleaseEvent(QKeyEvent *e) override; + virtual void resizeEvent(QResizeEvent *e) override; + virtual void paintEvent(QPaintEvent *e) override; + virtual void mousePressEvent(QMouseEvent *e) override; + virtual void mouseMoveEvent(QMouseEvent *e) override; + virtual void mouseReleaseEvent(QMouseEvent *e) override; + virtual void mouseDoubleClickEvent(QMouseEvent *e) override; + virtual bool focusNextPrevChild(bool next) override; #ifndef QT_NO_CONTEXTMENU - virtual void contextMenuEvent(QContextMenuEvent *e) Q_DECL_OVERRIDE; + virtual void contextMenuEvent(QContextMenuEvent *e) override; #endif #ifndef QT_NO_DRAGANDDROP - virtual void dragEnterEvent(QDragEnterEvent *e) Q_DECL_OVERRIDE; - virtual void dragLeaveEvent(QDragLeaveEvent *e) Q_DECL_OVERRIDE; - virtual void dragMoveEvent(QDragMoveEvent *e) Q_DECL_OVERRIDE; - virtual void dropEvent(QDropEvent *e) Q_DECL_OVERRIDE; + virtual void dragEnterEvent(QDragEnterEvent *e) override; + virtual void dragLeaveEvent(QDragLeaveEvent *e) override; + virtual void dragMoveEvent(QDragMoveEvent *e) override; + virtual void dropEvent(QDropEvent *e) override; #endif - virtual void focusInEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - virtual void focusOutEvent(QFocusEvent *e) Q_DECL_OVERRIDE; - virtual void showEvent(QShowEvent *) Q_DECL_OVERRIDE; - virtual void changeEvent(QEvent *e) Q_DECL_OVERRIDE; + virtual void focusInEvent(QFocusEvent *e) override; + virtual void focusOutEvent(QFocusEvent *e) override; + virtual void showEvent(QShowEvent *) override; + virtual void changeEvent(QEvent *e) override; #if QT_CONFIG(wheelevent) - virtual void wheelEvent(QWheelEvent *e) Q_DECL_OVERRIDE; + virtual void wheelEvent(QWheelEvent *e) override; #endif virtual QMimeData *createMimeDataFromSelection() const; virtual bool canInsertFromMimeData(const QMimeData *source) const; virtual void insertFromMimeData(const QMimeData *source); - virtual void inputMethodEvent(QInputMethodEvent *) Q_DECL_OVERRIDE; + virtual void inputMethodEvent(QInputMethodEvent *) override; QTextEdit(QTextEditPrivate &dd, QWidget *parent); - virtual void scrollContentsBy(int dx, int dy) Q_DECL_OVERRIDE; + virtual void scrollContentsBy(int dx, int dy) override; virtual void doSetTextCursor(const QTextCursor &cursor); void zoomInF(float range); diff --git a/src/widgets/widgets/qtoolbar.h b/src/widgets/widgets/qtoolbar.h index 9ffb472c76..54aefc5a94 100644 --- a/src/widgets/widgets/qtoolbar.h +++ b/src/widgets/widgets/qtoolbar.h @@ -188,10 +188,10 @@ Q_SIGNALS: void visibilityChanged(bool visible); protected: - void actionEvent(QActionEvent *event) Q_DECL_OVERRIDE; - void changeEvent(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE; - bool event(QEvent *event) Q_DECL_OVERRIDE; + void actionEvent(QActionEvent *event) override; + void changeEvent(QEvent *event) override; + void paintEvent(QPaintEvent *event) override; + bool event(QEvent *event) override; void initStyleOption(QStyleOptionToolBar *option) const; diff --git a/src/widgets/widgets/qtoolbarextension_p.h b/src/widgets/widgets/qtoolbarextension_p.h index b6223107c4..a388f1e40f 100644 --- a/src/widgets/widgets/qtoolbarextension_p.h +++ b/src/widgets/widgets/qtoolbarextension_p.h @@ -64,8 +64,8 @@ class Q_AUTOTEST_EXPORT QToolBarExtension : public QToolButton public: explicit QToolBarExtension(QWidget *parent); - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; + QSize sizeHint() const override; public Q_SLOTS: void setOrientation(Qt::Orientation o); diff --git a/src/widgets/widgets/qtoolbarlayout_p.h b/src/widgets/widgets/qtoolbarlayout_p.h index 9a81c4e50e..8c60164439 100644 --- a/src/widgets/widgets/qtoolbarlayout_p.h +++ b/src/widgets/widgets/qtoolbarlayout_p.h @@ -68,7 +68,7 @@ class QToolBarItem : public QWidgetItem { public: QToolBarItem(QWidget *widget); - bool isEmpty() const Q_DECL_OVERRIDE; + bool isEmpty() const override; QAction *action; bool customWidget; @@ -82,22 +82,22 @@ public: QToolBarLayout(QWidget *parent = 0); ~QToolBarLayout(); - void addItem(QLayoutItem *item) Q_DECL_OVERRIDE; - QLayoutItem *itemAt(int index) const Q_DECL_OVERRIDE; - QLayoutItem *takeAt(int index) Q_DECL_OVERRIDE; - int count() const Q_DECL_OVERRIDE; + void addItem(QLayoutItem *item) override; + QLayoutItem *itemAt(int index) const override; + QLayoutItem *takeAt(int index) override; + int count() const override; - bool isEmpty() const Q_DECL_OVERRIDE; - void invalidate() Q_DECL_OVERRIDE; - Qt::Orientations expandingDirections() const Q_DECL_OVERRIDE; + bool isEmpty() const override; + void invalidate() override; + Qt::Orientations expandingDirections() const override; - void setGeometry(const QRect &r) Q_DECL_OVERRIDE; - QSize minimumSize() const Q_DECL_OVERRIDE; - QSize sizeHint() const Q_DECL_OVERRIDE; + void setGeometry(const QRect &r) override; + QSize minimumSize() const override; + QSize sizeHint() const override; void insertAction(int index, QAction *action); int indexOf(QAction *action) const; - int indexOf(QWidget *widget) const Q_DECL_OVERRIDE { return QLayout::indexOf(widget); } + int indexOf(QWidget *widget) const override { return QLayout::indexOf(widget); } bool layoutActions(const QSize &size); QSize expandedSize(const QSize &size) const; diff --git a/src/widgets/widgets/qtoolbarseparator_p.h b/src/widgets/widgets/qtoolbarseparator_p.h index 8c9cf9f46a..d52b4fa6ae 100644 --- a/src/widgets/widgets/qtoolbarseparator_p.h +++ b/src/widgets/widgets/qtoolbarseparator_p.h @@ -71,9 +71,9 @@ public: Qt::Orientation orientation() const; - QSize sizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; void initStyleOption(QStyleOption *option) const; public Q_SLOTS: diff --git a/src/widgets/widgets/qtoolbox.cpp b/src/widgets/widgets/qtoolbox.cpp index fdcd07eb06..46ade0277c 100644 --- a/src/widgets/widgets/qtoolbox.cpp +++ b/src/widgets/widgets/qtoolbox.cpp @@ -69,12 +69,12 @@ public: inline void setSelected(bool b) { selected = b; update(); } inline void setIndex(int newIndex) { indexInPage = newIndex; } - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; protected: void initStyleOption(QStyleOptionToolBox *opt) const; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + void paintEvent(QPaintEvent *) override; private: bool selected; diff --git a/src/widgets/widgets/qtoolbox.h b/src/widgets/widgets/qtoolbox.h index 321507ba07..688b085411 100644 --- a/src/widgets/widgets/qtoolbox.h +++ b/src/widgets/widgets/qtoolbox.h @@ -95,11 +95,11 @@ Q_SIGNALS: void currentChanged(int index); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; + bool event(QEvent *e) override; virtual void itemInserted(int index); virtual void itemRemoved(int index); - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; + void showEvent(QShowEvent *e) override; + void changeEvent(QEvent *) override; private: diff --git a/src/widgets/widgets/qtoolbutton.h b/src/widgets/widgets/qtoolbutton.h index 7ba9a18fef..fdfb43b76b 100644 --- a/src/widgets/widgets/qtoolbutton.h +++ b/src/widgets/widgets/qtoolbutton.h @@ -74,8 +74,8 @@ public: explicit QToolButton(QWidget *parent = Q_NULLPTR); ~QToolButton(); - QSize sizeHint() const Q_DECL_OVERRIDE; - QSize minimumSizeHint() const Q_DECL_OVERRIDE; + QSize sizeHint() const override; + QSize minimumSizeHint() const override; Qt::ToolButtonStyle toolButtonStyle() const; @@ -106,19 +106,19 @@ Q_SIGNALS: void triggered(QAction *); protected: - bool event(QEvent *e) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void mouseReleaseEvent(QMouseEvent *) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void actionEvent(QActionEvent *) Q_DECL_OVERRIDE; - - void enterEvent(QEvent *) Q_DECL_OVERRIDE; - void leaveEvent(QEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; - void changeEvent(QEvent *) Q_DECL_OVERRIDE; - - bool hitButton(const QPoint &pos) const Q_DECL_OVERRIDE; - void nextCheckState() Q_DECL_OVERRIDE; + bool event(QEvent *e) override; + void mousePressEvent(QMouseEvent *) override; + void mouseReleaseEvent(QMouseEvent *) override; + void paintEvent(QPaintEvent *) override; + void actionEvent(QActionEvent *) override; + + void enterEvent(QEvent *) override; + void leaveEvent(QEvent *) override; + void timerEvent(QTimerEvent *) override; + void changeEvent(QEvent *) override; + + bool hitButton(const QPoint &pos) const override; + void nextCheckState() override; void initStyleOption(QStyleOptionToolButton *option) const; private: diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h index 257402e9dc..97ef3b3bc4 100644 --- a/src/widgets/widgets/qwidgetlinecontrol_p.h +++ b/src/widgets/widgets/qwidgetlinecontrol_p.h @@ -548,7 +548,7 @@ Q_SIGNALS: void editFocusChange(bool); #endif protected: - virtual void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; + virtual void timerEvent(QTimerEvent *event) override; private Q_SLOTS: void _q_deleteSelected(); diff --git a/src/widgets/widgets/qwidgetresizehandler_p.h b/src/widgets/widgets/qwidgetresizehandler_p.h index 7bb7d6cd94..79b9fc522c 100644 --- a/src/widgets/widgets/qwidgetresizehandler_p.h +++ b/src/widgets/widgets/qwidgetresizehandler_p.h @@ -95,7 +95,7 @@ Q_SIGNALS: void activate(); protected: - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE; + bool eventFilter(QObject *o, QEvent *e) override; void mouseMoveEvent(QMouseEvent *e); void keyPressEvent(QKeyEvent *e); diff --git a/src/widgets/widgets/qwidgettextcontrol_p.h b/src/widgets/widgets/qwidgettextcontrol_p.h index e2539a30e7..05ce54f628 100644 --- a/src/widgets/widgets/qwidgettextcontrol_p.h +++ b/src/widgets/widgets/qwidgettextcontrol_p.h @@ -254,9 +254,9 @@ public: bool findNextPrevAnchor(const QTextCursor& from, bool next, QTextCursor& newAnchor); protected: - virtual void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE; + virtual void timerEvent(QTimerEvent *e) override; - virtual bool event(QEvent *e) Q_DECL_OVERRIDE; + virtual bool event(QEvent *e) override; private: Q_DISABLE_COPY(QWidgetTextControl) @@ -292,9 +292,9 @@ class QTextEditMimeData : public QMimeData public: inline QTextEditMimeData(const QTextDocumentFragment &aFragment) : fragment(aFragment) {} - virtual QStringList formats() const Q_DECL_OVERRIDE; + virtual QStringList formats() const override; protected: - virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const Q_DECL_OVERRIDE; + virtual QVariant retrieveData(const QString &mimeType, QVariant::Type type) const override; private: void setup() const; diff --git a/src/winmain/qtmain_winrt.cpp b/src/winmain/qtmain_winrt.cpp index 13ca561d35..1f5b98794d 100644 --- a/src/winmain/qtmain_winrt.cpp +++ b/src/winmain/qtmain_winrt.cpp @@ -229,12 +229,12 @@ private: return S_OK; } - HRESULT __stdcall OnActivated(IActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnActivated(IActivatedEventArgs *args) override { return activatedLaunch(args); } - HRESULT __stdcall OnLaunched(ILaunchActivatedEventArgs *launchArgs) Q_DECL_OVERRIDE + HRESULT __stdcall OnLaunched(ILaunchActivatedEventArgs *launchArgs) override { ComPtr preArgs; HRESULT hr = launchArgs->QueryInterface(preArgs.GetAddressOf()); @@ -324,41 +324,41 @@ private: return S_OK; } - HRESULT __stdcall OnFileActivated(IFileActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnFileActivated(IFileActivatedEventArgs *args) override { return activatedLaunch(args); } - HRESULT __stdcall OnSearchActivated(ISearchActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnSearchActivated(ISearchActivatedEventArgs *args) override { Q_UNUSED(args); return S_OK; } - HRESULT __stdcall OnShareTargetActivated(IShareTargetActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnShareTargetActivated(IShareTargetActivatedEventArgs *args) override { return activatedLaunch(args); } - HRESULT __stdcall OnFileOpenPickerActivated(IFileOpenPickerActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnFileOpenPickerActivated(IFileOpenPickerActivatedEventArgs *args) override { Q_UNUSED(args); return S_OK; } - HRESULT __stdcall OnFileSavePickerActivated(IFileSavePickerActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnFileSavePickerActivated(IFileSavePickerActivatedEventArgs *args) override { Q_UNUSED(args); return S_OK; } - HRESULT __stdcall OnCachedFileUpdaterActivated(ICachedFileUpdaterActivatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnCachedFileUpdaterActivated(ICachedFileUpdaterActivatedEventArgs *args) override { Q_UNUSED(args); return S_OK; } - HRESULT __stdcall OnWindowCreated(Xaml::IWindowCreatedEventArgs *args) Q_DECL_OVERRIDE + HRESULT __stdcall OnWindowCreated(Xaml::IWindowCreatedEventArgs *args) override { Q_UNUSED(args); return S_OK; diff --git a/src/xml/dom/qdom.cpp b/src/xml/dom/qdom.cpp index 9affd697a0..df2d7c3ce8 100644 --- a/src/xml/dom/qdom.cpp +++ b/src/xml/dom/qdom.cpp @@ -291,16 +291,16 @@ public: void init(); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNodePrivate* insertBefore(QDomNodePrivate* newChild, QDomNodePrivate* refChild) Q_DECL_OVERRIDE; - QDomNodePrivate* insertAfter(QDomNodePrivate* newChild, QDomNodePrivate* refChild) Q_DECL_OVERRIDE; - QDomNodePrivate* replaceChild(QDomNodePrivate* newChild, QDomNodePrivate* oldChild) Q_DECL_OVERRIDE; - QDomNodePrivate* removeChild(QDomNodePrivate* oldChild) Q_DECL_OVERRIDE; - QDomNodePrivate* appendChild(QDomNodePrivate* newChild) Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNodePrivate* insertBefore(QDomNodePrivate* newChild, QDomNodePrivate* refChild) override; + QDomNodePrivate* insertAfter(QDomNodePrivate* newChild, QDomNodePrivate* refChild) override; + QDomNodePrivate* replaceChild(QDomNodePrivate* newChild, QDomNodePrivate* oldChild) override; + QDomNodePrivate* removeChild(QDomNodePrivate* oldChild) override; + QDomNodePrivate* appendChild(QDomNodePrivate* newChild) override; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::DocumentTypeNode; } + QDomNode::NodeType nodeType() const override { return QDomNode::DocumentTypeNode; } - void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + void save(QTextStream& s, int, int) const override; // Variables QDomNamedNodeMapPrivate* entities; @@ -317,8 +317,8 @@ public: QDomDocumentFragmentPrivate(QDomNodePrivate* n, bool deep); // Reimplemented from QDomNodePrivate - virtual QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::DocumentFragmentNode; } + virtual QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::DocumentFragmentNode; } }; class QDomCharacterDataPrivate : public QDomNodePrivate @@ -335,8 +335,8 @@ public: void replaceData(unsigned long offset, unsigned long count, const QString& arg); // Reimplemented from QDomNodePrivate - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::CharacterDataNode; } - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; + QDomNode::NodeType nodeType() const override { return QDomNode::CharacterDataNode; } + QDomNodePrivate* cloneNode(bool deep = true) override; }; class QDomTextPrivate : public QDomCharacterDataPrivate @@ -348,9 +348,9 @@ public: QDomTextPrivate* splitText(int offset); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::TextNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::TextNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomAttrPrivate : public QDomNodePrivate @@ -363,10 +363,10 @@ public: bool specified() const; // Reimplemented from QDomNodePrivate - void setNodeValue(const QString& v) Q_DECL_OVERRIDE; - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::AttributeNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + void setNodeValue(const QString& v) override; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::AttributeNode; } + virtual void save(QTextStream& s, int, int) const override; // Variables bool m_specified; @@ -398,9 +398,9 @@ public: // Reimplemented from QDomNodePrivate QDomNamedNodeMapPrivate* attributes() { return m_attr; } bool hasAttributes() { return (m_attr->length() > 0); } - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::ElementNode; } - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNode::NodeType nodeType() const override { return QDomNode::ElementNode; } + QDomNodePrivate* cloneNode(bool deep = true) override; + virtual void save(QTextStream& s, int, int) const override; // Variables QDomNamedNodeMapPrivate* m_attr; @@ -414,9 +414,9 @@ public: QDomCommentPrivate(QDomCommentPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::CommentNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::CommentNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomCDATASectionPrivate : public QDomTextPrivate @@ -426,9 +426,9 @@ public: QDomCDATASectionPrivate(QDomCDATASectionPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::CDATASectionNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::CDATASectionNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomNotationPrivate : public QDomNodePrivate @@ -439,9 +439,9 @@ public: QDomNotationPrivate(QDomNotationPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::NotationNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::NotationNode; } + virtual void save(QTextStream& s, int, int) const override; // Variables QString m_sys; @@ -456,9 +456,9 @@ public: QDomEntityPrivate(QDomEntityPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::EntityNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::EntityNode; } + virtual void save(QTextStream& s, int, int) const override; // Variables QString m_sys; @@ -473,9 +473,9 @@ public: QDomEntityReferencePrivate(QDomNodePrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::EntityReferenceNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::EntityReferenceNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomProcessingInstructionPrivate : public QDomNodePrivate @@ -486,9 +486,9 @@ public: QDomProcessingInstructionPrivate(QDomProcessingInstructionPrivate* n, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::ProcessingInstructionNode; } - virtual void save(QTextStream& s, int, int) const Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::ProcessingInstructionNode; } + virtual void save(QTextStream& s, int, int) const override; }; class QDomDocumentPrivate : public QDomNodePrivate @@ -523,9 +523,9 @@ public: QDomNodePrivate* importNode(QDomNodePrivate* importedNode, bool deep); // Reimplemented from QDomNodePrivate - QDomNodePrivate* cloneNode(bool deep = true) Q_DECL_OVERRIDE; - QDomNode::NodeType nodeType() const Q_DECL_OVERRIDE { return QDomNode::DocumentNode; } - void clear() Q_DECL_OVERRIDE; + QDomNodePrivate* cloneNode(bool deep = true) override; + QDomNode::NodeType nodeType() const override { return QDomNode::DocumentNode; } + void clear() override; // Variables QExplicitlySharedDataPointer impl; @@ -576,32 +576,32 @@ public: ~QDomHandler(); // content handler - bool endDocument() Q_DECL_OVERRIDE; - bool startElement(const QString& nsURI, const QString& localName, const QString& qName, const QXmlAttributes& atts) Q_DECL_OVERRIDE; - bool endElement(const QString& nsURI, const QString& localName, const QString& qName) Q_DECL_OVERRIDE; - bool characters(const QString& ch) Q_DECL_OVERRIDE; - bool processingInstruction(const QString& target, const QString& data) Q_DECL_OVERRIDE; - bool skippedEntity(const QString& name) Q_DECL_OVERRIDE; + bool endDocument() override; + bool startElement(const QString& nsURI, const QString& localName, const QString& qName, const QXmlAttributes& atts) override; + bool endElement(const QString& nsURI, const QString& localName, const QString& qName) override; + bool characters(const QString& ch) override; + bool processingInstruction(const QString& target, const QString& data) override; + bool skippedEntity(const QString& name) override; // error handler - bool fatalError(const QXmlParseException& exception) Q_DECL_OVERRIDE; + bool fatalError(const QXmlParseException& exception) override; // lexical handler - bool startCDATA() Q_DECL_OVERRIDE; - bool endCDATA() Q_DECL_OVERRIDE; - bool startEntity(const QString &) Q_DECL_OVERRIDE; - bool endEntity(const QString &) Q_DECL_OVERRIDE; - bool startDTD(const QString& name, const QString& publicId, const QString& systemId) Q_DECL_OVERRIDE; - bool comment(const QString& ch) Q_DECL_OVERRIDE; + bool startCDATA() override; + bool endCDATA() override; + bool startEntity(const QString &) override; + bool endEntity(const QString &) override; + bool startDTD(const QString& name, const QString& publicId, const QString& systemId) override; + bool comment(const QString& ch) override; // decl handler - bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId) Q_DECL_OVERRIDE ; + bool externalEntityDecl(const QString &name, const QString &publicId, const QString &systemId) override ; // DTD handler - bool notationDecl(const QString & name, const QString & publicId, const QString & systemId) Q_DECL_OVERRIDE; - bool unparsedEntityDecl(const QString &name, const QString &publicId, const QString &systemId, const QString ¬ationName) Q_DECL_OVERRIDE ; + bool notationDecl(const QString & name, const QString & publicId, const QString & systemId) override; + bool unparsedEntityDecl(const QString &name, const QString &publicId, const QString &systemId, const QString ¬ationName) override ; - void setDocumentLocator(QXmlLocator *locator) Q_DECL_OVERRIDE; + void setDocumentLocator(QXmlLocator *locator) override; QString errorMsg; int errorLine; diff --git a/src/xml/sax/qxml.cpp b/src/xml/sax/qxml.cpp index bc7d00483a..8615d9b10c 100644 --- a/src/xml/sax/qxml.cpp +++ b/src/xml/sax/qxml.cpp @@ -448,11 +448,11 @@ public: { } - int columnNumber() const Q_DECL_OVERRIDE + int columnNumber() const override { return (reader->d_ptr->columnNr == -1 ? -1 : reader->d_ptr->columnNr + 1); } - int lineNumber() const Q_DECL_OVERRIDE + int lineNumber() const override { return (reader->d_ptr->lineNr == -1 ? -1 : reader->d_ptr->lineNr + 1); } diff --git a/src/xml/sax/qxml.h b/src/xml/sax/qxml.h index 77a5a78650..7e048debbc 100644 --- a/src/xml/sax/qxml.h +++ b/src/xml/sax/qxml.h @@ -253,29 +253,29 @@ public: QXmlSimpleReader(); virtual ~QXmlSimpleReader(); - bool feature(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE; - void setFeature(const QString& name, bool value) Q_DECL_OVERRIDE; - bool hasFeature(const QString& name) const Q_DECL_OVERRIDE; - - void* property(const QString& name, bool *ok = Q_NULLPTR) const Q_DECL_OVERRIDE; - void setProperty(const QString& name, void* value) Q_DECL_OVERRIDE; - bool hasProperty(const QString& name) const Q_DECL_OVERRIDE; - - void setEntityResolver(QXmlEntityResolver* handler) Q_DECL_OVERRIDE; - QXmlEntityResolver* entityResolver() const Q_DECL_OVERRIDE; - void setDTDHandler(QXmlDTDHandler* handler) Q_DECL_OVERRIDE; - QXmlDTDHandler* DTDHandler() const Q_DECL_OVERRIDE; - void setContentHandler(QXmlContentHandler* handler) Q_DECL_OVERRIDE; - QXmlContentHandler* contentHandler() const Q_DECL_OVERRIDE; - void setErrorHandler(QXmlErrorHandler* handler) Q_DECL_OVERRIDE; - QXmlErrorHandler* errorHandler() const Q_DECL_OVERRIDE; - void setLexicalHandler(QXmlLexicalHandler* handler) Q_DECL_OVERRIDE; - QXmlLexicalHandler* lexicalHandler() const Q_DECL_OVERRIDE; - void setDeclHandler(QXmlDeclHandler* handler) Q_DECL_OVERRIDE; - QXmlDeclHandler* declHandler() const Q_DECL_OVERRIDE; - - bool parse(const QXmlInputSource& input) Q_DECL_OVERRIDE; - bool parse(const QXmlInputSource* input) Q_DECL_OVERRIDE; + bool feature(const QString& name, bool *ok = Q_NULLPTR) const override; + void setFeature(const QString& name, bool value) override; + bool hasFeature(const QString& name) const override; + + void* property(const QString& name, bool *ok = Q_NULLPTR) const override; + void setProperty(const QString& name, void* value) override; + bool hasProperty(const QString& name) const override; + + void setEntityResolver(QXmlEntityResolver* handler) override; + QXmlEntityResolver* entityResolver() const override; + void setDTDHandler(QXmlDTDHandler* handler) override; + QXmlDTDHandler* DTDHandler() const override; + void setContentHandler(QXmlContentHandler* handler) override; + QXmlContentHandler* contentHandler() const override; + void setErrorHandler(QXmlErrorHandler* handler) override; + QXmlErrorHandler* errorHandler() const override; + void setLexicalHandler(QXmlLexicalHandler* handler) override; + QXmlLexicalHandler* lexicalHandler() const override; + void setDeclHandler(QXmlDeclHandler* handler) override; + QXmlDeclHandler* declHandler() const override; + + bool parse(const QXmlInputSource& input) override; + bool parse(const QXmlInputSource* input) override; virtual bool parse(const QXmlInputSource* input, bool incremental); virtual bool parseContinue(); @@ -385,40 +385,40 @@ public: QXmlDefaultHandler(); virtual ~QXmlDefaultHandler(); - void setDocumentLocator(QXmlLocator* locator) Q_DECL_OVERRIDE; - bool startDocument() Q_DECL_OVERRIDE; - bool endDocument() Q_DECL_OVERRIDE; - bool startPrefixMapping(const QString& prefix, const QString& uri) Q_DECL_OVERRIDE; - bool endPrefixMapping(const QString& prefix) Q_DECL_OVERRIDE; - bool startElement(const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts) Q_DECL_OVERRIDE; - bool endElement(const QString& namespaceURI, const QString& localName, const QString& qName) Q_DECL_OVERRIDE; - bool characters(const QString& ch) Q_DECL_OVERRIDE; - bool ignorableWhitespace(const QString& ch) Q_DECL_OVERRIDE; - bool processingInstruction(const QString& target, const QString& data) Q_DECL_OVERRIDE; - bool skippedEntity(const QString& name) Q_DECL_OVERRIDE; - - bool warning(const QXmlParseException& exception) Q_DECL_OVERRIDE; - bool error(const QXmlParseException& exception) Q_DECL_OVERRIDE; - bool fatalError(const QXmlParseException& exception) Q_DECL_OVERRIDE; - - bool notationDecl(const QString& name, const QString& publicId, const QString& systemId) Q_DECL_OVERRIDE; - bool unparsedEntityDecl(const QString& name, const QString& publicId, const QString& systemId, const QString& notationName) Q_DECL_OVERRIDE; - - bool resolveEntity(const QString& publicId, const QString& systemId, QXmlInputSource*& ret) Q_DECL_OVERRIDE; - - bool startDTD(const QString& name, const QString& publicId, const QString& systemId) Q_DECL_OVERRIDE; - bool endDTD() Q_DECL_OVERRIDE; - bool startEntity(const QString& name) Q_DECL_OVERRIDE; - bool endEntity(const QString& name) Q_DECL_OVERRIDE; - bool startCDATA() Q_DECL_OVERRIDE; - bool endCDATA() Q_DECL_OVERRIDE; - bool comment(const QString& ch) Q_DECL_OVERRIDE; - - bool attributeDecl(const QString& eName, const QString& aName, const QString& type, const QString& valueDefault, const QString& value) Q_DECL_OVERRIDE; - bool internalEntityDecl(const QString& name, const QString& value) Q_DECL_OVERRIDE; - bool externalEntityDecl(const QString& name, const QString& publicId, const QString& systemId) Q_DECL_OVERRIDE; - - QString errorString() const Q_DECL_OVERRIDE; + void setDocumentLocator(QXmlLocator* locator) override; + bool startDocument() override; + bool endDocument() override; + bool startPrefixMapping(const QString& prefix, const QString& uri) override; + bool endPrefixMapping(const QString& prefix) override; + bool startElement(const QString& namespaceURI, const QString& localName, const QString& qName, const QXmlAttributes& atts) override; + bool endElement(const QString& namespaceURI, const QString& localName, const QString& qName) override; + bool characters(const QString& ch) override; + bool ignorableWhitespace(const QString& ch) override; + bool processingInstruction(const QString& target, const QString& data) override; + bool skippedEntity(const QString& name) override; + + bool warning(const QXmlParseException& exception) override; + bool error(const QXmlParseException& exception) override; + bool fatalError(const QXmlParseException& exception) override; + + bool notationDecl(const QString& name, const QString& publicId, const QString& systemId) override; + bool unparsedEntityDecl(const QString& name, const QString& publicId, const QString& systemId, const QString& notationName) override; + + bool resolveEntity(const QString& publicId, const QString& systemId, QXmlInputSource*& ret) override; + + bool startDTD(const QString& name, const QString& publicId, const QString& systemId) override; + bool endDTD() override; + bool startEntity(const QString& name) override; + bool endEntity(const QString& name) override; + bool startCDATA() override; + bool endCDATA() override; + bool comment(const QString& ch) override; + + bool attributeDecl(const QString& eName, const QString& aName, const QString& type, const QString& valueDefault, const QString& value) override; + bool internalEntityDecl(const QString& name, const QString& value) override; + bool externalEntityDecl(const QString& name, const QString& publicId, const QString& systemId) override; + + QString errorString() const override; private: QXmlDefaultHandlerPrivate *d; diff --git a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp index 4e3668d72e..1596a9fafd 100644 --- a/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp +++ b/tests/auto/concurrent/qtconcurrentrun/tst_qtconcurrentrun.cpp @@ -572,7 +572,7 @@ class SlowTask : public QRunnable { public: static QAtomicInt cancel; - void run() Q_DECL_OVERRIDE { + void run() override { int iter = 60; while (--iter && !cancel.load()) QThread::currentThread()->msleep(25); diff --git a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp index c3b53a2fc0..f8f9387abb 100644 --- a/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp +++ b/tests/auto/corelib/codecs/qtextcodec/tst_qtextcodec.cpp @@ -2406,16 +2406,16 @@ void tst_QTextCodec::shiftJis() struct UserCodec : public QTextCodec { // implement pure virtuals - QByteArray name() const Q_DECL_OVERRIDE + QByteArray name() const override { return "UserCodec"; } - QList aliases() const Q_DECL_OVERRIDE + QList aliases() const override { return QList() << "usercodec" << "user-codec"; } - int mibEnum() const Q_DECL_OVERRIDE + int mibEnum() const override { return 5000; } - virtual QString convertToUnicode(const char *, int, ConverterState *) const Q_DECL_OVERRIDE + virtual QString convertToUnicode(const char *, int, ConverterState *) const override { return QString(); } - virtual QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const Q_DECL_OVERRIDE + virtual QByteArray convertFromUnicode(const QChar *, int, ConverterState *) const override { return QByteArray(); } }; diff --git a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp index a0188f8ba9..a485788ec2 100644 --- a/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp +++ b/tests/auto/corelib/io/qiodevice/tst_qiodevice.cpp @@ -551,18 +551,18 @@ public: : QIODevice(), buf(byteArray), offset(0), ownbuf(false) { } virtual ~SequentialReadBuffer() { if (ownbuf) delete buf; } - bool isSequential() const Q_DECL_OVERRIDE { return true; } + bool isSequential() const override { return true; } const QByteArray &buffer() const { return *buf; } protected: - qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE + qint64 readData(char *data, qint64 maxSize) override { maxSize = qMin(maxSize, qint64(buf->size() - offset)); memcpy(data, buf->constData() + offset, maxSize); offset += maxSize; return maxSize; } - qint64 writeData(const char * /* data */, qint64 /* maxSize */) Q_DECL_OVERRIDE + qint64 writeData(const char * /* data */, qint64 /* maxSize */) override { return -1; } @@ -598,13 +598,13 @@ public: RandomAccessBuffer(const char *data) : QIODevice(), buf(data) { } protected: - qint64 readData(char *data, qint64 maxSize) Q_DECL_OVERRIDE + qint64 readData(char *data, qint64 maxSize) override { maxSize = qMin(maxSize, qint64(buf.size() - pos())); memcpy(data, buf.constData() + pos(), maxSize); return maxSize; } - qint64 writeData(const char *data, qint64 maxSize) Q_DECL_OVERRIDE + qint64 writeData(const char *data, qint64 maxSize) override { maxSize = qMin(maxSize, qint64(buf.size() - pos())); memcpy(buf.data() + pos(), data, maxSize); diff --git a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp index de6eb28503..881919fe4c 100644 --- a/tests/auto/corelib/io/qprocess/tst_qprocess.cpp +++ b/tests/auto/corelib/io/qprocess/tst_qprocess.cpp @@ -285,7 +285,7 @@ void tst_QProcess::startWithOldOpen() class OverriddenOpen : public QProcess { public: - virtual bool open(OpenMode mode) Q_DECL_OVERRIDE + virtual bool open(OpenMode mode) override { return QIODevice::open(mode); } }; diff --git a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp index 0e423a56ca..1aa15df590 100644 --- a/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp +++ b/tests/auto/corelib/io/qtextstream/tst_qtextstream.cpp @@ -609,14 +609,14 @@ void tst_QTextStream::readLinesFromBufferCRCR() class ErrorDevice : public QIODevice { protected: - qint64 readData(char *data, qint64 maxlen) Q_DECL_OVERRIDE + qint64 readData(char *data, qint64 maxlen) override { Q_UNUSED(data) Q_UNUSED(maxlen) return -1; } - qint64 writeData(const char *data, qint64 len) Q_DECL_OVERRIDE + qint64 writeData(const char *data, qint64 len) override { Q_UNUSED(data) Q_UNUSED(len) diff --git a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp index 383bbbd3f8..74e9e4e47d 100644 --- a/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp +++ b/tests/auto/corelib/itemmodels/qsortfilterproxymodel/tst_qsortfilterproxymodel.cpp @@ -4072,11 +4072,11 @@ public: } bool canDropMimeData(const QMimeData *, Qt::DropAction, - int row, int /* column */, const QModelIndex & /* parent */) const Q_DECL_OVERRIDE + int row, int /* column */, const QModelIndex & /* parent */) const override { return row == 1; } bool dropMimeData(const QMimeData *, Qt::DropAction, - int row, int /* column */, const QModelIndex & /* parent */) Q_DECL_OVERRIDE + int row, int /* column */, const QModelIndex & /* parent */) override { return row == 1; } }; diff --git a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp index 22f0d8ecaa..5e9dbdd226 100644 --- a/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp +++ b/tests/auto/corelib/kernel/qcoreapplication/tst_qcoreapplication.cpp @@ -56,7 +56,7 @@ class ThreadedEventReceiver : public QObject Q_OBJECT public: QList recordedEvents; - bool event(QEvent *event) Q_DECL_OVERRIDE + bool event(QEvent *event) override { if (event->type() != QEvent::Type(QEvent::User + 1)) return QObject::event(event); @@ -70,7 +70,7 @@ public: class Thread : public QDaemonThread { - void run() Q_DECL_OVERRIDE + void run() override { QThreadData *data = QThreadData::current(); QVERIFY(!data->requiresCoreApplication); // daemon thread diff --git a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp index 8f0d83ce32..c30efe4e3b 100644 --- a/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp +++ b/tests/auto/corelib/statemachine/qstatemachine/tst_qstatemachine.cpp @@ -6634,7 +6634,7 @@ void tst_QStateMachine::postEventFromBeginSelectTransitions() { class StateMachine : public QStateMachine { protected: - void beginSelectTransitions(QEvent* e) Q_DECL_OVERRIDE { + void beginSelectTransitions(QEvent* e) override { if (e->type() == QEvent::Type(QEvent::User + 2)) postEvent(new QEvent(QEvent::Type(QEvent::User + 1)), QStateMachine::HighPriority); } diff --git a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp index 37b052bf1d..408a90afc4 100644 --- a/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp +++ b/tests/auto/corelib/thread/qfuture/tst_qfuture.cpp @@ -1303,8 +1303,8 @@ QFuture createExceptionResultFuture() class DerivedException : public QException { public: - void raise() const Q_DECL_OVERRIDE { throw *this; } - DerivedException *clone() const Q_DECL_OVERRIDE { return new DerivedException(*this); } + void raise() const override { throw *this; } + DerivedException *clone() const override { return new DerivedException(*this); } }; QFuture createDerivedExceptionFuture() @@ -1454,7 +1454,7 @@ void tst_QFuture::nonGlobalThreadPool() return f; } - void run() Q_DECL_OVERRIDE + void run() override { const int ms = 100 + (qrand() % 100 - 100/2); QThread::msleep(ms); diff --git a/tests/auto/corelib/tools/qvector/tst_qvector.cpp b/tests/auto/corelib/tools/qvector/tst_qvector.cpp index 374fec221e..56daea31fe 100644 --- a/tests/auto/corelib/tools/qvector/tst_qvector.cpp +++ b/tests/auto/corelib/tools/qvector/tst_qvector.cpp @@ -2803,7 +2803,7 @@ void tst_QVector::detachThreadSafety() const static const uint threadsCount = 5; struct : QThread { - void run() Q_DECL_OVERRIDE + void run() override { QVector copy(*detachThreadSafetyData()->load()); QVERIFY(!copy.isDetached()); diff --git a/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp b/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp index 58dee6f6ca..7200d1cc8a 100644 --- a/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp +++ b/tests/auto/gui/kernel/qopenglwindow/tst_qopenglwindow.cpp @@ -74,17 +74,17 @@ public: initCount = resizeCount = paintCount = 0; } - void initializeGL() Q_DECL_OVERRIDE { + void initializeGL() override { ++initCount; } - void resizeGL(int w, int h) Q_DECL_OVERRIDE { + void resizeGL(int w, int h) override { ++resizeCount; QCOMPARE(w, size().width()); QCOMPARE(h, size().height()); } - void paintGL() Q_DECL_OVERRIDE { + void paintGL() override { ++paintCount; QOpenGLContext *ctx = QOpenGLContext::currentContext(); @@ -144,7 +144,7 @@ void tst_QOpenGLWindow::basic() class PainterWindow : public QOpenGLWindow { public: - void paintGL() Q_DECL_OVERRIDE { + void paintGL() override { QOpenGLContext *ctx = QOpenGLContext::currentContext(); QVERIFY(ctx); QCOMPARE(ctx, context()); @@ -183,7 +183,7 @@ public: PartialPainterWindow(QOpenGLWindow::UpdateBehavior u) : QOpenGLWindow(u), x(0) { } - void paintGL() Q_DECL_OVERRIDE { + void paintGL() override { ++paintCount; QPainter p(this); @@ -244,7 +244,7 @@ public: Error } m_state; - void paintUnderGL() Q_DECL_OVERRIDE { + void paintUnderGL() override { if (m_state == None || m_state == PaintOver) m_state = PaintUnder; else @@ -255,7 +255,7 @@ public: QCOMPARE(fbo, GLuint(0)); } - void paintGL() Q_DECL_OVERRIDE { + void paintGL() override { if (m_state == PaintUnder) m_state = Paint; else @@ -268,7 +268,7 @@ public: QCOMPARE(fbo, defaultFramebufferObject()); } - void paintOverGL() Q_DECL_OVERRIDE { + void paintOverGL() override { if (m_state == Paint) m_state = PaintOver; else diff --git a/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp b/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp index 41fcdf9f30..7fb79b28ae 100644 --- a/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp +++ b/tests/auto/gui/kernel/qrasterwindow/tst_qrasterwindow.cpp @@ -54,7 +54,7 @@ class PainterWindow : public QRasterWindow public: void reset() { paintCount = 0; } - void paintEvent(QPaintEvent*) Q_DECL_OVERRIDE { + void paintEvent(QPaintEvent*) override { ++paintCount; QPainter p(this); p.fillRect(QRect(0, 0, 100, 100), Qt::blue); diff --git a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp index ec143896ab..d56b09b75d 100644 --- a/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp +++ b/tests/auto/gui/kernel/qtouchevent/tst_qtouchevent.cpp @@ -63,7 +63,7 @@ public: deleteInTouchBegin = deleteInTouchUpdate = deleteInTouchEnd = false; } - bool event(QEvent *event) Q_DECL_OVERRIDE + bool event(QEvent *event) override { switch (event->type()) { case QEvent::TouchBegin: @@ -140,13 +140,13 @@ public: deleteInTouchBegin = deleteInTouchUpdate = deleteInTouchEnd = false; } - QRectF boundingRect() const Q_DECL_OVERRIDE { return QRectF(0, 0, 10, 10); } - void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE + QRectF boundingRect() const override { return QRectF(0, 0, 10, 10); } + void paint(QPainter *painter, const QStyleOptionGraphicsItem *, QWidget *) override { painter->fillRect(QRectF(QPointF(0, 0), boundingRect().size()), Qt::yellow); } - bool sceneEvent(QEvent *event) Q_DECL_OVERRIDE + bool sceneEvent(QEvent *event) override { switch (event->type()) { case QEvent::TouchBegin: @@ -1628,7 +1628,7 @@ class WindowTouchEventFilter : public QObject { Q_OBJECT public: - bool eventFilter(QObject *obj, QEvent *event) Q_DECL_OVERRIDE; + bool eventFilter(QObject *obj, QEvent *event) override; struct TouchInfo { QList points; QEvent::Type lastSeenType; diff --git a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp index fc9f50b15c..40f825fa4a 100644 --- a/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp +++ b/tests/auto/gui/kernel/qwindow/tst_qwindow.cpp @@ -352,7 +352,7 @@ private: class ColoredWindow : public QRasterWindow { public: explicit ColoredWindow(const QColor &color, QWindow *parent = 0) : QRasterWindow(parent), m_color(color) {} - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE + void paintEvent(QPaintEvent *) override { QPainter p(this); p.fillRect(QRect(QPoint(0, 0), size()), m_color); diff --git a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp index f4e3356ad0..9ade3b554e 100644 --- a/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp +++ b/tests/auto/gui/text/qstatictext/tst_qstatictext.cpp @@ -862,19 +862,19 @@ void tst_QStaticText::textDocumentColor() class TestPaintEngine: public QPaintEngine { public: - void drawTextItem(const QPointF &p, const QTextItem &) Q_DECL_OVERRIDE + void drawTextItem(const QPointF &p, const QTextItem &) override { differentVerticalPositions.insert(qRound(p.y())); } - void updateState(const QPaintEngineState &) Q_DECL_OVERRIDE {} + void updateState(const QPaintEngineState &) override {} - void drawPolygon(const QPointF *, int , PolygonDrawMode ) Q_DECL_OVERRIDE {} + void drawPolygon(const QPointF *, int , PolygonDrawMode ) override {} - bool begin(QPaintDevice *) Q_DECL_OVERRIDE { return true; } - bool end() Q_DECL_OVERRIDE { return true; } - void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) Q_DECL_OVERRIDE {} - Type type() const Q_DECL_OVERRIDE + bool begin(QPaintDevice *) override { return true; } + bool end() override { return true; } + void drawPixmap(const QRectF &, const QPixmap &, const QRectF &) override {} + Type type() const override { return User; } diff --git a/tests/auto/network/access/http2/http2srv.h b/tests/auto/network/access/http2/http2srv.h index 10d0e86736..f89e04cc0d 100644 --- a/tests/auto/network/access/http2/http2srv.h +++ b/tests/auto/network/access/http2/http2srv.h @@ -129,7 +129,7 @@ private slots: void readReady(); private: - void incomingConnection(qintptr socketDescriptor) Q_DECL_OVERRIDE; + void incomingConnection(qintptr socketDescriptor) override; quint32 clientSetting(Http2::Settings identifier, quint32 defaultValue); bool readMethodLine(); diff --git a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp index 7760138067..0d538865a3 100644 --- a/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp +++ b/tests/auto/network/socket/qlocalsocket/tst_qlocalsocket.cpp @@ -476,7 +476,7 @@ void tst_QLocalSocket::connectWithOldOpen() class OverriddenOpen : public LocalSocket { public: - virtual bool open(OpenMode mode) Q_DECL_OVERRIDE + virtual bool open(OpenMode mode) override { return QIODevice::open(mode); } }; diff --git a/tests/auto/other/qaccessibility/accessiblewidgets.h b/tests/auto/other/qaccessibility/accessiblewidgets.h index 0c337a72f4..d436f81d17 100644 --- a/tests/auto/other/qaccessibility/accessiblewidgets.h +++ b/tests/auto/other/qaccessibility/accessiblewidgets.h @@ -47,7 +47,7 @@ class QtTestAccessibleWidgetIface: public QAccessibleWidget { public: QtTestAccessibleWidgetIface(QtTestAccessibleWidget *w): QAccessibleWidget(w) {} - QString text(QAccessible::Text t) const Q_DECL_OVERRIDE + QString text(QAccessible::Text t) const override { if (t == QAccessible::Help) return QString::fromLatin1("Help yourself"); diff --git a/tests/auto/tools/moc/cxx11-explicit-override-control.h b/tests/auto/tools/moc/cxx11-explicit-override-control.h index f361a47248..2211112717 100644 --- a/tests/auto/tools/moc/cxx11-explicit-override-control.h +++ b/tests/auto/tools/moc/cxx11-explicit-override-control.h @@ -132,17 +132,17 @@ public: : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: - void pureSlot0() Q_DECL_OVERRIDE {} - void pureSlot1() Q_DECL_OVERRIDE {} - void pureSlot2() const Q_DECL_OVERRIDE {} - void pureSlot3() Q_DECL_OVERRIDE const {} + void pureSlot0() override {} + void pureSlot1() override {} + void pureSlot2() const override {} + void pureSlot3() override const {} #if 0 // moc doesn't support volatile slots - void pureSlot4() volatile Q_DECL_OVERRIDE {} - void pureSlot5() Q_DECL_OVERRIDE volatile {} - void pureSlot6() const volatile Q_DECL_OVERRIDE {} - void pureSlot7() volatile Q_DECL_OVERRIDE const {} - void pureSlot8() const Q_DECL_OVERRIDE volatile {} - void pureSlot9() Q_DECL_OVERRIDE volatile const {} + void pureSlot4() volatile override {} + void pureSlot5() override volatile {} + void pureSlot6() const volatile override {} + void pureSlot7() volatile override const {} + void pureSlot8() const override volatile {} + void pureSlot9() override volatile const {} #endif }; @@ -176,17 +176,17 @@ public: : ExplicitOverrideControlBase(parent) {} private Q_SLOTS: - void pureSlot0() Q_DECL_FINAL Q_DECL_OVERRIDE {} - void pureSlot1() Q_DECL_OVERRIDE Q_DECL_FINAL {} - void pureSlot2() Q_DECL_OVERRIDE const Q_DECL_FINAL {} - void pureSlot3() Q_DECL_FINAL const Q_DECL_OVERRIDE {} + void pureSlot0() Q_DECL_FINAL override {} + void pureSlot1() override Q_DECL_FINAL {} + void pureSlot2() override const Q_DECL_FINAL {} + void pureSlot3() Q_DECL_FINAL const override {} #if 0 // moc doesn't support volatile slots - void pureSlot4() volatile Q_DECL_FINAL Q_DECL_OVERRIDE {} - void pureSlot5() Q_DECL_OVERRIDE Q_DECL_FINAL volatile {} - void pureSlot6() Q_DECL_OVERRIDE const volatile Q_DECL_FINAL {} - void pureSlot7() volatile Q_DECL_OVERRIDE Q_DECL_FINAL const {} - void pureSlot8() const Q_DECL_FINAL Q_DECL_OVERRIDE volatile {} - void pureSlot9() Q_DECL_FINAL volatile const Q_DECL_OVERRIDE {} + void pureSlot4() volatile Q_DECL_FINAL override {} + void pureSlot5() override Q_DECL_FINAL volatile {} + void pureSlot6() override const volatile Q_DECL_FINAL {} + void pureSlot7() volatile override Q_DECL_FINAL const {} + void pureSlot8() const Q_DECL_FINAL override volatile {} + void pureSlot9() Q_DECL_FINAL volatile const override {} #endif }; diff --git a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp index 4441337f6e..7a7cfb5704 100644 --- a/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp +++ b/tests/auto/widgets/dialogs/qmessagebox/tst_qmessagebox.cpp @@ -147,7 +147,7 @@ public: bool done() const { return !m_timerId; } protected: - void timerEvent(QTimerEvent *te) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *te) override; private: int m_key; diff --git a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp index 44b7894c53..00d640e55e 100644 --- a/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp +++ b/tests/auto/widgets/dialogs/qprogressdialog/tst_qprogressdialog.cpp @@ -255,10 +255,10 @@ class QTestTranslator : public QTranslator public: explicit QTestTranslator(QString str) : m_str(qMove(str)) {} - QString translate(const char *, const char *sourceText, const char *, int) const Q_DECL_OVERRIDE + QString translate(const char *, const char *sourceText, const char *, int) const override { return m_str + sourceText + m_str; } - bool isEmpty() const Q_DECL_OVERRIDE { return false; } + bool isEmpty() const override { return false; } }; template diff --git a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp index 0f5277710c..97f3eb4a60 100644 --- a/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicslinearlayout/tst_qgraphicslinearlayout.cpp @@ -894,7 +894,7 @@ public: : QProxyStyle(key), horizontalSpacing(-1), verticalSpacing(-1) {} - virtual int pixelMetric(QStyle::PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE + virtual int pixelMetric(QStyle::PixelMetric pm, const QStyleOption *option = 0, const QWidget *widget = 0) const override { if (pm == QStyle::PM_LayoutHorizontalSpacing && horizontalSpacing >= 0) { return horizontalSpacing; diff --git a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp index 1be17b552e..a3c6805c7e 100644 --- a/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp +++ b/tests/auto/widgets/graphicsview/qgraphicswidget/tst_qgraphicswidget.cpp @@ -3461,12 +3461,12 @@ void tst_QGraphicsWidget::QTBUG_45867_send_itemChildAddedChange_to_parent() { } - QRectF boundingRect() const Q_DECL_OVERRIDE { return QRectF(); } + QRectF boundingRect() const override { return QRectF(); } - void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) Q_DECL_OVERRIDE {} + void paint(QPainter *, const QStyleOptionGraphicsItem *, QWidget *) override {} protected: - QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) Q_DECL_OVERRIDE + QVariant itemChange(QGraphicsItem::GraphicsItemChange change, const QVariant &value) override { if (change == QGraphicsItem::ItemChildAddedChange) ++m_itemChildAddedChangeNotificationsCount; diff --git a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp index a63ca49cbb..0fbb909646 100644 --- a/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp +++ b/tests/auto/widgets/itemviews/qabstractitemview/tst_qabstractitemview.cpp @@ -86,7 +86,7 @@ public: GeometriesTestView() : QTableView(), updateGeometriesCalled(false) {} bool updateGeometriesCalled; protected slots: - void updateGeometries() Q_DECL_OVERRIDE { updateGeometriesCalled = true; QTableView::updateGeometries(); } + void updateGeometries() override { updateGeometriesCalled = true; QTableView::updateGeometries(); } }; class tst_QAbstractItemView : public QObject @@ -1562,7 +1562,7 @@ public: QItemDelegate(parent) {} - void setEditorData(QWidget *editor, const QModelIndex &index) const Q_DECL_OVERRIDE { + void setEditorData(QWidget *editor, const QModelIndex &index) const override { Q_UNUSED(index); static bool w = true; editor->setEnabled(w); @@ -2006,7 +2006,7 @@ void tst_QAbstractItemView::QTBUG50535_update_on_new_selection_model() { } - void setSelectionModel(QItemSelectionModel *model) Q_DECL_OVERRIDE + void setSelectionModel(QItemSelectionModel *model) override { m_deselectedMustBeEmpty = !selectionModel() || !model || selectionModel()->model() != model->model(); QListView::setSelectionModel(model); @@ -2016,7 +2016,7 @@ void tst_QAbstractItemView::QTBUG50535_update_on_new_selection_model() bool selectionChangedOk() const { return m_selectionChangedOk; } protected: - bool viewportEvent(QEvent *event) Q_DECL_OVERRIDE + bool viewportEvent(QEvent *event) override { if (event->type() == QEvent::Paint) ++m_paintEventsCount; @@ -2024,7 +2024,7 @@ void tst_QAbstractItemView::QTBUG50535_update_on_new_selection_model() } void selectionChanged(const QItemSelection &selected, - const QItemSelection &deselected) Q_DECL_OVERRIDE + const QItemSelection &deselected) override { if (m_deselectedMustBeEmpty && !deselected.isEmpty()) m_selectionChangedOk = false; @@ -2147,7 +2147,7 @@ signals: void setSelectionCalled(const QRect &rect); protected: - void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags flags) Q_DECL_OVERRIDE + void setSelection(const QRect &rect, QItemSelectionModel::SelectionFlags flags) override { emit setSelectionCalled(rect); QListView::setSelection(rect, flags); diff --git a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp index b13e7b2f33..fea41f64a3 100644 --- a/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp +++ b/tests/auto/widgets/itemviews/qheaderview/tst_qheaderview.cpp @@ -1799,7 +1799,7 @@ class TestHeaderViewStyle : public QProxyStyle { public: TestHeaderViewStyle() : horizontalSectionSize(100) {} - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override { if (metric == QStyle::PM_HeaderDefaultSectionSizeHorizontal) return horizontalSectionSize; diff --git a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp index b25a423af6..e761ce2833 100644 --- a/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp +++ b/tests/auto/widgets/itemviews/qtreeview/tst_qtreeview.cpp @@ -2514,7 +2514,7 @@ class TestTreeViewStyle : public QProxyStyle { public: TestTreeViewStyle() : indentation(20) {} - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override { if (metric == QStyle::PM_TreeViewIndentation) return indentation; diff --git a/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp b/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp index c3ebb838bb..bcf48c21df 100644 --- a/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp +++ b/tests/auto/widgets/kernel/qgesturerecognizer/tst_qgesturerecognizer.cpp @@ -84,7 +84,7 @@ public: { return m_receivedGestures.value(gestureType); } protected: - bool event(QEvent * event) Q_DECL_OVERRIDE; + bool event(QEvent * event) override; private: typedef QHash GestureTypeHash; diff --git a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp index 9d0c939d84..ff35b0cdb1 100644 --- a/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp +++ b/tests/auto/widgets/kernel/qshortcut/tst_qshortcut.cpp @@ -1105,7 +1105,7 @@ public: int overrideCount; - bool event(QEvent *e) Q_DECL_OVERRIDE + bool event(QEvent *e) override { if (e->type() == QEvent::ShortcutOverride) overrideCount++; diff --git a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp index 096beedf63..0ec8c6d9b1 100644 --- a/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp +++ b/tests/auto/widgets/kernel/qwidget/tst_qwidget.cpp @@ -5878,7 +5878,7 @@ public: startTimer(1000); } - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE + void timerEvent(QTimerEvent *) override { switch (state++) { case 0: @@ -5901,7 +5901,7 @@ public: return false; } - bool nativeEvent(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE + bool nativeEvent(const QByteArray &eventType, void *message, long *) override { if (isMapNotify(eventType, message)) gotExpectedMapNotify = true; @@ -5909,7 +5909,7 @@ public: } // QAbstractNativeEventFilter interface - bool nativeEventFilter(const QByteArray &eventType, void *message, long *) Q_DECL_OVERRIDE + bool nativeEventFilter(const QByteArray &eventType, void *message, long *) override { if (isMapNotify(eventType, message)) gotExpectedGlobalEvent = true; @@ -10407,7 +10407,7 @@ class KeyboardWidget : public QWidget { public: KeyboardWidget(QWidget* parent = 0) : QWidget(parent), m_eventCounter(0) {} - virtual void mousePressEvent(QMouseEvent* ev) Q_DECL_OVERRIDE { + virtual void mousePressEvent(QMouseEvent* ev) override { m_modifiers = ev->modifiers(); m_appModifiers = QApplication::keyboardModifiers(); ++m_eventCounter; diff --git a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp index 9dc513c115..6dabc06b6d 100644 --- a/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp +++ b/tests/auto/widgets/kernel/qwidget_window/tst_qwidget_window.cpp @@ -223,7 +223,7 @@ public: , paintEventCount(0) {} - void paintEvent(QPaintEvent *event) Q_DECL_OVERRIDE + void paintEvent(QPaintEvent *event) override { ++paintEventCount; QWidget::paintEvent(event); @@ -696,7 +696,7 @@ public: int resizeCount; protected: - void resizeEvent(QResizeEvent *) Q_DECL_OVERRIDE + void resizeEvent(QResizeEvent *) override { resizeCount++; } @@ -763,7 +763,7 @@ public: , moveCount(0) { } - void moveEvent(QMoveEvent *) Q_DECL_OVERRIDE + void moveEvent(QMoveEvent *) override { moveCount++; } @@ -802,7 +802,7 @@ public: } protected: - bool eventFilter(QObject *o, QEvent *e) Q_DECL_OVERRIDE + bool eventFilter(QObject *o, QEvent *e) override { if (e->type() == filterEventType()) ++eventCount; diff --git a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp index d5ef2fe94b..f9c6b4c966 100644 --- a/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp +++ b/tests/auto/widgets/styles/qstyle/tst_qstyle.cpp @@ -736,7 +736,7 @@ public: , called(false) {} - void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const Q_DECL_OVERRIDE { + void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const override { called = true; return QProxyStyle::drawPrimitive(pe, opt, p, w); } @@ -784,62 +784,62 @@ public: invalidOptionsDetected(false) {} - void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const Q_DECL_OVERRIDE { + void drawPrimitive(PrimitiveElement pe, const QStyleOption *opt, QPainter *p, const QWidget *w) const override { checkStyleEnum(pe, opt); return QProxyStyle::drawPrimitive(pe, opt, p, w); } - void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w) const Q_DECL_OVERRIDE { + void drawControl(ControlElement element, const QStyleOption *opt, QPainter *p, const QWidget *w) const override { checkStyleEnum(element, opt); return QProxyStyle::drawControl(element, opt, p, w); } - QRect subElementRect(SubElement subElement, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE { + QRect subElementRect(SubElement subElement, const QStyleOption *option, const QWidget *widget) const override { checkStyleEnum(subElement, option); return QProxyStyle::subElementRect(subElement, option, widget); } - void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const Q_DECL_OVERRIDE { + void drawComplexControl(ComplexControl cc, const QStyleOptionComplex *opt, QPainter *p, const QWidget *widget) const override { checkStyleEnum(cc, opt); return QProxyStyle::drawComplexControl(cc, opt, p, widget); } - QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const Q_DECL_OVERRIDE { + QRect subControlRect(ComplexControl cc, const QStyleOptionComplex *opt, SubControl sc, const QWidget *widget) const override { checkStyleEnum(cc, opt); return QProxyStyle::subControlRect(cc, opt, sc, widget); } - int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE { + int pixelMetric(PixelMetric metric, const QStyleOption *option, const QWidget *widget) const override { checkStyleEnum(metric, option); return QProxyStyle::pixelMetric(metric, option, widget); } - QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const Q_DECL_OVERRIDE { + QSize sizeFromContents(ContentsType ct, const QStyleOption *opt, const QSize &contentsSize, const QWidget *w) const override { checkStyleEnum(ct, opt); return QProxyStyle::sizeFromContents(ct, opt, contentsSize, w); } - int styleHint(StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const Q_DECL_OVERRIDE { + int styleHint(StyleHint stylehint, const QStyleOption *opt, const QWidget *widget, QStyleHintReturn *returnData) const override { checkStyleEnum(stylehint, opt); return QProxyStyle::styleHint(stylehint, opt, widget, returnData); } - QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const Q_DECL_OVERRIDE { + QPixmap standardPixmap(StandardPixmap standardPixmap, const QStyleOption *opt, const QWidget *widget) const override { checkStyleEnum(standardPixmap, opt); return QProxyStyle::standardPixmap(standardPixmap, opt, widget); } - QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE { + QIcon standardIcon(StandardPixmap standardIcon, const QStyleOption *option, const QWidget *widget) const override { checkStyleEnum(standardIcon, option); return QProxyStyle::standardIcon(standardIcon, option, widget); } - QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const Q_DECL_OVERRIDE { + QPixmap generatedIconPixmap(QIcon::Mode iconMode, const QPixmap &pixmap, const QStyleOption *opt) const override { checkStyle(QString::asprintf("QIcon::Mode(%i)", iconMode).toLatin1(), opt); return QProxyStyle::generatedIconPixmap(iconMode, pixmap, opt); } - int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const Q_DECL_OVERRIDE { + int layoutSpacing(QSizePolicy::ControlType control1, QSizePolicy::ControlType control2, Qt::Orientation orientation, const QStyleOption *option, const QWidget *widget) const override { checkStyle(QString::asprintf("QSizePolicy::ControlType(%i), QSizePolicy::ControlType(%i)", control1, control2).toLatin1(), option); return QProxyStyle::layoutSpacing(control1, control2, orientation, option, widget); } diff --git a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp index 6363d0c673..500ec2e1fa 100644 --- a/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp +++ b/tests/auto/widgets/widgets/qlabel/tst_qlabel.cpp @@ -47,7 +47,7 @@ public: QList events; protected: - bool event(QEvent *ev) Q_DECL_OVERRIDE { + bool event(QEvent *ev) override { events.append(ev->type()); return QWidget::event(ev); } diff --git a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp index da37a9a968..b0ec4a55f4 100644 --- a/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp +++ b/tests/auto/widgets/widgets/qmenu/tst_qmenu.cpp @@ -819,7 +819,7 @@ public: } protected: - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE + void showEvent(QShowEvent *e) override { QVERIFY(m_subMenu->isVisible()); QVERIFY2(m_subMenu->x() > x(), @@ -828,7 +828,7 @@ protected: QMenu::showEvent(e); } - void timerEvent(QTimerEvent *e) Q_DECL_OVERRIDE + void timerEvent(QTimerEvent *e) override { if (e->timerId() == m_timerId) { switch (m_timerTick++) { @@ -1217,7 +1217,7 @@ public: setMouseTracking(true); } - bool event(QEvent *e) Q_DECL_OVERRIDE + bool event(QEvent *e) override { switch (e->type()) { case QEvent::MouseMove: @@ -1525,7 +1525,7 @@ void tst_QMenu::menuSize_Scrolling() ~TestMenu() {} private: - void showEvent(QShowEvent *e) Q_DECL_OVERRIDE + void showEvent(QShowEvent *e) override { QVERIFY(actions().length() == m_numItems); diff --git a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp index e10c7591d5..7bb0de7e17 100644 --- a/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp +++ b/tests/auto/widgets/widgets/qopenglwidget/tst_qopenglwidget.cpp @@ -100,16 +100,16 @@ public: m_w(expectedWidth), m_h(expectedHeight), r(1.0f), g(0.0f), b(0.0f) { } - void initializeGL() Q_DECL_OVERRIDE { + void initializeGL() override { m_initCalled = true; initializeOpenGLFunctions(); } - void paintGL() Q_DECL_OVERRIDE { + void paintGL() override { m_paintCalled = true; glClearColor(r, g, b, 1.0f); glClear(GL_COLOR_BUFFER_BIT); } - void resizeGL(int w, int h) Q_DECL_OVERRIDE { + void resizeGL(int w, int h) override { m_resizeCalled = true; m_resizeOk = w == m_w && h == m_h; } @@ -203,10 +203,10 @@ public: PainterWidget(QWidget *parent) : QOpenGLWidget(parent), m_clear(false) { } - void initializeGL() Q_DECL_OVERRIDE { + void initializeGL() override { initializeOpenGLFunctions(); } - void paintGL() Q_DECL_OVERRIDE { + void paintGL() override { QPainter p(this); QCOMPARE(p.device()->width(), width()); QCOMPARE(p.device()->height(), height()); @@ -322,7 +322,7 @@ public: void resetPaintCount() { m_count = 0; } protected: - void drawForeground(QPainter *, const QRectF &) Q_DECL_OVERRIDE; + void drawForeground(QPainter *, const QRectF &) override; int m_count; }; @@ -372,7 +372,7 @@ class PaintCountWidget : public QOpenGLWidget public: PaintCountWidget() : m_count(0) { } void reset() { m_count = 0; } - void paintGL() Q_DECL_OVERRIDE { ++m_count; } + void paintGL() override { ++m_count; } int m_count; }; @@ -393,7 +393,7 @@ void tst_QOpenGLWidget::requestUpdate() class FboCheckWidget : public QOpenGLWidget { public: - void paintGL() Q_DECL_OVERRIDE { + void paintGL() override { GLuint reportedDefaultFbo = QOpenGLContext::currentContext()->defaultFramebufferObject(); GLuint expectedDefaultFbo = defaultFramebufferObject(); QCOMPARE(reportedDefaultFbo, expectedDefaultFbo); diff --git a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp index 72e6ffdeb5..9050ad4486 100644 --- a/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp +++ b/tests/auto/widgets/widgets/qsplitter/tst_qsplitter.cpp @@ -299,7 +299,7 @@ class TestSplitterStyle : public QProxyStyle { public: TestSplitterStyle() : handleWidth(5) {} - int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const Q_DECL_OVERRIDE + int pixelMetric(PixelMetric metric, const QStyleOption *option = 0, const QWidget *widget = 0) const override { if (metric == QStyle::PM_SplitterWidth) return handleWidth; diff --git a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp index 55ef44f4e0..4e1d93dbbb 100644 --- a/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp +++ b/tests/auto/widgets/widgets/qtextedit/tst_qtextedit.cpp @@ -2622,7 +2622,7 @@ namespace { { } - void drawTextItem(const QPointF &, const QTextItem &textItem) Q_DECL_OVERRIDE + void drawTextItem(const QPointF &, const QTextItem &textItem) override { itemFonts.append(qMakePair(textItem.text(), textItem.font())); } diff --git a/tests/benchmarks/corelib/thread/qthreadpool/tst_qthreadpool.cpp b/tests/benchmarks/corelib/thread/qthreadpool/tst_qthreadpool.cpp index 30a7b82278..10928e3afc 100644 --- a/tests/benchmarks/corelib/thread/qthreadpool/tst_qthreadpool.cpp +++ b/tests/benchmarks/corelib/thread/qthreadpool/tst_qthreadpool.cpp @@ -53,7 +53,7 @@ tst_QThreadPool::~tst_QThreadPool() class NoOpRunnable : public QRunnable { public: - void run() Q_DECL_OVERRIDE { + void run() override { } }; diff --git a/tests/manual/cocoa/menurama/mainwindow.h b/tests/manual/cocoa/menurama/mainwindow.h index a7afa770be..3ca90dad8f 100644 --- a/tests/manual/cocoa/menurama/mainwindow.h +++ b/tests/manual/cocoa/menurama/mainwindow.h @@ -44,7 +44,7 @@ public: ~MainWindow(); protected: - void timerEvent(QTimerEvent *) Q_DECL_OVERRIDE; + void timerEvent(QTimerEvent *) override; public slots: void enableStuffMenu(bool enable); diff --git a/tests/manual/highdpi/dragwidget.h b/tests/manual/highdpi/dragwidget.h index 2cb821d509..8b67b20410 100644 --- a/tests/manual/highdpi/dragwidget.h +++ b/tests/manual/highdpi/dragwidget.h @@ -43,15 +43,15 @@ public: DragWidget(QString text = QString(), QWidget *parent = 0); protected: - void dragEnterEvent(QDragEnterEvent *event) Q_DECL_OVERRIDE; - void dragLeaveEvent(QDragLeaveEvent *event) Q_DECL_OVERRIDE; - void dropEvent(QDropEvent *event) Q_DECL_OVERRIDE; - void mousePressEvent(QMouseEvent *event) Q_DECL_OVERRIDE; - void dragMoveEvent(QDragMoveEvent * event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; - void timerEvent(QTimerEvent *event) Q_DECL_OVERRIDE; - void showEvent(QShowEvent *event) Q_DECL_OVERRIDE; - void hideEvent(QHideEvent *event) Q_DECL_OVERRIDE; + void dragEnterEvent(QDragEnterEvent *event) override; + void dragLeaveEvent(QDragLeaveEvent *event) override; + void dropEvent(QDropEvent *event) override; + void mousePressEvent(QMouseEvent *event) override; + void dragMoveEvent(QDragMoveEvent * event) override; + void paintEvent(QPaintEvent *) override; + void timerEvent(QTimerEvent *event) override; + void showEvent(QShowEvent *event) override; + void hideEvent(QHideEvent *event) override; private: QPoint dragPos; QPoint dropPos; diff --git a/tests/manual/qscreen/main.cpp b/tests/manual/qscreen/main.cpp index 445af82e09..4b9f49e9f0 100644 --- a/tests/manual/qscreen/main.cpp +++ b/tests/manual/qscreen/main.cpp @@ -73,12 +73,12 @@ public: } protected: - void mouseMoveEvent(QMouseEvent *ev) Q_DECL_OVERRIDE { + void mouseMoveEvent(QMouseEvent *ev) override { m_cursorPos = ev->screenPos().toPoint(); updateText(); } - void mousePressEvent(QMouseEvent *ev) Q_DECL_OVERRIDE { + void mousePressEvent(QMouseEvent *ev) override { m_cursorPos = ev->screenPos().toPoint(); qDebug() << "top level @" << m_cursorPos << ":" << QGuiApplication::topLevelAt(m_cursorPos); updateText(); @@ -150,7 +150,7 @@ public: QScreen *screenSubject() const { return m_watcher->screenSubject(); } protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; void startMouseMonitor(); private: diff --git a/tests/manual/touch/main.cpp b/tests/manual/touch/main.cpp index 1d00ea5db5..9d4b8d08bd 100644 --- a/tests/manual/touch/main.cpp +++ b/tests/manual/touch/main.cpp @@ -118,7 +118,7 @@ public: explicit PanGesture(const QWidget *w, const QPanGesture *source) : Gesture(w, source) , m_offset(source->offset()) {} - void draw(const QRectF &rect, QPainter &painter) const Q_DECL_OVERRIDE + void draw(const QRectF &rect, QPainter &painter) const override { const QPointF hotSpot = drawHotSpot(rect, painter); painter.drawLine(hotSpot, hotSpot + m_offset); @@ -134,7 +134,7 @@ public: , m_horizontal(source->horizontalDirection()), m_vertical(source->verticalDirection()) , m_angle(source->swipeAngle()) {} - void draw(const QRectF &rect, QPainter &painter) const Q_DECL_OVERRIDE; + void draw(const QRectF &rect, QPainter &painter) const override; private: QSwipeGesture::SwipeDirection m_horizontal; @@ -197,7 +197,7 @@ class EventFilter : public QObject { public: explicit EventFilter(const EventTypeVector &types, QObject *p) : QObject(p), m_types(types) {} - bool eventFilter(QObject *, QEvent *) Q_DECL_OVERRIDE; + bool eventFilter(QObject *, QEvent *) override; signals: void eventReceived(const QString &); @@ -292,8 +292,8 @@ signals: void logMessage(const QString &); protected: - bool event(QEvent *event) Q_DECL_OVERRIDE; - void paintEvent(QPaintEvent *) Q_DECL_OVERRIDE; + bool event(QEvent *event) override; + void paintEvent(QPaintEvent *) override; private: void handleGestureEvent(QGestureEvent *gestureEvent); diff --git a/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp b/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp index e8844f87fd..f2c5494ebc 100644 --- a/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp +++ b/tests/manual/widgets/qgraphicsview/rubberband/rubberbandtest.cpp @@ -36,7 +36,7 @@ public: setFlags(QGraphicsItem::ItemIsSelectable); } - void paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option*/, QWidget * /*widget*/) Q_DECL_OVERRIDE + void paint(QPainter *painter, const QStyleOptionGraphicsItem * /* option*/, QWidget * /*widget*/) override { if (isSelected()) painter->fillRect(rect(), QColor(255, 0, 0)); @@ -55,7 +55,7 @@ public: connect(this, SIGNAL(rubberBandChanged(QRect, QPointF, QPointF)), this, SLOT(updateRubberbandInfo(QRect, QPointF, QPointF))); } protected: - void mouseMoveEvent(QMouseEvent *event) Q_DECL_OVERRIDE + void mouseMoveEvent(QMouseEvent *event) override { QGraphicsView::mouseMoveEvent(event); diff --git a/util/glgen/codegenerator.cpp b/util/glgen/codegenerator.cpp index 70cd3a7931..9fbfc3bd8d 100644 --- a/util/glgen/codegenerator.cpp +++ b/util/glgen/codegenerator.cpp @@ -530,7 +530,7 @@ void CodeGenerator::writePublicClassDeclaration(const QString &baseFileName, stream << QStringLiteral("public:") << endl; stream << QString(QStringLiteral(" %1();")).arg(className) << endl; stream << QString(QStringLiteral(" ~%1();")).arg(className) << endl << endl; - stream << QStringLiteral(" bool initializeOpenGLFunctions() Q_DECL_OVERRIDE;") << endl << endl; + stream << QStringLiteral(" bool initializeOpenGLFunctions() override;") << endl << endl; // Get the functions needed for this class and declare them FunctionCollection functionSet = functionCollection(versionProfile); -- cgit v1.2.3