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, 36 insertions, 34 deletions

diff --git a/kopete/plugins/motionautoaway/COPYING.motion b/kopete/plugins/motionautoaway/COPYING.motion
index 0b84a43f..0a56ad07 100644
--- a/kopete/plugins/motionautoaway/COPYING.motion
+++ b/kopete/plugins/motionautoaway/COPYING.motion
@@ -59,7 +59,7 @@ modification follow.
 		    GNU GENERAL PUBLIC LICENSE
    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
 
-  0. This License applies to any program or other work which contains
+  0. This License applies to any program or other work which tqcontains
 a notice placed by the copyright holder saying it may be distributed
 under the terms of this General Public License.  The "Program", below,
 refers to any such program or work, and a "work based on the Program"
@@ -154,7 +154,7 @@ Sections 1 and 2 above provided that you also do one of the following:
 
 The source code for a work means the preferred form of the work for
 making modifications to it.  For an executable work, complete source
-code means all the source code for all modules it contains, plus any
+code means all the source code for all modules it tqcontains, plus any
 associated interface definition files, plus the scripts used to
 control compilation and installation of the executable.  However, as a
 special exception, the source code distributed need not include
diff --git a/kopete/plugins/motionautoaway/motionawayplugin.cpp b/kopete/plugins/motionautoaway/motionawayplugin.cpp
index 8dbd8853..da4e5431 100644
--- a/kopete/plugins/motionautoaway/motionawayplugin.cpp
+++ b/kopete/plugins/motionautoaway/motionawayplugin.cpp
@@ -79,7 +79,7 @@ typedef __signed__ long long __s64;
 
 #define DEF_WIDTH			352
 #define DEF_HEIGHT		288
-#define DEF_QUALITY		50
+#define DEF_TQUALITY		50
 #define DEF_CHANGES		5000
 
 #define DEF_POLL_INTERVAL 1500
@@ -92,14 +92,14 @@ typedef __signed__ long long __s64;
 typedef KGenericFactory<MotionAwayPlugin> MotionAwayPluginFactory;
 K_EXPORT_COMPONENT_FACTORY( kopete_motionaway, MotionAwayPluginFactory( "kopete_motionaway" )  )
 
-MotionAwayPlugin::MotionAwayPlugin( TQObject *parent, const char *name, const TQStringList & /* args */ )
-: Kopete::Plugin( MotionAwayPluginFactory::instance(), parent, name )
+MotionAwayPlugin::MotionAwayPlugin( TQObject *tqparent, const char *name, const TQStringList & /* args */ )
+: Kopete::Plugin( MotionAwayPluginFactory::instance(), tqparent, name )
 {
 	kdDebug(14305) << k_funcinfo << "Called." << endl;
 	/* This should be read from config someday may be */
 	m_width = DEF_WIDTH;
 	m_height = DEF_HEIGHT;
-	m_quality = DEF_QUALITY;
+	m_quality = DEF_TQUALITY;
 	m_maxChanges = DEF_CHANGES;
 	m_gap = DEF_GAP;
 
diff --git a/kopete/plugins/motionautoaway/motionawayplugin.h b/kopete/plugins/motionautoaway/motionawayplugin.h
index c15caa3a..c966b832 100644
--- a/kopete/plugins/motionautoaway/motionawayplugin.h
+++ b/kopete/plugins/motionautoaway/motionawayplugin.h
@@ -36,9 +36,10 @@ class TQTimer;
 class MotionAwayPlugin : public Kopete::Plugin
 {
 	Q_OBJECT
+  TQ_OBJECT
 
 public:
-	MotionAwayPlugin( TQObject *parent, const char *name, const TQStringList &args );
+	MotionAwayPlugin( TQObject *tqparent, const char *name, const TQStringList &args );
 	~MotionAwayPlugin();
 
 public slots:
diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.cpp b/kopete/plugins/motionautoaway/motionawaypreferences.cpp
index 889d4d30..46697051 100644
--- a/kopete/plugins/motionautoaway/motionawaypreferences.cpp
+++ b/kopete/plugins/motionautoaway/motionawaypreferences.cpp
@@ -30,8 +30,8 @@
 typedef KGenericFactory<MotionAwayPreferences> MotionAwayPreferencesFactory;
 K_EXPORT_COMPONENT_FACTORY( kcm_kopete_motionaway, MotionAwayPreferencesFactory("kcm_kopete_motionaway"))
 
-MotionAwayPreferences::MotionAwayPreferences(TQWidget *parent, const char* /*name*/, const TQStringList &args)
-							: KCModule(MotionAwayPreferencesFactory::instance(), parent, args)
+MotionAwayPreferences::MotionAwayPreferences(TQWidget *tqparent, const char* /*name*/, const TQStringList &args)
+							: KCModule(MotionAwayPreferencesFactory::instance(), tqparent, args)
 {
 	// Add actuall widget generated from ui file.
 	( new TQVBoxLayout( this ) )->setAutoAdd( true );
diff --git a/kopete/plugins/motionautoaway/motionawaypreferences.h b/kopete/plugins/motionautoaway/motionawaypreferences.h
index c93784d3..246541d5 100644
--- a/kopete/plugins/motionautoaway/motionawaypreferences.h
+++ b/kopete/plugins/motionautoaway/motionawaypreferences.h
@@ -29,8 +29,9 @@ class motionawayPrefsUI;
 class MotionAwayPreferences : public KCModule
 {
 	Q_OBJECT
+  TQ_OBJECT
 public:
-	MotionAwayPreferences(TQWidget *parent = 0, const char *name = 0, const TQStringList &args = TQStringList());
+	MotionAwayPreferences(TQWidget *tqparent = 0, const char *name = 0, const TQStringList &args = TQStringList());
 	virtual void save();
 	virtual void load();
 
diff --git a/kopete/plugins/motionautoaway/motionawayprefs.ui b/kopete/plugins/motionautoaway/motionawayprefs.ui
index 134f939a..e43ae524 100644
--- a/kopete/plugins/motionautoaway/motionawayprefs.ui
+++ b/kopete/plugins/motionautoaway/motionawayprefs.ui
@@ -1,7 +1,7 @@
 <!DOCTYPE UI><UI version="3.3" stdsetdef="1">
 <class>motionawayPrefsUI</class>
 <author>Duncan Mac-Vicar P.</author>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>motionawayPrefsUI</cstring>
     </property>
@@ -25,7 +25,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="QLabel">
+        <widget class="TQLabel">
             <property name="name">
                 <cstring>textLabel1</cstring>
             </property>
@@ -47,7 +47,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox2</cstring>
             </property>
@@ -58,15 +58,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout21</cstring>
+                        <cstring>tqlayout21</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel2_2</cstring>
                             </property>
@@ -87,7 +87,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>95</width>
                                     <height>20</height>
@@ -114,7 +114,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -123,7 +123,7 @@
                 </spacer>
             </vbox>
         </widget>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox1</cstring>
             </property>
@@ -134,15 +134,15 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout5</cstring>
+                        <cstring>tqlayout5</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QCheckBox">
+                        <widget class="TQCheckBox">
                             <property name="name">
                                 <cstring>BecomeAvailableWithActivity</cstring>
                             </property>
@@ -163,7 +163,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>30</width>
                                     <height>20</height>
@@ -172,15 +172,15 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout6</cstring>
+                        <cstring>tqlayout6</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel2</cstring>
                             </property>
@@ -201,7 +201,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>20</width>
                                     <height>20</height>
@@ -210,9 +210,9 @@
                         </spacer>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout16</cstring>
+                        <cstring>tqlayout16</cstring>
                     </property>
                     <hbox>
                         <property name="name">
@@ -223,7 +223,7 @@
                                 <cstring>AwayTimeout</cstring>
                             </property>
                         </widget>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>textLabel2</cstring>
                             </property>
@@ -241,7 +241,7 @@
                             <property name="sizeType">
                                 <enum>Expanding</enum>
                             </property>
-                            <property name="sizeHint">
+                            <property name="tqsizeHint">
                                 <size>
                                     <width>180</width>
                                     <height>20</height>
@@ -260,7 +260,7 @@
                     <property name="sizeType">
                         <enum>Fixed</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>20</height>
@@ -279,7 +279,7 @@
             <property name="sizeType">
                 <enum>Fixed</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>20</height>
@@ -288,7 +288,7 @@
         </spacer>
     </vbox>
 </widget>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>klineedit.h</includehint>
     <includehint>knuminput.h</includehint>