From 69cac65817d949cda2672ec4f0aa73d5e66a0ba1 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 22 Jun 2011 00:30:31 +0000 Subject: 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 --- .../jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h') diff --git a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h index b302b339..0192984e 100644 --- a/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h +++ b/kopete/protocols/jabber/jingle/libjingle/talk/third_party/mediastreamer/msMUlawenc.h @@ -42,7 +42,7 @@ typedef struct _MSMULAWEncoderClass { /* the MSMULAWEncoder derivates from MSFilter, so the MSFilter class MUST be the first of the MSMULAWEncoder class in order to the class mechanism to work*/ - MSFilterClass parent_class; + MSFilterClass tqparent_class; } MSMULAWEncoderClass; /* PUBLIC */ -- cgit v1.2.3