summaryrefslogtreecommitdiffstats
path: root/src/imports/compositor-extensions
diff options
context:
space:
mode:
Diffstat (limited to 'src/imports/compositor-extensions')
-rw-r--r--src/imports/compositor-extensions/qtshell/qwaylandqtshell.cpp42
-rw-r--r--src/imports/compositor-extensions/qtshell/qwaylandqtshellchrome.cpp50
2 files changed, 46 insertions, 46 deletions
diff --git a/src/imports/compositor-extensions/qtshell/qwaylandqtshell.cpp b/src/imports/compositor-extensions/qtshell/qwaylandqtshell.cpp
index 7788e3ea8..d0715e8c2 100644
--- a/src/imports/compositor-extensions/qtshell/qwaylandqtshell.cpp
+++ b/src/imports/compositor-extensions/qtshell/qwaylandqtshell.cpp
@@ -157,7 +157,7 @@ QByteArray QWaylandQtShell::interfaceName()
}
/*!
- * \qmlsignal void QtWaylandCompositor::QtShell::qtShellSurfaceRequested(WaylandSurface surface, WaylandResource resource)
+ * \qmlsignal void QtShell::qtShellSurfaceRequested(WaylandSurface surface, WaylandResource resource)
*
* This signal is emitted when the client has requested a QtShellSurface to be associated
* with \a surface. The handler for this signal is expected to create the QtShellSurface for
@@ -166,7 +166,7 @@ QByteArray QWaylandQtShell::interfaceName()
*/
/*!
- * \qmlsignal void QtWaylandCompositor::QtShell::qtShellSurfaceCreated(QtShellSurface *qtShellSurface)
+ * \qmlsignal void QtShell::qtShellSurfaceCreated(QtShellSurface *qtShellSurface)
*
* This signal is emitted when an QtShellSurface has been created. The supplied \a qtShellSurface is
* most commonly used to instantiate a ShellSurfaceItem.
@@ -221,7 +221,7 @@ QWaylandSurfaceRole QWaylandQtShellSurfacePrivate::s_role("qt_shell_surface");
*/
/*!
- \qmlsignal void QtWaylandCompositor::QtShellSurface::startMove()
+ \qmlsignal void QtShellSurface::startMove()
The client has requested an interactive move operation in the compositor by calling
\l{QWindow::startSystemMove()}.
@@ -230,7 +230,7 @@ QWaylandSurfaceRole QWaylandQtShellSurfacePrivate::s_role("qt_shell_surface");
*/
/*!
- \qmlsignal void QtWaylandCompositor::QtShellSurface::startResize(enum edges)
+ \qmlsignal void QtShellSurface::startResize(enum edges)
The client has requested an interactive resize operation in the compositor by calling
\l{QWindow::startSystemResize()}.
@@ -259,7 +259,7 @@ QWaylandQtShellSurface::QWaylandQtShellSurface(QWaylandQtShell *application, QWa
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellSurface::initialize(QtShell qtShell, WaylandSurface surface, WaylandResource resource)
+ * \qmlmethod void QtShellSurface::initialize(QtShell qtShell, WaylandSurface surface, WaylandResource resource)
*
* Initializes the QtShellSurface, associating it with the given \a qtShell, \a surface, and
* \a resource.
@@ -282,7 +282,7 @@ void QWaylandQtShellSurface::initialize(QWaylandQtShell *qtShell, QWaylandSurfac
}
/*!
- * \qmlproperty WaylandSurface QtWaylandCompositor::QtShellSurface::surface
+ * \qmlproperty WaylandSurface QtShellSurface::surface
*
* This property holds the surface associated with this QtShellSurface.
*/
@@ -299,7 +299,7 @@ QWaylandQtShell *QWaylandQtShellSurface::shell() const
}
/*!
- * \qmlproperty point QtWaylandCompositor::QtShellSurface::windowPosition
+ * \qmlproperty point QtShellSurface::windowPosition
*
* This property holds the position of the shell surface relative to its output.
*/
@@ -324,7 +324,7 @@ void QWaylandQtShellSurface::setWindowPosition(const QPoint &position)
}
/*!
- * \qmlproperty rect QtWaylandCompositor::QtShellSurface::windowGeometry
+ * \qmlproperty rect QtShellSurface::windowGeometry
*
* This property holds the window geometry of the shell surface.
*/
@@ -335,7 +335,7 @@ QRect QWaylandQtShellSurface::windowGeometry() const
}
/*!
- * \qmlproperty size QtWaylandCompositor::QtShellSurface::minimumSize
+ * \qmlproperty size QtShellSurface::minimumSize
*
* The minimum size of the window if the client has specified one. Otherwise an invalid size.
*/
@@ -346,7 +346,7 @@ QSize QWaylandQtShellSurface::minimumSize() const
}
/*!
- * \qmlproperty size QtWaylandCompositor::QtShellSurface::maximumSize
+ * \qmlproperty size QtShellSurface::maximumSize
*
* The maximum size of the window if the client has specified one. Otherwise an invalid size.
*/
@@ -357,7 +357,7 @@ QSize QWaylandQtShellSurface::maximumSize() const
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellSurface::requestWindowGeometry(int windowState, rect windowGeometry)
+ * \qmlmethod void QtShellSurface::requestWindowGeometry(int windowState, rect windowGeometry)
*
* Requests a new \a windowState and \a windowGeometry for the QtShellSurface. The state and
* geometry is updated when the client has acknowledged the request (at which point it is safe to
@@ -402,7 +402,7 @@ void QWaylandQtShellSurface::setFrameMargins(const QMargins &margins)
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellSurface::frameMarginLeft
+ * \qmlproperty int QtShellSurface::frameMarginLeft
*
* This holds the window frame margin to the left of the surface.
*/
@@ -425,7 +425,7 @@ int QWaylandQtShellSurface::frameMarginLeft() const
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellSurface::frameMarginRight
+ * \qmlproperty int QtShellSurface::frameMarginRight
*
* This holds the window frame margin to the right of the surface.
*/
@@ -448,7 +448,7 @@ int QWaylandQtShellSurface::frameMarginRight() const
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellSurface::frameMarginTop
+ * \qmlproperty int QtShellSurface::frameMarginTop
*
* This holds the window frame margin above the surface.
*/
@@ -471,7 +471,7 @@ int QWaylandQtShellSurface::frameMarginTop() const
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellSurface::frameMarginBottom
+ * \qmlproperty int QtShellSurface::frameMarginBottom
*
* This holds the window frame margin below the surface.
*/
@@ -499,7 +499,7 @@ int QWaylandQtShellSurface::frameMarginBottom() const
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellSurface::windowFlags
+ * \qmlproperty int QtShellSurface::windowFlags
*
* This property holds the window flags of the QtShellSurface.
*/
@@ -510,7 +510,7 @@ uint QWaylandQtShellSurface::windowFlags() const
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellSurface::sendClose()
+ * \qmlmethod void QtShellSurface::sendClose()
*
* Requests that the client application closes itself.
*/
@@ -521,7 +521,7 @@ void QWaylandQtShellSurface::sendClose()
}
/*!
- * \qmlproperty string QtWaylandCompositor::QtShellSurface::windowTitle
+ * \qmlproperty string QtShellSurface::windowTitle
*
* This property holds the window title of the QtShellSurface.
*/
@@ -532,7 +532,7 @@ QString QWaylandQtShellSurface::windowTitle() const
}
/*!
- * \qmlproperty bool QtWaylandCompositor::QtShellSurface::active
+ * \qmlproperty bool QtShellSurface::active
*
* This property holds whether the surface is currently considered active.
*
@@ -561,7 +561,7 @@ bool QWaylandQtShellSurface::active() const
}
/*!
- * \qmlproperty enum QtWaylandCompositor::QtShellSurface::capabilities
+ * \qmlproperty enum QtShellSurface::capabilities
*
* This property holds the capabilities of the compositor. By default, no special capabilities are
* enabled.
@@ -594,7 +594,7 @@ QWaylandQtShellSurface::CapabilityFlags QWaylandQtShellSurface::capabilities() c
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellSurface::windowState
+ * \qmlproperty int QtShellSurface::windowState
*
* This property holds the window state of the QtShellSurface.
*
diff --git a/src/imports/compositor-extensions/qtshell/qwaylandqtshellchrome.cpp b/src/imports/compositor-extensions/qtshell/qwaylandqtshellchrome.cpp
index 47fe586a6..ffccf5d21 100644
--- a/src/imports/compositor-extensions/qtshell/qwaylandqtshellchrome.cpp
+++ b/src/imports/compositor-extensions/qtshell/qwaylandqtshellchrome.cpp
@@ -171,7 +171,7 @@ void QWaylandQtShellChrome::init()
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::toggleFullScreen()
+ * \qmlmethod void QtShellChrome::toggleFullScreen()
*
* Toggles between fullscreen and normal window states. This method also clears the minimized
* or maximized window states if either is set.
@@ -195,7 +195,7 @@ void QWaylandQtShellChrome::toggleFullScreen()
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::toggleMaximized()
+ * \qmlmethod void QtShellChrome::toggleMaximized()
*
* Toggles between maximized and normal states. This method also clears the minimized
* window state if it is set.
@@ -219,7 +219,7 @@ void QWaylandQtShellChrome::toggleMaximized()
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::toggleMinimized()
+ * \qmlmethod void QtShellChrome::toggleMinimized()
*
* Toggles between minimized and normal states. This method also clears the maximized
* window state if it is set.
@@ -243,7 +243,7 @@ void QWaylandQtShellChrome::toggleMinimized()
}
/*!
- * \qmlproperty ShellSurfaceItem QtWaylandCompositor::QtShellChrome::shellSurfaceItem
+ * \qmlproperty ShellSurfaceItem QtShellChrome::shellSurfaceItem
*
* This property holds the shell surface item associated with this QtShellChrome. It will
* in turn manage the \c shellSurface of this item. The \c shellSurface of the item is expected to
@@ -402,7 +402,7 @@ void QWaylandQtShellChrome::titleBarMove()
}
/*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::titleBar
+ * \qmlproperty Item QtShellChrome::titleBar
*
* This property holds the default title bar item of the QtShellChrome. If set, a \l DragHandler
* will be installed on the title bar which moves the window around on user interaction. In
@@ -475,7 +475,7 @@ void QWaylandQtShellChrome::setTitleBar(QQuickItem *item)
}
/*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::leftResizeHandle
+ * \qmlproperty Item QtShellChrome::leftResizeHandle
*
* This property holds the default left resize handle of the QtShellChrome. If set, a \l DragHandler
* will be installed on the resize handle which resizes the window by moving its left edge.
@@ -539,7 +539,7 @@ void QWaylandQtShellChrome::setLeftResizeHandle(QQuickItem *item)
}
/*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::rightResizeHandle
+ * \qmlproperty Item QtShellChrome::rightResizeHandle
*
* This property holds the default right resize handle of the QtShellChrome. If set, a \l DragHandler
* will be installed on the resize handle which resizes the window by moving its right edge.
@@ -603,7 +603,7 @@ void QWaylandQtShellChrome::setRightResizeHandle(QQuickItem *item)
}
/*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::topResizeHandle
+ * \qmlproperty Item QtShellChrome::topResizeHandle
*
* This property holds the default top resize handle of the QtShellChrome. If set, a \l DragHandler
* will be installed on the resize handle which resizes the window by moving its top edge.
@@ -667,7 +667,7 @@ void QWaylandQtShellChrome::setTopResizeHandle(QQuickItem *item)
}
/*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::bottomResizeHandle
+ * \qmlproperty Item QtShellChrome::bottomResizeHandle
*
* This property holds the default bottom resize handle of the QtShellChrome. If set, a \l DragHandler
* will be installed on the resize handle which resizes the window by moving its bottom edge.
@@ -732,7 +732,7 @@ void QWaylandQtShellChrome::setBottomResizeHandle(QQuickItem *item)
}
/*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::topLeftResizeHandle
+ * \qmlproperty Item QtShellChrome::topLeftResizeHandle
*
* This property holds the default top-left resize handle of the QtShellChrome. If set, a \l DragHandler
* will be installed on the resize handle which resizes the window by moving its top and left edges
@@ -789,7 +789,7 @@ void QWaylandQtShellChrome::setTopLeftResizeHandle(QQuickItem *item)
}
/*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::bottomLeftResizeHandle
+ * \qmlproperty Item QtShellChrome::bottomLeftResizeHandle
*
* This property holds the default bottom-left resize handle of the QtShellChrome. If set, a \l DragHandler
* will be installed on the resize handle which resizes the window by moving its bottom and left edges
@@ -846,7 +846,7 @@ void QWaylandQtShellChrome::setBottomLeftResizeHandle(QQuickItem *item)
}
/*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::topRightResizeHandle
+ * \qmlproperty Item QtShellChrome::topRightResizeHandle
*
* This property holds the default top-right resize handle of the QtShellChrome. If set, a \l DragHandler
* will be installed on the resize handle which resizes the window by moving its top and right edges
@@ -903,7 +903,7 @@ void QWaylandQtShellChrome::setTopRightResizeHandle(QQuickItem *item)
}
/*!
- * \qmlproperty Item QtWaylandCompositor::QtShellChrome::bottomRightResizeHandle
+ * \qmlproperty Item QtShellChrome::bottomRightResizeHandle
*
* This property holds the default bottom-right resize handle of the QtShellChrome. If set, a \l DragHandler
* will be installed on the resize handle which resizes the window by moving its bottom and right edges
@@ -960,7 +960,7 @@ void QWaylandQtShellChrome::setBottomRightResizeHandle(QQuickItem *item)
}
/*!
- * \qmlproperty rect QtWaylandCompositor::QtShellChrome::maximizedRect
+ * \qmlproperty rect QtShellChrome::maximizedRect
*
* This property holds the are of the WaylandOutput which is available to be filled by the
* window when it is in maximized state. By default, the window will fill the entire geometry
@@ -1161,7 +1161,7 @@ void QWaylandQtShellChrome::updateWindowFlags()
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::windowFlags
+ * \qmlproperty int QtShellChrome::windowFlags
*
* This property holds the window flags of the QtShellChrome. They will match the \c windowFlags
* property of the associated QtShellSurface, except when this is equal to Qt.Window. In this case,
@@ -1175,7 +1175,7 @@ uint QWaylandQtShellChrome::currentWindowFlags() const
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::windowState
+ * \qmlproperty int QtShellChrome::windowState
*
* This property holds the window state of the shell surface. It will be updated immediately when
* the window state is requested on the compositor-side, before this has been acknowledged by the
@@ -1200,7 +1200,7 @@ bool QWaylandQtShellChrome::hasTitleBar() const
}
/*!
- * \qmlproperty bool QtWaylandCompositor::QtShellChrome::hasDecorations
+ * \qmlproperty bool QtShellChrome::hasDecorations
*
* This property is true if the QtShellChrome's decorations should be visible, based on its window
* state and window flags.
@@ -1290,7 +1290,7 @@ void QWaylandQtShellChrome::updateAutomaticPosition()
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::deactivate()
+ * \qmlmethod void QtShellChrome::deactivate()
*
* Manually deactivates this window. If the window was active, this will activate the next window in
* the stack instead.
@@ -1319,7 +1319,7 @@ void QWaylandQtShellChrome::activateOnGrab(QPointingDevice::GrabTransition trans
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::activate()
+ * \qmlmethod void QtShellChrome::activate()
*
* Manually activate this window. This will also raise the window.
*
@@ -1334,7 +1334,7 @@ void QWaylandQtShellChrome::activate()
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::raise()
+ * \qmlmethod void QtShellChrome::raise()
*
* Raise this window, so that it stacks on top of other windows (except if the other window's
* flags prohibit this.)
@@ -1347,7 +1347,7 @@ void QWaylandQtShellChrome::raise()
}
/*!
- * \qmlmethod void QtWaylandCompositor::QtShellChrome::lower()
+ * \qmlmethod void QtShellChrome::lower()
*
* Lower this window, so that it stacks underneath other windows (except if the other window's
* window flags prohibit this.)
@@ -1374,7 +1374,7 @@ void QWaylandQtShellChrome::updateActiveState()
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::frameMarginLeft
+ * \qmlproperty int QtShellChrome::frameMarginLeft
*
* Sets the size of the left margin of the QtShellChrome which is reserved for window decorations.
* By default, this will equal the width of the \l leftResizeHandle if it is set. Otherwise it will
@@ -1405,7 +1405,7 @@ int QWaylandQtShellChrome::frameMarginLeft() const
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::frameMarginRight
+ * \qmlproperty int QtShellChrome::frameMarginRight
*
* Sets the size of the right margin of the QtShellChrome which is reserved for window decorations.
* By default, this will equal the width of the \l rightResizeHandle if it is set. Otherwise it will
@@ -1436,7 +1436,7 @@ int QWaylandQtShellChrome::frameMarginRight() const
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::frameMarginTop
+ * \qmlproperty int QtShellChrome::frameMarginTop
*
* Sets the size of the top margin of the QtShellChrome which is reserved for window decorations.
* By default, this will equal the sum of the \l leftResizeHandle and the \l{titleBar}'s heights,
@@ -1466,7 +1466,7 @@ int QWaylandQtShellChrome::frameMarginTop() const
}
/*!
- * \qmlproperty int QtWaylandCompositor::QtShellChrome::frameMarginBottom
+ * \qmlproperty int QtShellChrome::frameMarginBottom
*
* Sets the size of the bottom margin of the QtShellChrome which is reserved for window decorations.
* By default, this will equal the height of the \l bottomResizeHandle if it is set. Otherwise it will