From b30a58d71d2608b033c1e9fcfa68cc69c14d31c7 Mon Sep 17 00:00:00 2001
From: Jeremy Katz <jeremy.katz@nokia.com>
Date: Mon, 3 May 2010 17:03:16 +0200
Subject: some cursor documentation fixes, reduce public access to class
internals
---
src/gui/painting/qgraphicssystemcursor_lite.cpp | 28 +++++++++++++++++--------
src/gui/painting/qgraphicssystemcursor_lite.h | 7 +++++--
2 files changed, 24 insertions(+), 11 deletions(-)
diff --git a/src/gui/painting/qgraphicssystemcursor_lite.cpp b/src/gui/painting/qgraphicssystemcursor_lite.cpp
index fdb026c..4c97948 100644
--- a/src/gui/painting/qgraphicssystemcursor_lite.cpp
+++ b/src/gui/painting/qgraphicssystemcursor_lite.cpp
@@ -66,7 +66,7 @@ QPointer<QGraphicsSystemCursor> QGraphicsSystemCursor::instance = 0;
*/
/*!
- \fn virtual void pointerEvent(const QMouseEvent & event)
+ \fn virtual void QGraphicsSystemCursor::pointerEvent(const QMouseEvent & event)
This method is called by Qt whenever a QMouseEvent is generated by the
underlying pointer input. \a event is a reference to the QMouseEvent in
@@ -76,7 +76,7 @@ QPointer<QGraphicsSystemCursor> QGraphicsSystemCursor::instance = 0;
*/
/*!
- \fn virtual void changeCursor(QCursor * widgetCursor, QWidget * widget)
+ \fn virtual void QGraphicsSystemCursor::changeCursor(QCursor * widgetCursor, QWidget * widget)
\brief This method is called by Qt whenever the cursor graphic should be changed.
@@ -91,8 +91,9 @@ QPointer<QGraphicsSystemCursor> QGraphicsSystemCursor::instance = 0;
*/
/*!
- Constructs a QGraphicsSystemCursor
+ \fn QGraphicsSystemCursor::QGraphicsSystemCursor()
+ \brief Constructs a QGraphicsSystemCursor
*/
QGraphicsSystemCursor::QGraphicsSystemCursor(QPlatformScreen *scr )
: screen(scr)
@@ -104,6 +105,15 @@ QGraphicsSystemCursor::QGraphicsSystemCursor(QPlatformScreen *scr )
// Beginning of built-in cursor graphics
// from src/gui/embedded/QGraphicsSystemCursorImage_qws.cpp
+/*!
+ \class QGraphicsSystemCursorImage
+
+ \brief The QGraphicsSystemCursorImage class provides a set of graphics
+ intended to be used as cursors.
+
+ \sa QGraphicsSystemCursor
+*/
+
static QGraphicsSystemCursorImage *systemCursorTable[Qt::LastCursor+1];
static bool systemCursorTableInit = false;
@@ -496,7 +506,7 @@ void QGraphicsSystemCursorImage::createSystemCursor(int id)
}
/*!
- \fn void set(Qt::CursorShape id)
+ \fn void QGraphicsSystemCursorImage::set(Qt::CursorShape id)
\brief Calling this method sets the cursor image to the specified shape
@@ -525,7 +535,7 @@ void QGraphicsSystemCursorImage::set(Qt::CursorShape id)
}
/*!
- \fn void set(const QImage * image, int hx, int hy)
+ \fn void QGraphicsSystemCursorImage::set(const QImage * image, int hx, int hy)
\brief Set the cursor image to the specified QImage, with the hotsport at (hx, hy)
@@ -544,7 +554,7 @@ void QGraphicsSystemCursorImage::set(const QImage * image, int hx, int hy)
}
/*!
- \fn set(const uchar *data, const uchar *mask, int width, int height, int hx, int hy)
+ \fn void QGraphicsSystemCursorImage::set(const uchar *data, const uchar *mask, int width, int height, int hx, int hy)
\brief set the cursor image to the graphic represented by the combination of data, mask,
width, and height
@@ -619,7 +629,7 @@ void QGraphicsSystemCursorImage::set(const uchar *data, const uchar *mask,
}
/*!
- \fn QGraphicsSystemCursorImage(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY)
+ \fn QGraphicsSystemCursorImage::QGraphicsSystemCursorImage(const uchar *data, const uchar *mask, int width, int height, int hotX, int hotY)
\brief set the cursor image to the graphic represented by the combination of data, mask,
width, and height
@@ -640,13 +650,13 @@ void QGraphicsSystemCursorImage::set(const uchar *data, const uchar *mask,
*/
/*!
- \fn QImage *image()
+ \fn QImage *QGraphicsSystemCursorImage::image()
\brief Return the cursor graphic as a pointer to a QImage
*/
/*!
- \fn QPoint hotspot
+ \fn QPoint QGraphicsSystemCursorImage::hotspot()
\brief Return the cursor's hotspot
*/
diff --git a/src/gui/painting/qgraphicssystemcursor_lite.h b/src/gui/painting/qgraphicssystemcursor_lite.h
index 5288b83..1f4cfd6 100644
--- a/src/gui/painting/qgraphicssystemcursor_lite.h
+++ b/src/gui/painting/qgraphicssystemcursor_lite.h
@@ -78,9 +78,12 @@ public:
static QPointer<QGraphicsSystemCursor> getInstance() { return instance; }
protected:
- static QPointer<QGraphicsSystemCursor> instance; // limit 1 cursor at a time
-
QPlatformScreen* screen; // Where to request an update
+
+private:
+ static QPointer<QGraphicsSystemCursor> instance; // limit 1 cursor at a time
+ friend void qt_lite_set_cursor(QWidget * w, bool force);
+ friend class QApplicationPrivate;
};
QT_END_NAMESPACE
--
cgit v0.12