diff options
Diffstat (limited to 'konversation/src/server.cpp')
-rw-r--r-- | konversation/src/server.cpp | 192 |
1 files changed, 96 insertions, 96 deletions
diff --git a/konversation/src/server.cpp b/konversation/src/server.cpp index a3c776a..e6627bd 100644 --- a/konversation/src/server.cpp +++ b/konversation/src/server.cpp @@ -124,9 +124,9 @@ Server::Server(TQObject* parent, ConnectionSettings& settings) : TQObject(parent updateAutoJoin(settings.initialChannel()); if (!getIdentity()->getShellCommand().isEmpty()) - TQTimer::singleShot(0, this, TQT_SLOT(doPreShellCommand())); + TQTimer::singleShot(0, this, TQ_SLOT(doPreShellCommand())); else - TQTimer::singleShot(0, this, TQT_SLOT(connectToIRCServer())); + TQTimer::singleShot(0, this, TQ_SLOT(connectToIRCServer())); initTimers(); @@ -191,7 +191,7 @@ Server::~Server() //... so called to match the ChatWindow derivatives. bool Server::closeYourself(bool) { - TQTimer::singleShot(0, m_statusView, TQT_SLOT(serverSaysClose())); + TQTimer::singleShot(0, m_statusView, TQ_SLOT(serverSaysClose())); return true; } @@ -201,7 +201,7 @@ void Server::doPreShellCommand() TQString command = getIdentity()->getShellCommand(); getStatusView()->appendServerMessage(i18n("Info"),"Running preconfigured command..."); - connect(&m_preShellCommand,TQT_SIGNAL(processExited(TDEProcess*)), this, TQT_SLOT(preShellCommandExited(TDEProcess*))); + connect(&m_preShellCommand,TQ_SIGNAL(processExited(TDEProcess*)), this, TQ_SLOT(preShellCommandExited(TDEProcess*))); TQStringList commandList = TQStringList::split(" ",command); @@ -251,90 +251,90 @@ void Server::initTimers() void Server::connectSignals() { // Timers - connect(&m_incomingTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(processIncomingData())); - connect(&m_notifyTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(notifyTimeout())); - connect(&m_pingResponseTimer, TQT_SIGNAL(timeout()), this, TQT_SLOT(updateLongPongLag())); + connect(&m_incomingTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(processIncomingData())); + connect(&m_notifyTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(notifyTimeout())); + connect(&m_pingResponseTimer, TQ_SIGNAL(timeout()), this, TQ_SLOT(updateLongPongLag())); // OutputFilter - connect(getOutputFilter(), TQT_SIGNAL(requestDccSend()), this,TQT_SLOT(requestDccSend())); - connect(getOutputFilter(), TQT_SIGNAL(requestDccSend(const TQString&)), this, TQT_SLOT(requestDccSend(const TQString&))); - connect(getOutputFilter(), TQT_SIGNAL(multiServerCommand(const TQString&, const TQString&)), - this, TQT_SLOT(sendMultiServerCommand(const TQString&, const TQString&))); - connect(getOutputFilter(), TQT_SIGNAL(reconnectServer()), this, TQT_SLOT(reconnect())); - connect(getOutputFilter(), TQT_SIGNAL(disconnectServer()), this, TQT_SLOT(disconnect())); - connect(getOutputFilter(), TQT_SIGNAL(openDccSend(const TQString &, KURL)), this, TQT_SLOT(addDccSend(const TQString &, KURL))); - connect(getOutputFilter(), TQT_SIGNAL(openDccChat(const TQString &)), this, TQT_SLOT(openDccChat(const TQString &))); - connect(getOutputFilter(), TQT_SIGNAL(sendToAllChannels(const TQString&)), this, TQT_SLOT(sendToAllChannels(const TQString&))); - connect(getOutputFilter(), TQT_SIGNAL(banUsers(const TQStringList&,const TQString&,const TQString&)), - this, TQT_SLOT(requestBan(const TQStringList&,const TQString&,const TQString&))); - connect(getOutputFilter(), TQT_SIGNAL(unbanUsers(const TQString&,const TQString&)), - this, TQT_SLOT(requestUnban(const TQString&,const TQString&))); - connect(getOutputFilter(), TQT_SIGNAL(openRawLog(bool)), this, TQT_SLOT(addRawLog(bool))); - connect(getOutputFilter(), TQT_SIGNAL(closeRawLog()), this, TQT_SLOT(closeRawLog())); - connect(getOutputFilter(), TQT_SIGNAL(encodingChanged()), this, TQT_SLOT(updateEncoding())); + connect(getOutputFilter(), TQ_SIGNAL(requestDccSend()), this,TQ_SLOT(requestDccSend())); + connect(getOutputFilter(), TQ_SIGNAL(requestDccSend(const TQString&)), this, TQ_SLOT(requestDccSend(const TQString&))); + connect(getOutputFilter(), TQ_SIGNAL(multiServerCommand(const TQString&, const TQString&)), + this, TQ_SLOT(sendMultiServerCommand(const TQString&, const TQString&))); + connect(getOutputFilter(), TQ_SIGNAL(reconnectServer()), this, TQ_SLOT(reconnect())); + connect(getOutputFilter(), TQ_SIGNAL(disconnectServer()), this, TQ_SLOT(disconnect())); + connect(getOutputFilter(), TQ_SIGNAL(openDccSend(const TQString &, KURL)), this, TQ_SLOT(addDccSend(const TQString &, KURL))); + connect(getOutputFilter(), TQ_SIGNAL(openDccChat(const TQString &)), this, TQ_SLOT(openDccChat(const TQString &))); + connect(getOutputFilter(), TQ_SIGNAL(sendToAllChannels(const TQString&)), this, TQ_SLOT(sendToAllChannels(const TQString&))); + connect(getOutputFilter(), TQ_SIGNAL(banUsers(const TQStringList&,const TQString&,const TQString&)), + this, TQ_SLOT(requestBan(const TQStringList&,const TQString&,const TQString&))); + connect(getOutputFilter(), TQ_SIGNAL(unbanUsers(const TQString&,const TQString&)), + this, TQ_SLOT(requestUnban(const TQString&,const TQString&))); + connect(getOutputFilter(), TQ_SIGNAL(openRawLog(bool)), this, TQ_SLOT(addRawLog(bool))); + connect(getOutputFilter(), TQ_SIGNAL(closeRawLog()), this, TQ_SLOT(closeRawLog())); + connect(getOutputFilter(), TQ_SIGNAL(encodingChanged()), this, TQ_SLOT(updateEncoding())); KonversationApplication* konvApp = static_cast<KonversationApplication*>(kapp); - connect(getOutputFilter(), TQT_SIGNAL(connectTo(Konversation::ConnectionFlag, const TQString&, + connect(getOutputFilter(), TQ_SIGNAL(connectTo(Konversation::ConnectionFlag, const TQString&, const TQString&, const TQString&, const TQString&, const TQString&, bool)), - konvApp->getConnectionManager(), TQT_SLOT(connectTo(Konversation::ConnectionFlag, + konvApp->getConnectionManager(), TQ_SLOT(connectTo(Konversation::ConnectionFlag, const TQString&, const TQString&, const TQString&, const TQString&, const TQString&, bool))); - connect(konvApp->getDccTransferManager(), TQT_SIGNAL(newTransferQueued(DccTransfer*)), - this, TQT_SLOT(slotNewDccTransferItemQueued(DccTransfer*))); + connect(konvApp->getDccTransferManager(), TQ_SIGNAL(newTransferQueued(DccTransfer*)), + this, TQ_SLOT(slotNewDccTransferItemQueued(DccTransfer*))); - connect(konvApp, TQT_SIGNAL(appearanceChanged()), this, TQT_SLOT(startNotifyTimer())); + connect(konvApp, TQ_SIGNAL(appearanceChanged()), this, TQ_SLOT(startNotifyTimer())); // ViewContainer - connect(this, TQT_SIGNAL(showView(ChatWindow*)), getViewContainer(), TQT_SLOT(showView(ChatWindow*))); - connect(this, TQT_SIGNAL(addDccPanel()), getViewContainer(), TQT_SLOT(addDccPanel())); - connect(this, TQT_SIGNAL(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)), - getViewContainer(), TQT_SLOT(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)) ); - connect(this, TQT_SIGNAL(serverLag(Server*, int)), getViewContainer(), TQT_SIGNAL(updateStatusBarLagLabel(Server*, int))); - connect(this, TQT_SIGNAL(tooLongLag(Server*, int)), getViewContainer(), TQT_SIGNAL(setStatusBarLagLabelTooLongLag(Server*, int))); - connect(this, TQT_SIGNAL(resetLag()), getViewContainer(), TQT_SIGNAL(resetStatusBarLagLabel())); - connect(getOutputFilter(), TQT_SIGNAL(showView(ChatWindow*)), getViewContainer(), TQT_SLOT(showView(ChatWindow*))); - connect(getOutputFilter(), TQT_SIGNAL(openKonsolePanel()), getViewContainer(), TQT_SLOT(addKonsolePanel())); - connect(getOutputFilter(), TQT_SIGNAL(openChannelList(const TQString&, bool)), getViewContainer(), TQT_SLOT(openChannelList(const TQString&, bool))); - connect(getOutputFilter(), TQT_SIGNAL(closeDccPanel()), getViewContainer(), TQT_SLOT(closeDccPanel())); - connect(getOutputFilter(), TQT_SIGNAL(addDccPanel()), getViewContainer(), TQT_SLOT(addDccPanel())); - connect(&m_inputFilter, TQT_SIGNAL(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)), - getViewContainer(), TQT_SLOT(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)) ); + connect(this, TQ_SIGNAL(showView(ChatWindow*)), getViewContainer(), TQ_SLOT(showView(ChatWindow*))); + connect(this, TQ_SIGNAL(addDccPanel()), getViewContainer(), TQ_SLOT(addDccPanel())); + connect(this, TQ_SIGNAL(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)), + getViewContainer(), TQ_SLOT(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)) ); + connect(this, TQ_SIGNAL(serverLag(Server*, int)), getViewContainer(), TQ_SIGNAL(updateStatusBarLagLabel(Server*, int))); + connect(this, TQ_SIGNAL(tooLongLag(Server*, int)), getViewContainer(), TQ_SIGNAL(setStatusBarLagLabelTooLongLag(Server*, int))); + connect(this, TQ_SIGNAL(resetLag()), getViewContainer(), TQ_SIGNAL(resetStatusBarLagLabel())); + connect(getOutputFilter(), TQ_SIGNAL(showView(ChatWindow*)), getViewContainer(), TQ_SLOT(showView(ChatWindow*))); + connect(getOutputFilter(), TQ_SIGNAL(openKonsolePanel()), getViewContainer(), TQ_SLOT(addKonsolePanel())); + connect(getOutputFilter(), TQ_SIGNAL(openChannelList(const TQString&, bool)), getViewContainer(), TQ_SLOT(openChannelList(const TQString&, bool))); + connect(getOutputFilter(), TQ_SIGNAL(closeDccPanel()), getViewContainer(), TQ_SLOT(closeDccPanel())); + connect(getOutputFilter(), TQ_SIGNAL(addDccPanel()), getViewContainer(), TQ_SLOT(addDccPanel())); + connect(&m_inputFilter, TQ_SIGNAL(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)), + getViewContainer(), TQ_SLOT(addDccChat(const TQString&,const TQString&,const TQStringList&,bool)) ); // Inputfilter - connect(&m_inputFilter, TQT_SIGNAL(welcome(const TQString&)), this, TQT_SLOT(connectionEstablished(const TQString&))); - connect(&m_inputFilter, TQT_SIGNAL(notifyResponse(const TQString&)), this, TQT_SLOT(notifyResponse(const TQString&))); - connect(&m_inputFilter, TQT_SIGNAL(startReverseDccSendTransfer(const TQString&,const TQStringList&)), - this, TQT_SLOT(startReverseDccSendTransfer(const TQString&,const TQStringList&))); - connect(&m_inputFilter, TQT_SIGNAL(addDccGet(const TQString&, const TQStringList&)), - this, TQT_SLOT(addDccGet(const TQString&, const TQStringList&))); - connect(&m_inputFilter, TQT_SIGNAL(resumeDccGetTransfer(const TQString&, const TQStringList&)), - this, TQT_SLOT(resumeDccGetTransfer(const TQString&, const TQStringList&))); - connect(&m_inputFilter, TQT_SIGNAL(resumeDccSendTransfer(const TQString&, const TQStringList&)), - this, TQT_SLOT(resumeDccSendTransfer(const TQString&, const TQStringList&))); - connect(&m_inputFilter, TQT_SIGNAL(userhost(const TQString&,const TQString&,bool,bool)), - this, TQT_SLOT(userhost(const TQString&,const TQString&,bool,bool)) ); - connect(&m_inputFilter, TQT_SIGNAL(topicAuthor(const TQString&,const TQString&,TQDateTime)), - this, TQT_SLOT(setTopicAuthor(const TQString&,const TQString&,TQDateTime)) ); - connect(&m_inputFilter, TQT_SIGNAL(endOfWho(const TQString&)), - this, TQT_SLOT(endOfWho(const TQString&)) ); - connect(&m_inputFilter, TQT_SIGNAL(invitation(const TQString&,const TQString&)), - this,TQT_SLOT(invitation(const TQString&,const TQString&)) ); - connect(&m_inputFilter, TQT_SIGNAL(addToChannelList(const TQString&, int, const TQString& )), - this, TQT_SLOT(addToChannelList(const TQString&, int, const TQString& ))); + connect(&m_inputFilter, TQ_SIGNAL(welcome(const TQString&)), this, TQ_SLOT(connectionEstablished(const TQString&))); + connect(&m_inputFilter, TQ_SIGNAL(notifyResponse(const TQString&)), this, TQ_SLOT(notifyResponse(const TQString&))); + connect(&m_inputFilter, TQ_SIGNAL(startReverseDccSendTransfer(const TQString&,const TQStringList&)), + this, TQ_SLOT(startReverseDccSendTransfer(const TQString&,const TQStringList&))); + connect(&m_inputFilter, TQ_SIGNAL(addDccGet(const TQString&, const TQStringList&)), + this, TQ_SLOT(addDccGet(const TQString&, const TQStringList&))); + connect(&m_inputFilter, TQ_SIGNAL(resumeDccGetTransfer(const TQString&, const TQStringList&)), + this, TQ_SLOT(resumeDccGetTransfer(const TQString&, const TQStringList&))); + connect(&m_inputFilter, TQ_SIGNAL(resumeDccSendTransfer(const TQString&, const TQStringList&)), + this, TQ_SLOT(resumeDccSendTransfer(const TQString&, const TQStringList&))); + connect(&m_inputFilter, TQ_SIGNAL(userhost(const TQString&,const TQString&,bool,bool)), + this, TQ_SLOT(userhost(const TQString&,const TQString&,bool,bool)) ); + connect(&m_inputFilter, TQ_SIGNAL(topicAuthor(const TQString&,const TQString&,TQDateTime)), + this, TQ_SLOT(setTopicAuthor(const TQString&,const TQString&,TQDateTime)) ); + connect(&m_inputFilter, TQ_SIGNAL(endOfWho(const TQString&)), + this, TQ_SLOT(endOfWho(const TQString&)) ); + connect(&m_inputFilter, TQ_SIGNAL(invitation(const TQString&,const TQString&)), + this,TQ_SLOT(invitation(const TQString&,const TQString&)) ); + connect(&m_inputFilter, TQ_SIGNAL(addToChannelList(const TQString&, int, const TQString& )), + this, TQ_SLOT(addToChannelList(const TQString&, int, const TQString& ))); // Status View - connect(this, TQT_SIGNAL(serverOnline(bool)), getStatusView(), TQT_SLOT(serverOnline(bool))); + connect(this, TQ_SIGNAL(serverOnline(bool)), getStatusView(), TQ_SLOT(serverOnline(bool))); // Scripts - connect(getOutputFilter(), TQT_SIGNAL(launchScript(const TQString&, const TQString&)), - m_scriptLauncher, TQT_SLOT(launchScript(const TQString&, const TQString&))); - connect(m_scriptLauncher, TQT_SIGNAL(scriptNotFound(const TQString&)), - this, TQT_SLOT(scriptNotFound(const TQString&))); - connect(m_scriptLauncher, TQT_SIGNAL(scriptExecutionError(const TQString&)), - this, TQT_SLOT(scriptExecutionError(const TQString&))); + connect(getOutputFilter(), TQ_SIGNAL(launchScript(const TQString&, const TQString&)), + m_scriptLauncher, TQ_SLOT(launchScript(const TQString&, const TQString&))); + connect(m_scriptLauncher, TQ_SIGNAL(scriptNotFound(const TQString&)), + this, TQ_SLOT(scriptNotFound(const TQString&))); + connect(m_scriptLauncher, TQ_SIGNAL(scriptExecutionError(const TQString&)), + this, TQ_SLOT(scriptExecutionError(const TQString&))); // Stats - connect(this, TQT_SIGNAL(sentStat(int, int)), TQT_SLOT(collectStats(int, int))); + connect(this, TQ_SIGNAL(sentStat(int, int)), TQ_SLOT(collectStats(int, int))); } int Server::getPort() @@ -389,22 +389,22 @@ void Server::connectToIRCServer() if(!getConnectionSettings().server().SSLEnabled()) { m_socket = new KNetwork::TDEBufferedSocket(TQString(), TQString(), 0L, "serverSocket"); - connect(m_socket, TQT_SIGNAL(connected(const KResolverEntry&)), TQT_SLOT (ircServerConnectionSuccess())); + connect(m_socket, TQ_SIGNAL(connected(const KResolverEntry&)), TQ_SLOT (ircServerConnectionSuccess())); } else { m_socket = new SSLSocket(getViewContainer()->getWindow(), 0L, "serverSSLSocket"); - connect(m_socket, TQT_SIGNAL(sslInitDone()), TQT_SLOT(ircServerConnectionSuccess())); - connect(m_socket, TQT_SIGNAL(sslFailure(const TQString&)), TQT_SIGNAL(sslInitFailure())); - connect(m_socket, TQT_SIGNAL(sslFailure(const TQString&)), TQT_SLOT(sslError(const TQString&))); + connect(m_socket, TQ_SIGNAL(sslInitDone()), TQ_SLOT(ircServerConnectionSuccess())); + connect(m_socket, TQ_SIGNAL(sslFailure(const TQString&)), TQ_SIGNAL(sslInitFailure())); + connect(m_socket, TQ_SIGNAL(sslFailure(const TQString&)), TQ_SLOT(sslError(const TQString&))); } m_socket->enableWrite(false); - connect(m_socket, TQT_SIGNAL(hostFound()), TQT_SLOT(lookupFinished())); - connect(m_socket, TQT_SIGNAL(gotError(int)), TQT_SLOT(broken(int)) ); - connect(m_socket, TQT_SIGNAL(readyRead()), TQT_SLOT(incoming())); - connect(m_socket, TQT_SIGNAL(closed()), TQT_SLOT(closed())); + connect(m_socket, TQ_SIGNAL(hostFound()), TQ_SLOT(lookupFinished())); + connect(m_socket, TQ_SIGNAL(gotError(int)), TQ_SLOT(broken(int)) ); + connect(m_socket, TQ_SIGNAL(readyRead()), TQ_SLOT(incoming())); + connect(m_socket, TQ_SIGNAL(closed()), TQ_SLOT(closed())); m_socket->connect(getConnectionSettings().server().host(), TQString::number(getConnectionSettings().server().port())); @@ -550,7 +550,7 @@ void Server::ircServerConnectionSuccess() Konversation::ServerSettings serverSettings = getConnectionSettings().server(); - connect(this, TQT_SIGNAL(nicknameChanged(const TQString&)), getStatusView(), TQT_SLOT(setNickname(const TQString&))); + connect(this, TQ_SIGNAL(nicknameChanged(const TQString&)), getStatusView(), TQ_SLOT(setNickname(const TQString&))); getStatusView()->appendServerMessage(i18n("Info"),i18n("Connected; logging in...")); TQString connectString = "USER " + @@ -631,7 +631,7 @@ void Server::connectionEstablished(const TQString& ownHost) // Some servers don't include the userhost in RPL_WELCOME, so we // need to use RPL_USERHOST to get ahold of our IP later on if (!ownHost.isEmpty()) - KNetwork::KResolver::resolveAsync(this,TQT_SLOT(gotOwnResolvedHostByWelcome(KResolverResults)),ownHost,"0"); + KNetwork::KResolver::resolveAsync(this,TQ_SLOT(gotOwnResolvedHostByWelcome(KResolverResults)),ownHost,"0"); updateConnectionState(Konversation::SSConnected); @@ -646,7 +646,7 @@ void Server::connectionEstablished(const TQString& ownHost) requestUserhost(getNickname()); // Start the PINGPONG match - TQTimer::singleShot(1000 /*1 sec*/, this, TQT_SLOT(sendPing())); + TQTimer::singleShot(1000 /*1 sec*/, this, TQ_SLOT(sendPing())); // Recreate away state if we were set away prior to a reconnect. if (m_away) @@ -1447,8 +1447,8 @@ class Query* Server::addQuery(const NickInfoPtr & nickInfo, bool weinitiated) TQString lcNickname = nickname.lower(); query = getViewContainer()->addQuery(this, nickInfo, weinitiated); - connect(query, TQT_SIGNAL(sendFile(const TQString&)),this, TQT_SLOT(requestDccSend(const TQString&))); - connect(this, TQT_SIGNAL(serverOnline(bool)), query, TQT_SLOT(serverOnline(bool))); + connect(query, TQ_SIGNAL(sendFile(const TQString&)),this, TQ_SLOT(requestDccSend(const TQString&))); + connect(this, TQ_SIGNAL(serverOnline(bool)), query, TQ_SLOT(serverOnline(bool))); // Append query to internal list m_queryList.append(query); @@ -1648,13 +1648,13 @@ void Server::slotNewDccTransferItemQueued(DccTransfer* transfer) kdDebug() << "Server::slotNewDccTranfserItemQueued(): connecting slots for " << transfer->getFileName() << " [" << transfer->getType() << "]" << endl; if ( transfer->getType() == DccTransfer::Receive ) { - connect( transfer, TQT_SIGNAL( done( DccTransfer* ) ), this, TQT_SLOT( dccGetDone( DccTransfer* ) ) ); - connect( transfer, TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( dccStatusChanged( DccTransfer*, int, int ) ) ); + connect( transfer, TQ_SIGNAL( done( DccTransfer* ) ), this, TQ_SLOT( dccGetDone( DccTransfer* ) ) ); + connect( transfer, TQ_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQ_SLOT( dccStatusChanged( DccTransfer*, int, int ) ) ); } else { - connect( transfer, TQT_SIGNAL( done( DccTransfer* ) ), this, TQT_SLOT( dccSendDone( DccTransfer* ) ) ); - connect( transfer, TQT_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQT_SLOT( dccStatusChanged( DccTransfer*, int, int ) ) ); + connect( transfer, TQ_SIGNAL( done( DccTransfer* ) ), this, TQ_SLOT( dccSendDone( DccTransfer* ) ) ); + connect( transfer, TQ_SIGNAL( statusChanged( DccTransfer*, int, int ) ), this, TQ_SLOT( dccStatusChanged( DccTransfer*, int, int ) ) ); } } } @@ -1989,8 +1989,8 @@ void Server::joinChannel(const TQString& name, const TQString& hostmask) m_channelList.append(channel); - connect(channel,TQT_SIGNAL (sendFile()),this,TQT_SLOT (requestDccSend()) ); - connect(this, TQT_SIGNAL(nicknameChanged(const TQString&)), channel, TQT_SLOT(setNickname(const TQString&))); + connect(channel,TQ_SIGNAL (sendFile()),this,TQ_SLOT (requestDccSend()) ); + connect(this, TQ_SIGNAL(nicknameChanged(const TQString&)), channel, TQ_SLOT(setNickname(const TQString&))); } // Move channel from unjoined (if present) to joined list and add our own nickname to the joined list. ChannelNickPtr channelNick = addNickToJoinedChannelsList(name, getNickname()); @@ -2689,7 +2689,7 @@ void Server::userhost(const TQString& nick,const TQString& hostmask,bool away,bo { TQString myhost = hostmask.section('@', 1); // Use async lookup else you will be blocking GUI badly - KNetwork::KResolver::resolveAsync(this,TQT_SLOT(gotOwnResolvedHostByUserhost(KResolverResults)),myhost,"0"); + KNetwork::KResolver::resolveAsync(this,TQ_SLOT(gotOwnResolvedHostByUserhost(KResolverResults)),myhost,"0"); } NickInfoPtr nickInfo = getNickInfo(nick); if (nickInfo) @@ -2921,7 +2921,7 @@ void Server::addRawLog(bool show) { if (!m_rawLog) m_rawLog = getViewContainer()->addRawLog(this); - connect(this, TQT_SIGNAL(serverOnline(bool)), m_rawLog, TQT_SLOT(serverOnline(bool))); + connect(this, TQ_SIGNAL(serverOnline(bool)), m_rawLog, TQ_SLOT(serverOnline(bool))); // bring raw log to front since the main window does not do this for us if (show) emit showView(m_rawLog); @@ -2938,9 +2938,9 @@ ChannelListPanel* Server::addChannelListPanel() { m_channelListPanel = getViewContainer()->addChannelListPanel(this); - connect(m_channelListPanel, TQT_SIGNAL(refreshChannelList()), this, TQT_SLOT(requestChannelList())); - connect(m_channelListPanel, TQT_SIGNAL(joinChannel(const TQString&)), this, TQT_SLOT(sendJoinCommand(const TQString&))); - connect(this, TQT_SIGNAL(serverOnline(bool)), m_channelListPanel, TQT_SLOT(serverOnline(bool))); + connect(m_channelListPanel, TQ_SIGNAL(refreshChannelList()), this, TQ_SLOT(requestChannelList())); + connect(m_channelListPanel, TQ_SIGNAL(joinChannel(const TQString&)), this, TQ_SLOT(sendJoinCommand(const TQString&))); + connect(this, TQ_SIGNAL(serverOnline(bool)), m_channelListPanel, TQ_SLOT(serverOnline(bool))); } return m_channelListPanel; @@ -3133,7 +3133,7 @@ void Server::reconnect() // quitServer might cause is delivered before connectToIRCServer // sets SSConnecting and broken() announces a deliberate disconnect // due to the failure allegedly occuring during SSConnecting. - TQTimer::singleShot(0, this, TQT_SLOT(connectToIRCServer())); + TQTimer::singleShot(0, this, TQ_SLOT(connectToIRCServer())); } void Server::disconnect() @@ -3317,7 +3317,7 @@ void Server::pongReceived() emit serverLag(this, m_currentLag); // Send another PING in 60 seconds - TQTimer::singleShot(60000 /*60 sec*/, this, TQT_SLOT(sendPing())); + TQTimer::singleShot(60000 /*60 sec*/, this, TQ_SLOT(sendPing())); } void Server::updateLongPongLag() |