diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2010-06-09 22:05:07 (GMT) |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2010-06-09 22:08:34 (GMT) |
| commit | 1abf2d6dfafc71f73746b7e69e11e0c8152edb4a (patch) | |
| tree | e6aa5b8a0654c53efd8f9ca87b91a7cd508fdf41 /src/gui/kernel | |
| parent | da603c7c80ea14df18790ae77f5de82880307650 (diff) | |
| download | Qt-1abf2d6dfafc71f73746b7e69e11e0c8152edb4a.zip Qt-1abf2d6dfafc71f73746b7e69e11e0c8152edb4a.tar.gz Qt-1abf2d6dfafc71f73746b7e69e11e0c8152edb4a.tar.bz2 | |
Rename QLocale::isWrittenRightToLeft() to textDirection()
This is more in line with the rest of Qt.
Reviewed-by: Simon Hausmann
Diffstat (limited to 'src/gui/kernel')
| -rw-r--r-- | src/gui/kernel/qkeymapper_mac.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qkeymapper_qws.cpp | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qkeymapper_x11.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/kernel/qkeymapper_mac.cpp b/src/gui/kernel/qkeymapper_mac.cpp index 885f5ba..873b8f9 100644 --- a/src/gui/kernel/qkeymapper_mac.cpp +++ b/src/gui/kernel/qkeymapper_mac.cpp @@ -672,7 +672,7 @@ QKeyMapperPrivate::updateKeyboard() #endif if (iso639Code) { keyboardInputLocale = QLocale(QCFString::toQString(iso639Code)); - keyboardInputDirection = keyboardInputLocale.isWrittenRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight; + keyboardInputDirection = keyboardInputLocale.textDirection(); } else { keyboardInputLocale = QLocale::c(); keyboardInputDirection = Qt::LeftToRight; diff --git a/src/gui/kernel/qkeymapper_qws.cpp b/src/gui/kernel/qkeymapper_qws.cpp index 0e9f35a..63bb46b 100644 --- a/src/gui/kernel/qkeymapper_qws.cpp +++ b/src/gui/kernel/qkeymapper_qws.cpp @@ -52,7 +52,7 @@ QT_USE_NAMESPACE QKeyMapperPrivate::QKeyMapperPrivate() { keyboardInputLocale = QLocale::system(); - keyboardInputDirection = keyboardInputLocale.isWrittenRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight; + keyboardInputDirection = keyboardInputLocale.textDirection(); } QKeyMapperPrivate::~QKeyMapperPrivate() diff --git a/src/gui/kernel/qkeymapper_x11.cpp b/src/gui/kernel/qkeymapper_x11.cpp index f0d548c..825edbc 100644 --- a/src/gui/kernel/qkeymapper_x11.cpp +++ b/src/gui/kernel/qkeymapper_x11.cpp @@ -517,7 +517,7 @@ void QKeyMapperPrivate::clearMappings() // qWarning("Qt: unable to determine keyboard layout, please talk to qt-bugs@trolltech.com"); ? keyboardInputLocale = q_getKeyboardLocale(layoutName, variantName); - keyboardInputDirection = keyboardInputLocale.isWrittenRightToLeft() ? Qt::RightToLeft : Qt::LeftToRight; + keyboardInputDirection = keyboardInputLocale.textDirection(); #if 0 qDebug() << "keyboard input locale =" |