diff options
| author | Giuseppe D'Angelo <giuseppe.dangelo@kdab.com> | 2013-09-03 00:50:16 +0200 |
|---|---|---|
| committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-06 09:12:36 +0200 |
| commit | 6c88be2af28f979cda6bb8024a49af435e3ca3eb (patch) | |
| tree | c169c4700c717abca8150ed061b93b2207a19fb1 /src/plugins/platforms/xcb/qxcbconnection.cpp | |
| parent | fdbabc4f03244322089d064c5e24aadedc8ecf11 (diff) | |
Remove qFind usages from the XCB plugin
QtAlgorithms is getting deprecated,
see http://www.mail-archive.com/development@qt-project.org/msg01603.html
Change-Id: Ieccef12c617276d0526ce2876fd76e37b4240a43
Reviewed-by: Gunnar Sletta <gunnar.sletta@digia.com>
Diffstat (limited to 'src/plugins/platforms/xcb/qxcbconnection.cpp')
| -rw-r--r-- | src/plugins/platforms/xcb/qxcbconnection.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/plugins/platforms/xcb/qxcbconnection.cpp b/src/plugins/platforms/xcb/qxcbconnection.cpp index 39750c1462..ff5b36c448 100644 --- a/src/plugins/platforms/xcb/qxcbconnection.cpp +++ b/src/plugins/platforms/xcb/qxcbconnection.cpp @@ -53,12 +53,13 @@ #include "qxcbintegration.h" #include "qxcbsystemtraytracker.h" -#include <QtAlgorithms> #include <QSocketNotifier> #include <QAbstractEventDispatcher> #include <QTimer> #include <QByteArray> +#include <algorithm> + #include <dlfcn.h> #include <stdio.h> #include <errno.h> @@ -1421,7 +1422,7 @@ static const char * xcb_atomnames = { QXcbAtom::Atom QXcbConnection::qatom(xcb_atom_t xatom) const { - return static_cast<QXcbAtom::Atom>(qFind(m_allAtoms, m_allAtoms + QXcbAtom::NAtoms, xatom) - m_allAtoms); + return static_cast<QXcbAtom::Atom>(std::find(m_allAtoms, m_allAtoms + QXcbAtom::NAtoms, xatom) - m_allAtoms); } void QXcbConnection::initializeAllAtoms() { |