From 4bbdfaa8ff5b6087b3edf4676ea87a4c0af3f700 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Fri, 4 Sep 2015 16:20:54 +0200 Subject: Fix some qdoc warnings. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit qtbase/src/corelib/io/qdebug.cpp:698: warning: Class QDebugStateSaver has no \inmodule command; using project name by default: QtCore qtbase/src/gui/opengl/qopenglframebufferobject.cpp:1138: warning: Can't link to 'takeTextures()' qtbase/src/gui/opengl/qopenglframebufferobject.cpp:1159: warning: Can't link to 'takeTextures()' qtbase/src/gui/opengl/qopenglframebufferobject.cpp:953: warning: No such parameter 'height' in QOpenGLFramebufferObject::addColorAttachment() qtbase/src/gui/opengl/qopenglframebufferobject.cpp:953: warning: No such parameter 'width' in QOpenGLFramebufferObject::addColorAttachment() qtbase/src/gui/opengl/qopenglframebufferobject.cpp:953: warning: Undocumented parameter 'size' in QOpenGLFramebufferObject::addColorAttachment() qtbase/src/gui/painting/qpaintdevice.qdoc:80: warning: Undocumented enum item 'PdmDevicePixelRatioScaled' in QPaintDevice::PaintDeviceMetric qtbase/src/testlib/qbenchmarkmetric.cpp:154: warning: Invalid use of '\relates' (already a member of 'QTest') qtbase/src/testlib/qbenchmarkmetric.cpp:81: warning: Invalid use of '\relates' (already a member of 'QTest') qtbase/src/widgets/dialogs/qdialog.cpp:152: warning: Can't link to 'QCloseEvent::ignore()' qtbase/src/widgets/dialogs/qdialog.cpp:557: warning: Can't link to 'QApplication::quit()' qtbase/src/widgets/kernel/qwidget.cpp:8326: warning: Can't link to 'QCloseEvent::accept()' qtbase/src/widgets/kernel/qwidget.cpp:8326: warning: Can't link to 'QCloseEvent::ignore()' qtbase/src/widgets/kernel/qwidget.cpp:9300: warning: Can't link to 'QWheelEvent::accept()' qtbase/src/widgets/kernel/qwidget.cpp:9300: warning: Can't link to 'QWheelEvent::ignore()' qtbase/src/widgets/kernel/qwidget.cpp:9321: warning: Can't link to 'QTabletEvent::accept()' qtbase/src/widgets/kernel/qwidget.cpp:9321: warning: Can't link to 'QTabletEvent::ignore()' qtbase/src/widgets/kernel/qwidget.cpp:9373: warning: Can't link to 'QKeyEvent::ignore()' Change-Id: I97ae85398181645c1054c303e5c8a87deb619409 Reviewed-by: Martin Smith Reviewed-by: Topi Reiniö --- src/widgets/dialogs/qdialog.cpp | 4 ++-- src/widgets/kernel/qwidget.cpp | 14 +++++++------- src/widgets/widgets/qmenubar.cpp | 2 +- 3 files changed, 10 insertions(+), 10 deletions(-) (limited to 'src/widgets') diff --git a/src/widgets/dialogs/qdialog.cpp b/src/widgets/dialogs/qdialog.cpp index 054c220b84..d04241fee0 100644 --- a/src/widgets/dialogs/qdialog.cpp +++ b/src/widgets/dialogs/qdialog.cpp @@ -243,7 +243,7 @@ void QDialogPrivate::deletePlatformHelper() \section1 Escape Key If the user presses the Esc key in a dialog, QDialog::reject() - will be called. This will cause the window to close: The \l{QCloseEvent}{close event} cannot be \l{QCloseEvent::ignore()}{ignored}. + will be called. This will cause the window to close: The \l{QCloseEvent}{close event} cannot be \l{QEvent::ignore()}{ignored}. \section1 Extensibility @@ -565,7 +565,7 @@ int QDialog::exec() last window closed, the QApplication::lastWindowClosed() signal is emitted. - \sa accept(), reject(), QApplication::activeWindow(), QApplication::quit() + \sa accept(), reject(), QApplication::activeWindow(), QCoreApplication::quit() */ void QDialog::done(int r) diff --git a/src/widgets/kernel/qwidget.cpp b/src/widgets/kernel/qwidget.cpp index 32c52ade56..b9628cfa1e 100644 --- a/src/widgets/kernel/qwidget.cpp +++ b/src/widgets/kernel/qwidget.cpp @@ -8328,8 +8328,8 @@ bool QWidgetPrivate::close_helper(CloseMode mode) otherwise returns \c false. First it sends the widget a QCloseEvent. The widget is - \l{hide()}{hidden} if it \l{QCloseEvent::accept()}{accepts} - the close event. If it \l{QCloseEvent::ignore()}{ignores} + \l{hide()}{hidden} if it \l{QEvent::accept()}{accepts} + the close event. If it \l{QEvent::ignore()}{ignores} the event, nothing happens. The default implementation of QWidget::closeEvent() accepts the close event. @@ -9302,12 +9302,12 @@ void QWidget::mouseDoubleClickEvent(QMouseEvent *event) subclass to receive wheel events for the widget. If you reimplement this handler, it is very important that you - \l{QWheelEvent}{ignore()} the event if you do not handle + \l{QEvent}{ignore()} the event if you do not handle it, so that the widget's parent can interpret it. The default implementation ignores the event. - \sa QWheelEvent::ignore(), QWheelEvent::accept(), event(), + \sa QEvent::ignore(), QEvent::accept(), event(), QWheelEvent */ @@ -9323,12 +9323,12 @@ void QWidget::wheelEvent(QWheelEvent *event) subclass to receive tablet events for the widget. If you reimplement this handler, it is very important that you - \l{QTabletEvent}{ignore()} the event if you do not handle + \l{QEvent}{ignore()} the event if you do not handle it, so that the widget's parent can interpret it. The default implementation ignores the event. - \sa QTabletEvent::ignore(), QTabletEvent::accept(), event(), + \sa QEvent::ignore(), QEvent::accept(), event(), QTabletEvent */ @@ -9388,7 +9388,7 @@ void QWidget::keyPressEvent(QKeyEvent *event) need to call QKeyEvent::accept() - just do not call the base class implementation if you act upon the key. - \sa keyPressEvent(), QKeyEvent::ignore(), setFocusPolicy(), + \sa keyPressEvent(), QEvent::ignore(), setFocusPolicy(), focusInEvent(), focusOutEvent(), event(), QKeyEvent */ diff --git a/src/widgets/widgets/qmenubar.cpp b/src/widgets/widgets/qmenubar.cpp index 91775e3862..d382131075 100644 --- a/src/widgets/widgets/qmenubar.cpp +++ b/src/widgets/widgets/qmenubar.cpp @@ -638,7 +638,7 @@ void QMenuBar::initStyleOption(QStyleOptionMenuItem *option, const QAction *acti \row \li quit or exit \li Application Menu | Quit \li If this entry is not found a default Quit item will be - created to call QApplication::quit() + created to call QCoreApplication::quit() \endtable You can override this behavior by using the QAction::menuRole() -- cgit v1.2.3