1berry/qtbase
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

QApplication: remove obsolete keypadNavigationEnabled member

Browse Source 
QApplicationPrivate::keypadNavigationEnabled remains, and is
used in many places in QtWidgets.

Change-Id: Id95239560c279850f340f65414acb92202d10367
Reviewed-by: Sona Kurazyan <sona.kurazyan@qt.io>
This commit is contained in:
Volker Hilsheimer 2020-04-08 13:22:48 +02:00
parent 9c551778c8
commit 0f968085b9
2 changed files with 1 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
src/widgets/kernel/qapplication.cpp
View File

@ -1559,7 +1559,7 @@ void QApplicationPrivate::setFocusWidget(QWidget *focus, Qt::FocusReason reason)
//send events //send events
if (prev) { if (prev) {
#ifdef QT_KEYPAD_NAVIGATION #ifdef QT_KEYPAD_NAVIGATION
if (QApplication::keypadNavigationEnabled()) { if (QApplicationPrivate::keyboardNavigationEnabled()) {
if (prev->hasEditFocus() && reason != Qt::PopupFocusReason) if (prev->hasEditFocus() && reason != Qt::PopupFocusReason)
prev->setEditFocus(false); prev->setEditFocus(false);
} }
@ -3684,51 +3684,6 @@ Qt::NavigationMode QApplication::navigationMode()
{ {
return QApplicationPrivate::navigationMode; return QApplicationPrivate::navigationMode;
} }
# if QT_DEPRECATED_SINCE(5, 13)
/*!
Sets whether Qt should use focus navigation suitable for use with a
minimal keypad.
This feature is available in Qt for Embedded Linux, and Windows CE only.
\note On Windows CE this feature is disabled by default for touch device
mkspecs. To enable keypad navigation, build Qt with
QT_KEYPAD_NAVIGATION defined.
\deprecated
\sa setNavigationMode()
*/
void QApplication::setKeypadNavigationEnabled(bool enable)
{
if (enable) {
QApplication::setNavigationMode(Qt::NavigationModeKeypadTabOrder);
} else {
QApplication::setNavigationMode(Qt::NavigationModeNone);
}
}
/*!
Returns \c true if Qt is set to use keypad navigation; otherwise returns
false. The default value is false.
This feature is available in Qt for Embedded Linux, and Windows CE only.
\note On Windows CE this feature is disabled by default for touch device
mkspecs. To enable keypad navigation, build Qt with
QT_KEYPAD_NAVIGATION defined.
\deprecated
\sa navigationMode()
*/
bool QApplication::keypadNavigationEnabled()
{
return QApplicationPrivate::navigationMode == Qt::NavigationModeKeypadTabOrder ||
QApplicationPrivate::navigationMode == Qt::NavigationModeKeypadDirectional;
}
# endif
#endif #endif
/*! /*!

6
src/widgets/kernel/qapplication.h
View File

@ -159,12 +159,6 @@ public:
bool notify(QObject *, QEvent *) override; bool notify(QObject *, QEvent *) override;
#ifdef QT_KEYPAD_NAVIGATION #ifdef QT_KEYPAD_NAVIGATION
# if QT_DEPRECATED_SINCE(5, 13)
static QT_DEPRECATED_X ("Use QApplication::setNavigationMode() instead")
void setKeypadNavigationEnabled(bool);
static QT_DEPRECATED_X ("Use QApplication::navigationMode() instead")
bool keypadNavigationEnabled();
# endif
static void setNavigationMode(Qt::NavigationMode mode); static void setNavigationMode(Qt::NavigationMode mode);
static Qt::NavigationMode navigationMode(); static Qt::NavigationMode navigationMode();
#endif #endif