diff options
| author | Morten Sørvig <msorvig@trolltech.com> | 2009-06-15 14:18:46 +0200 |
|---|---|---|
| committer | Morten Sørvig <msorvig@trolltech.com> | 2009-06-15 14:32:51 +0200 |
| commit | e4c224f0ef1b57a1389148b78d236349603503a5 (patch) | |
| tree | ca81ee532e8e7fac691b8749d42a151f681a73dc /src | |
| parent | 86b8daf2a0348be875cbd0b330ab7773f55a35dc (diff) | |
Rename nsCursorForQCursor -> qt_mac_nsCursorForQCursor.
Reviewed-by: Richard Moe Gustavsen
Diffstat (limited to 'src')
| -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 f1a7f39f40..90ae60a664 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 ad1860db7f..81e1e18d48 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 ae98f2e3a8..545a9e25e3 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 42682ac702..ba7655be64 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 |