Minor QPlatformMenu API cleanup.
authorMorten Johan Sorvig <morten.sorvig@nokia.com>
Mon, 21 May 2012 13:33:42 +0000 (15:33 +0200)
committerQt by Nokia <qt-info@nokia.com>
Wed, 23 May 2012 08:02:11 +0000 (10:02 +0200)
commit98dbaecf7f9c16be82b895a75ff02e89ff1f3269
tree5f5039bc15c5afd1afc1842ab47415492e57cca8
parent62fafaf16a972337fb3d6540889efc7cbf56ba7c
Minor QPlatformMenu API cleanup.

Make the QPlatformMenu* classes abstract with
pure virtual functions. Delete qplatformmenu_qpa.cpp.
QtGui no longer has to carry the empty implementations.

Change the inheritance tree - Make QPlatformMenu
and QPlatformMenuBar inherit QObject instead of
QMenuItem. Add (now) missing virtual functions to
QPlatformMenu. The effect of this change is to
reduce the number of pure virtuals the platform
has to implement.

Change QPlatformMenuBar::syncMenu to take a
QPlatformMenu pointer instead of a QPlatformMenuItem*
pointer.

Fix a couple of header/unused variable
compiler warnings.

Change-Id: I77450e40c6aae26f3e1aca204603acebd242c036
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Reviewed-by: Bradley T. Hughes <bradley.hughes@nokia.com>
src/gui/kernel/kernel.pri
src/gui/kernel/qplatformmenu.h [changed mode: 0644->0755]
src/gui/kernel/qplatformmenu_qpa.cpp [deleted file]
src/plugins/platforms/cocoa/qcocoamenubar.h
src/plugins/platforms/cocoa/qcocoamenubar.mm
src/plugins/platforms/cocoa/qcocoanativeinterface.mm
src/plugins/platforms/cocoa/qcocoatheme.mm