Rename old tq methods that no longer need a unique name

1 files changed, 11 insertions, 11 deletions

diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp
index eb9c625..f6cf5ad 100644
--- a/konversation/src/server.cpp
+++ b/konversation/src/server.cpp
@@ -324,7 +324,7 @@ void Server::connectSignals()
     connect(&m_inputFilter, TQT_SIGNAL(addToChannelList(const TQString&, int, const TQString& )),
         this, TQT_SLOT(addToChannelList(const TQString&, int, const TQString& )));
 
-    // tqStatus View
+    // Status View
     connect(this, TQT_SIGNAL(serverOnline(bool)), getStatusView(), TQT_SLOT(serverOnline(bool)));
 
     // Scripts
@@ -1882,10 +1882,10 @@ void Server::dccGetDone(DccTransfer* item)
     if(showfile.startsWith("\"") && showfile.endsWith("\""))
         showfile = showfile.mid(1, showfile.length() - 2);
 
-    if(item->gettqStatus()==DccTransfer::Done)
+    if(item->getStatus()==DccTransfer::Done)
         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender",
             "Download of \"%1\" from %2 finished.").tqarg(showfile, item->getPartnerNick()));
-    else if(item->gettqStatus()==DccTransfer::Failed)
+    else if(item->getStatus()==DccTransfer::Failed)
         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender",
             "Download of \"%1\" from %2 failed. Reason: %3.").tqarg(showfile,
             item->getPartnerNick(), item->getStatusDetail()));
@@ -1901,16 +1901,16 @@ void Server::dccSendDone(DccTransfer* item)
     if(showfile.startsWith("\"") && showfile.endsWith("\""))
         showfile = showfile.mid(1, showfile.length() - 2);
 
-    if(item->gettqStatus()==DccTransfer::Done)
+    if(item->getStatus()==DccTransfer::Done)
         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient",
             "Upload of \"%1\" to %2 finished.").tqarg(showfile, item->getPartnerNick()));
-    else if(item->gettqStatus()==DccTransfer::Failed)
+    else if(item->getStatus()==DccTransfer::Failed)
         appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient",
             "Upload of \"%1\" to %2 failed. Reason: %3.").tqarg(showfile, item->getPartnerNick(),
             item->getStatusDetail()));
 }
 
-void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatus)
+void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus)
 {
     if(!item)
         return;
@@ -1923,13 +1923,13 @@ void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatu
     if ( item->getType() == DccTransfer::Send )
     {
         // when resuming, a message about the receiver's acceptance has been shown already, so suppress this message
-        if ( newtqStatus == DccTransfer::Transferring && oldtqStatus == DccTransfer::WaitingRemote && !item->isResumed() )
+        if ( newStatus == DccTransfer::Transferring && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() )
             appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient",
                 "Sending \"%1\" to %2...").tqarg( showfile, item->getPartnerNick() ) );
     }
     else  // type == Receive
     {
-        if ( newtqStatus == DccTransfer::Transferring && !item->isResumed() )
+        if ( newStatus == DccTransfer::Transferring && !item->isResumed() )
         {
             appendMessageToFrontmost( i18n( "DCC" ),
                                         i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...")
@@ -2068,7 +2068,7 @@ void Server::updateChannelMode(const TQString &updater, const TQString &channelN
         if (plus)
         {
             TQDateTime when;
-            addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::tqcurrentDateTime().toTime_t()));
+            addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::currentDateTime().toTime_t()));
         } else {
             removeBan(channelName, parameter);
         }
@@ -3226,7 +3226,7 @@ TQString Server::awayTime() const
 
     if (m_away)
     {
-        int diff = TQDateTime::tqcurrentDateTime().toTime_t() - m_awayTime;
+        int diff = TQDateTime::currentDateTime().toTime_t() - m_awayTime;
         int num = diff / 3600;
 
         if (num < 10)
@@ -3254,7 +3254,7 @@ TQString Server::awayTime() const
 
 void Server::startAwayTimer()
 {
-    m_awayTime = TQDateTime::tqcurrentDateTime().toTime_t();
+    m_awayTime = TQDateTime::currentDateTime().toTime_t();
 }
 
 KABC::Addressee Server::getOfflineNickAddressee(TQString& nickname)