diff options
| author | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-02-22 12:50:34 (GMT) |
|---|---|---|
| committer | Richard Moe Gustavsen <richard.gustavsen@nokia.com> | 2010-02-22 12:50:34 (GMT) |
| commit | 991fa0beff10e53824879adbe4b52e4dacce6700 (patch) | |
| tree | 4322b960c4e1d12034facf31372b8bedea7998b8 /src/gui | |
| parent | 42a0771c161ba9aa8d5967d6bbcbea49a76425bc (diff) | |
| download | Qt-991fa0beff10e53824879adbe4b52e4dacce6700.zip Qt-991fa0beff10e53824879adbe4b52e4dacce6700.tar.gz Qt-991fa0beff10e53824879adbe4b52e4dacce6700.tar.bz2 | |
Cocoa: Fix build with namespace
Reviewed-by: MortenS
Diffstat (limited to 'src/gui')
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qt_cocoa_helpers_mac.mm | 1 | ||||
| -rw-r--r-- | src/gui/text/qstatictext.h | 4 | ||||
| -rw-r--r-- | src/gui/util/qsystemtrayicon_mac.mm | 2 |
4 files changed, 4 insertions, 5 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm index d5e7534..455176e 100644 --- a/src/gui/kernel/qcocoaview_mac.mm +++ b/src/gui/kernel/qcocoaview_mac.mm @@ -83,6 +83,7 @@ extern bool qt_sendSpontaneousEvent(QObject *, QEvent *); // qapplication.cpp extern OSViewRef qt_mac_nativeview_for(const QWidget *w); // qwidget_mac.mm extern QPointer<QWidget> qt_mouseover; //qapplication_mac.mm extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp +extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); struct dndenum_mapper { @@ -692,7 +693,6 @@ extern "C" { qt_button_down = 0; } -extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); - (void)otherMouseDown:(NSEvent *)theEvent { if (!qt_button_down) diff --git a/src/gui/kernel/qt_cocoa_helpers_mac.mm b/src/gui/kernel/qt_cocoa_helpers_mac.mm index 9702829..e9fdbda 100644 --- a/src/gui/kernel/qt_cocoa_helpers_mac.mm +++ b/src/gui/kernel/qt_cocoa_helpers_mac.mm @@ -138,7 +138,6 @@ void QMacWindowFader::performFade() } extern bool qt_sendSpontaneousEvent(QObject *receiver, QEvent *event); // qapplication.cpp; -extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); // qcocoaview.mm extern QWidget * mac_mouse_grabber; extern QPointer<QWidget> qt_button_down; //qapplication_mac.cpp diff --git a/src/gui/text/qstatictext.h b/src/gui/text/qstatictext.h index 1e59944..00d42e0 100644 --- a/src/gui/text/qstatictext.h +++ b/src/gui/text/qstatictext.h @@ -97,10 +97,10 @@ private: friend class QStaticTextPrivate; }; -Q_DECLARE_METATYPE(QStaticText) - QT_END_NAMESPACE +Q_DECLARE_METATYPE(QStaticText) + QT_END_HEADER #endif // QSTATICTEXT_H diff --git a/src/gui/util/qsystemtrayicon_mac.mm b/src/gui/util/qsystemtrayicon_mac.mm index 5cadbbd..348657e 100644 --- a/src/gui/util/qsystemtrayicon_mac.mm +++ b/src/gui/util/qsystemtrayicon_mac.mm @@ -93,6 +93,7 @@ extern bool qt_mac_execute_apple_script(const QString &script, AEDesc *ret); //q extern void qtsystray_sendActivated(QSystemTrayIcon *i, int r); //qsystemtrayicon.cpp extern NSString *keySequenceToKeyEqivalent(const QKeySequence &accel); // qmenu_mac.mm extern NSUInteger keySequenceModifierMask(const QKeySequence &accel); // qmenu_mac.mm +extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); QT_END_NAMESPACE QT_USE_NAMESPACE @@ -382,7 +383,6 @@ QT_END_NAMESPACE [self menuTrackingDone:nil]; } -extern Qt::MouseButton cocoaButton2QtButton(NSInteger buttonNum); - (void)otherMouseDown:(NSEvent *)mouseEvent { [self mousePressed:mouseEvent button:cocoaButton2QtButton([mouseEvent buttonNumber])]; |