summaryrefslogtreecommitdiffstats
path: root/src/dbus/qdbusconnection.cpp
diff options
context:
space:
mode:
authorGiuseppe D'Angelo <giuseppe.dangelo@kdab.com>2012-09-18 22:41:59 +0100
committerThe Qt Project <gerrit-noreply@qt-project.org>2012-09-19 16:12:30 +0200
commit1e37d854f71a965ae34c41b7f437683db5e4b6fb (patch)
tree6cea974ef251d4d584ec5487bcca4c83b5080d18 /src/dbus/qdbusconnection.cpp
parent21d344524355af7baf9f140bd05d3b5e6bdd154d (diff)
Remove qLowerBound usages from qtbase
Replace them with std::lower_bound; this allows for deprecation of qLowerBound. Change-Id: I536e7338eb85ea6c7c1a5bf23121292767927e0b Reviewed-by: Marc Mutz <marc.mutz@kdab.com> Reviewed-by: Robin Burchell <robin+qt@viroteck.net>
Diffstat (limited to 'src/dbus/qdbusconnection.cpp')
-rw-r--r--src/dbus/qdbusconnection.cpp8
1 files changed, 5 insertions, 3 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp
index 8afe714501..cd867c2f3a 100644
--- a/src/dbus/qdbusconnection.cpp
+++ b/src/dbus/qdbusconnection.cpp
@@ -56,6 +56,8 @@
#include "qdbusthreaddebug_p.h"
+#include <algorithm>
+
#ifndef QT_NO_DBUS
QT_BEGIN_NAMESPACE
@@ -829,7 +831,7 @@ bool QDBusConnection::registerObject(const QString &path, QObject *object, Regis
// find the position where we'd insert the node
QDBusConnectionPrivate::ObjectTreeNode::DataList::Iterator it =
- qLowerBound(node->children.begin(), node->children.end(), pathComponents.at(i));
+ std::lower_bound(node->children.begin(), node->children.end(), pathComponents.at(i));
if (it != node->children.end() && it->name == pathComponents.at(i)) {
// match: this node exists
node = it;
@@ -902,7 +904,7 @@ void QDBusConnection::unregisterObject(const QString &path, UnregisterMode mode)
}
QDBusConnectionPrivate::ObjectTreeNode::DataList::Iterator it =
- qLowerBound(node->children.begin(), node->children.end(), pathComponents.at(i));
+ std::lower_bound(node->children.begin(), node->children.end(), pathComponents.at(i));
if (it == node->children.end() || it->name != pathComponents.at(i))
break; // node not found
@@ -938,7 +940,7 @@ QObject *QDBusConnection::objectRegisteredAt(const QString &path) const
return node->obj;
QDBusConnectionPrivate::ObjectTreeNode::DataList::ConstIterator it =
- qLowerBound(node->children.constBegin(), node->children.constEnd(), pathComponents.at(i));
+ std::lower_bound(node->children.constBegin(), node->children.constEnd(), pathComponents.at(i));
if (it == node->children.constEnd() || it->name != pathComponents.at(i))
break; // node not found