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
v3.5.13-sru
tpearson 14 years ago
parent 342e55467d
commit 746a2c4f87

@ -188,9 +188,9 @@ bool Object_skel::_initAttribute(const AttributeDef& attribute)
void Object_skel::_defaultNotify(const Notification& notification) void Object_skel::_defaultNotify(const Notification& notification)
{ {
list<AttributeSlotBind *>::iterator i; 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) 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) void Object_skel::_emit_changed(const char *attrib, const AnyConstRef& value)
{ {
list<AttributeSlotBind *>::iterator i; 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) if((*i)->method == attrib)
{ {

@ -6,7 +6,7 @@ bin_PROGRAMS = mcopidl
mcopidl_SOURCES = mcopidl.cc yacc.cc scanner.cc namespace.cc mcopidl_SOURCES = mcopidl.cc yacc.cc scanner.cc namespace.cc
mcopidl_LDFLAGS = $(all_libraries) mcopidl_LDFLAGS = $(all_libraries)
mcopidl_LDADD = ../mcop/libmcop.la $(LIBPTHREAD) mcopidl_LDADD = ../mcop/libmcop.la $(LIBPTHREAD) $(LIB_QT)
noinst_HEADERS = yacc.cc.h noinst_HEADERS = yacc.cc.h
mcopidl.o: $(top_srcdir)/mcop/common.h mcopidl.o: $(top_srcdir)/mcop/common.h

@ -53,23 +53,23 @@ libartsgslplayobject_la_COMPILE_FIRST = soundserver.h ../flow/artsflow.h
bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec bin_PROGRAMS = artsd artsplay artscat artswrapper artsshell artsrec
artsd_LDADD = libsoundserver_idl.la $(FLOWLIBS) \ artsd_LDADD = libsoundserver_idl.la $(LIB_QT) $(FLOWLIBS) \
$(top_builddir)/mcop_mt/libmcop_mt.la $(top_builddir)/mcop_mt/libmcop_mt.la
artsd_LDFLAGS = $(USE_THREADS) artsd_LDFLAGS = $(USE_THREADS)
artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc crashhandler.cc soundserverstartup_impl.cc artsd_SOURCES = soundserverv2_impl.cc soundserver_impl.cc simplesoundserver_impl.cc artsd.cc cpuusage.cc samplestorage_impl.cc crashhandler.cc soundserverstartup_impl.cc
artsd_COMPILE_FIRST = soundserver.h artsversion.h artsd_COMPILE_FIRST = soundserver.h artsversion.h
artscat_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(LIBPTHREAD) artscat_LDADD = libsoundserver_idl.la $(LIB_QT) $(FLOWLIBS) $(LIBPTHREAD)
artscat_LDFLAGS = $(USE_THREADS) artscat_LDFLAGS = $(USE_THREADS)
artscat_SOURCES = artscat.cc artscat_SOURCES = artscat.cc
artscat_COMPILE_FIRST = soundserver.h artsversion.h artscat_COMPILE_FIRST = soundserver.h artsversion.h
artsrec_LDADD = libsoundserver_idl.la $(FLOWLIBS) $(LIBPTHREAD) artsrec_LDADD = libsoundserver_idl.la $(LIB_QT) $(FLOWLIBS) $(LIBPTHREAD)
artsrec_LDFLAGS = $(USE_THREADS) artsrec_LDFLAGS = $(USE_THREADS)
artsrec_SOURCES = artsrec.cc artsrec_SOURCES = artsrec.cc
artsrec_COMPILE_FIRST = soundserver.h artsversion.h artsrec_COMPILE_FIRST = soundserver.h artsversion.h
artsplay_LDADD = libsoundserver_idl.la $(LIBPTHREAD) artsplay_LDADD = libsoundserver_idl.la $(LIB_QT) $(LIBPTHREAD)
artsplay_LDFLAGS = $(USE_THREADS) artsplay_LDFLAGS = $(USE_THREADS)
artsplay_SOURCES = artsplay.cc artsplay_SOURCES = artsplay.cc
artsplay_COMPILE_FIRST = soundserver.h artsversion.h artsplay_COMPILE_FIRST = soundserver.h artsversion.h
@ -80,7 +80,7 @@ artswrapper_INCLUDES = -I$(top_builddir) -DEXECUTE=\"$(artsdpath)\"
artswrapper_LDADD = $(LIBPOSIX4) artswrapper_LDADD = $(LIBPOSIX4)
artswrapper_LDFLAGS = $(KDE_USE_PIE) artswrapper_LDFLAGS = $(KDE_USE_PIE)
artsshell_LDADD = libsoundserver_idl.la $(LIBPTHREAD) artsshell_LDADD = libsoundserver_idl.la $(LIB_QT) $(LIBPTHREAD)
artsshell_LDFLAGS = $(USE_THREADS) artsshell_LDFLAGS = $(USE_THREADS)
artsshell_SOURCES = artsshell.cc tradercheck.cc artsshell_SOURCES = artsshell.cc tradercheck.cc
artsshell_COMPILE_FIRST = soundserver.h artsversion.h ../flow/artsflow.h artsshell_COMPILE_FIRST = soundserver.h artsversion.h ../flow/artsflow.h

Loading…
Cancel
Save