diff options
| author | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-01-05 07:15:03 (GMT) |
|---|---|---|
| committer | Morten Johan Sørvig <morten.sorvig@nokia.com> | 2010-01-05 07:15:03 (GMT) |
| commit | b1b8ff495f7a33769b2aea9091622e3fa1e3344c (patch) | |
| tree | 4058ea4bb280c5608163313c42218e52aa9c8f08 /src | |
| parent | 2176a58c5312e2f994d5e345708a3b37e333d668 (diff) | |
| download | Qt-b1b8ff495f7a33769b2aea9091622e3fa1e3344c.zip Qt-b1b8ff495f7a33769b2aea9091622e3fa1e3344c.tar.gz Qt-b1b8ff495f7a33769b2aea9091622e3fa1e3344c.tar.bz2 | |
Don't use QPointer in objectve-c interfaces.
(Constructors and destructors are not called.)
Diffstat (limited to 'src')
| -rw-r--r-- | src/gui/widgets/qcocoamenu_mac_p.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/widgets/qcocoamenu_mac_p.h b/src/gui/widgets/qcocoamenu_mac_p.h index 3ad0ab8..57b4e17 100644 --- a/src/gui/widgets/qcocoamenu_mac_p.h +++ b/src/gui/widgets/qcocoamenu_mac_p.h @@ -52,10 +52,10 @@ #include "qmacdefines_mac.h" #ifdef QT_MAC_USE_COCOA -#include <qpointer.h> #import <Cocoa/Cocoa.h> QT_FORWARD_DECLARE_CLASS(QMenu) +QT_FORWARD_DECLARE_CLASS(QAction) #if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_5 @@ -72,7 +72,7 @@ QT_FORWARD_DECLARE_CLASS(QMenu) @interface QT_MANGLE_NAMESPACE(QCocoaMenu) : NSMenu <NSMenuDelegate> { QMenu *qmenu; - QPointer<QAction> previousAction; + QAction *previousAction; } - (id)initWithQMenu:(QMenu*)menu; - (BOOL)menuHasKeyEquivalent:(NSMenu *)menu forEvent:(NSEvent *)event target:(id *)target action:(SEL *)action; |