diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-20 16:22:12 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-24 12:56:48 +0200 |
| commit | 458837ba0978acbbb8905b71ab605ef184cdf85d (patch) | |
| tree | c619087d3c63ebd619426535c95f5de13b101294 | |
| parent | 62a85ae39e6c3191582cf060a226415959b0fd08 (diff) | |
Remove some qBinaryFind usages from the Cocoa helpers
This is done per the mailing list discussion at
http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: I374ee2c88ee18d20fb2b295c936adaca1d696199
Reviewed-by: Gabriel de Dietrich <gabriel.dedietrich@digia.com>
| -rw-r--r-- | src/plugins/platforms/cocoa/qcocoahelpers.mm | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforms/cocoa/qcocoahelpers.mm b/src/plugins/platforms/cocoa/qcocoahelpers.mm index 901efbfb39..197a2058af 100644 --- a/src/plugins/platforms/cocoa/qcocoahelpers.mm +++ b/src/plugins/platforms/cocoa/qcocoahelpers.mm @@ -325,16 +325,16 @@ QChar qt_mac_qtKey2CocoaKey(Qt::Key key) std::sort(rev_entries.begin(), rev_entries.end(), qtKey2CocoaKeySortLessThan); } const QVector<KeyPair>::iterator i - = qBinaryFind(rev_entries.begin(), rev_entries.end(), key); - if (i == rev_entries.end()) + = std::lower_bound(rev_entries.begin(), rev_entries.end(), key); + if ((i == rev_entries.end()) || (key < *i)) return QChar(); return i->cocoaKey; } Qt::Key qt_mac_cocoaKey2QtKey(QChar keyCode) { - const KeyPair *i = qBinaryFind(entries, end, keyCode); - if (i == end) + const KeyPair *i = std::lower_bound(entries, end, keyCode); + if ((i == end) || (keyCode < *i)) return Qt::Key(keyCode.toUpper().unicode()); return i->qtKey; } |