From 746a2c4f876cd0c3c4307a0c3cf5f7131802a16c Mon Sep 17 00:00:00 2001 From: tpearson Date: Mon, 28 Feb 2011 03:18:35 +0000 Subject: 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 --- mcop/object.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'mcop') 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::iterator i; - list& slots = _internalData->attributeSlots; + list& 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::iterator i; - list& slots = _internalData->attributeSlots; + list& myslots = _internalData->attributeSlots; - for(i = slots.begin(); i != slots.end(); i++) + for(i = myslots.begin(); i != myslots.end(); i++) { if((*i)->method == attrib) { -- cgit v1.2.1