From 10ff1b477bf54f1433d98e4c1ce1c2cf147371be Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 18 Sep 2011 23:43:22 +0000 Subject: Fix a number of strings in Trinity that were incorrectly converted to TQ* from Q* This fixes the Kopete MSN protocol among other things git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- src/kvirc/kernel/kvi_irccontext.cpp | 2 +- src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp | 2 +- src/kvirc/sparser/kvi_sp_numeric.cpp | 2 +- src/kvirc/sparser/kvi_sp_tables.cpp | 2 +- src/modules/options/optw_connection.cpp | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp index 18feca1..55c3998 100644 --- a/src/kvirc/kernel/kvi_irccontext.cpp +++ b/src/kvirc/kernel/kvi_irccontext.cpp @@ -856,7 +856,7 @@ void KviIrcContext::terminateConnectionRequest(bool bForce,const TQString &szQui KviTQCString dat = console()->encodeText(buffer); bWasSentQuit = false; connection()->stateData()->setSentQuit(); - connection()->sendFmtData("TQUIT :%s",dat.data() ? dat.data() : ""); // here theoretically we COULD get disconnected + connection()->sendFmtData("QUIT :%s",dat.data() ? dat.data() : ""); // here theoretically we COULD get disconnected } // else it was already sent anyway if(KVI_OPTION_BOOL(KviOption_boolForceBrutalQuit) || bWasSentQuit || bForce) diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp index 2e35f75..7a675d2 100644 --- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp +++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp @@ -884,7 +884,7 @@ namespace KviKvsCoreCallbackCommands [comment]# We don't wait anymore :)[/comment] %:state++ echo "Sending TQUIT..." - return "TQUIT$cr$lf" + return "QUIT$cr$lf" } break; default: diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp index 265432f..efa5220 100644 --- a/src/kvirc/sparser/kvi_sp_numeric.cpp +++ b/src/kvirc/sparser/kvi_sp_numeric.cpp @@ -1425,7 +1425,7 @@ void KviServerParser::parseNumericNoSuchNick(KviIrcMessage *msg) } } // FIXME: #warning "KVI_OUT_NOSUCHNICKCHANNEL ?" - // FIXME: #warning "TQUERIES SHOULD REPORT NO TARGET HERE! (?)" + // FIXME: #warning "QUERIES SHOULD REPORT NO TARGET HERE! (?)" if(!msg->haltOutput()) { KviWindow * pOut = (KviWindow *)(msg->connection()->findQuery(szNick)); diff --git a/src/kvirc/sparser/kvi_sp_tables.cpp b/src/kvirc/sparser/kvi_sp_tables.cpp index 4432230..948a5c0 100644 --- a/src/kvirc/sparser/kvi_sp_tables.cpp +++ b/src/kvirc/sparser/kvi_sp_tables.cpp @@ -34,7 +34,7 @@ KviLiteralMessageParseStruct KviServerParser::m_literalParseProcTable[]= { "TOPIC" , PTM(parseLiteralTopic) }, { "JOIN" , PTM(parseLiteralJoin) }, { "PART" , PTM(parseLiteralPart) }, - { "TQUIT" , PTM(parseLiteralQuit) }, + { "QUIT" , PTM(parseLiteralQuit) }, { "NICK" , PTM(parseLiteralNick) }, { "KICK" , PTM(parseLiteralKick) }, { "NOTICE" , PTM(parseLiteralNotice) }, diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp index ecd026f..d6990c9 100644 --- a/src/modules/options/optw_connection.cpp +++ b/src/modules/options/optw_connection.cpp @@ -79,7 +79,7 @@ KviConnectionOptionsWidget::KviConnectionOptionsWidget(TQWidget * parent) "that was not requested by the user by the means of the TQUIT message." \ "

Warning: If you use /RAW to send a TQUIT message to the server, " \ "this option will not behave correctly, since does not detect the outgoing " \ - "TQUIT message and will attempt to reconnect after the server has closed the connection. " \ + "QUIT message and will attempt to reconnect after the server has closed the connection. " \ "For this reason, always use the /TQUIT command to close your connections. " \ "This option may also behave incorrectly with bouncers that support " \ "detaching, in this case a solution could be to prepare an alias that sends the " \ -- cgit v1.2.3