summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel
diff options
context:
space:
mode:
authorGirish Ramakrishnan <girish.1.ramakrishnan@nokia.com>2012-05-30 11:26:53 -0700
committerQt by Nokia <qt-info@nokia.com>2012-05-31 09:13:01 +0200
commit94492d88a7f483e08af328cfe1e7f3695a8661a4 (patch)
tree6c240909821e863e8a284a293f57410b15bfd277 /src/gui/kernel
parent8d27345327ce6af67cb04cf552bcbb2a02f0bec5 (diff)
Remove QCursor::handle
This used to be the Qt/Embedded's QCursor handle implementation. Change-Id: I31b8ed44ac9325defcb13d887949d9536a262be8 Reviewed-by: Friedemann Kleint <Friedemann.Kleint@nokia.com>
Diffstat (limited to 'src/gui/kernel')
-rw-r--r--src/gui/kernel/qcursor.h4
-rw-r--r--src/gui/kernel/qcursor_p.h1
-rw-r--r--src/gui/kernel/qcursor_qpa.cpp11
3 files changed, 1 insertions, 15 deletions
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h
index 41dfd78836..550d6f8891 100644
--- a/src/gui/kernel/qcursor.h
+++ b/src/gui/kernel/qcursor.h
@@ -108,10 +108,6 @@ public:
inline static void setPos(const QPoint &p) { setPos(p.x(), p.y()); }
inline static void setPos(QScreen *screen, const QPoint &p) { setPos(screen, p.x(), p.y()); }
-#ifndef qdoc
- int handle() const;
-#endif
-
private:
QCursorData *d;
};
diff --git a/src/gui/kernel/qcursor_p.h b/src/gui/kernel/qcursor_p.h
index 8623c22200..2eabf2f156 100644
--- a/src/gui/kernel/qcursor_p.h
+++ b/src/gui/kernel/qcursor_p.h
@@ -76,7 +76,6 @@ public:
QBitmap *bm, *bmm;
QPixmap pixmap;
short hx, hy;
- int id;
static bool initialized;
void update();
static QCursorData *setBitmap(const QBitmap &bitmap, const QBitmap &mask, int hotX, int hotY);
diff --git a/src/gui/kernel/qcursor_qpa.cpp b/src/gui/kernel/qcursor_qpa.cpp
index cc9163fbc0..45559e4404 100644
--- a/src/gui/kernel/qcursor_qpa.cpp
+++ b/src/gui/kernel/qcursor_qpa.cpp
@@ -52,14 +52,12 @@ QT_USE_NAMESPACE
#ifndef QT_NO_CURSOR
-static int nextCursorId = Qt::BitmapCursor;
-
/*****************************************************************************
Internal QCursorData class
*****************************************************************************/
QCursorData::QCursorData(Qt::CursorShape s)
- : ref(1), cshape(s), bm(0), bmm(0), hx(0), hy(0), id(s)
+ : ref(1), cshape(s), bm(0), bmm(0), hx(0), hy(0)
{
}
@@ -76,12 +74,6 @@ QCursorData::~QCursorData()
extern QCursorData *qt_cursorTable[Qt::LastCursor + 1]; // qcursor.cpp
-int QCursor::handle() const
-{
- return d->id;
-}
-
-
QCursorData *QCursorData::setBitmap(const QBitmap &bitmap, const QBitmap &mask, int hotX, int hotY)
{
if (!QCursorData::initialized)
@@ -96,7 +88,6 @@ QCursorData *QCursorData::setBitmap(const QBitmap &bitmap, const QBitmap &mask,
d->bm = new QBitmap(bitmap);
d->bmm = new QBitmap(mask);
d->cshape = Qt::BitmapCursor;
- d->id = ++nextCursorId;
d->hx = hotX >= 0 ? hotX : bitmap.width() / 2;
d->hy = hotY >= 0 ? hotY : bitmap.height() / 2;