diff options
| author | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-28 03:18:35 +0000 |
|---|---|---|
| committer | tpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da> | 2011-02-28 03:18:35 +0000 |
| commit | 746a2c4f876cd0c3c4307a0c3cf5f7131802a16c (patch) | |
| tree | d818fd44860e24a163b4d6c0be3e6c976b5a79ce /mcop | |
| parent | 342e55467d1ec4e8bf8783396183c227efd92957 (diff) | |
| download | arts-746a2c4f876cd0c3c4307a0c3cf5f7131802a16c.tar.gz arts-746a2c4f876cd0c3c4307a0c3cf5f7131802a16c.zip | |
Fix Qt namespace conflicts in arts
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/dependencies/arts@1222998 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'mcop')
| -rw-r--r-- | mcop/object.cc | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/mcop/object.cc b/mcop/object.cc index de6342e..5153f0f 100644 --- a/mcop/object.cc +++ b/mcop/object.cc @@ -188,9 +188,9 @@ bool Object_skel::_initAttribute(const AttributeDef& attribute) void Object_skel::_defaultNotify(const Notification& notification) { list<AttributeSlotBind *>::iterator i; - list<AttributeSlotBind *>& slots = _internalData->attributeSlots; + list<AttributeSlotBind *>& myslots = _internalData->attributeSlots; - for(i = slots.begin(); i != slots.end(); i++) + for(i = myslots.begin(); i != myslots.end(); i++) { if((*i)->notifyID() == notification.ID) { @@ -258,9 +258,9 @@ void Object_skel::notify(const Notification& notification) void Object_skel::_emit_changed(const char *attrib, const AnyConstRef& value) { list<AttributeSlotBind *>::iterator i; - list<AttributeSlotBind *>& slots = _internalData->attributeSlots; + list<AttributeSlotBind *>& myslots = _internalData->attributeSlots; - for(i = slots.begin(); i != slots.end(); i++) + for(i = myslots.begin(); i != myslots.end(); i++) { if((*i)->method == attrib) { |