diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-06-15 12:18:46 (GMT) |
|---|---|---|
| committer | Jason McDonald <jason.mcdonald@nokia.com> | 2009-06-15 13:22:40 (GMT) |
| commit | 61728dd4371f075030b58cf65ed2d0e9657c3b97 (patch) | |
| tree | 198aeab30994cbebca4beef4b10fc5d2e792ebf6 | |
| parent | e75ef82bc4570c0a6da3da26a1dda5d6e065f23b (diff) | |
| download | Qt-61728dd4371f075030b58cf65ed2d0e9657c3b97.zip Qt-61728dd4371f075030b58cf65ed2d0e9657c3b97.tar.gz Qt-61728dd4371f075030b58cf65ed2d0e9657c3b97.tar.bz2 | |
Rename nsCursorForQCursor -> qt_mac_nsCursorForQCursor.
Reviewed-by: Richard Moe Gustavsen
(cherry picked from commit e4c224f0ef1b57a1389148b78d236349603503a5)
| -rw-r--r-- | src/gui/kernel/qcocoaview_mac.mm | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qcursor.h | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qcursor_mac.mm | 2 | ||||
| -rw-r--r-- | 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 38f6466..9e532fd 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 2bd61a9..7bc06e8 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 89737e2..da8f428 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 bbd62a2..40b8bd0 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 |