From 553b2c7f80b5a102ede8e0e3f84f32c057b41781 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 16 Dec 2011 09:56:59 -0600 Subject: Revert "Rename a number of old tq methods that are no longer tq specific" This reverts commit d458ffeadb4dbf9c84ec2f909d901208d443c349. --- konversation/src/server.cpp | 90 ++++++++++++++++++++++----------------------- 1 file changed, 45 insertions(+), 45 deletions(-) (limited to 'konversation/src/server.cpp') diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp index 07bd17e..eb9c625 100644 --- a/konversation/src/server.cpp +++ b/konversation/src/server.cpp @@ -44,7 +44,7 @@ #include #include -#include +#include #include #include @@ -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& ))); - // Status View + // tqStatus View connect(this, TQT_SIGNAL(serverOnline(bool)), getStatusView(), TQT_SLOT(serverOnline(bool))); // Scripts @@ -413,8 +413,8 @@ void Server::connectToIRCServer() // set up the connection details setPrefixes(m_serverNickPrefixModes, m_serverNickPrefixes); getStatusView()->appendServerMessage(i18n("Info"),i18n("Looking for server %1:%2...") - .arg(getConnectionSettings().server().host()) - .arg(getConnectionSettings().server().port())); + .tqarg(getConnectionSettings().server().host()) + .tqarg(getConnectionSettings().server().port())); // reset InputFilter (auto request info, /WHO request info) m_inputFilter.reset(); } @@ -534,8 +534,8 @@ void Server::lookupFinished() { // inform user about the error getStatusView()->appendServerMessage(i18n("Error"),i18n("Server %1 not found: %2") - .arg(getConnectionSettings().server().host()) - .arg(m_socket->KSocketBase::errorString(m_socket->error()))); + .tqarg(getConnectionSettings().server().host()) + .tqarg(m_socket->KSocketBase::errorString(m_socket->error()))); m_socket->resetStatus(); @@ -607,8 +607,8 @@ void Server::broken(int state) static_cast(kapp)->notificationHandler()->connectionFailure(getStatusView(), getServerName()); TQString error = i18n("Connection to Server %1 lost: %2.") - .arg(getConnectionSettings().server().host()) - .arg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state)); + .tqarg(getConnectionSettings().server().host()) + .tqarg(KNetwork::KSocketBase::errorString((KNetwork::KSocketBase::SocketError)state)); getStatusView()->appendServerMessage(i18n("Error"), error); @@ -619,9 +619,9 @@ void Server::broken(int state) void Server::sslError(const TQString& reason) { TQString error = i18n("Could not connect to %1:%2 using SSL encryption.Maybe the server does not support SSL, or perhaps you have the wrong port? %3") - .arg(getConnectionSettings().server().host()) - .arg(getConnectionSettings().server().port()) - .arg(reason); + .tqarg(getConnectionSettings().server().host()) + .tqarg(getConnectionSettings().server().port()) + .tqarg(reason); getStatusView()->appendServerMessage(i18n("SSL Connection Error"),error); updateConnectionState(Konversation::SSDeliberatelyDisconnected); @@ -707,7 +707,7 @@ void Server::quitServer() m_socket->close(); - getStatusView()->appendServerMessage(i18n("Info"), i18n("Disconnected from %1.").arg(getConnectionSettings().server().host())); + getStatusView()->appendServerMessage(i18n("Info"), i18n("Disconnected from %1.").tqarg(getConnectionSettings().server().host())); } void Server::notifyAction(const TQString& nick) @@ -857,7 +857,7 @@ TQString Server::getNextNickname() if (newNick.isNull()) { - TQString inputText = i18n("No nicknames from the \"%1\" identity were accepted by the connection \"%2\".\nPlease enter a new one or press Cancel to disconnect:").arg(getIdentity()->getName()).arg(getDisplayName()); + TQString inputText = i18n("No nicknames from the \"%1\" identity were accepted by the connection \"%2\".\nPlease enter a new one or press Cancel to disconnect:").tqarg(getIdentity()->getName()).tqarg(getDisplayName()); newNick = KInputDialog::getText(i18n("Nickname error"), inputText, TQString(), 0, getStatusView(), "NickChangeDialog"); } @@ -908,7 +908,7 @@ void Server::incoming() { getStatusView()->appendServerMessage(i18n("Error"), i18n("There was an error reading the data from the server: %1"). - arg(m_socket->KSocketBase::errorString())); + tqarg(m_socket->KSocketBase::errorString())); broken(m_socket->error()); return; @@ -1633,7 +1633,7 @@ void Server::requestDccSend(const TQString &a_recipient) ":lastDccDir", TQString(), getViewContainer()->getWindow(), - i18n("Select File(s) to Send to %1").arg(recipient) + i18n("Select File(s) to Send to %1").tqarg(recipient) ); KURL::List::iterator it; for ( it = fileURLs.begin() ; it != fileURLs.end() ; ++it ) @@ -1709,7 +1709,7 @@ void Server::addDccGet(const TQString &sourceNick, const TQStringList &dccArgume appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 offers to send you \"%2\" (%3)..." ) - .arg( newDcc->getPartnerNick(), + .tqarg( newDcc->getPartnerNick(), showfile, ( newDcc->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( newDcc->getFileSize() ) ) ); @@ -1725,7 +1725,7 @@ void Server::openDccChat(const TQString& nickname) void Server::requestDccChat(const TQString& partnerNick, const TQString& numericalOwnIp, const TQString& ownPort) { - queue(TQString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001").arg(partnerNick).arg(numericalOwnIp).arg(ownPort)); + queue(TQString("PRIVMSG %1 :\001DCC CHAT chat %2 %3\001").tqarg(partnerNick).tqarg(numericalOwnIp).tqarg(ownPort)); } void Server::dccSendRequest(const TQString &partner, const TQString &fileName, const TQString &address, const TQString &port, unsigned long size) @@ -1740,7 +1740,7 @@ void Server::dccSendRequest(const TQString &partner, const TQString &fileName, c appendMessageToFrontmost( i18n( "DCC" ), i18n( "Asking %1 to accept upload of \"%2\" (%3)..." ) - .arg( partner, + .tqarg( partner, showfile, ( size == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( size ) ) ); } @@ -1790,7 +1790,7 @@ void Server::startReverseDccSendTransfer(const TQString& sourceNick,const TQStri appendMessageToFrontmost( i18n( "Error" ), i18n( "%1 = file name, %2 = nickname", "Received invalid passive DCC send acceptance message for \"%1\" from %2." ) - .arg( showfile, + .tqarg( showfile, sourceNick ) ); } @@ -1817,7 +1817,7 @@ void Server::resumeDccGetTransfer(const TQString &sourceNick, const TQStringList appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 = nickname of sender, %3 = percentage of file size, %4 = file size", "Resuming download of \"%1\" from %2 starting at %3% of %4..." ) - .arg( showfile, + .tqarg( showfile, sourceNick, TQString::number( dccTransfer->getProgress() ), ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) ); @@ -1827,7 +1827,7 @@ void Server::resumeDccGetTransfer(const TQString &sourceNick, const TQStringList appendMessageToFrontmost( i18n( "Error" ), i18n( "%1 = file name, %2 = nickname", "Received invalid resume acceptance message for \"%1\" from %2." ) - .arg( showfile, + .tqarg( showfile, sourceNick ) ); } } @@ -1852,7 +1852,7 @@ void Server::resumeDccSendTransfer(const TQString &sourceNick, const TQStringLis appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 = nickname of recipient, %3 = percentage of file size, %4 = file size", "Resuming upload of \"%1\" to %2 starting at %3% of %4...") - .arg( showfile, + .tqarg( showfile, sourceNick, TQString::number(dccTransfer->getProgress()), ( dccTransfer->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( dccTransfer->getFileSize() ) ) ); @@ -1867,7 +1867,7 @@ void Server::resumeDccSendTransfer(const TQString &sourceNick, const TQStringLis appendMessageToFrontmost( i18n( "Error" ), i18n( "%1 = file name, %2 = nickname", "Received invalid resume request for \"%1\" from %2." ) - .arg( showfile, + .tqarg( showfile, sourceNick ) ); } } @@ -1882,12 +1882,12 @@ void Server::dccGetDone(DccTransfer* item) if(showfile.startsWith("\"") && showfile.endsWith("\"")) showfile = showfile.mid(1, showfile.length() - 2); - if(item->getStatus()==DccTransfer::Done) + if(item->gettqStatus()==DccTransfer::Done) appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", - "Download of \"%1\" from %2 finished.").arg(showfile, item->getPartnerNick())); - else if(item->getStatus()==DccTransfer::Failed) + "Download of \"%1\" from %2 finished.").tqarg(showfile, item->getPartnerNick())); + else if(item->gettqStatus()==DccTransfer::Failed) appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of sender", - "Download of \"%1\" from %2 failed. Reason: %3.").arg(showfile, + "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->getStatus()==DccTransfer::Done) + if(item->gettqStatus()==DccTransfer::Done) appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", - "Upload of \"%1\" to %2 finished.").arg(showfile, item->getPartnerNick())); - else if(item->getStatus()==DccTransfer::Failed) + "Upload of \"%1\" to %2 finished.").tqarg(showfile, item->getPartnerNick())); + else if(item->gettqStatus()==DccTransfer::Failed) appendMessageToFrontmost(i18n("DCC"),i18n("%1 = file name, %2 = nickname of recipient", - "Upload of \"%1\" to %2 failed. Reason: %3.").arg(showfile, item->getPartnerNick(), + "Upload of \"%1\" to %2 failed. Reason: %3.").tqarg(showfile, item->getPartnerNick(), item->getStatusDetail())); } -void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus) +void Server::dccStatusChanged(DccTransfer *item, int newtqStatus, int oldtqStatus) { if(!item) return; @@ -1923,17 +1923,17 @@ void Server::dccStatusChanged(DccTransfer *item, int newStatus, int oldStatus) if ( item->getType() == DccTransfer::Send ) { // when resuming, a message about the receiver's acceptance has been shown already, so suppress this message - if ( newStatus == DccTransfer::Transferring && oldStatus == DccTransfer::WaitingRemote && !item->isResumed() ) + if ( newtqStatus == DccTransfer::Transferring && oldtqStatus == DccTransfer::WaitingRemote && !item->isResumed() ) appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 nickname of recipient", - "Sending \"%1\" to %2...").arg( showfile, item->getPartnerNick() ) ); + "Sending \"%1\" to %2...").tqarg( showfile, item->getPartnerNick() ) ); } else // type == Receive { - if ( newStatus == DccTransfer::Transferring && !item->isResumed() ) + if ( newtqStatus == DccTransfer::Transferring && !item->isResumed() ) { appendMessageToFrontmost( i18n( "DCC" ), i18n( "%1 = file name, %2 = file size, %3 = nickname of sender", "Downloading \"%1\" (%2) from %3...") - .arg( showfile, + .tqarg( showfile, ( item->getFileSize() == 0 ) ? i18n( "unknown size" ) : KIO::convertSize( item->getFileSize() ), item->getPartnerNick() ) ); } @@ -2068,7 +2068,7 @@ void Server::updateChannelMode(const TQString &updater, const TQString &channelN if (plus) { TQDateTime when; - addBan(channelName, TQString("%1 %2 %3").arg(parameter).arg(updater).arg(TQDateTime::currentDateTime().toTime_t())); + addBan(channelName, TQString("%1 %2 %3").tqarg(parameter).tqarg(updater).tqarg(TQDateTime::tqcurrentDateTime().toTime_t())); } else { removeBan(channelName, parameter); } @@ -2299,7 +2299,7 @@ NickInfoPtr Server::setWatchedNickOnline(const TQString& nickname) if (!addressee.isEmpty()) Konversation::Addressbook::self()->emitContactPresenceChanged(addressee.uid()); appendMessageToFrontmost(i18n("Notify"),""+ - i18n("%1 is online (%2).").arg(nickname).arg(getServerName())+"", getStatusView()); + i18n("%1 is online (%2).").tqarg(nickname).tqarg(getServerName())+"", getStatusView()); static_cast(kapp)->notificationHandler()->nickOnline(getStatusView(), nickname); @@ -2316,7 +2316,7 @@ void Server::setWatchedNickOffline(const TQString& nickname, const NickInfoPtr n emit watchedNickChanged(this, nickname, false); - appendMessageToFrontmost(i18n("Notify"), i18n("%1 went offline (%2).").arg(nickname).arg(getServerName()), getStatusView()); + appendMessageToFrontmost(i18n("Notify"), i18n("%1 went offline (%2).").tqarg(nickname).tqarg(getServerName()), getStatusView()); static_cast(kapp)->notificationHandler()->nickOffline(getStatusView(), nickname); @@ -2727,7 +2727,7 @@ void Server::appendCommandMessageToChannel(const TQString& channel,const TQStrin } else { - appendStatusMessage(command, TQString("%1 %2").arg(channel).arg(message)); + appendStatusMessage(command, TQString("%1 %2").tqarg(channel).tqarg(message)); } } @@ -2895,7 +2895,7 @@ void Server::invitation(const TQString& nick,const TQString& channel) { if(KMessageBox::questionYesNo(getViewContainer()->getWindow(), i18n("You were invited by %1 to join channel %2. " - "Do you accept the invitation?").arg(nick).arg(channel), + "Do you accept the invitation?").tqarg(nick).tqarg(channel), i18n("Invitation"), i18n("Join"), i18n("Ignore"), @@ -2907,12 +2907,12 @@ void Server::invitation(const TQString& nick,const TQString& channel) void Server::scriptNotFound(const TQString& name) { - appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not find script \"%1\".").arg(name)); + appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not find script \"%1\".").tqarg(name)); } void Server::scriptExecutionError(const TQString& name) { - appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not execute script \"%1\". Check file permissions.").arg(name)); + appendMessageToFrontmost(i18n("DCOP"),i18n("Error: Could not execute script \"%1\". Check file permissions.").tqarg(name)); } bool Server::isAChannel(const TQString &channel) const @@ -3226,7 +3226,7 @@ TQString Server::awayTime() const if (m_away) { - int diff = TQDateTime::currentDateTime().toTime_t() - m_awayTime; + int diff = TQDateTime::tqcurrentDateTime().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::currentDateTime().toTime_t(); + m_awayTime = TQDateTime::tqcurrentDateTime().toTime_t(); } KABC::Addressee Server::getOfflineNickAddressee(TQString& nickname) -- cgit v1.2.3