diff options
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qplatformcursor_qpa.cpp | 6 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformcursor_qpa.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qplatformintegration_qpa.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qscreen.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/gui/kernel/qplatformcursor_qpa.cpp b/src/gui/kernel/qplatformcursor_qpa.cpp index 56d2847cfb..752de18969 100644 --- a/src/gui/kernel/qplatformcursor_qpa.cpp +++ b/src/gui/kernel/qplatformcursor_qpa.cpp @@ -74,15 +74,15 @@ QList <QWeakPointer<QPlatformCursor> > QPlatformCursorPrivate::instances; */ /*! - \fn virtual void QPlatformCursor::changeCursor(QCursor * widgetCursor, QWidget * widget) + \fn virtual void QPlatformCursor::changeCursor(QCursor * windowCursor, QWindow * window) \brief This method is called by Qt whenever the cursor graphic should be changed. Implementation of this method is mandatory for a subclass of QPlatformCursor. - \a widgetCursor is a pointer to the QCursor that should be displayed. + \a windowCursor is a pointer to the QCursor that should be displayed. - \a widget is a pointer to the widget currently displayed at QCursor::pos(). Note + \a window is a pointer to the window currently displayed at QCursor::pos(). Note that this may be 0 if the current position is not occupied by a displayed widget. \sa QCursor::pos() diff --git a/src/gui/kernel/qplatformcursor_qpa.h b/src/gui/kernel/qplatformcursor_qpa.h index af40c7d1c0..da3c4752a0 100644 --- a/src/gui/kernel/qplatformcursor_qpa.h +++ b/src/gui/kernel/qplatformcursor_qpa.h @@ -85,7 +85,7 @@ public: // input methods virtual void pointerEvent(const QMouseEvent & event) { Q_UNUSED(event); } - virtual void changeCursor(QCursor * widgetCursor, QWindow * widget) = 0; + virtual void changeCursor(QCursor * windowCursor, QWindow * window) = 0; virtual QPoint pos() const; virtual void setPos(const QPoint &pos); diff --git a/src/gui/kernel/qplatformintegration_qpa.cpp b/src/gui/kernel/qplatformintegration_qpa.cpp index 7c72ab43aa..97c2445529 100644 --- a/src/gui/kernel/qplatformintegration_qpa.cpp +++ b/src/gui/kernel/qplatformintegration_qpa.cpp @@ -172,7 +172,7 @@ QPlatformNativeInterface * QPlatformIntegration::nativeInterface() const /*! - \fn QAbstractEventDispatcher *guiThreadEventDispatcher() const = 0 + \fn QAbstractEventDispatcher *QPlatformIntegration::guiThreadEventDispatcher() const = 0 Accessor function for the event dispatcher. The platform plugin should create an instance of the QAbstractEventDispatcher in its constructor and set it diff --git a/src/gui/kernel/qscreen.cpp b/src/gui/kernel/qscreen.cpp index 1f0d2f9fe6..b6cf78c5a6 100644 --- a/src/gui/kernel/qscreen.cpp +++ b/src/gui/kernel/qscreen.cpp @@ -386,7 +386,7 @@ QRect QScreen::mapBetween(Qt::ScreenOrientation a, Qt::ScreenOrientation b, cons } /*! - \fn QScreen::currentOrientationChanged() + \fn QScreen::currentOrientationChanged(Qt::ScreenOrientation orientation) This signal is emitted when the current orientation of the screen changes. The current orientation is a hint to the application saying |