1 files changed, 18 insertions, 18 deletions

diff --git a/kget/transfer.cpp b/kget/transfer.cpp
index 36ce7887..230daa19 100644
--- a/kget/transfer.cpp
+++ b/kget/transfer.cpp
@@ -109,7 +109,7 @@ Transfer::init(const uint _id)
     id = _id;
     m_pSlave = new Slave(this, src, dest);
     canResume = false;
-    startTime = TQDateTime::tqcurrentDateTime();
+    startTime = TQDateTime::currentDateTime();
     speed = 0;
     // retryCount = ksettings.reconnectRetries-1;
     retryCount = 0;
@@ -270,10 +270,10 @@ void Transfer::updateAll()
 {
     sDebugIn << endl;
 
-    updatetqStatus(status);       // first phase of animation
+    updateStatus(status);       // first phase of animation
 
-    logMessage(i18n("Copy file from: %1").tqarg(src.prettyURL()));
-    logMessage(i18n("To: %1").tqarg(dest.prettyURL()));
+    logMessage(i18n("Copy file from: %1").arg(src.prettyURL()));
+    logMessage(i18n("To: %1").arg(dest.prettyURL()));
 
     // source
     setText(view->lv_url, src.prettyURL());
@@ -291,7 +291,7 @@ void Transfer::updateAll()
 	}
 
     if (totalSize != 0) {
-        //logMessage(i18n("Total size is %1 bytes").tqarg((double)totalSize));
+        //logMessage(i18n("Total size is %1 bytes").arg((double)totalSize));
         setText(view->lv_total, KIO::convertSize(totalSize));
     } else {
         //logMessage(i18n("Total size is unknown"));
@@ -303,7 +303,7 @@ void Transfer::updateAll()
 }
 
 
-bool Transfer::updatetqStatus(int counter)
+bool Transfer::updateStatus(int counter)
 {
     //sDebug<< ">>>>Entering"<<endl;
 
@@ -337,18 +337,18 @@ bool Transfer::updatetqStatus(int counter)
     setPixmap(view->lv_pixmap, *pix);
     view->setUpdatesEnabled(true);
 
-    if(prevtqStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING)
+    if(prevStatus!=status || prevMode != mode || status==ST_RUNNING || status==ST_TRYING)
         {
         TQRect rect = view->header()->sectionRect(view->lv_pixmap);
 
         int x = rect.x();
-        int y = view->tqitemRect(this).y();
+        int y = view->itemRect(this).y();
         int w = rect.width();
         int h = rect.height();
 
         view->TQScrollView::updateContents(x,y,w,h);
 
-        prevtqStatus = status;
+        prevStatus = status;
        prevMode = mode;
     }
 
@@ -386,7 +386,7 @@ void Transfer::slotResume()
 
     status = ST_TRYING;
     mode = MD_TQUEUED;
-    logMessage(i18n("Attempt number %1").tqarg(retryCount));
+    logMessage(i18n("Attempt number %1").arg(retryCount));
 
     sDebug << "sending Resume to slave " << endl;
     m_pSlave->Op(Slave::RETR);
@@ -510,8 +510,8 @@ void Transfer::slotRequestSchedule()
 
     // if the time was already set somewhere in the future, keep it
     // otherwise set it to the current time + 60 seconds
-    if (startTime < TQDateTime::tqcurrentDateTime()) {
-        TQDateTime dt = TQDateTime::tqcurrentDateTime();
+    if (startTime < TQDateTime::currentDateTime()) {
+        TQDateTime dt = TQDateTime::currentDateTime();
         startTime = dt.addSecs(60);
     }
     if (status == ST_RUNNING) {
@@ -581,7 +581,7 @@ void Transfer::slotRenaming(KIO::Job *, const KURL &, const KURL & to)
 
         dest = to;
 
-        logMessage(i18n("Renaming to %1").tqarg(dest.prettyURL().ascii()));
+        logMessage(i18n("Renaming to %1").arg(dest.prettyURL().ascii()));
 
           // destination
           setText (view->lv_filename, dest.fileName ());
@@ -623,7 +623,7 @@ void Transfer::slotSpeed(unsigned long bytes_per_second)
             dlgIndividual->setSpeed(i18n("Stopped"));
 
     } else {
-        TQString tmps = i18n("%1/s").tqarg(KIO::convertSize(speed));
+        TQString tmps = i18n("%1/s").arg(KIO::convertSize(speed));
         setText(view->lv_speed, tmps);
         setText(view->lv_remaining, remainingTime);
         if(dlgIndividual)
@@ -644,7 +644,7 @@ void Transfer::slotTotalSize(KIO::filesize_t bytes)
     if (totalSize == 0) {
         totalSize = bytes;
         if (totalSize != 0) {
-            logMessage(i18n("Total size is %1 bytes").tqarg((double)totalSize,0,'f',0));
+            logMessage(i18n("Total size is %1 bytes").arg((double)totalSize,0,'f',0));
             setText(view->lv_total, KIO::convertSize(totalSize));
 			if(dlgIndividual)
 				{
@@ -787,7 +787,7 @@ bool Transfer::read(KSimpleConfig * config, int id)
     }
 
     mode = (TransferMode) config->readNumEntry("Mode", MD_TQUEUED);
-    status = (TransfertqStatus) config->readNumEntry("Status", ST_RUNNING);
+    status = (TransferStatus) config->readNumEntry("Status", ST_RUNNING);
     startTime = config->readDateTimeEntry("ScheduledTime");
     canResume = config->readBoolEntry("CanResume", true);
     totalSize = config->readUnsignedNum64Entry("TotalSize", 0);
@@ -851,7 +851,7 @@ void Transfer::slotExecError()
 
     status = ST_STOPPED;
     mode = MD_SCHEDULED;
-    startTime=TQDateTime::tqcurrentDateTime().addSecs(ksettings.reconnectTime * 60);
+    startTime=TQDateTime::currentDateTime().addSecs(ksettings.reconnectTime * 60);
     emit statusChanged(this, OP_SCHEDULED);
 
     sDebugOut << endl;
@@ -982,7 +982,7 @@ bool Transfer::keepDialogOpen() const
 
 void Transfer::maybeShow()
 {
-    if ( ksettings.b_showIndividual && gettqStatus() != Transfer::ST_FINISHED )
+    if ( ksettings.b_showIndividual && getStatus() != Transfer::ST_FINISHED )
     {
         if(dlgIndividual)
             dlgIndividual->show();