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

5 files changed, 30 insertions, 28 deletions

diff --git a/kopete/plugins/texteffect/texteffectplugin.cpp b/kopete/plugins/texteffect/texteffectplugin.cpp
index 47bdbc14..664a38a8 100644
--- a/kopete/plugins/texteffect/texteffectplugin.cpp
+++ b/kopete/plugins/texteffect/texteffectplugin.cpp
@@ -28,8 +28,8 @@
 typedef KGenericFactory<TextEffectPlugin> TextEffectPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( kopete_texteffect, TextEffectPluginFactory( "kopete_texteffect" )  )
 
-TextEffectPlugin::TextEffectPlugin( TQObject *parent, const char *name, const TQStringList &/*args*/ )
-: Kopete::Plugin( TextEffectPluginFactory::instance(), parent, name )
+TextEffectPlugin::TextEffectPlugin( TQObject *tqparent, const char *name, const TQStringList &/*args*/ )
+: Kopete::Plugin( TextEffectPluginFactory::instance(), tqparent, name )
 {
 	if( !pluginStatic_ )
 		pluginStatic_=this;
diff --git a/kopete/plugins/texteffect/texteffectplugin.h b/kopete/plugins/texteffect/texteffectplugin.h
index 6766bcfa..4090b6b3 100644
--- a/kopete/plugins/texteffect/texteffectplugin.h
+++ b/kopete/plugins/texteffect/texteffectplugin.h
@@ -41,11 +41,12 @@ class TextEffectConfig;
 class TextEffectPlugin : public Kopete::Plugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
 	static TextEffectPlugin  *plugin();
 
-	TextEffectPlugin( TQObject *parent, const char *name, const TQStringList &args );
+	TextEffectPlugin( TQObject *tqparent, const char *name, const TQStringList &args );
 	~TextEffectPlugin();
 
 public slots:
diff --git a/kopete/plugins/texteffect/texteffectpreferences.cpp b/kopete/plugins/texteffect/texteffectpreferences.cpp
index 9fb2994c..ddbe5f61 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.cpp
+++ b/kopete/plugins/texteffect/texteffectpreferences.cpp
@@ -35,10 +35,10 @@
 typedef KGenericFactory<TextEffectPreferences> TextEffectPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_texteffect, TextEffectPreferencesFactory( "kcm_kopete_texteffect" )  )
 
-TextEffectPreferences::TextEffectPreferences(TQWidget *parent,
+TextEffectPreferences::TextEffectPreferences(TQWidget *tqparent,
                                              const char* /*name*/,
                                              const TQStringList &args)
-	: KCModule(TextEffectPreferencesFactory::instance(), parent, args)
+	: KCModule(TextEffectPreferencesFactory::instance(), tqparent, args)
 {
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
 
@@ -106,7 +106,7 @@ void TextEffectPreferences::load()
 	preferencesDialog->m_casewaves->setChecked(config->waves());
 
 
-	// Call parent's save method
+	// Call tqparent's save method
 	KCModule::load();
 
 	// Indicate that we have not changed ^_^
@@ -134,7 +134,7 @@ void TextEffectPreferences::save()
 	// Notify the plugin that the settings have changed
 	//TextEffectPlugin::plugin()->slotSettingsChanged();
 
-	// Call parent's save method
+	// Call tqparent's save method
 	KCModule::save();
 
 	// Indicate that we have not changed ^_^
@@ -157,7 +157,7 @@ void TextEffectPreferences::slotAddPressed()
 	TQColor myColor;
 	if( KColorDialog::getColor( myColor ) == KColorDialog::Accepted )
 	{
-		preferencesDialog->mColorsListBox->insertItem(myColor.name());
+		preferencesDialog->mColorsListBox->insertItem(TQString(myColor.name()));
 	}
 
 	// Indicate that something has changed
diff --git a/kopete/plugins/texteffect/texteffectpreferences.h b/kopete/plugins/texteffect/texteffectpreferences.h
index 4a64ac1f..eb30faed 100644
--- a/kopete/plugins/texteffect/texteffectpreferences.h
+++ b/kopete/plugins/texteffect/texteffectpreferences.h
@@ -30,12 +30,13 @@ class TQStringList;
 
 class TextEffectPreferences : public KCModule  {
    Q_OBJECT
+  TQ_OBJECT
 public:
 
-	TextEffectPreferences(TQWidget *parent = 0, const char* name = 0, const TQStringList &args = TQStringList());
+	TextEffectPreferences(TQWidget *tqparent = 0, const char* name = 0, const TQStringList &args = TQStringList());
 	~TextEffectPreferences();
 
-	// Overloaded from parent
+	// Overloaded from tqparent
 	virtual void save();
 	virtual void load();
     virtual void defaults();
diff --git a/kopete/plugins/texteffect/texteffectprefs.ui b/kopete/plugins/texteffect/texteffectprefs.ui
index 95ff801c..919e2f54 100644
--- a/kopete/plugins/texteffect/texteffectprefs.ui
+++ b/kopete/plugins/texteffect/texteffectprefs.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>TextEffectPrefs</class>
 <author>Olivier Goffart</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>TextEffectPrefs</cstring>
     </property>
@@ -23,11 +23,11 @@
         <property name="spacing">
             <number>0</number>
         </property>
-        <widget class="QTabWidget" row="0" column="0">
+        <widget class="TQTabWidget" row="0" column="0">
             <property name="name">
                 <cstring>TabWidget3</cstring>
             </property>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -38,7 +38,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>groupBox1</cstring>
                         </property>
@@ -54,7 +54,7 @@
                                     <cstring>mColorsListBox</cstring>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="0" column="1">
+                            <widget class="TQPushButton" row="0" column="1">
                                 <property name="name">
                                     <cstring>mColorsAdd</cstring>
                                 </property>
@@ -62,7 +62,7 @@
                                     <string>&amp;Add...</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="1" column="1">
+                            <widget class="TQPushButton" row="1" column="1">
                                 <property name="name">
                                     <cstring>mColorsRemove</cstring>
                                 </property>
@@ -70,7 +70,7 @@
                                     <string>&amp;Remove</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="2" column="1">
+                            <widget class="TQPushButton" row="2" column="1">
                                 <property name="name">
                                     <cstring>mColorsUp</cstring>
                                 </property>
@@ -78,7 +78,7 @@
                                     <string>Move &amp;Up</string>
                                 </property>
                             </widget>
-                            <widget class="QPushButton" row="3" column="1">
+                            <widget class="TQPushButton" row="3" column="1">
                                 <property name="name">
                                     <cstring>mColorsDown</cstring>
                                 </property>
@@ -96,7 +96,7 @@
                                 <property name="sizeType">
                                     <enum>Expanding</enum>
                                 </property>
-                                <property name="sizeHint">
+                                <property name="tqsizeHint">
                                     <size>
                                         <width>21</width>
                                         <height>81</height>
@@ -105,7 +105,7 @@
                             </spacer>
                         </grid>
                     </widget>
-                    <widget class="QCheckBox" row="1" column="0">
+                    <widget class="TQCheckBox" row="1" column="0">
                         <property name="name">
                             <cstring>m_colorRandom</cstring>
                         </property>
@@ -127,7 +127,7 @@
                             <enum>Horizontal</enum>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="3" column="0">
+                    <widget class="TQCheckBox" row="3" column="0">
                         <property name="name">
                             <cstring>m_fg</cstring>
                         </property>
@@ -135,7 +135,7 @@
                             <string>Change global text foreground color</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="4" column="0">
+                    <widget class="TQCheckBox" row="4" column="0">
                         <property name="name">
                             <cstring>m_char</cstring>
                         </property>
@@ -143,7 +143,7 @@
                             <string>Change color every letter</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox" row="5" column="0">
+                    <widget class="TQCheckBox" row="5" column="0">
                         <property name="name">
                             <cstring>m_words</cstring>
                         </property>
@@ -153,7 +153,7 @@
                     </widget>
                 </grid>
             </widget>
-            <widget class="QWidget">
+            <widget class="TQWidget">
                 <property name="name">
                     <cstring>tab</cstring>
                 </property>
@@ -164,7 +164,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>m_lamer</cstring>
                         </property>
@@ -180,7 +180,7 @@
                             <string>L4m3r t4lk</string>
                         </property>
                     </widget>
-                    <widget class="QCheckBox">
+                    <widget class="TQCheckBox">
                         <property name="name">
                             <cstring>m_casewaves</cstring>
                         </property>
@@ -206,7 +206,7 @@
                         <property name="sizeType">
                             <enum>Expanding</enum>
                         </property>
-                        <property name="sizeHint">
+                        <property name="tqsizeHint">
                             <size>
                                 <width>20</width>
                                 <height>279</height>
@@ -224,7 +224,7 @@
 <includes>
     <include location="global" impldecl="in implementation">knuminput.h</include>
 </includes>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klistbox.h</includehint>
 </includehints>