diff options
| author | Thiago Macieira <thiago.macieira@intel.com> | 2012-05-24 16:45:11 +0200 |
|---|---|---|
| committer | Qt by Nokia <qt-info@nokia.com> | 2012-05-29 11:35:21 +0200 |
| commit | fad1fa65ed2a76539a229acaa83299875ce8b4c1 (patch) | |
| tree | a8c966de6a2fe291b6dc32b01b1b4a1330da683b /src/dbus/qdbusconnection.cpp | |
| parent | 395f7579c004927f3ac3ac8a5e28817634bfc881 (diff) | |
QtDBus: compile with QT_STRICT_ITERATORS
Unlike most other modules, QtDBus in its use of QVector also needs to
check if the item isn't null, which makes for some special changes.
Change-Id: Ia22ad2a6b26c9c34dc09ab882d81323a941d166a
Reviewed-by: Stephen Kelly <stephen.kelly@kdab.com>
Diffstat (limited to 'src/dbus/qdbusconnection.cpp')
| -rw-r--r-- | src/dbus/qdbusconnection.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/dbus/qdbusconnection.cpp b/src/dbus/qdbusconnection.cpp index 08a840c5c9..8afe714501 100644 --- a/src/dbus/qdbusconnection.cpp +++ b/src/dbus/qdbusconnection.cpp @@ -789,7 +789,7 @@ bool QDBusConnection::registerObject(const QString &path, QObject *object, Regis QDBusWriteLocker locker(RegisterObjectAction, d); // lower-bound search for where this object should enter in the tree - QDBusConnectionPrivate::ObjectTreeNode *node = &d->rootNode; + QDBusConnectionPrivate::ObjectTreeNode::DataList::Iterator node = &d->rootNode; int i = 1; while (node) { if (pathComponents.count() == i) { |