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

6 files changed, 41 insertions, 39 deletions

diff --git a/kopete/plugins/autoreplace/autoreplaceconfig.cpp b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
index 2537f44a..09ef9d05 100644
--- a/kopete/plugins/autoreplace/autoreplaceconfig.cpp
+++ b/kopete/plugins/autoreplace/autoreplaceconfig.cpp
@@ -63,7 +63,7 @@ void AutoReplaceConfig::load()
 
 TQStringList AutoReplaceConfig::defaultAutoReplaceList()
 {
-    return TQStringList::split( ",", i18n( "list_of_words_to_replace",
+    return TQStringList::split( ",", i18n( "list_of_words_to_tqreplace",
 			"ur,your,r,are,u,you,theres,there is,arent,are not,dont,do not" ) );
 }
 
diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.cpp b/kopete/plugins/autoreplace/autoreplaceplugin.cpp
index f3610a7f..62060ef3 100644
--- a/kopete/plugins/autoreplace/autoreplaceplugin.cpp
+++ b/kopete/plugins/autoreplace/autoreplaceplugin.cpp
@@ -26,11 +26,11 @@
 #include "autoreplaceconfig.h"
 
 typedef KGenericFactory<AutoReplacePlugin> AutoReplacePluginFactory;
-K_EXPORT_COMPONENT_FACTORY( kopete_autoreplace, AutoReplacePluginFactory( "kopete_autoreplace" )  )
+K_EXPORT_COMPONENT_FACTORY( kopete_autotqreplace, AutoReplacePluginFactory( "kopete_autotqreplace" )  )
 AutoReplacePlugin * AutoReplacePlugin::pluginStatic_ = 0L;
 
-AutoReplacePlugin::AutoReplacePlugin( TQObject *parent, const char * name, const TQStringList & )
-: Kopete::Plugin( AutoReplacePluginFactory::instance(), parent, name )
+AutoReplacePlugin::AutoReplacePlugin( TQObject *tqparent, const char * name, const TQStringList & )
+: Kopete::Plugin( AutoReplacePluginFactory::instance(), tqparent, name )
 {
 	if( !pluginStatic_ )
 		pluginStatic_ = this;
@@ -81,12 +81,12 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg )
 		bool isReplaced=false;
 		for ( it = map.begin(); it != map.end(); ++it )
 		{
-			TQRegExp re( match.arg( TQRegExp::escape( it.key() ) ) );
+			TQRegExp re( match.tqarg( TQRegExp::escape( it.key() ) ) );
 			if( re.search( replaced_message ) != -1 )
 			{
 				TQString before = re.cap(1);
 				TQString after = re.cap(3);
-				replaced_message.replace( re, before + map.find( it.key() ).data() + after );
+				replaced_message.tqreplace( re, before + map.tqfind( it.key() ).data() + after );
 				isReplaced=true;
 			}
 		}
@@ -101,8 +101,8 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg )
 			{
 				TQString replaced_message = msg.plainBody();
 				// eventually add . at the end of the lines, sent lines only
-				replaced_message.replace( TQRegExp( "([a-z])$" ), "\\1." );
-				// replaced_message.replace(TQRegExp( "([\\w])$" ), "\\1." );
+				replaced_message.tqreplace( TQRegExp( "([a-z])$" ), "\\1." );
+				// replaced_message.tqreplace(TQRegExp( "([\\w])$" ), "\\1." );
 
 				// the message is now the one with replaced words
 				msg.setBody( replaced_message, Kopete::Message::PlainText );
@@ -113,7 +113,7 @@ void AutoReplacePlugin::slotAboutToSend( Kopete::Message &msg )
 				TQString replaced_message = msg.plainBody();
 				// eventually start each sent line with capital letter
 				// TODO 	". "	 "? "	 "! "
-				replaced_message[ 0 ] = replaced_message.at( 0 ).upper();
+				replaced_message[ 0 ] = replaced_message.tqat( 0 ).upper();
 
 				// the message is now the one with replaced words
 				msg.setBody( replaced_message, Kopete::Message::PlainText );
diff --git a/kopete/plugins/autoreplace/autoreplaceplugin.h b/kopete/plugins/autoreplace/autoreplaceplugin.h
index 7d9bcedf..de306a4b 100644
--- a/kopete/plugins/autoreplace/autoreplaceplugin.h
+++ b/kopete/plugins/autoreplace/autoreplaceplugin.h
@@ -38,11 +38,12 @@ class AutoReplaceConfig;
 class AutoReplacePlugin : public Kopete::Plugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	static AutoReplacePlugin *plugin();
 
-	AutoReplacePlugin( TQObject *parent, const char *name, const TQStringList &args );
+	AutoReplacePlugin( TQObject *tqparent, const char *name, const TQStringList &args );
 	~AutoReplacePlugin();
 
 private slots:
diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.cpp b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
index 4f852610..628cb679 100644
--- a/kopete/plugins/autoreplace/autoreplacepreferences.cpp
+++ b/kopete/plugins/autoreplace/autoreplacepreferences.cpp
@@ -34,10 +34,10 @@
 
 typedef KGenericFactory<AutoReplacePreferences> AutoReplacePreferencesFactory;
 
-K_EXPORT_COMPONENT_FACTORY( kcm_kopete_autoreplace, AutoReplacePreferencesFactory( "kcm_kopete_autoreplace" ) )
+K_EXPORT_COMPONENT_FACTORY( kcm_kopete_autotqreplace, AutoReplacePreferencesFactory( "kcm_kopete_autotqreplace" ) )
 
-AutoReplacePreferences::AutoReplacePreferences( TQWidget *parent, const char * /* name */, const TQStringList &args )
-: KCAutoConfigModule( AutoReplacePreferencesFactory::instance(), parent, args )
+AutoReplacePreferences::AutoReplacePreferences( TQWidget *tqparent, const char * /* name */, const TQStringList &args )
+: KCAutoConfigModule( AutoReplacePreferencesFactory::instance(), tqparent, args )
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 	preferencesDialog = new AutoReplacePrefsUI( this );
@@ -113,7 +113,7 @@ void AutoReplacePreferences::save()
 	KCAutoConfigModule::save();
 }
 
-// read m_key m_value, create a QListViewItem
+// read m_key m_value, create a TQListViewItem
 void AutoReplacePreferences::slotAddCouple()
 {
 	TQString k = preferencesDialog->m_key->text();
@@ -123,10 +123,10 @@ void AutoReplacePreferences::slotAddCouple()
 		TQListViewItem * lvi;
 		TQListViewItem * oldLvi = 0;
 		// see if we are replacing an existing entry
-		if ( ( oldLvi = preferencesDialog->m_list->findItem( k, 0 ) ) )
+		if ( ( oldLvi = preferencesDialog->m_list->tqfindItem( k, 0 ) ) )
 			delete oldLvi;
 		lvi = new TQListViewItem( preferencesDialog->m_list, k, v );
-		// Triggers a size, geometry and content update
+		// Triggers a size, tqgeometry and content update
 		// during the next iteration of the event loop
 		preferencesDialog->m_list->triggerUpdate();
 		// select last added
diff --git a/kopete/plugins/autoreplace/autoreplacepreferences.h b/kopete/plugins/autoreplace/autoreplacepreferences.h
index 00638bfa..72e0b548 100644
--- a/kopete/plugins/autoreplace/autoreplacepreferences.h
+++ b/kopete/plugins/autoreplace/autoreplacepreferences.h
@@ -32,9 +32,10 @@ class AutoReplaceConfig;
 class AutoReplacePreferences : public KCAutoConfigModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	AutoReplacePreferences( TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList() );
+	AutoReplacePreferences( TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList() );
 	~AutoReplacePreferences();
 
 	virtual void save();
diff --git a/kopete/plugins/autoreplace/autoreplaceprefs.ui b/kopete/plugins/autoreplace/autoreplaceprefs.ui
index 09db8e9d..f7cb8c55 100644
--- a/kopete/plugins/autoreplace/autoreplaceprefs.ui
+++ b/kopete/plugins/autoreplace/autoreplaceprefs.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>AutoReplacePrefsUI</class>
 <author>Roberto Pariset</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>AutoReplacePrefsUI</cstring>
     </property>
@@ -17,7 +17,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QGroupBox" row="0" column="0">
+        <widget class="TQGroupBox" row="0" column="0">
             <property name="name">
                 <cstring>gb_sentences</cstring>
             </property>
@@ -28,7 +28,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>DotEndSentence</cstring>
                     </property>
@@ -36,7 +36,7 @@
                         <string>Add a dot at the end of each sent line</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>CapitalizeBeginningSentence</cstring>
                     </property>
@@ -46,7 +46,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox" row="2" column="0">
+        <widget class="TQGroupBox" row="2" column="0">
             <property name="name">
                 <cstring>gb_options</cstring>
             </property>
@@ -57,7 +57,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>AutoReplaceIncoming</cstring>
                     </property>
@@ -65,7 +65,7 @@
                         <string>Auto replace on incoming messages</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>AutoReplaceOutgoing</cstring>
                     </property>
@@ -78,7 +78,7 @@
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>replacementsGroup</cstring>
             </property>
@@ -89,15 +89,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget" row="1" column="1" rowspan="2" colspan="1">
+                <widget class="TQLayoutWidget" row="1" column="1" rowspan="2" colspan="1">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <vbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>m_add</cstring>
                             </property>
@@ -111,7 +111,7 @@
                                 <bool>false</bool>
                             </property>
                         </widget>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>m_edit</cstring>
                             </property>
@@ -135,14 +135,14 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>40</height>
                                 </size>
                             </property>
                         </spacer>
-                        <widget class="QPushButton">
+                        <widget class="TQPushButton">
                             <property name="name">
                                 <cstring>m_remove</cstring>
                             </property>
@@ -155,15 +155,15 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
+                <widget class="TQLayoutWidget" row="0" column="0" rowspan="1" colspan="2">
                     <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>textLabel1</cstring>
                             </property>
@@ -174,12 +174,12 @@
                                 <cstring>m_key</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>m_key</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -190,14 +190,14 @@
                                 <cstring>m_value</cstring>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>m_value</cstring>
                             </property>
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QListView" row="2" column="0">
+                <widget class="TQListView" row="2" column="0">
                     <property name="name">
                         <cstring>m_list</cstring>
                     </property>
@@ -215,5 +215,5 @@
         </widget>
     </grid>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>