diff options
author | Sergio Ahumada <sergio.ahumada@digia.com> | 2013-09-21 01:30:43 +0200 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2013-09-21 02:59:14 +0200 |
commit | 642ebccaad1656420fc5a9b37c04bec02ec079b4 (patch) | |
tree | eaabf10380ca37ecb8899bd1e146153c642b223e /src/dbus/qdbusconnection_p.h | |
parent | 129a8ce3898091c7a6a84b9b0b68fa32b7ce61bd (diff) | |
parent | 8c6755aeec312ae771ef334fc863642514db3f7c (diff) |
Merge "Merge remote-tracking branch 'origin/stable' into dev" into refs/staging/dev
Diffstat (limited to 'src/dbus/qdbusconnection_p.h')
-rw-r--r-- | src/dbus/qdbusconnection_p.h | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/src/dbus/qdbusconnection_p.h b/src/dbus/qdbusconnection_p.h index 013896bd32..515eab6dfe 100644 --- a/src/dbus/qdbusconnection_p.h +++ b/src/dbus/qdbusconnection_p.h @@ -140,16 +140,24 @@ public: { typedef QVector<ObjectTreeNode> DataList; - inline ObjectTreeNode() : obj(0), flags(0), activeChildren(0) { } + inline ObjectTreeNode() : obj(0), flags(0) { } inline ObjectTreeNode(const QString &n) // intentionally implicit - : name(n), obj(0), flags(0), activeChildren(0) { } + : name(n), obj(0), flags(0) { } inline ~ObjectTreeNode() { } inline bool operator<(const QString &other) const { return name < other; } inline bool operator<(const QStringRef &other) const { return QStringRef(&name) < other; } +#if defined(Q_CC_MSVC) && _MSC_VER < 1600 + inline bool operator<(const ObjectTreeNode &other) const + { return name < other.name; } + friend inline bool operator<(const QString &str, const ObjectTreeNode &obj) + { return str < obj.name; } + friend inline bool operator<(const QStringRef &str, const ObjectTreeNode &obj) + { return str < QStringRef(&obj.name); } +#endif inline bool isActive() const - { return obj || activeChildren; } + { return obj || !children.isEmpty(); } QString name; union { @@ -157,7 +165,6 @@ public: QDBusVirtualObject *treeNode; }; int flags; - int activeChildren; DataList children; }; |