summaryrefslogtreecommitdiffstats
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/graphicsview/qgraphicsitem.h4
-rw-r--r--src/gui/kernel/qevent.h8
-rw-r--r--src/gui/painting/qmatrix.h14
3 files changed, 13 insertions, 13 deletions
diff --git a/src/gui/graphicsview/qgraphicsitem.h b/src/gui/graphicsview/qgraphicsitem.h
index 665f33f..089d6fe 100644
--- a/src/gui/graphicsview/qgraphicsitem.h
+++ b/src/gui/graphicsview/qgraphicsitem.h
@@ -294,8 +294,8 @@ public:
QPointF transformOriginPoint() const;
void setTransformOriginPoint(const QPointF &origin);
- inline void setTransformOriginPoint(qreal x, qreal y)
- { setTransformOriginPoint(QPointF(x,y)); }
+ inline void setTransformOriginPoint(qreal ax, qreal ay)
+ { setTransformOriginPoint(QPointF(ax,ay)); }
virtual void advance(int phase);
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 697b93a..fa2b22f 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -70,7 +70,7 @@ public:
QInputEvent(Type type, Qt::KeyboardModifiers modifiers = Qt::NoModifier);
~QInputEvent();
inline Qt::KeyboardModifiers modifiers() const { return modState; }
- inline void setModifiers(Qt::KeyboardModifiers modifiers) { modState = modifiers; }
+ inline void setModifiers(Qt::KeyboardModifiers amodifiers) { modState = amodifiers; }
protected:
Qt::KeyboardModifiers modState;
};
@@ -805,10 +805,10 @@ public:
inline const QList<QTouchEvent::TouchPoint> &touchPoints() const { return _touchPoints; }
// internal
- inline void setWidget(QWidget *widget) { _widget = widget; }
- inline void setDeviceType(DeviceType deviceType) { _deviceType = deviceType; }
+ inline void setWidget(QWidget *awidget) { _widget = awidget; }
+ inline void setDeviceType(DeviceType adeviceType) { _deviceType = adeviceType; }
inline void setTouchPointStates(Qt::TouchPointStates touchPointStates) { _touchPointStates = touchPointStates; }
- inline void setTouchPoints(const QList<QTouchEvent::TouchPoint> &touchPoints) { _touchPoints = touchPoints; }
+ inline void setTouchPoints(const QList<QTouchEvent::TouchPoint> &atouchPoints) { _touchPoints = atouchPoints; }
protected:
QWidget *_widget;
diff --git a/src/gui/painting/qmatrix.h b/src/gui/painting/qmatrix.h
index 983ebd5..8887f0e 100644
--- a/src/gui/painting/qmatrix.h
+++ b/src/gui/painting/qmatrix.h
@@ -129,13 +129,13 @@ private:
, _m22(1.)
, _dx(0.)
, _dy(0.) {}
- inline QMatrix(qreal m11, qreal m12, qreal m21, qreal m22, qreal dx, qreal dy, bool)
- : _m11(m11)
- , _m12(m12)
- , _m21(m21)
- , _m22(m22)
- , _dx(dx)
- , _dy(dy) {}
+ inline QMatrix(qreal am11, qreal am12, qreal am21, qreal am22, qreal adx, qreal ady, bool)
+ : _m11(am11)
+ , _m12(am12)
+ , _m21(am21)
+ , _m22(am22)
+ , _dx(adx)
+ , _dy(ady) {}
friend class QTransform;
qreal _m11, _m12;
qreal _m21, _m22;