From 828986de2eb867320d827dfa44705b680fce0a2b Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Thu, 24 Mar 2022 17:10:11 +0100 Subject: [PATCH] bad return statements fixed --- src/controls/QskListView.cpp | 6 ++++-- src/controls/QskMenu.cpp | 4 ++-- src/controls/QskPageIndicator.cpp | 4 ++-- src/controls/QskTextInput.cpp | 6 +++--- 4 files changed, 11 insertions(+), 9 deletions(-) diff --git a/src/controls/QskListView.cpp b/src/controls/QskListView.cpp index 331f8f8b..8495cdd3 100644 --- a/src/controls/QskListView.cpp +++ b/src/controls/QskListView.cpp @@ -196,11 +196,13 @@ void QskListView::keyPressEvent( QKeyEvent* event ) case Qt::Key_PageDown: { // TODO ... - return Inherited::keyPressEvent( event ); + Inherited::keyPressEvent( event ); + return; } default: { - return Inherited::keyPressEvent( event ); + Inherited::keyPressEvent( event ); + return; } } diff --git a/src/controls/QskMenu.cpp b/src/controls/QskMenu.cpp index 06168bfc..0cff4321 100644 --- a/src/controls/QskMenu.cpp +++ b/src/controls/QskMenu.cpp @@ -308,7 +308,7 @@ void QskMenu::mousePressEvent( QMouseEvent* event ) return; } - return Inherited::mousePressEvent( event ); + Inherited::mousePressEvent( event ); } void QskMenu::mouseReleaseEvent( QMouseEvent* event ) @@ -327,7 +327,7 @@ void QskMenu::mouseReleaseEvent( QMouseEvent* event ) return; } - return Inherited::mouseReleaseEvent( event ); + Inherited::mouseReleaseEvent( event ); } void QskMenu::aboutToShow() diff --git a/src/controls/QskPageIndicator.cpp b/src/controls/QskPageIndicator.cpp index 0b7f89f0..9316d9a2 100644 --- a/src/controls/QskPageIndicator.cpp +++ b/src/controls/QskPageIndicator.cpp @@ -184,7 +184,7 @@ void QskPageIndicator::mousePressEvent( QMouseEvent* event ) return; } - return Inherited::mousePressEvent( event ); + Inherited::mousePressEvent( event ); } void QskPageIndicator::mouseUngrabEvent() @@ -209,7 +209,7 @@ void QskPageIndicator::mouseReleaseEvent( QMouseEvent* event ) return; } - return Inherited::mouseReleaseEvent( event ); + Inherited::mouseReleaseEvent( event ); } void QskPageIndicator::keyPressEvent( QKeyEvent* event ) diff --git a/src/controls/QskTextInput.cpp b/src/controls/QskTextInput.cpp index d355638a..800b6de4 100644 --- a/src/controls/QskTextInput.cpp +++ b/src/controls/QskTextInput.cpp @@ -756,12 +756,12 @@ int QskTextInput::passwordMaskDelay() const void QskTextInput::setPasswordMaskDelay( int ms ) { - return m_data->textInput->setPasswordMaskDelay( ms ); + m_data->textInput->setPasswordMaskDelay( ms ); } void QskTextInput::resetPasswordMaskDelay() { - return m_data->textInput->resetPasswordMaskDelay(); + m_data->textInput->resetPasswordMaskDelay(); } QString QskTextInput::displayText() const @@ -771,7 +771,7 @@ QString QskTextInput::displayText() const QString QskTextInput::preeditText() const { - auto d = QQuickTextInputPrivate::get( m_data->textInput ); + const auto d = QQuickTextInputPrivate::get( m_data->textInput ); return d->m_textLayout.preeditAreaText(); }