8 files changed, 22 insertions, 22 deletions
diff --git a/kpf/src/ActiveMonitor.cpp b/kpf/src/ActiveMonitor.cpp
index dc6115df..8b07f036 100644
--- a/kpf/src/ActiveMonitor.cpp
+++ b/kpf/src/ActiveMonitor.cpp
@@ -146,7 +146,7 @@ namespace KPF
     void
   ActiveMonitor::slotCull()
   {
-    TQDateTime dt = TQDateTime::tqcurrentDateTime();
+    TQDateTime dt = TQDateTime::currentDateTime();
 
     TQListViewItemIterator it(view_);
 
diff --git a/kpf/src/ActiveMonitorItem.cpp b/kpf/src/ActiveMonitorItem.cpp
index 04fe857d..217e437c 100644
--- a/kpf/src/ActiveMonitorItem.cpp
+++ b/kpf/src/ActiveMonitorItem.cpp
@@ -93,7 +93,7 @@ namespace KPF
   {
     switch (c)
     {
-      case tqStatus:
+      case Status:
         return 16;
         break;
 
@@ -115,19 +115,19 @@ namespace KPF
       switch (server_->state())
       {
         case Server::WaitingForRequest:
-          setPixmap(tqStatus, SmallIcon("connect_creating"));
+          setPixmap(Status, SmallIcon("connect_creating"));
           break;
 
         case Server::WaitingForHeaders:
-          setPixmap(tqStatus, SmallIcon("connect_creating"));
+          setPixmap(Status, SmallIcon("connect_creating"));
           break;
 
         case Server::Responding:
-          setPixmap(tqStatus, SmallIcon("connect_established"));
+          setPixmap(Status, SmallIcon("connect_established"));
           break;
 
         case Server::Finished:
-          setPixmap(tqStatus, SmallIcon("connect_no"));
+          setPixmap(Status, SmallIcon("connect_no"));
           break;
       }
     }
diff --git a/kpf/src/ActiveMonitorItem.h b/kpf/src/ActiveMonitorItem.h
index 8cc347e2..a5d78971 100644
--- a/kpf/src/ActiveMonitorItem.h
+++ b/kpf/src/ActiveMonitorItem.h
@@ -48,7 +48,7 @@ namespace KPF
 
       enum Column
       {
-        tqStatus,
+        Status,
         Progress,
         Size,
         Sent,
diff --git a/kpf/src/BandwidthGraph.cpp b/kpf/src/BandwidthGraph.cpp
index 546aa630..84a4bdef 100644
--- a/kpf/src/BandwidthGraph.cpp
+++ b/kpf/src/BandwidthGraph.cpp
@@ -112,7 +112,7 @@ namespace KPF
     p.drawPixmap( ( width()-bgPix_.width() )/2, 
             ( height()-bgPix_.height() )/2, bgPix_ );
 
-    p.setPen(tqcolorGroup().dark());
+    p.setPen(colorGroup().dark());
 
     for (uint i = 0; i < history_.size(); i++)
     {
@@ -280,13 +280,13 @@ namespace KPF
   }
 
     TQSize
-  BandwidthGraph::tqsizeHint() const
+  BandwidthGraph::sizeHint() const
   {
     return TQSize(32, 32);
   }
 
     TQSize
-  BandwidthGraph::tqminimumSizeHint() const
+  BandwidthGraph::minimumSizeHint() const
   {
     return TQSize(12, 12);
   }
diff --git a/kpf/src/BandwidthGraph.h b/kpf/src/BandwidthGraph.h
index 8684c71f..257381cf 100644
--- a/kpf/src/BandwidthGraph.h
+++ b/kpf/src/BandwidthGraph.h
@@ -76,12 +76,12 @@ namespace KPF
       /**
        * Overridden to provide reasonable default size and tqshape.
        */
-      virtual TQSize tqsizeHint() const;
+      virtual TQSize sizeHint() const;
 
       /**
        * Overridden to provide reasonable minimum size and tqshape.
        */
-      virtual TQSize tqminimumSizeHint() const;
+      virtual TQSize minimumSizeHint() const;
 
       /**
        * @return the WebServer object given on construction.
diff --git a/kpf/src/PropertiesDialogPlugin.cpp b/kpf/src/PropertiesDialogPlugin.cpp
index 028697d3..56dfb51f 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_kpftqStatus;
+      TQLabel                * l_kpfStatus;
 
       TQSpinBox              * sb_listenPort;
       TQSpinBox              * sb_bandwidthLimit;
@@ -298,10 +298,10 @@ namespace KPF
 
     l->addWidget(about);
 
-    d->l_kpftqStatus =
+    d->l_kpfStatus =
       new TQLabel(i18n("Applet status: <strong>not running</strong>"), w);
 
-    l->addWidget(d->l_kpftqStatus);
+    l->addWidget(d->l_kpfStatus);
 
     TQHBoxLayout * l2 = new TQHBoxLayout(l);
 
@@ -507,7 +507,7 @@ namespace KPF
     void
   PropertiesDialogPlugin::slotStartKPF()
   {
-    d->l_kpftqStatus
+    d->l_kpfStatus
       ->setText(i18n("Applet status: <strong>starting...</strong>"));
 
     kapp->dcopClient()
@@ -519,7 +519,7 @@ namespace KPF
     void
   PropertiesDialogPlugin::slotStartKPFFailed()
   {
-    d->l_kpftqStatus
+    d->l_kpfStatus
       ->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_kpftqStatus
+      d->l_kpfStatus
         ->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_kpftqStatus
+      d->l_kpfStatus
         ->setText(i18n("Applet status: <strong>not running</strong>"));
 
       d->stack->raiseWidget(d->initWidget);
diff --git a/kpf/src/Server.cpp b/kpf/src/Server.cpp
index 87d3c733..868a88d3 100644
--- a/kpf/src/Server.cpp
+++ b/kpf/src/Server.cpp
@@ -53,7 +53,7 @@ namespace KPF
 
     d->followSymlinks = followSymlinks;
 
-    d->birth = TQDateTime::tqcurrentDateTime();
+    d->birth = TQDateTime::currentDateTime();
 
     d->socket.setSocket(socket);
 
@@ -754,7 +754,7 @@ namespace KPF
 
     d->socket.close();
 
-    d->death = TQDateTime::tqcurrentDateTime();
+    d->death = TQDateTime::currentDateTime();
 
     emit(finished(this));
   }
diff --git a/kpf/src/Utils.cpp b/kpf/src/Utils.cpp
index 8dc5c373..631059a7 100644
--- a/kpf/src/Utils.cpp
+++ b/kpf/src/Utils.cpp
@@ -105,7 +105,7 @@ namespace KPF
 
   TQString dateString()
   {
-    return dateString(TQDateTime::tqcurrentDateTime());
+    return dateString(TQDateTime::currentDateTime());
   }