TQt4 port kdenetwork

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdenetwork@1237912 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 9 insertions, 9 deletions

diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h
index 054440d1..66e80902 100644
--- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h
+++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msqdispatcher.h
@@ -19,36 +19,36 @@
 */
 
 
-#ifndef MSQDISPATCHER_H
-#define MSQDISPATCHER_H
+#ifndef MSTQDISPATCHER_H
+#define MSTQDISPATCHER_H
 
 #include "msfilter.h"
 
 
 /*this is the class that implements a qdispatcher filter*/
 
-#define MS_QDISPATCHER_MAX_INPUTS  1
-#define MS_QDISPATCHER_MAX_OUTPUTS 5 
+#define MS_TQDISPATCHER_MAX_INPUTS  1
+#define MS_TQDISPATCHER_MAX_OUTPUTS 5 
 
 typedef struct _MSQdispatcher
 {
     /* the MSQdispatcher derivates from MSFilter, so the MSFilter object MUST be the first of the MSQdispatcher object
        in order to the object mechanism to work*/
     MSFilter filter;
-	MSQueue *q_inputs[MS_QDISPATCHER_MAX_INPUTS];
-	MSQueue *q_outputs[MS_QDISPATCHER_MAX_OUTPUTS];
+	MSQueue *q_inputs[MS_TQDISPATCHER_MAX_INPUTS];
+	MSQueue *q_outputs[MS_TQDISPATCHER_MAX_OUTPUTS];
 } MSQdispatcher;
 
 typedef struct _MSQdispatcherClass
 {
 	/* the MSQdispatcher derivates from MSFilter, so the MSFilter class MUST be the first of the MSQdispatcher class
        in order to the class mechanism to work*/
-	MSFilterClass parent_class;
+	MSFilterClass tqparent_class;
 } MSQdispatcherClass;
 
 /* PUBLIC */
-#define MS_QDISPATCHER(filter) ((MSQdispatcher*)(filter))
-#define MS_QDISPATCHER_CLASS(klass) ((MSQdispatcherClass*)(klass))
+#define MS_TQDISPATCHER(filter) ((MSQdispatcher*)(filter))
+#define MS_TQDISPATCHER_CLASS(klass) ((MSQdispatcherClass*)(klass))
 MSFilter * ms_qdispatcher_new(void);
 
 /* FOR INTERNAL USE*/