From d2d084dddffb2e7fc67326ea6a1c5ba4cf145a37 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/kdesdk@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- kbugbuster/backend/smtp.cpp | 4 ++-- umbrello/umbrello/codegenerators/php5writer.cpp | 2 +- umbrello/umbrello/codegenerators/phpwriter.cpp | 2 +- umbrello/umbrello/codeimport/kdevcppparser/driver.cpp | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/kbugbuster/backend/smtp.cpp b/kbugbuster/backend/smtp.cpp index 2496e57b..df31131b 100644 --- a/kbugbuster/backend/smtp.cpp +++ b/kbugbuster/backend/smtp.cpp @@ -149,8 +149,8 @@ void Smtp::readyRead() } else if ( state == smtpSuccess && responseLine[0] == '2' ) { TQTimer::singleShot( 0, this, TQT_SIGNAL(success()) ); } else if ( state == smtpQuit && responseLine[0] == '2' ) { - command = "TQUIT"; - *t << "TQUIT\r\n"; + command = "QUIT"; + *t << "QUIT\r\n"; // here, we just close. state = smtpClose; emit status( i18n( "Message sent" ) ); diff --git a/umbrello/umbrello/codegenerators/php5writer.cpp b/umbrello/umbrello/codegenerators/php5writer.cpp index 10146b6c..f0de28a3 100644 --- a/umbrello/umbrello/codegenerators/php5writer.cpp +++ b/umbrello/umbrello/codegenerators/php5writer.cpp @@ -2389,7 +2389,7 @@ static const char *php5words[] = "putenv", "qdom_error", "qdom_tree", - "TQUERY_STRING", + "QUERY_STRING", "quoted_printable_decode", "quotemeta", "rad2deg", diff --git a/umbrello/umbrello/codegenerators/phpwriter.cpp b/umbrello/umbrello/codegenerators/phpwriter.cpp index 4116020d..f7e1e76e 100644 --- a/umbrello/umbrello/codegenerators/phpwriter.cpp +++ b/umbrello/umbrello/codegenerators/phpwriter.cpp @@ -2385,7 +2385,7 @@ static const char *words[] = "putenv", "qdom_error", "qdom_tree", - "TQUERY_STRING", + "QUERY_STRING", "quoted_printable_decode", "quotemeta", "rad2deg", diff --git a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp index 8a76b939..c1db8656 100644 --- a/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp +++ b/umbrello/umbrello/codeimport/kdevcppparser/driver.cpp @@ -339,7 +339,7 @@ void Driver::setupLexer( Lexer * lexer ) lexer->addSkipWord( "TQ_TYPENAME" ); lexer->addSkipWord( "TQ_REFCOUNT" ); lexer->addSkipWord( "TQ_EXPLICIT" ); - lexer->addSkipWord( "TQMAC_PASCAL" ); + lexer->addSkipWord( "QMAC_PASCAL" ); lexer->addSkipWord( "QT_STATIC_CONST" ); lexer->addSkipWord( "QT_STATIC_CONST_IMPL" ); lexer->addSkipWord( "TQT_WIN_PAINTER_MEMBERS" ); -- cgit v1.2.3