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, 49 insertions, 47 deletions

diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.cpp b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
index d0f23a07..f32ba757 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespage.cpp
+++ b/filesharing/advanced/propsdlgplugin/propertiespage.cpp
@@ -52,8 +52,8 @@
 
 #define FILESHARE_DEBUG 5009
 
-PropertiesPage::PropertiesPage(TQWidget* parent, KFileItemList items,bool enterUrl) 
-  : PropertiesPageGUI(parent), 
+PropertiesPage::PropertiesPage(TQWidget* tqparent, KFileItemList items,bool enterUrl) 
+  : PropertiesPageGUI(tqparent), 
   m_enterUrl(enterUrl), 
   m_items(items), 
   m_nfsFile(0), 
@@ -211,15 +211,15 @@ bool PropertiesPage::save(NFSFile* nfsFile, SambaFile* sambaFile, bool nfs, bool
      if (nfsNeedsKDEsu) {
          nfsFile->saveTo(nfsTempFile.name());
          command += TQString("cp %1 %2;exportfs -ra;")
-        .arg(KProcess::quote( nfsTempFile.name() ))
-        .arg(KProcess::quote( nfsFileName ));
+        .tqarg(KProcess::quote( nfsTempFile.name() ))
+        .tqarg(KProcess::quote( nfsFileName ));
      }         
      
      if (sambaNeedsKDEsu) {
          sambaFile->saveTo(sambaTempFile.name());
          command += TQString("cp %1 %2;")
-        .arg(KProcess::quote( sambaTempFile.name() ))
-        .arg(KProcess::quote( sambaFileName ));
+        .tqarg(KProcess::quote( sambaTempFile.name() ))
+        .tqarg(KProcess::quote( sambaFileName ));
      }       
          
      proc<<"kdesu" << "-d" << "-c"<<command;
@@ -527,7 +527,7 @@ bool PropertiesPage::updateSambaShare() {
       SambaShare* otherShare = m_sambaFile->getShare(sambaNameEdit->text());
       if (otherShare && otherShare != m_sambaShare) {
         // There is another Share with the same name
-        KMessageBox::sorry(this, i18n("<qt>There is already a share with the name <strong>%1</strong>.<br> Please choose another name.</qt>").arg(sambaNameEdit->text()));
+        KMessageBox::sorry(this, i18n("<qt>There is already a share with the name <strong>%1</strong>.<br> Please choose another name.</qt>").tqarg(sambaNameEdit->text()));
         sambaNameEdit->selectAll();
         sambaNameEdit->setFocus();
         return false;
diff --git a/filesharing/advanced/propsdlgplugin/propertiespage.h b/filesharing/advanced/propsdlgplugin/propertiespage.h
index e635d909..4e93ac86 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespage.h
+++ b/filesharing/advanced/propsdlgplugin/propertiespage.h
@@ -32,8 +32,9 @@ class TQCheckBox;
 class PropertiesPage : public PropertiesPageGUI
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
-  PropertiesPage(TQWidget* parent, KFileItemList items, bool enterUrl=false);
+  PropertiesPage(TQWidget* tqparent, KFileItemList items, bool enterUrl=false);
   virtual ~PropertiesPage();
   
   bool save();
diff --git a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui
index 4f756d3b..5373ad7c 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui
+++ b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>PropertiesPageGUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>PropertiesPageGUI</cstring>
     </property>
@@ -19,15 +19,15 @@
         <property name="margin">
             <number>0</number>
         </property>
-        <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>folderLbl</cstring>
                     </property>
@@ -42,7 +42,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="QCheckBox">
+        <widget class="TQCheckBox">
             <property name="name">
                 <cstring>shareChk</cstring>
             </property>
@@ -67,7 +67,7 @@
                 <enum>Horizontal</enum>
             </property>
         </widget>
-        <widget class="QFrame">
+        <widget class="TQFrame">
             <property name="name">
                 <cstring>shareFrame</cstring>
             </property>
@@ -84,7 +84,7 @@
                 <property name="margin">
                     <number>0</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>nfsChk</cstring>
                     </property>
@@ -95,7 +95,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>nfsGrp</cstring>
                     </property>
@@ -106,15 +106,15 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <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="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>publicNFSChk</cstring>
                                     </property>
@@ -125,7 +125,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>writableNFSChk</cstring>
                                     </property>
@@ -146,7 +146,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>40</width>
                                             <height>20</height>
@@ -155,9 +155,9 @@
                                 </spacer>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout4</cstring>
+                                <cstring>tqlayout4</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -181,7 +181,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>156</width>
                                             <height>20</height>
@@ -192,7 +192,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>sambaChk</cstring>
                     </property>
@@ -203,7 +203,7 @@
                         <bool>true</bool>
                     </property>
                 </widget>
-                <widget class="QGroupBox">
+                <widget class="TQGroupBox">
                     <property name="name">
                         <cstring>sambaGrp</cstring>
                     </property>
@@ -214,15 +214,15 @@
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
                                     <cstring>unnamed</cstring>
                                 </property>
-                                <widget class="QLabel">
+                                <widget class="TQLabel">
                                     <property name="name">
                                         <cstring>textLabel1</cstring>
                                     </property>
@@ -237,15 +237,15 @@
                                 </widget>
                             </hbox>
                         </widget>
-                        <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>publicSambaChk</cstring>
                                     </property>
@@ -256,7 +256,7 @@
                                         <bool>true</bool>
                                     </property>
                                 </widget>
-                                <widget class="QCheckBox">
+                                <widget class="TQCheckBox">
                                     <property name="name">
                                         <cstring>writableSambaChk</cstring>
                                     </property>
@@ -277,7 +277,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>40</width>
                                             <height>20</height>
@@ -286,9 +286,9 @@
                                 </spacer>
                             </hbox>
                         </widget>
-                        <widget class="QLayoutWidget">
+                        <widget class="TQLayoutWidget">
                             <property name="name">
-                                <cstring>layout3</cstring>
+                                <cstring>tqlayout3</cstring>
                             </property>
                             <hbox>
                                 <property name="name">
@@ -312,7 +312,7 @@
                                     <property name="sizeType">
                                         <enum>Expanding</enum>
                                     </property>
-                                    <property name="sizeHint">
+                                    <property name="tqsizeHint">
                                         <size>
                                             <width>40</width>
                                             <height>20</height>
@@ -335,7 +335,7 @@
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>1</height>
@@ -460,19 +460,19 @@
 <variables>
     <variable>bool m_hasChanged;</variable>
 </variables>
-<signals>
+<Q_SIGNALS>
     <signal>changed()</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
     <slot access="protected">changedSlot()</slot>
     <slot>moreNFSBtn_clicked()</slot>
     <slot>sambaChkToggled( bool )</slot>
     <slot>publicSambaChkToggled( bool b )</slot>
     <slot>publicNFSChkToggled( bool b )</slot>
     <slot>moreSambaBtnClicked()</slot>
-</slots>
+</Q_SLOTS>
 <functions>
     <function returnType="bool">hasChanged()</function>
 </functions>
-<layoutdefaults spacing="6" margin="11"/>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui.h b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui.h
index 89d4a56e..ce260ca1 100644
--- a/filesharing/advanced/propsdlgplugin/propertiespagegui.ui.h
+++ b/filesharing/advanced/propsdlgplugin/propertiespagegui.ui.h
@@ -2,7 +2,7 @@
 ** ui.h extension file, included from the uic-generated form implementation.
 **
 ** If you wish to add, delete or rename functions or slots use
-** Qt Designer which will update this file, preserving your code. Create an
+** TQt Designer which will update this file, preserving your code. Create an
 ** init() function in place of a constructor, and a destroy() function in
 ** place of a destructor.
 *****************************************************************************/
diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
index fafb4ece..93a9a6e8 100644
--- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
+++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.cpp
@@ -81,7 +81,7 @@ PropsDlgSharePlugin::PropsDlgSharePlugin( KPropertiesDialog *dlg,
         connect( btn, TQT_SIGNAL( clicked() ), TQT_SLOT( slotConfigureFileSharing() ) );
         btn->setDefault(false);
         TQHBoxLayout* hBox = new TQHBoxLayout( (TQWidget *)0L );
-        hBox->addWidget( btn, 0, Qt::AlignLeft );
+        hBox->addWidget( btn, 0, TQt::AlignLeft );
         vLayout->addLayout(hBox);
         vLayout->addStretch( 10 ); // align items on top
         return;
diff --git a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.h b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.h
index 56556dae..e28b9c49 100644
--- a/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.h
+++ b/filesharing/advanced/propsdlgplugin/propsdlgshareplugin.h
@@ -17,14 +17,15 @@
 
 */
 
-#ifndef KONQFILESHAREPLUGIN_H
-#define KONQFILESHAREPLUGIN_H
+#ifndef KONTQFILESHAREPLUGIN_H
+#define KONTQFILESHAREPLUGIN_H
 
 #include <kpropertiesdialog.h>
 
 class PropsDlgSharePlugin : public KPropsDlgPlugin
 {
 Q_OBJECT
+  TQ_OBJECT
 public:
   PropsDlgSharePlugin( KPropertiesDialog *dlg, const char *, const TQStringList & );
   virtual ~PropsDlgSharePlugin();