diff --git a/src/controls/QskBoundedInput.cpp b/src/controls/QskBoundedInput.cpp index 02d88313..4b6e647b 100644 --- a/src/controls/QskBoundedInput.cpp +++ b/src/controls/QskBoundedInput.cpp @@ -182,14 +182,14 @@ void QskBoundedInput::keyPressEvent( QKeyEvent* event ) if ( !isReadOnly() ) { if ( event->key() == Qt::Key_Up || - qskKeyMatches( event, QKeySequence::MoveToNextChar ) ) + qskIsStandardKeyInput( event, QKeySequence::MoveToNextChar ) ) { increment( m_stepSize ); return; } if ( event->key() == Qt::Key_Down || - qskKeyMatches( event, QKeySequence::MoveToPreviousChar ) ) + qskIsStandardKeyInput( event, QKeySequence::MoveToPreviousChar ) ) { increment( -m_stepSize ); return; diff --git a/src/controls/QskEvent.cpp b/src/controls/QskEvent.cpp index 85965d70..e349e619 100644 --- a/src/controls/QskEvent.cpp +++ b/src/controls/QskEvent.cpp @@ -114,7 +114,7 @@ qreal qskWheelIncrement( const QWheelEvent* event ) #endif -bool qskKeyMatches( const QKeyEvent* event, QKeySequence::StandardKey key ) +bool qskIsStandardKeyInput( const QKeyEvent* event, QKeySequence::StandardKey key ) { #if 1 return event->matches( key ); diff --git a/src/controls/QskEvent.h b/src/controls/QskEvent.h index d0db70a3..bd5b8e90 100644 --- a/src/controls/QskEvent.h +++ b/src/controls/QskEvent.h @@ -150,6 +150,6 @@ QSK_EXPORT qreal qskWheelIncrement( const QWheelEvent* ); #endif -QSK_EXPORT bool qskKeyMatches( const QKeyEvent*, QKeySequence::StandardKey ); +QSK_EXPORT bool qskIsStandardKeyInput( const QKeyEvent*, QKeySequence::StandardKey ); #endif diff --git a/src/controls/QskPageIndicator.cpp b/src/controls/QskPageIndicator.cpp index 750b5cb2..50ff5b82 100644 --- a/src/controls/QskPageIndicator.cpp +++ b/src/controls/QskPageIndicator.cpp @@ -15,10 +15,10 @@ QSK_SYSTEM_STATE( QskPageIndicator, Selected, QskAspect::FirstSystemState << 1 ) static int qskKeyIncrement( const QskPageIndicator* indicator, const QKeyEvent* event ) { - if ( qskKeyMatches( event, QKeySequence::MoveToNextChar ) ) + if ( qskIsStandardKeyInput( event, QKeySequence::MoveToNextChar ) ) return 1; - if ( qskKeyMatches( event, QKeySequence::MoveToPreviousChar ) ) + if ( qskIsStandardKeyInput( event, QKeySequence::MoveToPreviousChar ) ) return -1; const auto key = event->key(); diff --git a/src/dialogs/QskDialogSubWindow.cpp b/src/dialogs/QskDialogSubWindow.cpp index 23c86e00..20c690e5 100644 --- a/src/dialogs/QskDialogSubWindow.cpp +++ b/src/dialogs/QskDialogSubWindow.cpp @@ -281,7 +281,7 @@ void QskDialogSubWindow::keyPressEvent( QKeyEvent* event ) button->click(); } - if ( qskKeyMatches( event, QKeySequence::Cancel ) ) + if ( qskIsStandardKeyInput( event, QKeySequence::Cancel ) ) { // using shortcuts instead ??? diff --git a/src/dialogs/QskDialogWindow.cpp b/src/dialogs/QskDialogWindow.cpp index 5a726192..29a5e714 100644 --- a/src/dialogs/QskDialogWindow.cpp +++ b/src/dialogs/QskDialogWindow.cpp @@ -249,7 +249,7 @@ void QskDialogWindow::keyPressEvent( QKeyEvent* event ) button->click(); } - if ( qskKeyMatches( event, QKeySequence::Cancel ) ) + if ( qskIsStandardKeyInput( event, QKeySequence::Cancel ) ) { // using shortcuts instead ???