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

9 files changed, 32 insertions, 28 deletions

diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.cpp b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
index 9dffde7f..d8daa817 100644
--- a/kopete/plugins/netmeeting/netmeetingguiclient.cpp
+++ b/kopete/plugins/netmeeting/netmeetingguiclient.cpp
@@ -32,11 +32,11 @@
 
 class NetMeetingPlugin;
 
-NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *parent,  const char *name )
-: TQObject( parent, name ) , KXMLGUIClient(parent)
+NetMeetingGUIClient::NetMeetingGUIClient( MSNChatSession *tqparent,  const char *name )
+: TQObject( tqparent, name ) , KXMLGUIClient(tqparent)
 {
 	setInstance(KGenericFactory<NetMeetingPlugin>::instance());
-	m_manager=parent;
+	m_manager=tqparent;
 
 	new KAction( i18n( "Invite to Use NetMeeting" ), 0, this, TQT_SLOT( slotStartInvitation() ), actionCollection() , "netmeeting" ) ;
 
diff --git a/kopete/plugins/netmeeting/netmeetingguiclient.h b/kopete/plugins/netmeeting/netmeetingguiclient.h
index c847a5cd..5c337431 100644
--- a/kopete/plugins/netmeeting/netmeetingguiclient.h
+++ b/kopete/plugins/netmeeting/netmeetingguiclient.h
@@ -34,9 +34,10 @@ class NetMeetingPlugin;
 class NetMeetingGUIClient : public TQObject , public KXMLGUIClient
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	NetMeetingGUIClient( MSNChatSession *parent, const char *name=0L);
+	NetMeetingGUIClient( MSNChatSession *tqparent, const char *name=0L);
 	~NetMeetingGUIClient();
 
 private slots:
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.cpp b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
index 5fb799c1..73e08d4a 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.cpp
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.cpp
@@ -32,8 +32,8 @@
 #include <tqtimer.h>
 #include <kprocess.h>
 
-NetMeetingInvitation::NetMeetingInvitation(bool incoming, MSNContact *c, TQObject *parent)
- : TQObject(parent) , MSNInvitation( incoming, NetMeetingInvitation::applicationID() , i18n("NetMeeting") )
+NetMeetingInvitation::NetMeetingInvitation(bool incoming, MSNContact *c, TQObject *tqparent)
+ : TQObject(tqparent) , MSNInvitation( incoming, NetMeetingInvitation::applicationID() , i18n("NetMeeting") )
 {
 	m_contact=c;
 	oki=false;
@@ -59,12 +59,12 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg)
 	TQRegExp rx("Invitation-Command: ([A-Z]*)");
 	rx.search(msg);
 	TQString command=rx.cap(1);
-	if( msg.contains("Invitation-Command: INVITE") )
+	if( msg.tqcontains("Invitation-Command: INVITE") )
 	{
 		MSNInvitation::parseInvitation(msg); //for the cookie
 
 		unsigned int result = KMessageBox::questionYesNo( Kopete::UI::Global::mainWidget(),
-					i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).arg(m_contact->metaContact()->displayName()),
+					i18n("%1 wants to start a chat with NetMeeting; do you want to accept it? " ).tqarg(m_contact->metaContact()->displayName()),
 					i18n("MSN Plugin") , i18n("Accept"),i18n("Refuse"));
 
 		MSNChatSession* manager=dynamic_cast<MSNChatSession*>(m_contact->manager());
@@ -98,7 +98,7 @@ void NetMeetingInvitation::parseInvitation(const TQString& msg)
 			}
 		}
 	}
-	else if( msg.contains("Invitation-Command: ACCEPT") )
+	else if( msg.tqcontains("Invitation-Command: ACCEPT") )
 	{
 		if( ! incoming() )
 		{
@@ -162,7 +162,7 @@ void NetMeetingInvitation::startMeeting(const TQString & ip_address)
 	
 	KConfig *config=KGlobal::config();
 	config->setGroup("Netmeeting Plugin");
-	TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").arg(ip_address);
+	TQString app=config->readEntry("NetmeetingApplication","ekiga -c callto://%1").tqarg(ip_address);
 	
 	kdDebug() << k_funcinfo << app <<  endl ;
 	
diff --git a/kopete/plugins/netmeeting/netmeetinginvitation.h b/kopete/plugins/netmeeting/netmeetinginvitation.h
index eb4b2ba6..4efe3ed1 100644
--- a/kopete/plugins/netmeeting/netmeetinginvitation.h
+++ b/kopete/plugins/netmeeting/netmeetinginvitation.h
@@ -28,8 +28,9 @@ class MSNContact;
 class NetMeetingInvitation : public TQObject , public MSNInvitation
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-	NetMeetingInvitation(bool incoming ,MSNContact*, TQObject *parent = 0);
+	NetMeetingInvitation(bool incoming ,MSNContact*, TQObject *tqparent = 0);
 	~NetMeetingInvitation();
 
 	static TQString applicationID() { return "44BBA842-CC51-11CF-AAFA-00AA00B6015C"; }
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.cpp b/kopete/plugins/netmeeting/netmeetingplugin.cpp
index 2d71c257..715f26e6 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.cpp
+++ b/kopete/plugins/netmeeting/netmeetingplugin.cpp
@@ -35,8 +35,8 @@
 static const KAboutData aboutdata("kopete_netmeeting", I18N_NOOP("NetMeeting") , "1.0" );
 K_EXPORT_COMPONENT_FACTORY( kopete_netmeeting, KGenericFactory<NetMeetingPlugin>( &aboutdata )  )
 
-NetMeetingPlugin::NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ )
-: Kopete::Plugin( KGlobal::instance(), parent, name )
+NetMeetingPlugin::NetMeetingPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ )
+: Kopete::Plugin( KGlobal::instance(), tqparent, name )
 {
 	if(MSNProtocol::protocol())
 		slotPluginLoaded(MSNProtocol::protocol());
@@ -81,7 +81,7 @@ void NetMeetingPlugin::slotNewKMM(Kopete::ChatSession *KMM)
 
 void NetMeetingPlugin::slotInvitation(MSNInvitation*& invitation,  const TQString &bodyMSG , long unsigned int /*cookie*/ , MSNChatSession* msnMM , MSNContact* c )
 {
-	if(!invitation &&  bodyMSG.contains(NetMeetingInvitation::applicationID()))
+	if(!invitation &&  bodyMSG.tqcontains(NetMeetingInvitation::applicationID()))
 	{
 		invitation=new NetMeetingInvitation(true,c,msnMM);
 		invitation->parseInvitation(bodyMSG);
diff --git a/kopete/plugins/netmeeting/netmeetingplugin.h b/kopete/plugins/netmeeting/netmeetingplugin.h
index 495eb510..da877926 100644
--- a/kopete/plugins/netmeeting/netmeetingplugin.h
+++ b/kopete/plugins/netmeeting/netmeetingplugin.h
@@ -29,9 +29,10 @@ class MSNInvitation;
 class NetMeetingPlugin : public Kopete::Plugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	NetMeetingPlugin( TQObject *parent, const char *name, const TQStringList &args );
+	NetMeetingPlugin( TQObject *tqparent, const char *name, const TQStringList &args );
 	~NetMeetingPlugin();
 
 private slots:
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.cpp b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
index 313eb197..1c737cab 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.cpp
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.cpp
@@ -39,8 +39,8 @@
 typedef KGenericFactory<NetmeetingPreferences> NetmeetingPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_netmeeting, NetmeetingPreferencesFactory( "kcm_kopete_netmeeting" )  )
 
-NetmeetingPreferences::NetmeetingPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-							: KCModule(NetmeetingPreferencesFactory::instance(), parent, args)
+NetmeetingPreferences::NetmeetingPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args)
+							: KCModule(NetmeetingPreferencesFactory::instance(), tqparent, args)
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	preferencesDialog = new NetmeetingPrefsUI(this);
diff --git a/kopete/plugins/netmeeting/netmeetingpreferences.h b/kopete/plugins/netmeeting/netmeetingpreferences.h
index 6ad09f58..2711eab8 100644
--- a/kopete/plugins/netmeeting/netmeetingpreferences.h
+++ b/kopete/plugins/netmeeting/netmeetingpreferences.h
@@ -28,9 +28,10 @@ class NetmeetingPrefsUI;
 
 class NetmeetingPreferences : public KCModule  {
    Q_OBJECT
+  TQ_OBJECT
 public:
 
-	NetmeetingPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
+	NetmeetingPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList());
 	~NetmeetingPreferences();
 
 	virtual void save();
diff --git a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
index ed84eb6b..f9ab61be 100644
--- a/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
+++ b/kopete/plugins/netmeeting/netmeetingprefs_ui.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>NetmeetingPrefsUI</class>
 <author>Olivier Goffart</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>Form1</cstring>
     </property>
@@ -17,7 +17,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -26,7 +26,7 @@
 
 This is not the same as webcam chat you can find in the newer Windows Messenger®,  but uses the older NetMeeting chat you can find in old versions.</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -44,15 +44,15 @@ This is not the same as webcam chat you can find in the newer Windows Messenger�
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QLayoutWidget">
+        <widget class="TQLayoutWidget">
             <property name="name">
-                <cstring>layout1</cstring>
+                <cstring>tqlayout1</cstring>
             </property>
             <hbox>
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>textLabel2</cstring>
                     </property>
@@ -91,14 +91,14 @@ This is not the same as webcam chat you can find in the newer Windows Messenger�
                 </widget>
             </hbox>
         </widget>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel3</cstring>
             </property>
             <property name="text">
                 <string>&lt;b&gt;%1&lt;/b&gt; will be replaced by the ip to call</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>WordBreak|AlignVCenter</set>
             </property>
         </widget>
@@ -112,7 +112,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger�
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>21</width>
                     <height>60</height>
@@ -139,7 +139,7 @@ This is not the same as webcam chat you can find in the newer Windows Messenger�
 </widget>
 <customwidgets>
 </customwidgets>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>