summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-07-31 07:58:21 (GMT)
committerRichard Moe Gustavsen <richard.gustavsen@nokia.com>2009-07-31 08:00:09 (GMT)
commit9c45d4daab2196b6418e7fb2be70f9e6d7a57799 (patch)
tree4d596e43e3da2b3b44ea280c0e085f47901b4f23
parent1dbd205e304d0f0819f558591def249bdceac9fa (diff)
downloadQt-9c45d4daab2196b6418e7fb2be70f9e6d7a57799.zip
Qt-9c45d4daab2196b6418e7fb2be70f9e6d7a57799.tar.gz
Qt-9c45d4daab2196b6418e7fb2be70f9e6d7a57799.tar.bz2
Cocoa with namespace breaks the build
Added the needed macros around the classnames the way it should be done. Reviewed-by: Prasanth
-rw-r--r--src/gui/kernel/qcocoaview_mac.mm4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index e3ec30a..2b83df9 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -324,7 +324,7 @@ extern "C" {
return NSDragOperationNone;
} else {
// save the mouse position, used by draggingExited handler.
- DnDParams *dndParams = [QCocoaView currentMouseEvent];
+ DnDParams *dndParams = [QT_MANGLE_NAMESPACE(QCocoaView) currentMouseEvent];
dndParams->activeDragEnterPos = windowPoint;
// send a drag move event immediately after a drag enter event (as per documentation).
QDragMoveEvent qDMEvent(posDrag, qtAllowed, mimeData, QApplication::mouseButtons(), modifiers);
@@ -403,7 +403,7 @@ extern "C" {
dragEnterSequence = -1;
if (qwidget->testAttribute(Qt::WA_TransparentForMouseEvents)) {
// try sending the leave event to the last view which accepted drag enter.
- DnDParams *dndParams = [QCocoaView currentMouseEvent];
+ DnDParams *dndParams = [QT_MANGLE_NAMESPACE(QCocoaView) currentMouseEvent];
NSView *candidateView = [[[self window] contentView] hitTest:dndParams->activeDragEnterPos];
if (candidateView && candidateView != self)
return [candidateView draggingExited:sender];