summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorJohan Klokkhammer Helsing <johan.helsing@qt.io>2016-07-06 09:34:33 +0200
committerJohan Helsing <johan.helsing@qt.io>2016-07-11 09:47:18 +0000
commitacc585d0c96665b2efab0d622250ed209155d534 (patch)
tree44374bb0d0bc13605e96b459df5aba6d7450065d /src
parent28bee1e6b4bec3e9ea952de132530e9409463684 (diff)
Rename enableWSCursor to windowSystemCursorEnabled
What WS stood for may not have been obvious. Change-Id: Ib2a3f566e4e49d8be0c14c4937e7356b51718e44 Reviewed-by: Giulio Camuffo <giulio.camuffo@kdab.com>
Diffstat (limited to 'src')
-rw-r--r--src/imports/compositor/plugins.qmltypes2
-rw-r--r--src/imports/compositor/qwaylandmousetracker.cpp16
-rw-r--r--src/imports/compositor/qwaylandmousetracker_p.h8
3 files changed, 13 insertions, 13 deletions
diff --git a/src/imports/compositor/plugins.qmltypes b/src/imports/compositor/plugins.qmltypes
index fdcc63d0f..a34630923 100644
--- a/src/imports/compositor/plugins.qmltypes
+++ b/src/imports/compositor/plugins.qmltypes
@@ -127,7 +127,7 @@ Module {
Property { name: "mouseX"; type: "double"; isReadonly: true }
Property { name: "mouseY"; type: "double"; isReadonly: true }
Property { name: "containsMouse"; type: "bool"; isReadonly: true }
- Property { name: "enableWSCursor"; type: "bool" }
+ Property { name: "windowSystemCursorEnabled"; type: "bool" }
Signal { name: "hoveredChanged" }
}
Component {
diff --git a/src/imports/compositor/qwaylandmousetracker.cpp b/src/imports/compositor/qwaylandmousetracker.cpp
index a77d6b1a0..489dc7b55 100644
--- a/src/imports/compositor/qwaylandmousetracker.cpp
+++ b/src/imports/compositor/qwaylandmousetracker.cpp
@@ -45,7 +45,7 @@ class QWaylandMouseTrackerPrivate : public QQuickItemPrivate
Q_DECLARE_PUBLIC(QWaylandMouseTracker)
public:
QWaylandMouseTrackerPrivate()
- : enableWSCursor(false)
+ : windowSystemCursorEnabled(false)
, hovered(false)
{
QImage cursorImage(64,64,QImage::Format_ARGB32);
@@ -76,7 +76,7 @@ public:
}
QPointF mousePos;
- bool enableWSCursor;
+ bool windowSystemCursorEnabled;
QPixmap cursorPixmap;
bool hovered;
};
@@ -102,24 +102,24 @@ qreal QWaylandMouseTracker::mouseY() const
return d->mousePos.y();
}
-void QWaylandMouseTracker::setEnableWSCursor(bool enable)
+void QWaylandMouseTracker::setWindowSystemCursorEnabled(bool enable)
{
Q_D(QWaylandMouseTracker);
- if (d->enableWSCursor != enable) {
- d->enableWSCursor = enable;
+ if (d->windowSystemCursorEnabled != enable) {
+ d->windowSystemCursorEnabled = enable;
if (enable) {
unsetCursor();
} else {
setCursor(QCursor(d->cursorPixmap));
}
- emit enableWSCursorChanged();
+ emit windowSystemCursorEnabledChanged();
}
}
-bool QWaylandMouseTracker::enableWSCursor() const
+bool QWaylandMouseTracker::windowSystemCursorEnabled() const
{
Q_D(const QWaylandMouseTracker);
- return d->enableWSCursor;
+ return d->windowSystemCursorEnabled;
}
bool QWaylandMouseTracker::hovered() const
diff --git a/src/imports/compositor/qwaylandmousetracker_p.h b/src/imports/compositor/qwaylandmousetracker_p.h
index 1bc37a5e2..d90b037ff 100644
--- a/src/imports/compositor/qwaylandmousetracker_p.h
+++ b/src/imports/compositor/qwaylandmousetracker_p.h
@@ -53,21 +53,21 @@ class Q_WAYLAND_COMPOSITOR_EXPORT QWaylandMouseTracker : public QQuickItem
Q_PROPERTY(qreal mouseY READ mouseY NOTIFY mouseYChanged)
Q_PROPERTY(bool containsMouse READ hovered NOTIFY hoveredChanged)
- Q_PROPERTY(bool enableWSCursor READ enableWSCursor WRITE setEnableWSCursor NOTIFY enableWSCursorChanged)
+ Q_PROPERTY(bool windowSystemCursorEnabled READ windowSystemCursorEnabled WRITE setWindowSystemCursorEnabled NOTIFY windowSystemCursorEnabledChanged)
public:
QWaylandMouseTracker(QQuickItem *parent = 0);
qreal mouseX() const;
qreal mouseY() const;
- void setEnableWSCursor(bool enable);
- bool enableWSCursor() const;
+ void setWindowSystemCursorEnabled(bool enable);
+ bool windowSystemCursorEnabled() const;
bool hovered() const;
signals:
void mouseXChanged();
void mouseYChanged();
- void enableWSCursorChanged();
+ void windowSystemCursorEnabledChanged();
void hoveredChanged();
protected: