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

11 files changed, 80 insertions, 78 deletions

diff --git a/filesharing/advanced/nfs/hostprops.ui b/filesharing/advanced/nfs/hostprops.ui
index 4ff97e28..52a23e14 100644
--- a/filesharing/advanced/nfs/hostprops.ui
+++ b/filesharing/advanced/nfs/hostprops.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>HostProps</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>HostProps</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox" row="0" column="0" rowspan="1" colspan="2">
+        <widget class="TQGroupBox" row="0" column="0" rowspan="1" colspan="2">
             <property name="name">
                 <cstring>propertiesGrp</cstring>
             </property>
@@ -34,7 +34,7 @@
                     <verstretch>0</verstretch>
                 </sizepolicy>
             </property>
-            <property name="minimumSize">
+            <property name="tqminimumSize">
                 <size>
                     <width>180</width>
                     <height>0</height>
@@ -59,7 +59,7 @@
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QLabel">
+                <widget class="TQLabel">
                     <property name="name">
                         <cstring>TextLabel1</cstring>
                     </property>
@@ -70,7 +70,7 @@
                         <cstring>nameEdit</cstring>
                     </property>
                 </widget>
-                <widget class="QLineEdit">
+                <widget class="TQLineEdit">
                     <property name="name">
                         <cstring>nameEdit</cstring>
                     </property>
@@ -103,11 +103,11 @@ The host may be specified in a number of ways:
 
 &lt;i&gt;IP networks&lt;/i&gt;
 &lt;p&gt;
- You can also export directories to all hosts on an IP (sub-) network simultaneously. This is done by specifying an IP address and netmask pair as address/netmask where the netmask can be specified in dotted-decimal format, or as a contiguous mask length (for example, either `/255.255.252.0' or `/22' appended to the network base address result in identical subnetworks with 10 bits of host).
+ You can also export directories to all hosts on an IP (sub-) network simultaneously. This is done by specifying an IP address and nettqmask pair as address/nettqmask where the nettqmask can be specified in dotted-decimal format, or as a contiguous tqmask length (for example, either `/255.255.252.0' or `/22' appended to the network base address result in identical subnetworks with 10 bits of host).
 &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>publicChk</cstring>
                     </property>
@@ -124,7 +124,7 @@ This is just the same as if you would enter a wildcard in the address field.
                 </widget>
             </vbox>
         </widget>
-        <widget class="QGroupBox" row="1" column="0">
+        <widget class="TQGroupBox" row="1" column="0">
             <property name="name">
                 <cstring>GroupBox7</cstring>
             </property>
@@ -149,7 +149,7 @@ This is just the same as if you would enter a wildcard in the address field.
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox" row="0" column="0">
+                <widget class="TQCheckBox" row="0" column="0">
                     <property name="name">
                         <cstring>readOnlyChk</cstring>
                     </property>
@@ -166,7 +166,7 @@ The default is to disallow any request which changes the filesystem
 &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="1" column="0">
+                <widget class="TQCheckBox" row="1" column="0">
                     <property name="name">
                         <cstring>secureChk</cstring>
                     </property>
@@ -183,7 +183,7 @@ If unsure leave it unchecked.
 &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="2" column="0">
+                <widget class="TQCheckBox" row="2" column="0">
                     <property name="name">
                         <cstring>syncChk</cstring>
                     </property>
@@ -200,7 +200,7 @@ The default is to allow the server to write the data out whenever it is ready.
 &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="3" column="0">
+                <widget class="TQCheckBox" row="3" column="0">
                     <property name="name">
                         <cstring>wdelayChk</cstring>
                     </property>
@@ -216,7 +216,7 @@ The default is to allow the server to write the data out whenever it is ready.
 This option only has effect if sync is also set. The NFS server will normally delay committing a write request to disk slightly if it suspects that another related write request may be in progress or may arrive soon. This allows multiple write requests to be committed to disk with the one operation which can improve performance. If an NFS server received mainly small unrelated requests, this behavior could actually reduce performance, so no wdelay is available to turn it off. &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="4" column="0">
+                <widget class="TQCheckBox" row="4" column="0">
                     <property name="name">
                         <cstring>hideChk</cstring>
                     </property>
@@ -226,13 +226,13 @@ This option only has effect if sync is also set. The NFS server will normally de
                     <property name="whatsThis" stdset="0">
                         <string>&lt;b&gt;No hide&lt;/b&gt;
 &lt;p&gt;
-This option is based on the option of the same name provided in IRIX NFS. Normally, if a server exports two filesystems one of which is mounted on the other, then the client will have to mount both filesystems explicitly to get access to them. If it just mounts the parent, it will see an empty directory at the place where the other filesystem is mounted. That filesystem is "hidden".
+This option is based on the option of the same name provided in IRIX NFS. Normally, if a server exports two filesystems one of which is mounted on the other, then the client will have to mount both filesystems explicitly to get access to them. If it just mounts the tqparent, it will see an empty directory at the place where the other filesystem is mounted. That filesystem is "hidden".
 &lt;/p&gt;
 &lt;p&gt;
-Setting the nohide option on a filesystem causes it not to be hidden, and an appropriately authorized client will be able to move from the parent to that filesystem without noticing the change.
+Setting the nohide option on a filesystem causes it not to be hidden, and an appropriately authorized client will be able to move from the tqparent to that filesystem without noticing the change.
 &lt;/p&gt;
 &lt;p&gt;
-However, some NFS clients do not cope well with this situation as, for instance, it is then possible for two files in the one apparent filesystem to have the same inode number.
+However, some NFS clients do not cope well with this situation as, for instance, it is then possible for two files in the one aptqparent filesystem to have the same inode number.
 &lt;/p&gt;
 &lt;p&gt;
 The nohide option is currently only effective on single host exports. It does not work reliably with netgroup, subnet, or wildcard exports.
@@ -242,7 +242,7 @@ This option can be very useful in some situations, but it should be used with du
 &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="5" column="0">
+                <widget class="TQCheckBox" row="5" column="0">
                     <property name="name">
                         <cstring>subtreeChk</cstring>
                     </property>
@@ -268,7 +268,7 @@ As a general guide, a home directory filesystem, which is normally exported at t
 &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox" row="6" column="0">
+                <widget class="TQCheckBox" row="6" column="0">
                     <property name="name">
                         <cstring>secureLocksChk</cstring>
                     </property>
@@ -287,7 +287,7 @@ Early NFS client implementations did not send credentials with lock requests, an
                 </widget>
             </grid>
         </widget>
-        <widget class="QGroupBox" row="1" column="1">
+        <widget class="TQGroupBox" row="1" column="1">
             <property name="name">
                 <cstring>GroupBox3</cstring>
             </property>
@@ -302,7 +302,7 @@ Early NFS client implementations did not send credentials with lock requests, an
             <property name="title">
                 <string>User Mapping</string>
             </property>
-            <property name="alignment">
+            <property name="tqalignment">
                 <set>AlignAuto</set>
             </property>
             <vbox>
@@ -315,7 +315,7 @@ Early NFS client implementations did not send credentials with lock requests, an
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>allSquashChk</cstring>
                     </property>
@@ -328,7 +328,7 @@ Early NFS client implementations did not send credentials with lock requests, an
 Map all uids and gids to the anonymous user. Useful for NFS-exported public FTP directories, news spool directories, etc. &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QCheckBox">
+                <widget class="TQCheckBox">
                     <property name="name">
                         <cstring>rootSquashChk</cstring>
                     </property>
@@ -346,15 +346,15 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
 &lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout15</cstring>
+                        <cstring>tqlayout15</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel1_2</cstring>
                             </property>
@@ -368,7 +368,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
                                 <string>&lt;b&gt;Anonym. UID/GID&lt;/b&gt; &lt;p&gt; These options explicitly set the uid and gid of the anonymous account. This option is primarily useful for PC/NFS clients, where you might want all requests appear to be from one user. &lt;/p&gt;</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>anonuidEdit</cstring>
                             </property>
@@ -380,7 +380,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>50</width>
                                     <height>0</height>
@@ -392,15 +392,15 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="QLayoutWidget">
+                <widget class="TQLayoutWidget">
                     <property name="name">
-                        <cstring>layout16</cstring>
+                        <cstring>tqlayout16</cstring>
                     </property>
                     <hbox>
                         <property name="name">
                             <cstring>unnamed</cstring>
                         </property>
-                        <widget class="QLabel">
+                        <widget class="TQLabel">
                             <property name="name">
                                 <cstring>TextLabel2</cstring>
                             </property>
@@ -414,7 +414,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
                                 <string>&lt;b&gt;Anonym. UID/GID&lt;/b&gt; &lt;p&gt; These options explicitly set the uid and gid of the anonymous account. This option is primarily useful for PC/NFS clients, where you might want all requests appear to be from one user. &lt;/p&gt;</string>
                             </property>
                         </widget>
-                        <widget class="QLineEdit">
+                        <widget class="TQLineEdit">
                             <property name="name">
                                 <cstring>anongidEdit</cstring>
                             </property>
@@ -426,7 +426,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
                                     <verstretch>0</verstretch>
                                 </sizepolicy>
                             </property>
-                            <property name="minimumSize">
+                            <property name="tqminimumSize">
                                 <size>
                                     <width>50</width>
                                     <height>0</height>
@@ -450,7 +450,7 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
             <property name="sizeType">
                 <enum>Expanding</enum>
             </property>
-            <property name="sizeHint">
+            <property name="tqsizeHint">
                 <size>
                     <width>20</width>
                     <height>16</height>
@@ -548,11 +548,11 @@ Map requests from uid/gid 0 to the anonymous uid/gid. Note that this does not ap
 <includes>
     <include location="local" impldecl="in implementation">hostprops.ui.h</include>
 </includes>
-<signals>
+<Q_SIGNALS>
     <signal>modified()</signal>
-</signals>
-<slots>
+</Q_SIGNALS>
+<Q_SLOTS>
     <slot>setModified()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filesharing/advanced/nfs/hostprops.ui.h b/filesharing/advanced/nfs/hostprops.ui.h
index 5d456a22..8baba339 100644
--- a/filesharing/advanced/nfs/hostprops.ui.h
+++ b/filesharing/advanced/nfs/hostprops.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
diff --git a/filesharing/advanced/nfs/nfsdialog.cpp b/filesharing/advanced/nfs/nfsdialog.cpp
index 926e3229..d7b12161 100644
--- a/filesharing/advanced/nfs/nfsdialog.cpp
+++ b/filesharing/advanced/nfs/nfsdialog.cpp
@@ -38,8 +38,8 @@
 #include "nfsfile.h"
 #include "nfsdialoggui.h"
 
-NFSDialog::NFSDialog(TQWidget * parent, NFSEntry* entry)
- : KDialogBase(Plain, i18n("NFS Options"), Ok|Cancel, Ok, parent), 
+NFSDialog::NFSDialog(TQWidget * tqparent, NFSEntry* entry)
+ : KDialogBase(Plain, i18n("NFS Options"), Ok|Cancel, Ok, tqparent), 
    m_nfsEntry(entry),
    m_modified(false)
 {
@@ -62,11 +62,11 @@ void NFSDialog::initGUI() {
   TQWidget* page = plainPage();
   m_gui = new NFSDialogGUI(page);
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page );
-  layout->addWidget( m_gui );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page );
+  tqlayout->addWidget( m_gui );
   
   KAccel* accel = new KAccel( m_gui->listView );
-  accel->insert( "Delete", Qt::Key_Delete, this, TQT_SLOT(slotRemoveHost()));
+  accel->insert( "Delete", TQt::Key_Delete, TQT_TQOBJECT(this), TQT_SLOT(slotRemoveHost()));
 }
 
 void NFSDialog::initSlots()
diff --git a/filesharing/advanced/nfs/nfsdialog.h b/filesharing/advanced/nfs/nfsdialog.h
index e40370b9..90effdae 100644
--- a/filesharing/advanced/nfs/nfsdialog.h
+++ b/filesharing/advanced/nfs/nfsdialog.h
@@ -31,8 +31,9 @@ class NFSDialogGUI;
 class NFSDialog : public KDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public: 
-  NFSDialog(TQWidget * parent, NFSEntry* entry);
+  NFSDialog(TQWidget * tqparent, NFSEntry* entry);
   ~NFSDialog();
   bool modified();
 protected:
diff --git a/filesharing/advanced/nfs/nfsdialoggui.ui b/filesharing/advanced/nfs/nfsdialoggui.ui
index 002ae30a..b3f32cd4 100644
--- a/filesharing/advanced/nfs/nfsdialoggui.ui
+++ b/filesharing/advanced/nfs/nfsdialoggui.ui
@@ -1,6 +1,6 @@
 <!DOCTYPE UI><UI version="3.2" stdsetdef="1">
 <class>NFSDialogGUI</class>
-<widget class="QWidget">
+<widget class="TQWidget">
     <property name="name">
         <cstring>NFSDialogGUI</cstring>
     </property>
@@ -22,7 +22,7 @@
         <property name="spacing">
             <number>6</number>
         </property>
-        <widget class="QGroupBox">
+        <widget class="TQGroupBox">
             <property name="name">
                 <cstring>groupBox</cstring>
             </property>
@@ -49,7 +49,7 @@ The first column shows the name or address of the host, the second column shows
                 <property name="spacing">
                     <number>6</number>
                 </property>
-                <widget class="QPushButton" row="0" column="1">
+                <widget class="TQPushButton" row="0" column="1">
                     <property name="name">
                         <cstring>addHostBtn</cstring>
                     </property>
@@ -57,7 +57,7 @@ The first column shows the name or address of the host, the second column shows
                         <string>&amp;Add Host...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="1" column="1">
+                <widget class="TQPushButton" row="1" column="1">
                     <property name="name">
                         <cstring>modifyHostBtn</cstring>
                     </property>
@@ -68,7 +68,7 @@ The first column shows the name or address of the host, the second column shows
                         <string>Mo&amp;dify Host...</string>
                     </property>
                 </widget>
-                <widget class="QPushButton" row="2" column="1">
+                <widget class="TQPushButton" row="2" column="1">
                     <property name="name">
                         <cstring>removeHostBtn</cstring>
                     </property>
@@ -89,7 +89,7 @@ The first column shows the name or address of the host, the second column shows
                     <property name="sizeType">
                         <enum>Expanding</enum>
                     </property>
-                    <property name="sizeHint">
+                    <property name="tqsizeHint">
                         <size>
                             <width>20</width>
                             <height>40</height>
@@ -149,8 +149,8 @@ The first column shows the name or address of the host, the second column shows
 <includes>
     <include location="local" impldecl="in implementation">nfsdialoggui.ui.h</include>
 </includes>
-<slots>
+<Q_SLOTS>
     <slot>listView_selectionChanged()</slot>
-</slots>
-<layoutdefaults spacing="6" margin="11"/>
+</Q_SLOTS>
+<tqlayoutdefaults spacing="6" margin="11"/>
 </UI>
diff --git a/filesharing/advanced/nfs/nfsdialoggui.ui.h b/filesharing/advanced/nfs/nfsdialoggui.ui.h
index 85894340..8ed1d4e7 100644
--- a/filesharing/advanced/nfs/nfsdialoggui.ui.h
+++ b/filesharing/advanced/nfs/nfsdialoggui.ui.h
@@ -1,7 +1,7 @@
 /****************************************************************************
 ** ui.h extension file, included from the uic-generated form implementation.
 **
-** If you wish to add, delete or rename slots use Qt Designer which will
+** If you wish to add, delete or rename slots use TQt Designer which will
 ** update this file, preserving your code. Create an init() slot in place of
 ** a constructor, and a destroy() slot in place of a destructor.
 *****************************************************************************/
diff --git a/filesharing/advanced/nfs/nfsentry.cpp b/filesharing/advanced/nfs/nfsentry.cpp
index 207e0eae..8c71053d 100644
--- a/filesharing/advanced/nfs/nfsentry.cpp
+++ b/filesharing/advanced/nfs/nfsentry.cpp
@@ -27,8 +27,8 @@ NFSHost::NFSHost(const TQString & hostString)
 
   TQString s = hostString;
 
-  int l = s.find('(');
-  int r = s.find(')');
+  int l = s.tqfind('(');
+  int r = s.tqfind(')');
 
   initParams();
 
@@ -90,7 +90,7 @@ void NFSHost::parseParamsString(const TQString & s)
 
   do
   {
-    i = rest.find(",",0);
+    i = rest.tqfind(",",0);
 
     if (i==-1)
       p = rest;
@@ -125,10 +125,10 @@ TQString NFSHost::paramString() const
   if (!hide) s+="nohide,";
 
   if (anongid!=65534)
-     s+=TQString("anongid=%1,").arg(anongid);
+     s+=TQString("anongid=%1,").tqarg(anongid);
 
   if (anonuid!=65534)
-     s+=TQString("anonuid=%1,").arg(anonuid);
+     s+=TQString("anonuid=%1,").tqarg(anonuid);
 
   // get rid of the last ','
   s.truncate(s.length()-1);
@@ -251,7 +251,7 @@ void NFSHost::setParam(const TQString & s)
      rootSquash = false;
      return; }
 
-  int i = p.find("=",0);
+  int i = p.tqfind("=",0);
 
   // get anongid or anonuid
   if (i>-1)
@@ -306,7 +306,7 @@ TQString NFSEntry::toString() const
 {
   TQString s = _path.stripWhiteSpace();
 
-  if (_path.find(' ') > -1) {
+  if (_path.tqfind(' ') > -1) {
     s = '"'+s+'"';
   }
   
@@ -360,7 +360,7 @@ NFSHost* NFSEntry::getPublicHost() const
   if (result)
       return result;
       
-  return getHostByName(TQString::null);
+  return getHostByName(TQString());
 }
 
 
diff --git a/filesharing/advanced/nfs/nfsentry.h b/filesharing/advanced/nfs/nfsentry.h
index 43071504..98d1e56a 100644
--- a/filesharing/advanced/nfs/nfsentry.h
+++ b/filesharing/advanced/nfs/nfsentry.h
@@ -74,7 +74,7 @@ typedef TQPtrListIterator<NFSLine> NFSLineIterator;
 
 class NFSEmptyLine : public NFSLine {
 public:
-  virtual TQString toString() const { return TQString::fromLatin1("\n"); }
+  virtual TQString toString() const { return TQString::tqfromLatin1("\n"); }
   virtual ~NFSEmptyLine() {};
 };
 
diff --git a/filesharing/advanced/nfs/nfsfile.cpp b/filesharing/advanced/nfs/nfsfile.cpp
index c61a393c..4caea490 100644
--- a/filesharing/advanced/nfs/nfsfile.cpp
+++ b/filesharing/advanced/nfs/nfsfile.cpp
@@ -61,7 +61,7 @@ void NFSFile::removeEntry(NFSEntry *entry)
 
 bool NFSFile::hasEntry(NFSEntry *entry)
 {
-  return 0 < _entries.contains(entry);
+  return 0 < _entries.tqcontains(entry);
 }
 
 
@@ -151,7 +151,7 @@ bool NFSFile::load()
     
     // Handle quotation marks
     if ( completeLine[0] == '"' ) {
-      int i = completeLine.find('"',1);
+      int i = completeLine.tqfind('"',1);
       if (i == -1) {
         kdError() << "NFSFile: Parse error: Missing quotation mark: " 
                   << completeLine << endl;   
@@ -161,9 +161,9 @@ bool NFSFile::load()
       hosts = completeLine.mid(i+1);
       
     } else { // no quotation marks
-      int i = completeLine.find(' ');
+      int i = completeLine.tqfind(' ');
       if (i == -1)
-          i = completeLine.find('\t');
+          i = completeLine.tqfind('\t');
       
       if (i == -1) 
         path = completeLine;
@@ -241,8 +241,8 @@ bool NFSFile::save()
     KProcIO proc;
 
     TQString command = TQString("cp %1 %2")
-        .arg(KProcess::quote( tempFile.name() ))
-        .arg(KProcess::quote( _url.path() ));
+        .tqarg(KProcess::quote( tempFile.name() ))
+        .tqarg(KProcess::quote( _url.path() ));
 
     if (restartNFSServer)
       command +=";exportfs -ra";
diff --git a/filesharing/advanced/nfs/nfshostdlg.cpp b/filesharing/advanced/nfs/nfshostdlg.cpp
index b2205f25..e13be0c7 100644
--- a/filesharing/advanced/nfs/nfshostdlg.cpp
+++ b/filesharing/advanced/nfs/nfshostdlg.cpp
@@ -32,8 +32,8 @@
 #include "nfsentry.h"
 
 
-NFSHostDlg::NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry)
-  : KDialogBase(Plain, i18n("Host Properties"), Ok|Cancel, Ok, parent),
+NFSHostDlg::NFSHostDlg(TQWidget* tqparent, HostList* hosts, NFSEntry* entry)
+  : KDialogBase(Plain, i18n("Host Properties"), Ok|Cancel, Ok, tqparent),
   m_hosts(hosts), m_nfsEntry(entry), m_modified(false)
 {
 
@@ -41,8 +41,8 @@ NFSHostDlg::NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry)
 
   m_gui = new HostProps(page);
 
-  TQVBoxLayout *layout = new TQVBoxLayout( page, 0, 6 );
-  layout->addWidget( m_gui );
+  TQVBoxLayout *tqlayout = new TQVBoxLayout( page, 0, 6 );
+  tqlayout->addWidget( m_gui );
 
   connect( m_gui, TQT_SIGNAL(modified()), this, TQT_SLOT(setModified()));
 
@@ -108,7 +108,7 @@ void NFSHostDlg::setEditValue(TQLineEdit* edit, const TQString & value) {
       edit->setText(value);
   else 
   if (edit->text() != value)
-      edit->setText(TQString::null);
+      edit->setText(TQString());
 }
 
 void NFSHostDlg::setCheckBoxValue(TQCheckBox* chk, bool value) {
@@ -156,14 +156,14 @@ bool NFSHostDlg::saveName(NFSHost* host) {
     TQString name = m_gui->nameEdit->text().stripWhiteSpace();
     if (name.isEmpty()) {
       KMessageBox::sorry(this,
-              i18n("Please enter a hostname or an IP address.").arg(name),
+              i18n("Please enter a hostname or an IP address.").tqarg(name),
               i18n("No Hostname/IP-Address"));
       m_gui->nameEdit->setFocus();
       return false;
     } else {
       NFSHost* host2 = m_nfsEntry->getHostByName(name);
       if (host2 && host2 != host) {
-        KMessageBox::sorry(this,i18n("The host '%1' already exists.").arg(name),
+        KMessageBox::sorry(this,i18n("The host '%1' already exists.").tqarg(name),
                           i18n("Host Already Exists"));
         m_gui->nameEdit->setFocus();
         return false;
diff --git a/filesharing/advanced/nfs/nfshostdlg.h b/filesharing/advanced/nfs/nfshostdlg.h
index 4bee0117..b035b67a 100644
--- a/filesharing/advanced/nfs/nfshostdlg.h
+++ b/filesharing/advanced/nfs/nfshostdlg.h
@@ -31,8 +31,9 @@ class TQLineEdit;
 class NFSHostDlg : public KDialogBase
 {
 Q_OBJECT
+  TQ_OBJECT
 public: 
-	NFSHostDlg(TQWidget* parent, HostList* hosts, NFSEntry* entry);
+	NFSHostDlg(TQWidget* tqparent, HostList* hosts, NFSEntry* entry);
 	virtual ~NFSHostDlg();
     bool isModified();
 protected: