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

49 files changed, 252 insertions, 236 deletions

diff --git a/kpf/DESIGN b/kpf/DESIGN
index 7f5d9fa9..c8eac16b 100644
--- a/kpf/DESIGN
+++ b/kpf/DESIGN
@@ -33,7 +33,7 @@ Server
   May serve more than one request per connection (this is HTTP persistence.)
   Creates Request object on incoming request.
   Creates Response object when incoming request is fully received.
-  Sends Request and Response objects out via signals, so that they
+  Sends Request and Response objects out via Q_SIGNALS, so that they
   may be used by ActiveMonitorItem objects.
 
 WebServer
@@ -93,7 +93,7 @@ traffic is received by a Server object, it simply drops the connection.
 
 A WebServer object is responsible for bandwidth management.
 
-A Server object may not send data until it is told to by its parent (WebServer)
+A Server object may not send data until it is told to by its tqparent (WebServer)
 object. A Server object sends a readyToWrite(this) signal when it has data to
 send.
 
diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp
index 5a11848d..0f1134e4 100644
--- a/kpf/src/ActiveMonitor.cpp
+++ b/kpf/src/ActiveMonitor.cpp
@@ -38,10 +38,10 @@ namespace KPF
   ActiveMonitor::ActiveMonitor
     (
      WebServer * server,
-     TQWidget * parent,
+     TQWidget * tqparent,
      const char * name
     )
-    : TQWidget (parent, name),
+    : TQWidget (tqparent, name),
       server_ (server)
   {
     view_ = new TQListView(this);
@@ -49,7 +49,7 @@ namespace KPF
     view_->setAllColumnsShowFocus(true);
     view_->setSelectionMode(TQListView::Extended);
 
-    view_->addColumn(i18n("Status"));
+    view_->addColumn(i18n("tqStatus"));
     view_->addColumn(i18n("Progress"));
     view_->addColumn(i18n("File Size"));
     view_->addColumn(i18n("Bytes Sent"));
@@ -57,9 +57,9 @@ namespace KPF
     view_->addColumn(i18n("Resource"));
     view_->addColumn(i18n("Host"));
 
-    TQVBoxLayout * layout = new TQVBoxLayout(this);
+    TQVBoxLayout * tqlayout = new TQVBoxLayout(this);
 
-    layout->addWidget(view_);
+    tqlayout->addWidget(view_);
 
     connect
       (
@@ -146,7 +146,7 @@ namespace KPF
     void
   ActiveMonitor::slotCull()
   {
-    TQDateTime dt = TQDateTime::currentDateTime();
+    TQDateTime dt = TQDateTime::tqcurrentDateTime();
 
     TQListViewItemIterator it(view_);
 
diff --git a/kpf/src/ActiveMonitor.h b/kpf/src/ActiveMonitor.h
index 742bed6f..7beb7828 100644
--- a/kpf/src/ActiveMonitor.h
+++ b/kpf/src/ActiveMonitor.h
@@ -44,9 +44,10 @@ namespace KPF
    * Proxies signals from Server objects to ActiveMonitorItem objects.
    * This is done to avoid making ActiveMonitorItem inherit TQObject.
    */
-  class ActiveMonitor : public QWidget
+  class ActiveMonitor : public TQWidget
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
@@ -57,7 +58,7 @@ namespace KPF
       ActiveMonitor
         (
           WebServer   * server,
-          TQWidget     * parent  = 0,
+          TQWidget     * tqparent  = 0,
           const char  * name    = 0
         );
 
diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp
index 6721080e..367ff768 100644
--- a/kpf/src/ActiveMonitorItem.cpp
+++ b/kpf/src/ActiveMonitorItem.cpp
@@ -31,8 +31,8 @@
 
 namespace KPF
 {
-  ActiveMonitorItem::ActiveMonitorItem(Server * server, TQListView * parent)
-    : TQListViewItem (parent),
+  ActiveMonitorItem::ActiveMonitorItem(Server * server, TQListView * tqparent)
+    : TQListViewItem (tqparent),
       server_       (server),
       size_         (0),
       sent_         (0)
@@ -93,7 +93,7 @@ namespace KPF
   {
     switch (c)
     {
-      case Status:
+      case tqStatus:
         return 16;
         break;
 
@@ -115,19 +115,19 @@ namespace KPF
       switch (server_->state())
       {
         case Server::WaitingForRequest:
-          setPixmap(Status, SmallIcon("connect_creating"));
+          setPixmap(tqStatus, SmallIcon("connect_creating"));
           break;
 
         case Server::WaitingForHeaders:
-          setPixmap(Status, SmallIcon("connect_creating"));
+          setPixmap(tqStatus, SmallIcon("connect_creating"));
           break;
 
         case Server::Responding:
-          setPixmap(Status, SmallIcon("connect_established"));
+          setPixmap(tqStatus, SmallIcon("connect_established"));
           break;
 
         case Server::Finished:
-          setPixmap(Status, SmallIcon("connect_no"));
+          setPixmap(tqStatus, SmallIcon("connect_no"));
           break;
       }
     }
@@ -139,7 +139,7 @@ namespace KPF
     return server_;
   }
 
-    QDateTime
+    TQDateTime
   ActiveMonitorItem::death() const
   {
     return death_;
@@ -178,7 +178,7 @@ namespace KPF
       sent_ += l;
       setText(Sent, TQString::number(sent_));
       updateState();
-      repaint();
+      tqrepaint();
     }
   }
 
diff --git a/kpf/src/ActiveMonitorItem.h b/kpf/src/ActiveMonitorItem.h
index 0f03f716..fe8b5aa3 100644
--- a/kpf/src/ActiveMonitorItem.h
+++ b/kpf/src/ActiveMonitorItem.h
@@ -42,13 +42,13 @@ namespace KPF
    * and the response code, plus a simple graph displaying the data transfer
    * progress of any response.
    */
-  class ActiveMonitorItem : public QListViewItem
+  class ActiveMonitorItem : public TQListViewItem
   {
     public:
 
       enum Column
       {
-        Status,
+        tqStatus,
         Progress,
         Size,
         Sent,
@@ -60,7 +60,7 @@ namespace KPF
       /**
        * @param server the associated Server object.
        */
-      ActiveMonitorItem(Server * server, TQListView * parent);
+      ActiveMonitorItem(Server * server, TQListView * tqparent);
       virtual ~ActiveMonitorItem();
 
       /**
diff --git a/kpf/src/ActiveMonitorWindow.cpp b/kpf/src/ActiveMonitorWindow.cpp
index 7eb3f07f..1d4ef84b 100644
--- a/kpf/src/ActiveMonitorWindow.cpp
+++ b/kpf/src/ActiveMonitorWindow.cpp
@@ -34,12 +34,12 @@ namespace KPF
   ActiveMonitorWindow::ActiveMonitorWindow
     (
       WebServer   * server,
-      TQWidget     * parent,
+      TQWidget     * tqparent,
       const char  * name
     )
-    : KMainWindow(parent, name)
+    : KMainWindow(tqparent, name)
   {
-    setCaption(i18n("Monitoring %1 - kpf").arg(server->root()));
+    setCaption(i18n("Monitoring %1 - kpf").tqarg(server->root()));
 
     monitor_ = new ActiveMonitor(server, this, "ActiveMonitor");
 
@@ -51,7 +51,7 @@ namespace KPF
         i18n("&Cancel Selected Transfers"),
         "stop",
         0,
-        monitor_,
+        TQT_TQOBJECT(monitor_),
         TQT_SLOT(slotKillSelected()),
         actionCollection(),
         "kill"
diff --git a/kpf/src/ActiveMonitorWindow.h b/kpf/src/ActiveMonitorWindow.h
index bb9dc2e0..5db33194 100644
--- a/kpf/src/ActiveMonitorWindow.h
+++ b/kpf/src/ActiveMonitorWindow.h
@@ -42,6 +42,7 @@ namespace KPF
   class ActiveMonitorWindow : public KMainWindow
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
@@ -52,7 +53,7 @@ namespace KPF
       ActiveMonitorWindow
         (
           WebServer   * server,
-          TQWidget     * parent  = 0,
+          TQWidget     * tqparent  = 0,
           const char  * name    = 0
         );
 
diff --git a/kpf/src/Applet.cpp b/kpf/src/Applet.cpp
index 0eee06c8..8311231c 100644
--- a/kpf/src/Applet.cpp
+++ b/kpf/src/Applet.cpp
@@ -54,7 +54,7 @@ static const char kpfVersion[] = "1.0.1";
 extern "C"
 {
   KDE_EXPORT  KPanelApplet *
-  init(TQWidget * parent, const TQString & configFile)
+  init(TQWidget * tqparent, const TQString & configFile)
   {
     if (0 == kpf::userId() || 0 == kpf::effectiveUserId())
     {
@@ -79,7 +79,7 @@ extern "C"
          configFile,
          KPanelApplet::Normal,
          KPanelApplet::About|KPanelApplet::Help,
-         parent,
+         tqparent,
          "kpf"
         );
     }
@@ -93,10 +93,10 @@ namespace KPF
    const TQString  & configFile,
    Type             type,
    int              actions,
-   TQWidget        * parent,
+   TQWidget        * tqparent,
    const char     * name
   )
-    : KPanelApplet  (configFile, type, actions, parent, name),
+    : KPanelApplet  (configFile, type, actions, tqparent, name),
       wizard_       (0L),
       popup_        (0L),
       dcopClient_   (0L)
@@ -148,7 +148,7 @@ namespace KPF
     if (0 == serverCount)
       serverCount = 1;
 
-    if (Vertical == orientation())
+    if (Qt::Vertical == orientation())
       return h / serverCount;
     else
       return h * serverCount;
@@ -162,7 +162,7 @@ namespace KPF
     if (0 == serverCount)
       serverCount = 1;
 
-    if (Vertical == orientation())
+    if (Qt::Vertical == orientation())
       return w * serverCount;
     else
       return w / serverCount;
@@ -171,7 +171,7 @@ namespace KPF
     void
   Applet::help()
   {
-    kapp->invokeHelp( TQString::null, "kpf" );
+    kapp->invokeHelp( TQString(), "kpf" );
   }
 
     void
@@ -220,7 +220,7 @@ namespace KPF
   }
 
     void
-  Applet::orientationChange(Orientation)
+  Applet::orientationChange(Qt::Orientation)
   {
     resetLayout();
   }
@@ -248,7 +248,7 @@ namespace KPF
 
     switch (orientation())
     {
-      case Vertical:
+      case Qt::Vertical:
         {
           uint itemHeight = height() / itemList_.count();
 
@@ -262,7 +262,7 @@ namespace KPF
         }
         break;
 
-      case Horizontal:
+      case Qt::Horizontal:
         {
           uint itemWidth = width() / itemList_.count();
 
diff --git a/kpf/src/Applet.h b/kpf/src/Applet.h
index 9520d237..bd41962f 100644
--- a/kpf/src/Applet.h
+++ b/kpf/src/Applet.h
@@ -46,6 +46,7 @@ namespace KPF
   class Applet : public KPanelApplet
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
@@ -92,13 +93,13 @@ namespace KPF
 
       /**
        * Called when a WebServer object has been created. Creates an
-       * AppletItem, associates it with the former, and updates the layout.
+       * AppletItem, associates it with the former, and updates the tqlayout.
        */
       void slotServerCreated(WebServer *);
 
       /**
        * Called when a WebServer object has been disabled. 
-       * Deletes the associated AppletItem and updates the layout.
+       * Deletes the associated AppletItem and updates the tqlayout.
        */
       void slotServerDisabled(WebServer *);
 
@@ -120,13 +121,13 @@ namespace KPF
       virtual void about();
 
       /**
-       * Overridden to keep track of orientation change and update layout
+       * Overridden to keep track of orientation change and update tqlayout
        * accordingly.
        */
-      virtual void orientationChange(Orientation);
+      virtual void orientationChange(Qt::Orientation);
 
       /**
-       * Overridden to update layout accordingly.
+       * Overridden to update tqlayout accordingly.
        */
       virtual void moveEvent(TQMoveEvent *);
       virtual void resizeEvent(TQResizeEvent *);
@@ -137,7 +138,7 @@ namespace KPF
       virtual void mousePressEvent(TQMouseEvent *);
 
       /**
-       * Updates the layout, moving AppletItem objects into proper positions.
+       * Updates the tqlayout, moving AppletItem objects into proper positions.
        */
       virtual void resetLayout();
 
diff --git a/kpf/src/AppletItem.cpp b/kpf/src/AppletItem.cpp
index 4c70640e..9e49679d 100644
--- a/kpf/src/AppletItem.cpp
+++ b/kpf/src/AppletItem.cpp
@@ -43,8 +43,8 @@
 
 namespace KPF
 {
-  AppletItem::AppletItem(WebServer * server, TQWidget * parent)
-    : TQWidget       (parent, "KPF::AppletItem"),
+  AppletItem::AppletItem(WebServer * server, TQWidget * tqparent)
+    : TQWidget       (tqparent, "KPF::AppletItem"),
       server_       (server),
       configDialog_ (0L),
       monitorWindow_      (0L),
@@ -62,7 +62,7 @@ namespace KPF
 
     (new TQVBoxLayout(this))->addWidget(graph_);
 
-    TQString popupTitle(i18n("kpf - %1").arg(server_->root()));
+    TQString popupTitle(i18n("kpf - %1").tqarg(server_->root()));
 
     popup_ = new KPopupMenu(this);
 
@@ -123,7 +123,7 @@ namespace KPF
 
       case TQEvent::MouseButtonRelease:
         {
-          TQMouseEvent * e = static_cast<TQMouseEvent *>(ev);
+          TQMouseEvent * e = TQT_TQMOUSEEVENT(ev);
 
           if (0 == e)
           {
@@ -132,7 +132,7 @@ namespace KPF
             break;
           }
 
-          if (!rect().contains(e->pos()))
+          if (!TQT_TQRECT_OBJECT(rect()).tqcontains(e->pos()))
           {
             break;
           }
@@ -159,7 +159,7 @@ namespace KPF
 
       case TQEvent::MouseButtonPress:
         {
-          TQMouseEvent * e = static_cast<TQMouseEvent *>(ev);
+          TQMouseEvent * e = TQT_TQMOUSEEVENT(ev);
 
           if (0 == e)
           {
diff --git a/kpf/src/AppletItem.h b/kpf/src/AppletItem.h
index 5c602e13..6381555b 100644
--- a/kpf/src/AppletItem.h
+++ b/kpf/src/AppletItem.h
@@ -43,9 +43,10 @@ namespace KPF
    * which allows WebServer object control, plus creation of a new WebServer,
    * for user convenience.
    */
-  class AppletItem : public QWidget
+  class AppletItem : public TQWidget
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
@@ -53,7 +54,7 @@ namespace KPF
        * @param server The WebServer object which will be monitored and
        * controlled by this object.
        */
-      AppletItem(WebServer * server, TQWidget * parent);
+      AppletItem(WebServer * server, TQWidget * tqparent);
 
       ~AppletItem();
 
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index 9acc85e5..bc2f1ee8 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -40,10 +40,10 @@ namespace KPF
     (
      WebServer      * server,
      OverlaySelect    overlaySelect,
-     TQWidget        * parent,
+     TQWidget        * tqparent,
      const char     * name
     )
-    : TQWidget       (parent, name, WRepaintNoErase),
+    : TQWidget       (tqparent, name, WRepaintNoErase),
       server_       (server),
       max_          (0L),
       overlaySelect_  (overlaySelect)
@@ -88,10 +88,10 @@ namespace KPF
   BandwidthGraph::setTooltip()
   {
     TQToolTip::add(this, i18n( "%1 on port %2" )
-            .arg( server_->root() ).arg( server_->listenPort() ) );
+            .tqarg( server_->root() ).tqarg( server_->listenPort() ) );
   }
 
-    QRect
+    TQRect
   BandwidthGraph::contentsRect() const
   {
     return TQRect(1, 1, width() - 2, height() - 2);
@@ -112,7 +112,7 @@ namespace KPF
     p.drawPixmap( ( width()-bgPix_.width() )/2, 
             ( height()-bgPix_.height() )/2, bgPix_ );
 
-    p.setPen(colorGroup().dark());
+    p.setPen(tqcolorGroup().dark());
 
     for (uint i = 0; i < history_.size(); i++)
     {
@@ -251,15 +251,15 @@ namespace KPF
 
       if (max_ > 1024)
         if (max_ > 1024 * 1024)
-          maxString = mbs.arg(max_ / (1024 * 1024));
+          maxString = mbs.tqarg(max_ / (1024 * 1024));
         else
-          maxString = kbs.arg(max_ / 1024);
+          maxString = kbs.tqarg(max_ / 1024);
       else if ( max_ > 0 )
-        maxString = bs.arg(max_);
+        maxString = bs.tqarg(max_);
       else
         maxString = i18n( "Idle" );
 
-      p.setPen(Qt::white);
+      p.setPen(TQt::white);
 
       p.drawText
         (
@@ -268,7 +268,7 @@ namespace KPF
          maxString
         );
 
-      p.setPen(Qt::black);
+      p.setPen(TQt::black);
 
       p.drawText
         (
@@ -279,14 +279,14 @@ namespace KPF
     }
   }
 
-    QSize
-  BandwidthGraph::sizeHint() const
+    TQSize
+  BandwidthGraph::tqsizeHint() const
   {
     return TQSize(32, 32);
   }
 
-    QSize
-  BandwidthGraph::minimumSizeHint() const
+    TQSize
+  BandwidthGraph::tqminimumSizeHint() const
   {
     return TQSize(12, 12);
   }
diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h
index 4ac4adcf..ef72a3b8 100644
--- a/kpf/src/BandwidthGraph.h
+++ b/kpf/src/BandwidthGraph.h
@@ -40,9 +40,10 @@ namespace KPF
    * May also displays an overlayed icon to show the status of a WebServer,
    * i.e. whether it is active (no icon,) paused or in contention for a port.
    */
-  class BandwidthGraph : public QWidget
+  class BandwidthGraph : public TQWidget
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
@@ -61,7 +62,7 @@ namespace KPF
         (
          WebServer    * server,
          OverlaySelect  overlaySelect,
-         TQWidget      * parent = 0,
+         TQWidget      * tqparent = 0,
          const char   * name = 0
         );
 
@@ -73,14 +74,14 @@ namespace KPF
       void setTooltip();
 
       /**
-       * Overridden to provide reasonable default size and shape.
+       * Overridden to provide reasonable default size and tqshape.
        */
-      virtual TQSize sizeHint() const;
+      virtual TQSize tqsizeHint() const;
 
       /**
-       * Overridden to provide reasonable minimum size and shape.
+       * Overridden to provide reasonable minimum size and tqshape.
        */
-      virtual TQSize minimumSizeHint() const;
+      virtual TQSize tqminimumSizeHint() const;
 
       /**
        * @return the WebServer object given on construction.
diff --git a/kpf/src/ByteRange.cpp b/kpf/src/ByteRange.cpp
index 2db5de6b..b5bdf0a1 100644
--- a/kpf/src/ByteRange.cpp
+++ b/kpf/src/ByteRange.cpp
@@ -128,7 +128,7 @@ namespace KPF
   {
     kpfDebug << "addByteRange(" << s << ")" << endl;
 
-    int dashPos = s.find('-');
+    int dashPos = s.tqfind('-');
 
     if (-1 == dashPos)
     {
diff --git a/kpf/src/ConfigDialogPage.cpp b/kpf/src/ConfigDialogPage.cpp
index 657e96f0..12872a0a 100644
--- a/kpf/src/ConfigDialogPage.cpp
+++ b/kpf/src/ConfigDialogPage.cpp
@@ -43,8 +43,8 @@
 
 namespace KPF
 {
-  ConfigDialogPage::ConfigDialogPage(WebServer * server, TQWidget * parent)
-    : TQWidget                   (parent, "KPF::ConfigDialogPage"),
+  ConfigDialogPage::ConfigDialogPage(WebServer * server, TQWidget * tqparent)
+    : TQWidget                   (tqparent, "KPF::ConfigDialogPage"),
       server_                   (server),
       errorMessageConfigDialog_ (0L)
   {
diff --git a/kpf/src/ConfigDialogPage.h b/kpf/src/ConfigDialogPage.h
index ff798155..aef03cca 100644
--- a/kpf/src/ConfigDialogPage.h
+++ b/kpf/src/ConfigDialogPage.h
@@ -41,13 +41,14 @@ namespace KPF
   /**
    * Allows user configuration of a WebServer object.
    */
-  class ConfigDialogPage : public QWidget
+  class ConfigDialogPage : public TQWidget
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-      ConfigDialogPage(WebServer *, TQWidget * parent);
+      ConfigDialogPage(WebServer *, TQWidget * tqparent);
 
       virtual ~ConfigDialogPage();
 
@@ -86,7 +87,7 @@ namespace KPF
       TQLabel    * l_listenPort_;
       TQLabel    * l_bandwidthLimit_;
       TQLabel    * l_connectionLimit_;
-      QLabel	* l_serverName_;
+      TQLabel	* l_serverName_;
 
       TQSpinBox  * sb_listenPort_;
       TQSpinBox  * sb_bandwidthLimit_;
diff --git a/kpf/src/Defaults.cpp b/kpf/src/Defaults.cpp
index 07e42c39..9d2cc020 100644
--- a/kpf/src/Defaults.cpp
+++ b/kpf/src/Defaults.cpp
@@ -34,7 +34,7 @@ namespace KPF
     const bool  DefaultFollowSymlinks  = false;
     const bool  DefaultCustomErrors    = false;
     const bool  DefaultPaused          = false;
-    const TQString& DefaultServername   = TQString::null;
+    const TQString& DefaultServername   = TQString();
 
     static const char       Name[]                    = "kpfappletrc";
     static const char       KeyServerRootList[]       = "ServerRootList";
@@ -88,7 +88,7 @@ namespace KPF
          * to extend this switch.
          */
       }
-      return TQString::null;
+      return TQString();
     }
   } // End namespace Config
 
diff --git a/kpf/src/DirSelectWidget.cpp b/kpf/src/DirSelectWidget.cpp
index a405dcb0..92b6ab0a 100644
--- a/kpf/src/DirSelectWidget.cpp
+++ b/kpf/src/DirSelectWidget.cpp
@@ -39,10 +39,10 @@ namespace KPF
   DirSelectWidget::DirSelectWidget
     (
       const TQString & pathToMakeVisible,
-      TQWidget       * parent,
+      TQWidget       * tqparent,
       const char    * name
     )
-    : KListView(parent, name)
+    : KListView(tqparent, name)
   {
     d = new Private;
     d->pathToMakeVisible = pathToMakeVisible;
@@ -71,7 +71,7 @@ namespace KPF
     void
   DirSelectWidget::timerEvent(TQTimerEvent *)
   {
-    killTimers();
+    TQT_TQOBJECT(this)->killTimers();
 
     if (0 != firstChild())
       firstChild()->setOpen(true);
@@ -87,10 +87,10 @@ namespace KPF
 
     TQDir dir(p);
 
-    const QFileInfoList * entryInfoList =
+    const TQFileInfoList * entryInfoList =
       dir.entryInfoList(TQDir::Dirs | TQDir::Readable);
 
-    for (QFileInfoListIterator it(*entryInfoList); it.current(); ++it)
+    for (TQFileInfoListIterator it(*entryInfoList); it.current(); ++it)
     {
       if (it.current()->isDir() && it.current()->isReadable())
       {
@@ -100,12 +100,12 @@ namespace KPF
     }
   }
 
-    QString
+    TQString
   DirSelectWidget::path(TQListViewItem * item) const
   {
     TQString ret(item->text(0));
 
-    while (0 != (item = item->parent()))
+    while (0 != (item = item->tqparent()))
       ret.prepend("/" + item->text(0));
 
     return ret;
diff --git a/kpf/src/DirSelectWidget.h b/kpf/src/DirSelectWidget.h
index 6bb2194f..a16b13d9 100644
--- a/kpf/src/DirSelectWidget.h
+++ b/kpf/src/DirSelectWidget.h
@@ -34,6 +34,7 @@ namespace KPF
   class DirSelectWidget : public KListView
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
diff --git a/kpf/src/DirectoryLister.cpp b/kpf/src/DirectoryLister.cpp
index b642d912..18aa7a98 100644
--- a/kpf/src/DirectoryLister.cpp
+++ b/kpf/src/DirectoryLister.cpp
@@ -63,7 +63,7 @@ namespace KPF
 
   TQByteArray buildHTML(const TQString & title, const TQString & body)
   {
-    TQPalette pal = qApp->palette();
+    TQPalette pal = tqApp->palette();
     TQByteArray temp_string;
     TQTextStream html(temp_string, IO_WriteOnly);
 
@@ -226,7 +226,7 @@ namespace KPF
     delete d;
   }
 
-    QByteArray
+    TQByteArray
   DirectoryLister::html(const TQString & root, const TQString & _path)
   {
     kpfDebug << "root: " << root << " path: " << _path << endl;
@@ -248,11 +248,11 @@ namespace KPF
       return buildHTML
         (
           i18n("Error"),
-          i18n("Directory does not exist: %1 %2").arg(root).arg(path)
+          i18n("Directory does not exist: %1 %2").tqarg(root).tqarg(path)
         );
     }
 
-    const QFileInfoList * infoList =
+    const TQFileInfoList * infoList =
       d.entryInfoList(TQDir::DefaultFilter, TQDir::Name | TQDir::DirsFirst);
 
     if (0 == infoList)
@@ -260,7 +260,7 @@ namespace KPF
       return buildHTML
         (
           i18n("Error"),
-          i18n("Directory unreadable: %1 %2").arg(root).arg(path)
+          i18n("Directory unreadable: %1 %2").tqarg(root).tqarg(path)
         );
     }
 
@@ -275,7 +275,7 @@ namespace KPF
     html  += "<th align=\"left\" class=\"listheading\">Size</th>\n";
     html  += "</tr>\n";
 
-    for (QFileInfoListIterator it(*infoList); it.current(); ++it)
+    for (TQFileInfoListIterator it(*infoList); it.current(); ++it)
     {
       static int counter = 0;
 
@@ -335,7 +335,7 @@ namespace KPF
 
     return buildHTML
       (
-        i18n("Directory listing for %1").arg(TQStyleSheet::escape(path)),
+        i18n("Directory listing for %1").tqarg(TQStyleSheet::escape(path)),
         html
       );
   }
diff --git a/kpf/src/ErrorMessageConfigDialog.cpp b/kpf/src/ErrorMessageConfigDialog.cpp
index 0a2833c6..1d913146 100644
--- a/kpf/src/ErrorMessageConfigDialog.cpp
+++ b/kpf/src/ErrorMessageConfigDialog.cpp
@@ -42,11 +42,11 @@ namespace KPF
   ErrorMessageConfigDialog::ErrorMessageConfigDialog
   (
    WebServer  * webServer,
-   TQWidget    * parent
+   TQWidget    * tqparent
   )
     : KDialogBase
     (
-     parent,
+     tqparent,
      "ErrorMessageConfigDialog",
      false,
      i18n("Configure error messages"),
@@ -62,11 +62,11 @@ namespace KPF
 
     TQFrame * w = makeMainWidget();
 
-    TQVBoxLayout * layout =
+    TQVBoxLayout * tqlayout =
       new TQVBoxLayout(w, KDialog::marginHint(), KDialog::spacingHint());
 
     TQLabel * info =
-      new QLabel
+      new TQLabel
       (
        i18n
        (
@@ -84,9 +84,9 @@ namespace KPF
        w
       );
 
-    layout->addWidget(info);
+    tqlayout->addWidget(info);
 
-    TQGridLayout * grid = new TQGridLayout(layout, codeList.count(), 2);
+    TQGridLayout * grid = new TQGridLayout(tqlayout, codeList.count(), 2);
 
     TQString pattern(i18n("%1 %2"));
 
@@ -107,7 +107,7 @@ namespace KPF
 
       itemList_.append(new Item(*it, requester, responseName, originalPath));
 
-      TQLabel * l = new TQLabel(pattern.arg(*it).arg(responseName), w);
+      TQLabel * l = new TQLabel(pattern.tqarg(*it).tqarg(responseName), w);
 
       l->setBuddy(requester);
 
diff --git a/kpf/src/ErrorMessageConfigDialog.h b/kpf/src/ErrorMessageConfigDialog.h
index 7ad71a40..3c43f940 100644
--- a/kpf/src/ErrorMessageConfigDialog.h
+++ b/kpf/src/ErrorMessageConfigDialog.h
@@ -39,10 +39,11 @@ namespace KPF
   class ErrorMessageConfigDialog : public KDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-      ErrorMessageConfigDialog(WebServer *, TQWidget * parent);
+      ErrorMessageConfigDialog(WebServer *, TQWidget * tqparent);
 
       virtual ~ErrorMessageConfigDialog();
 
diff --git a/kpf/src/KPFInterface.cpp b/kpf/src/KPFInterface.cpp
index cc9c4bc5..47e4acef 100644
--- a/kpf/src/KPFInterface.cpp
+++ b/kpf/src/KPFInterface.cpp
@@ -37,14 +37,14 @@ KPFInterface::~KPFInterface()
   // Empty.
 }
 
-  QStringList
+  TQStringList
 KPFInterface::serverRootList()
 {
-  QList<KPF::WebServer> l(KPF::WebServerManager::instance()->serverListLocal());
+  TQList<KPF::WebServer> l(KPF::WebServerManager::instance()->serverListLocal());
 
   TQStringList ret;
 
-  for (QListIterator<KPF::WebServer> it(l); it.current(); ++it)
+  for (TQListIterator<KPF::WebServer> it(l); it.current(); ++it)
     ret << it.current()->root();
 
   return ret;
diff --git a/kpf/src/PortValidator.cpp b/kpf/src/PortValidator.cpp
index b841377c..538cd3bf 100644
--- a/kpf/src/PortValidator.cpp
+++ b/kpf/src/PortValidator.cpp
@@ -27,8 +27,8 @@
 
 namespace KPF
 {
-  PortValidator::PortValidator(TQObject * parent, const char * name)
-    : TQValidator(parent, name)
+  PortValidator::PortValidator(TQObject * tqparent, const char * name)
+    : TQValidator(tqparent, name)
   {
     // Empty.
   }
diff --git a/kpf/src/PortValidator.h b/kpf/src/PortValidator.h
index cba5cbfc..c252c6a2 100644
--- a/kpf/src/PortValidator.h
+++ b/kpf/src/PortValidator.h
@@ -32,11 +32,11 @@ namespace KPF
    * Used for checking that a port input by the user is not the same as
    * one used by an existing server.
    */
-  class PortValidator : public QValidator
+  class PortValidator : public TQValidator
   {
     public:
 
-      PortValidator(TQObject * parent, const char * name = 0);
+      PortValidator(TQObject * tqparent, const char * name = 0);
 
       virtual State validate(TQString & input, int & pos) const;
   };
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index b53422ba..57f7c994 100644
--- a/kpf/src/PropertiesDialogPlugin.cpp
+++ b/kpf/src/PropertiesDialogPlugin.cpp
@@ -136,7 +136,7 @@ namespace KPF
       TQLabel                * l_bandwidthLimit;
 //      TQLabel                * l_connectionLimit;
       TQLabel                * l_serverName;
-      TQLabel                * l_kpfStatus;
+      TQLabel                * l_kpftqStatus;
 
       TQSpinBox              * sb_listenPort;
       TQSpinBox              * sb_bandwidthLimit;
@@ -273,12 +273,12 @@ namespace KPF
   }
 
     TQWidget *
-  PropertiesDialogPlugin::createInitWidget(TQWidget * parent)
+  PropertiesDialogPlugin::createInitWidget(TQWidget * tqparent)
   {
-    TQWidget * w = new TQWidget(parent);
+    TQWidget * w = new TQWidget(tqparent);
 
     TQLabel * about =
-      new QLabel
+      new TQLabel
       (
        i18n
        (
@@ -298,10 +298,10 @@ namespace KPF
 
     l->addWidget(about);
 
-    d->l_kpfStatus =
+    d->l_kpftqStatus =
       new TQLabel(i18n("Applet status: <strong>not running</strong>"), w);
 
-    l->addWidget(d->l_kpfStatus);
+    l->addWidget(d->l_kpftqStatus);
 
     TQHBoxLayout * l2 = new TQHBoxLayout(l);
 
@@ -316,9 +316,9 @@ namespace KPF
   }
 
     TQWidget *
-  PropertiesDialogPlugin::createConfigWidget(TQWidget * parent)
+  PropertiesDialogPlugin::createConfigWidget(TQWidget * tqparent)
   {
-    TQWidget * w = new TQWidget(parent);
+    TQWidget * w = new TQWidget(tqparent);
 
     d->cb_share =
       new TQCheckBox(i18n("Share this directory on the &Web"), w);
@@ -395,7 +395,7 @@ namespace KPF
        " (%1)"
        "</p>"
       )
-      .arg(TQDir::homeDirPath());
+      .tqarg(TQDir::homeDirPath());
 
     TQString listenPortHelp =
       i18n
@@ -507,11 +507,11 @@ namespace KPF
     void
   PropertiesDialogPlugin::slotStartKPF()
   {
-    d->l_kpfStatus
+    d->l_kpftqStatus
       ->setText(i18n("Applet status: <strong>starting...</strong>"));
 
     kapp->dcopClient()
-      ->send("kicker", "default", "addApplet(TQString)", "kpfapplet.desktop");
+      ->send("kicker", "default", "addApplet(TQString)", TQString("kpfapplet.desktop"));
 
     TQTimer::singleShot(4 * 1000, this, TQT_SLOT(slotStartKPFFailed()));
   }
@@ -519,7 +519,7 @@ namespace KPF
     void
   PropertiesDialogPlugin::slotStartKPFFailed()
   {
-    d->l_kpfStatus
+    d->l_kpftqStatus
       ->setText(i18n("Applet status: <strong>failed to start</strong>"));
 
     d->pb_startKPF->setEnabled(true);
@@ -532,7 +532,7 @@ namespace KPF
     {
       d->kpfRunning = true;
 
-      d->l_kpfStatus
+      d->l_kpftqStatus
         ->setText(i18n("Applet status: <strong>running</strong>"));
 
       d->pb_startKPF->setEnabled(false);
@@ -554,7 +554,7 @@ namespace KPF
 
       d->pb_startKPF->setEnabled(true);
 
-      d->l_kpfStatus
+      d->l_kpftqStatus
         ->setText(i18n("Applet status: <strong>not running</strong>"));
 
       d->stack->raiseWidget(d->initWidget);
diff --git a/kpf/src/PropertiesDialogPlugin.h b/kpf/src/PropertiesDialogPlugin.h
index 8406f4c2..fc46b77d 100644
--- a/kpf/src/PropertiesDialogPlugin.h
+++ b/kpf/src/PropertiesDialogPlugin.h
@@ -37,6 +37,7 @@ namespace KPF
   class PropertiesDialogPlugin : public KPropsDlgPlugin
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
@@ -64,8 +65,8 @@ namespace KPF
       void updateGUIFromCurrentState();
       void updateWantedStateFromGUI();
 
-      TQWidget * createInitWidget(TQWidget * parent);
-      TQWidget * createConfigWidget(TQWidget * parent);
+      TQWidget * createInitWidget(TQWidget * tqparent);
+      TQWidget * createConfigWidget(TQWidget * tqparent);
 
       void readSettings();
       void setControlsEnabled(bool);
diff --git a/kpf/src/Request.cpp b/kpf/src/Request.cpp
index 442e4993..886aac44 100644
--- a/kpf/src/Request.cpp
+++ b/kpf/src/Request.cpp
@@ -56,7 +56,7 @@ namespace KPF
     {
       TQString line(*it);
 
-      int colonPos = line.find(':');
+      int colonPos = line.tqfind(':');
 
       if (-1 != colonPos)
       {
@@ -114,7 +114,7 @@ namespace KPF
 
     s.remove(0, 5);
 
-    int dotPos = s.find('.');
+    int dotPos = s.tqfind('.');
 
     if (-1 != dotPos)
     {
@@ -224,31 +224,31 @@ namespace KPF
     return haveIfUnmodifiedSince_;
   }
 
-    QString
+    TQString
   Request::path() const
   {
     return path_;
   }
 
-    QString
+    TQString
   Request::host() const
   {
     return host_;
   }
 
-    QDateTime
+    TQDateTime
   Request::ifModifiedSince() const
   {
     return ifModifiedSince_;
   }
 
-    QDateTime
+    TQDateTime
   Request::ifUnmodifiedSince() const
   {
     return ifUnmodifiedSince_;
   }
 
-    QCString
+    TQCString
   Request::protocolString() const
   {
     TQCString s("HTTP/");
@@ -346,14 +346,14 @@ namespace KPF
     expectContinue_         = false;
     haveRange_              = false;
     persist_                = false;
-    path_                   = TQString::null;
-    host_                   = TQString::null;
+    path_                   = TQString();
+    host_                   = TQString();
     ifModifiedSince_        = TQDateTime();
     ifUnmodifiedSince_      = TQDateTime();
     range_.clear();
   }
 
-    QString
+    TQString
   Request::clean(const TQString & _path) const
   {
     TQString s(_path);
@@ -367,7 +367,7 @@ namespace KPF
     // Double slash -> slash.
 
     TQRegExp r("\\/\\/+");
-    s.replace(r, "/");
+    s.tqreplace(r, "/");
 
     return s;
   }
diff --git a/kpf/src/Resource.cpp b/kpf/src/Resource.cpp
index 6c3dad91..e9f521a5 100644
--- a/kpf/src/Resource.cpp
+++ b/kpf/src/Resource.cpp
@@ -207,7 +207,7 @@ namespace KPF
     {
       if (d->offset < d->size)
       {
-        uint bytesAvailable = QMIN(maxlen, d->size - d->offset);
+        uint bytesAvailable = TQMIN(maxlen, d->size - d->offset);
 
         memcpy(data, d->html.data() + d->offset, bytesAvailable);
 
@@ -271,7 +271,7 @@ namespace KPF
     return d->fileInfo.isReadable();
   }
 
-    QDateTime
+    TQDateTime
   Resource::lastModified() const
   {
     return d->fileInfo.lastModified();
@@ -320,7 +320,7 @@ namespace KPF
     return !(d->fileInfo.isDir());
   }
 
-    QString
+    TQString
   Resource::mimeType() const
   {
     if (d->fileInfo.isDir())
diff --git a/kpf/src/Response.cpp b/kpf/src/Response.cpp
index a52de893..1299fd44 100644
--- a/kpf/src/Response.cpp
+++ b/kpf/src/Response.cpp
@@ -76,7 +76,7 @@ namespace KPF
     return code_;
   }
 
-    QCString
+    TQCString
   Response::text(const Request & request) const
   {
     TQString s;
@@ -90,7 +90,7 @@ namespace KPF
         if (request.protocol() >= 1.0)
         {
           s = TQString(request.protocolString())
-            + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_));
+            + TQString(" %1 %2\r\n").tqarg(code_).tqarg(responseName(code_));
         }
         break;
 
@@ -103,7 +103,7 @@ namespace KPF
       case 501:
       case 505:
         s = TQString(request.protocolString())
-          + TQString(" %1 %2\r\n").arg(code_).arg(responseName(code_))
+          + TQString(" %1 %2\r\n").tqarg(code_).tqarg(responseName(code_))
           + data(code_, request);
         break;
 
@@ -115,7 +115,7 @@ namespace KPF
     return s.utf8();
   }
 
-    QString
+    TQString
   Response::data(uint code, const Request & request) const
   {
     TQString contentType = "Content-Type: text/html; charset=utf-8\r\n";
@@ -152,9 +152,9 @@ namespace KPF
           {
             TQString line(str.readLine());
 
-            line.replace(regexpMessage,   responseName(code));
-            line.replace(regexpCode,      TQString::number(code));
-            line.replace(regexpResource,  request.path());
+            line.tqreplace(regexpMessage,   responseName(code));
+            line.tqreplace(regexpCode,      TQString::number(code));
+            line.tqreplace(regexpResource,  request.path());
 
             html = line + "\r\n";
           }
@@ -178,7 +178,7 @@ namespace KPF
     }
 
     TQString contentLength =
-      TQString("Content-Length: %1\r\n").arg(html.length());
+      TQString("Content-Length: %1\r\n").tqarg(html.length());
 
     return (contentType + contentLength + "\r\n" + html);
   }
diff --git a/kpf/src/RootValidator.cpp b/kpf/src/RootValidator.cpp
index 00fae54d..6e0ec172 100644
--- a/kpf/src/RootValidator.cpp
+++ b/kpf/src/RootValidator.cpp
@@ -29,8 +29,8 @@
 
 namespace KPF
 {
-  RootValidator::RootValidator(TQObject * parent, const char * name)
-    : TQValidator(parent, name)
+  RootValidator::RootValidator(TQObject * tqparent, const char * name)
+    : TQValidator(tqparent, name)
   {
   }
 
diff --git a/kpf/src/RootValidator.h b/kpf/src/RootValidator.h
index 020816f7..05d02757 100644
--- a/kpf/src/RootValidator.h
+++ b/kpf/src/RootValidator.h
@@ -32,11 +32,11 @@ namespace KPF
    * Used for checking that a path input by the user is acceptable
    * as a server root directory.
    */
-  class RootValidator : public QValidator
+  class RootValidator : public TQValidator
   {
     public:
 
-      RootValidator(TQObject * parent, const char * name = 0);
+      RootValidator(TQObject * tqparent, const char * name = 0);
 
       virtual State validate(TQString & input, int & pos) const;
   };
diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp
index 90d94209..00904132 100644
--- a/kpf/src/Server.cpp
+++ b/kpf/src/Server.cpp
@@ -41,9 +41,9 @@ namespace KPF
      const TQString  & dir,
      bool             followSymlinks,
      int              socket,
-     WebServer        * parent
+     WebServer        * tqparent
     )
-    : TQObject(parent, "Server")
+    : TQObject(tqparent, "Server")
   {
     d = new Private;
 
@@ -53,7 +53,7 @@ namespace KPF
 
     d->followSymlinks = followSymlinks;
 
-    d->birth = TQDateTime::currentDateTime();
+    d->birth = TQDateTime::tqcurrentDateTime();
 
     d->socket.setSocket(socket);
 
@@ -226,7 +226,7 @@ namespace KPF
 
     d->request.setMethod    (l[0]);
     d->request.setPath      (l[1]);
-    d->request.setProtocol  (l.count() == 3 ? l[2] : TQString::null);
+    d->request.setProtocol  (l.count() == 3 ? l[2] : TQString());
 
     // Before we check the request, say we received it.
 
@@ -252,10 +252,10 @@ namespace KPF
     // If there's .. or ~ in the path, we disallow. Either there's a mistake
     // or someone's trying to h@x0r us. I wouldn't have worried about ~
     // normally, because I don't do anything with it, so the resource would
-    // simply not be found, but I'm worried that the QDir/QFile/QFileInfo
+    // simply not be found, but I'm worried that the TQDir/TQFile/TQFileInfo
     // stuff might try to expand it, so I'm not taking any chances.
 
-    if (d->request.path().contains("..") || d->request.path().contains('~'))
+    if (d->request.path().tqcontains("..") || d->request.path().tqcontains('~'))
     {
       kpfDebug << d->id << ": readRequest: bogus path" << endl;
       d->state = Responding;
@@ -333,7 +333,7 @@ namespace KPF
 
     while (!d->incomingLineBuffer.isEmpty())
     {
-      // This would be cleaner if there was a QValueQueue.
+      // This would be cleaner if there was a TQValueQueue.
       // Basically we 'dequeue' the first line from incomingHeaderBuffer.
 
       TQString line(d->incomingLineBuffer.first());
@@ -754,12 +754,12 @@ namespace KPF
 
     d->socket.close();
 
-    d->death = TQDateTime::currentDateTime();
+    d->death = TQDateTime::tqcurrentDateTime();
 
     emit(finished(this));
   }
 
-    QHostAddress
+    TQHostAddress
   Server::peerAddress() const
   {
     return d->socket.peerAddress();
@@ -1106,13 +1106,13 @@ namespace KPF
     return d->state;
   }
 
-    QDateTime
+    TQDateTime
   Server::birth() const
   {
     return d->birth;
   }
 
-    QDateTime
+    TQDateTime
   Server::death() const
   {
     return d->death;
diff --git a/kpf/src/Server.h b/kpf/src/Server.h
index c83f4a3d..2e332801 100644
--- a/kpf/src/Server.h
+++ b/kpf/src/Server.h
@@ -37,11 +37,12 @@ namespace KPF
 
   /**
    * Converses with a remote client. Handles requests and generates responses.
-   * Bandwidth is controlled by parent (WebServer).
+   * Bandwidth is controlled by tqparent (WebServer).
    */
-  class Server : public QObject
+  class Server : public TQObject
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
@@ -60,14 +61,14 @@ namespace KPF
        *
        * @param socket The system's socket device, used for communication.
        *
-       * @param parent A WebServer, which will manage this Server.
+       * @param tqparent A WebServer, which will manage this Server.
        */
       Server
         (
          const TQString  & dir,
          bool             followSymlinks,
          int              socket,
-         WebServer      * parent
+         WebServer      * tqparent
         );
 
       /**
diff --git a/kpf/src/ServerSocket.cpp b/kpf/src/ServerSocket.cpp
index 38d419a5..ffbab706 100644
--- a/kpf/src/ServerSocket.cpp
+++ b/kpf/src/ServerSocket.cpp
@@ -28,8 +28,8 @@
 
 namespace KPF
 {
-  ServerSocket::ServerSocket(TQObject * parent, const char * name)
-    : TQSocket(parent, name)
+  ServerSocket::ServerSocket(TQObject * tqparent, const char * name)
+    : TQSocket(tqparent, name)
   {
     // Empty.
   }
diff --git a/kpf/src/ServerSocket.h b/kpf/src/ServerSocket.h
index 76618c9b..13016672 100644
--- a/kpf/src/ServerSocket.h
+++ b/kpf/src/ServerSocket.h
@@ -29,14 +29,14 @@
 namespace KPF
 {
   /**
-   * Used to help calculate how much of a QSocket's output buffer we can
+   * Used to help calculate how much of a TQSocket's output buffer we can
    * use before data will be sent out.
    */
-  class ServerSocket : public QSocket
+  class ServerSocket : public TQSocket
   {
     public:
 
-      ServerSocket(TQObject * parent, const char * name = 0);
+      ServerSocket(TQObject * tqparent, const char * name = 0);
 
       uint outputBufferLeft();
   };
diff --git a/kpf/src/ServerWizard.cpp b/kpf/src/ServerWizard.cpp
index 840c64d9..214b6003 100644
--- a/kpf/src/ServerWizard.cpp
+++ b/kpf/src/ServerWizard.cpp
@@ -46,10 +46,10 @@
 
 namespace KPF
 {
-  ServerWizard::ServerWizard(TQWidget * parent)
-    : KWizard(parent, "KPF::ServerWizard", true)
+  ServerWizard::ServerWizard(TQWidget * tqparent)
+    : KWizard(tqparent, "KPF::ServerWizard", true)
   {
-    setCaption(i18n("New Server - %1").arg("kpf"));
+    setCaption(i18n("New Server - %1").tqarg("kpf"));
 
     page1_ = new TQWidget(this);
     page2_ = new TQWidget(this);
@@ -58,7 +58,7 @@ namespace KPF
     page5_ = new TQWidget(this);
     
     TQLabel * l_rootDirectoryHelp =
-      new QLabel
+      new TQLabel
       (
        i18n
        (
@@ -75,7 +75,7 @@ namespace KPF
       );
 
     TQLabel * l_listenPortHelp =
-      new QLabel
+      new TQLabel
       (
        i18n
        (
@@ -88,7 +88,7 @@ namespace KPF
       );
 
     TQLabel * l_bandwidthLimitHelp =
-      new QLabel
+      new TQLabel
       (
        i18n
        (
@@ -105,7 +105,7 @@ namespace KPF
       );
 /*
     TQLabel * l_connectionLimitHelp =
-      new QLabel
+      new TQLabel
       (
        i18n
        (
@@ -119,7 +119,7 @@ namespace KPF
 */
     bool canPublish = DNSSD::ServiceBrowser::isAvailable() == DNSSD::ServiceBrowser::Working;
     TQLabel * l_serverNameHelp =
-      new QLabel
+      new TQLabel
       (
        KPF::HelpText::getServerNameHelp(),
        page5_
@@ -171,59 +171,59 @@ namespace KPF
     sb_bandwidthLimit_  ->setSuffix(i18n(" kB/s"));
 //    sb_connectionLimit_ ->setValue(Config::DefaultConnectionLimit);
 
-    TQVBoxLayout * layout1 =
+    TQVBoxLayout * tqlayout1 =
       new TQVBoxLayout(page1_, KDialog::marginHint(), KDialog::spacingHint());
 
-    TQVBoxLayout * layout2 =
+    TQVBoxLayout * tqlayout2 =
       new TQVBoxLayout(page2_, KDialog::marginHint(), KDialog::spacingHint());
 
-    TQVBoxLayout * layout3 =
+    TQVBoxLayout * tqlayout3 =
       new TQVBoxLayout(page3_, KDialog::marginHint(), KDialog::spacingHint());
 
-//    TQVBoxLayout * layout4 =
+//    TQVBoxLayout * tqlayout4 =
 //      new TQVBoxLayout(page4_, KDialog::marginHint(), KDialog::spacingHint());
 
-    TQVBoxLayout * layout5 = 
+    TQVBoxLayout * tqlayout5 = 
       new TQVBoxLayout(page5_, KDialog::marginHint(), KDialog::spacingHint());
 
-    layout1->addWidget(l_rootDirectoryHelp);
-    layout2->addWidget(l_listenPortHelp);
-    layout3->addWidget(l_bandwidthLimitHelp);
-//    layout4->addWidget(l_connectionLimitHelp);
-    layout5->addWidget(l_serverNameHelp);
+    tqlayout1->addWidget(l_rootDirectoryHelp);
+    tqlayout2->addWidget(l_listenPortHelp);
+    tqlayout3->addWidget(l_bandwidthLimitHelp);
+//    tqlayout4->addWidget(l_connectionLimitHelp);
+    tqlayout5->addWidget(l_serverNameHelp);
     
-    TQHBoxLayout * layout10 = new TQHBoxLayout(layout1);
+    TQHBoxLayout * tqlayout10 = new TQHBoxLayout(tqlayout1);
 
-    layout10->addWidget(l_root_);
-    layout10->addWidget(kur_root_);
+    tqlayout10->addWidget(l_root_);
+    tqlayout10->addWidget(kur_root_);
 
-    layout1->addStretch(1);
+    tqlayout1->addStretch(1);
 
-    TQHBoxLayout * layout20 = new TQHBoxLayout(layout2);
+    TQHBoxLayout * tqlayout20 = new TQHBoxLayout(tqlayout2);
 
-    layout20->addWidget(l_listenPort_);
-    layout20->addWidget(sb_listenPort_);
+    tqlayout20->addWidget(l_listenPort_);
+    tqlayout20->addWidget(sb_listenPort_);
 
-    layout2->addStretch(1);
+    tqlayout2->addStretch(1);
 
-    TQHBoxLayout * layout30 = new TQHBoxLayout(layout3);
+    TQHBoxLayout * tqlayout30 = new TQHBoxLayout(tqlayout3);
 
-    layout30->addWidget(l_bandwidthLimit_);
-    layout30->addWidget(sb_bandwidthLimit_);
+    tqlayout30->addWidget(l_bandwidthLimit_);
+    tqlayout30->addWidget(sb_bandwidthLimit_);
 
-    layout3->addStretch(1);
+    tqlayout3->addStretch(1);
 
-//    TQHBoxLayout * layout40 = new TQHBoxLayout(layout4);
+//    TQHBoxLayout * tqlayout40 = new TQHBoxLayout(tqlayout4);
 
-//    layout40->addWidget(l_connectionLimit_);
-//    layout40->addWidget(sb_connectionLimit_);
+//    tqlayout40->addWidget(l_connectionLimit_);
+//    tqlayout40->addWidget(sb_connectionLimit_);
 
-//    layout4->addStretch(1);
+//    tqlayout4->addStretch(1);
 
-    TQHBoxLayout * layout50 = new TQHBoxLayout(layout5);
+    TQHBoxLayout * tqlayout50 = new TQHBoxLayout(tqlayout5);
     
-    layout50->addWidget(l_serverName_);
-    layout50->addWidget(le_serverName_);
+    tqlayout50->addWidget(l_serverName_);
+    tqlayout50->addWidget(le_serverName_);
 
     addPage(page1_, i18n("Root Directory"));
     addPage(page2_, i18n("Listen Port"));
@@ -286,7 +286,7 @@ namespace KPF
     kur_root_->setURL(location);
   }
 
-    QString
+    TQString
   ServerWizard::root() const
   {
     return kur_root_->url();
@@ -303,7 +303,7 @@ namespace KPF
   {
     return sb_bandwidthLimit_->value();
   }
-    QString
+    TQString
     
   ServerWizard::serverName() const
   {
@@ -396,7 +396,7 @@ namespace KPF
       return;
     }
 
-    fileDialog->setCaption(i18n("Choose Directory to Share - %1").arg("kpf"));
+    fileDialog->setCaption(i18n("Choose Directory to Share - %1").tqarg("kpf"));
   }
 
     void
diff --git a/kpf/src/ServerWizard.h b/kpf/src/ServerWizard.h
index cb2d455f..de4896cf 100644
--- a/kpf/src/ServerWizard.h
+++ b/kpf/src/ServerWizard.h
@@ -38,10 +38,11 @@ namespace KPF
   class ServerWizard : public KWizard
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-      ServerWizard(TQWidget * parent = 0);
+      ServerWizard(TQWidget * tqparent = 0);
 
       virtual ~ServerWizard();
 
diff --git a/kpf/src/SingleServerConfigDialog.cpp b/kpf/src/SingleServerConfigDialog.cpp
index c39f944b..f3a2c0eb 100644
--- a/kpf/src/SingleServerConfigDialog.cpp
+++ b/kpf/src/SingleServerConfigDialog.cpp
@@ -33,14 +33,14 @@ namespace KPF
   SingleServerConfigDialog::SingleServerConfigDialog
     (
      WebServer  * server,
-     TQWidget    * parent
+     TQWidget    * tqparent
     )
     : KDialogBase
       (
-       parent,
+       tqparent,
        "KPF::SingleServerConfigDialog",
        false,
-       i18n("Configuring Server %1 - kpf").arg(server->root()),
+       i18n("Configuring Server %1 - kpf").tqarg(server->root()),
        KDialogBase::Ok | KDialogBase::Cancel,
        KDialogBase::Ok,
        true
diff --git a/kpf/src/SingleServerConfigDialog.h b/kpf/src/SingleServerConfigDialog.h
index e9bb415c..c5f6acc5 100644
--- a/kpf/src/SingleServerConfigDialog.h
+++ b/kpf/src/SingleServerConfigDialog.h
@@ -37,10 +37,11 @@ namespace KPF
   class SingleServerConfigDialog : public KDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-      SingleServerConfigDialog(WebServer *, TQWidget * parent);
+      SingleServerConfigDialog(WebServer *, TQWidget * tqparent);
 
       virtual ~SingleServerConfigDialog();
 
diff --git a/kpf/src/StartingKPFDialog.cpp b/kpf/src/StartingKPFDialog.cpp
index 15a50d47..3daf1ec1 100644
--- a/kpf/src/StartingKPFDialog.cpp
+++ b/kpf/src/StartingKPFDialog.cpp
@@ -47,11 +47,11 @@ namespace KPF
       TQTimer timer;
   };
 
-  StartingKPFDialog::StartingKPFDialog(TQWidget * parent)
+  StartingKPFDialog::StartingKPFDialog(TQWidget * tqparent)
     :
     KDialogBase
     (
-     parent,
+     tqparent,
      "StartingKPFDialog",
      true, /* modal */
      i18n("Starting KDE public fileserver applet"),
@@ -65,15 +65,15 @@ namespace KPF
     TQFrame * mainWidget = makeMainWidget();
 
     TQLabel * about =
-      new QLabel
+      new TQLabel
       (
        i18n("Starting kpf..."),
        mainWidget
       );
 
-    TQVBoxLayout * layout = new TQVBoxLayout(mainWidget);
+    TQVBoxLayout * tqlayout = new TQVBoxLayout(mainWidget);
 
-    layout->addWidget(about);
+    tqlayout->addWidget(about);
 
     kapp->dcopClient()->setNotifications(true);
 
@@ -85,7 +85,7 @@ namespace KPF
       );
 
     kapp->dcopClient()
-      ->send("kicker", "default", "addApplet(TQString)", "kpfapplet.desktop");
+      ->send("kicker", "default", "addApplet(TQString)", TQString("kpfapplet.desktop"));
 
     connect(&d->timer, TQT_SIGNAL(timeout()), TQT_SLOT(slotTimeout()));
 
diff --git a/kpf/src/StartingKPFDialog.h b/kpf/src/StartingKPFDialog.h
index 9dc7b651..39571f60 100644
--- a/kpf/src/StartingKPFDialog.h
+++ b/kpf/src/StartingKPFDialog.h
@@ -35,10 +35,11 @@ namespace KPF
   class StartingKPFDialog : public KDialogBase
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-      StartingKPFDialog(TQWidget * parent);
+      StartingKPFDialog(TQWidget * tqparent);
 
       virtual ~StartingKPFDialog();
 
diff --git a/kpf/src/Utils.cpp b/kpf/src/Utils.cpp
index 08f3318a..8dc5c373 100644
--- a/kpf/src/Utils.cpp
+++ b/kpf/src/Utils.cpp
@@ -61,7 +61,7 @@ namespace KPF
     return ::mktime(&tempTm);
   }
 
-    QDateTime
+    TQDateTime
   toGMT(const TQDateTime & dt)
   {
     time_t dtAsTimeT = qDateTimeToTimeT(dt);
@@ -105,7 +105,7 @@ namespace KPF
 
   TQString dateString()
   {
-    return dateString(TQDateTime::currentDateTime());
+    return dateString(TQDateTime::tqcurrentDateTime());
   }
 
 
@@ -118,7 +118,7 @@ namespace KPF
     if (0 == asTm)
     {
       kpfDebug << "::gmtime() failed" << endl;
-      return TQString::null;
+      return TQString();
     }
 
     asTm->tm_isdst = -1;
@@ -311,7 +311,7 @@ namespace KPF
     return dt.isValid();
   }
 
-     QString
+     TQString
   translatedResponseName(uint code)
   {
     TQString s;
@@ -359,7 +359,7 @@ namespace KPF
     return s;
   }
 
-     QString
+     TQString
   responseName(uint code)
   {
     TQString s;
diff --git a/kpf/src/Utils.h b/kpf/src/Utils.h
index 12e55507..df6a15f7 100644
--- a/kpf/src/Utils.h
+++ b/kpf/src/Utils.h
@@ -35,13 +35,13 @@
 namespace KPF
 {
   /**
-   * Safe version of QMIN
+   * Safe version of TQMIN
    * @return minimum of a and b.
    */
   template<class T> T min(T a, T b) { return a < b ? a : b; }
 
   /**
-   * Safe version of QMAX
+   * Safe version of TQMAX
    * @return minimum of a and b.
    */
   template<class T> T max(T a, T b) { return b < a ? a : b; }
diff --git a/kpf/src/WebServer.cpp b/kpf/src/WebServer.cpp
index b7fd944b..fa4cceb7 100644
--- a/kpf/src/WebServer.cpp
+++ b/kpf/src/WebServer.cpp
@@ -26,7 +26,7 @@
 #include <sys/socket.h>
 #include <unistd.h>
 
-// Qt includes
+// TQt includes
 #include <tqsocket.h>
 #include <tqdatetime.h>
 #include <tqtimer.h>
@@ -359,7 +359,7 @@ namespace KPF
     return d->followSymlinks;
   }
 
-    QString
+    TQString
   WebServer::root()
   {
     return d->root;
@@ -545,7 +545,7 @@ namespace KPF
   {
     return d->paused;
   }
-    QString
+    TQString
   WebServer::serverName()
   {
     return d->serverName;
diff --git a/kpf/src/WebServer.h b/kpf/src/WebServer.h
index 4940e863..2ef8a1d5 100644
--- a/kpf/src/WebServer.h
+++ b/kpf/src/WebServer.h
@@ -46,6 +46,7 @@ namespace KPF
   {
     K_DCOP
     Q_OBJECT
+//    TQ_OBJECT
 
     public:
 
diff --git a/kpf/src/WebServerManager.h b/kpf/src/WebServerManager.h
index daa8db33..05bf98b6 100644
--- a/kpf/src/WebServerManager.h
+++ b/kpf/src/WebServerManager.h
@@ -43,6 +43,7 @@ namespace KPF
   class WebServerManager : public TQObject, virtual public DCOPObject
   {
     Q_OBJECT
+//    TQ_OBJECT
     K_DCOP
 
     public:
@@ -72,7 +73,7 @@ namespace KPF
        uint             bandwidthLimit  = Config::DefaultBandwidthLimit,
        uint             connectionLimit = Config::DefaultConnectionLimit,
        bool             followSymlinks  = Config::DefaultFollowSymlinks,
-       const TQString  & serverName = TQString::null
+       const TQString  & serverName = TQString()
       );
 
       /**
diff --git a/kpf/src/WebServerSocket.cpp b/kpf/src/WebServerSocket.cpp
index fceaa6c1..26f47c08 100644
--- a/kpf/src/WebServerSocket.cpp
+++ b/kpf/src/WebServerSocket.cpp
@@ -26,7 +26,7 @@
 
 namespace KPF
 {
-  WebServerSocket::WebServerSocket(Q_UINT16 port, uint maxconn)
+  WebServerSocket::WebServerSocket(TQ_UINT16 port, uint maxconn)
     : TQServerSocket(port, maxconn, 0L)
   {
     // Empty.
diff --git a/kpf/src/WebServerSocket.h b/kpf/src/WebServerSocket.h
index bebd6a79..68b3bc3e 100644
--- a/kpf/src/WebServerSocket.h
+++ b/kpf/src/WebServerSocket.h
@@ -31,13 +31,14 @@ namespace KPF
   /**
    * Overridden to emit a signal on a new connection.
    */
-  class WebServerSocket : public QServerSocket
+  class WebServerSocket : public TQServerSocket
   {
     Q_OBJECT
+  TQ_OBJECT
 
     public:
 
-      WebServerSocket(Q_UINT16 port, uint maxconn);
+      WebServerSocket(TQ_UINT16 port, uint maxconn);
       virtual void newConnection(int fd);
 
     signals: