From e4c224f0ef1b57a1389148b78d236349603503a5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Morten=20S=C3=B8rvig?= <msorvig@trolltech.com>
Date: Mon, 15 Jun 2009 14:18:46 +0200
Subject: Rename nsCursorForQCursor -> qt_mac_nsCursorForQCursor.

Reviewed-by: Richard Moe Gustavsen
---
 src/gui/kernel/qcocoaview_mac.mm | 2 +-
 src/gui/kernel/qcursor.h         | 3 +--
 src/gui/kernel/qcursor_mac.mm    | 2 +-
 src/gui/kernel/qcursor_p.h       | 1 +
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/gui/kernel/qcocoaview_mac.mm b/src/gui/kernel/qcocoaview_mac.mm
index f1a7f39..90ae60a 100644
--- a/src/gui/kernel/qcocoaview_mac.mm
+++ b/src/gui/kernel/qcocoaview_mac.mm
@@ -257,7 +257,7 @@ extern "C" {
     }
 
     QRegion mask = qt_widget_private(cursorWidget)->extra->mask;
-    NSCursor *nscursor = static_cast<NSCursor *>(nsCursorForQCursor(cursorWidget->cursor()));
+    NSCursor *nscursor = static_cast<NSCursor *>(qt_mac_nsCursorForQCursor(cursorWidget->cursor()));
     if (mask.isEmpty()) {
         [self addCursorRect:[qt_mac_nativeview_for(cursorWidget) visibleRect] cursor:nscursor];
     } else {
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h
index ad1860d..81e1e18 100644
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@@ -77,7 +77,6 @@ class QBitmap;
 class QPixmap;
 
 #if defined(Q_WS_MAC)
-void *nsCursorForQCursor(const QCursor &c);
 void qt_mac_set_cursor(const QCursor *c, const QPoint &p);
 #endif
 
@@ -129,7 +128,7 @@ public:
 private:
     QCursorData *d;
 #if defined(Q_WS_MAC)
-    friend void *nsCursorForQCursor(const QCursor &c);
+    friend void *qt_mac_nsCursorForQCursor(const QCursor &c);
     friend void qt_mac_set_cursor(const QCursor *c, const QPoint &p);
 #endif
 };
diff --git a/src/gui/kernel/qcursor_mac.mm b/src/gui/kernel/qcursor_mac.mm
index ae98f2e..545a9e2 100644
--- a/src/gui/kernel/qcursor_mac.mm
+++ b/src/gui/kernel/qcursor_mac.mm
@@ -95,7 +95,7 @@ protected:
     }
 };
 
-void *nsCursorForQCursor(const QCursor &c)
+void *qt_mac_nsCursorForQCursor(const QCursor &c)
 {
     c.d->update();
     return [[static_cast<NSCursor *>(c.d->curs.cp.nscursor) retain] autorelease];
diff --git a/src/gui/kernel/qcursor_p.h b/src/gui/kernel/qcursor_p.h
index 42682ac..ba7655b 100644
--- a/src/gui/kernel/qcursor_p.h
+++ b/src/gui/kernel/qcursor_p.h
@@ -69,6 +69,7 @@
 QT_BEGIN_NAMESPACE
 
 #if defined (Q_WS_MAC)
+void *qt_mac_nsCursorForQCursor(const QCursor &c);
 class QMacAnimateCursor;
 #endif
 
-- 
cgit v0.12