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/koffice@1254372 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

13 files changed, 18 insertions, 18 deletions

diff --git a/filters/chalk/raw/dcraw.c b/filters/chalk/raw/dcraw.c
index b892a5ca..b937e1da 100644
--- a/filters/chalk/raw/dcraw.c
+++ b/filters/chalk/raw/dcraw.c
@@ -3281,7 +3281,7 @@ void CLASS parse_makernote()
 	     !strcmp (buf,"EPSON"))
     fseek (ifp, -2, SEEK_CUR);
   else if (!strcmp (buf,"AOC") ||
-	   !strcmp (buf,"TQVC"))
+	   !strcmp (buf,"QVC"))
     fseek (ifp, -4, SEEK_CUR);
   else fseek (ifp, -10, SEEK_CUR);
 
diff --git a/filters/karbon/msod/msod.cc b/filters/karbon/msod/msod.cc
index 88e4f10b..3e79e3ab 100644
--- a/filters/karbon/msod/msod.cc
+++ b/filters/karbon/msod/msod.cc
@@ -132,14 +132,14 @@ void Msod::drawShape(
         "LIGHTNINGBOLT",            // Lightningbolt
         "HEART",                    // Heart
         "PICTUREFRAME",             // PictureFrame
-        "TQUADARROW",                // Quadarrow
+        "QUADARROW",                // Quadarrow
         "LEFTARROWCALLOUT",         // Leftarrowcallout
         "RIGHTARROWCALLOUT",        // Rightarrowcallout
         "UPARROWCALLOUT",           // Uparrowcallout
         "DOWNARROWCALLOUT",         // Downarrowcallout
         "LEFTRIGHTARROWCALLOUT",    // Leftrightarrowcallout
         "UPDOWNARROWCALLOUT",       // Updownarrowcallout
-        "TQUADARROWCALLOUT",         // Quadarrowcallout
+        "QUADARROWCALLOUT",         // Quadarrowcallout
         "BEVEL",                    // Bevel
         "LEFTBRACKET",              // Leftbracket
         "RIGHTBRACKET",             // Rightbracket
diff --git a/filters/kspread/excel/sidewinder/excel.cpp b/filters/kspread/excel/sidewinder/excel.cpp
index c201ea27..8155bca5 100644
--- a/filters/kspread/excel/sidewinder/excel.cpp
+++ b/filters/kspread/excel/sidewinder/excel.cpp
@@ -1005,7 +1005,7 @@ static const FunctionEntry FunctionEntries[] =
   { "ZTEST",           0 },     // 324
   { "LARGE",           2 },     // 325
   { "SMALL",           2 },     // 326
-  { "TQUARTILE",        2 },     // 327
+  { "QUARTILE",        2 },     // 327
   { "PERCENTILE",      2 },     // 328
   { "PERCENTRANK",     0 },     // 329
   { "MODALVALUE",      0 },     // 330
diff --git a/filters/kspread/qpro/qproimport.cc b/filters/kspread/qpro/qproimport.cc
index 31a3ac43..9a0db4fa 100644
--- a/filters/kspread/qpro/qproimport.cc
+++ b/filters/kspread/qpro/qproimport.cc
@@ -130,7 +130,7 @@ KoFilter::ConversiontqStatus QpImport::convert( const TQCString& from, const TQC
 
     if( !lIn )
     {
-        KMessageBox::sorry( 0L, i18n("TQPRO filter cannot open input file - please report.") );
+        KMessageBox::sorry( 0L, i18n("QPRO filter cannot open input file - please report.") );
         return KoFilter::FileNotFound;
     }
 
diff --git a/kexi/3rdparty/kexisql/src/threadtest.c b/kexi/3rdparty/kexisql/src/threadtest.c
index 89b84a10..89c79a4c 100644
--- a/kexi/3rdparty/kexisql/src/threadtest.c
+++ b/kexi/3rdparty/kexisql/src/threadtest.c
@@ -107,7 +107,7 @@ char **db_query(sqlite *db, const char *zFile, const char *zFormat, ...){
   va_end(ap);
   memset(&sResult, 0, sizeof(sResult));
   sResult.zFile = zFile;
-  if( verbose ) printf("TQUERY %s: %s\n", zFile, zSql);
+  if( verbose ) printf("QUERY %s: %s\n", zFile, zSql);
   rc = sqlite_exec(db, zSql, db_query_callback, &sResult, &zErrMsg);
   if( rc==SQLITE_SCHEMA ){
     if( zErrMsg ) free(zErrMsg);
diff --git a/kexi/3rdparty/kexisql3/src/parse.c b/kexi/3rdparty/kexisql3/src/parse.c
index 5eda3e3f..7c1fe420 100644
--- a/kexi/3rdparty/kexisql3/src/parse.c
+++ b/kexi/3rdparty/kexisql3/src/parse.c
@@ -888,7 +888,7 @@ static const char *const yyTokenName[] = {
   "$",             "END_OF_FILE",   "ILLEGAL",       "SPACE",       
   "UNCLOSED_STRING",  "COMMENT",       "FUNCTION",      "COLUMN",      
   "AGG_FUNCTION",  "AGG_COLUMN",    "CONST_FUNC",    "SEMI",        
-  "EXPLAIN",       "TQUERY",         "PLAN",          "BEGIN",       
+  "EXPLAIN",       "QUERY",         "PLAN",          "BEGIN",       
   "TRANSACTION",   "DEFERRED",      "IMMEDIATE",     "EXCLUSIVE",   
   "COMMIT",        "END",           "ROLLBACK",      "CREATE",      
   "TABLE",         "TEMP",          "LP",            "RP",          
diff --git a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp
index 89dd8d77..89aad061 100644
--- a/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp
+++ b/kexi/kexidb/drivers/mySQL/mysqlkeywords.cpp
@@ -229,8 +229,8 @@ namespace KexiDB {
 		"PROCESS",
 		"PROCESSLIST",
 		"PURGE",
-		"TQUERY",
-		"TQUICK",
+		"QUERY",
+		"QUICK",
 		"RAID0",
 		"RAID_CHUNKS",
 		"RAID_CHUNKSIZE",
diff --git a/kexi/kexidb/parser/sqlparser.cpp b/kexi/kexidb/parser/sqlparser.cpp
index 57e386ee..091d516b 100644
--- a/kexi/kexidb/parser/sqlparser.cpp
+++ b/kexi/kexidb/parser/sqlparser.cpp
@@ -1310,7 +1310,7 @@ static const char *const yytname[] =
   "OPEN", "OPTION", "OR", "ORDER", "OUTER", "OUTPUT", "OVERLAPS", "PAGE",
   "PARTIAL", "SQL_PASCAL", "PERSISTENT", "CTQL_PI", "PLI", "POSITION",
   "PRECISION", "PREPARE", "PRESERVE", "PRIMARY", "PRIOR", "PRIVILEGES",
-  "PROCEDURE", "PRODUCT", "PUBLIC", "TQUARTER", "TQUIT", "RAND", "READ_ONLY",
+  "PROCEDURE", "PRODUCT", "PUBLIC", "QUARTER", "QUIT", "RAND", "READ_ONLY",
   "REAL", "REFERENCES", "REPEAT", "REPLACE", "RESTRICT", "REVOKE", "RIGHT",
   "ROLLBACK", "ROWS", "RPAD", "RTRIM", "SCHEMA", "SCREEN_WIDTH", "SCROLL",
   "SECOND", "SECONDS_BETWEEN", "SELECT", "SEQUENCE", "SETOPT", "SET",
@@ -1324,7 +1324,7 @@ static const char *const yytname[] =
   "TO_DATE", "TRANSACTION", "TRANSLATE", "TRANSLATION", "TRUNCATE",
   "GENERAL_TITLE", "TWO_DIGITS", "UCASE", "UNION", "UNITQUE", "SQL_UNKNOWN",
   "UPDATE", "UPPER", "USAGE", "USER", "IDENTIFIER",
-  "IDENTIFIER_DOT_ASTERISK", "TQUERY_PARAMETER", "USING", "VALUE", "VALUES",
+  "IDENTIFIER_DOT_ASTERISK", "QUERY_PARAMETER", "USING", "VALUE", "VALUES",
   "VARBINARY", "VARCHAR", "VARYING", "VENDOR", "VIEW", "WEEK", "WHEN",
   "WHENEVER", "WHERE", "WHERE_CURRENT_OF", "WITH", "WORD_WRAPPED", "WORK",
   "WRAPPED", "XOR", "YEAR", "YEARS_BETWEEN", "SCAN_ERROR", "__LAST_TOKEN",
diff --git a/kexi/kexidb/queryschema.cpp b/kexi/kexidb/queryschema.cpp
index a82ca99a..b77f76a3 100644
--- a/kexi/kexidb/queryschema.cpp
+++ b/kexi/kexidb/queryschema.cpp
@@ -779,7 +779,7 @@ TQString QuerySchema::debugString()
 	dbg.reserve(1024);
 	//fields
 	TableSchema *mt = masterTable();
-	dbg = TQString("TQUERY ") + schemaDataDebugString() + "\n"
+	dbg = TQString("QUERY ") + schemaDataDebugString() + "\n"
 		+ "-masterTable=" + (mt ? mt->name() :"<NULL>")
 		+ "\n-COLUMNS:\n"
 		+ ((fieldCount()>0) ? FieldList::debugString() : "<NONE>") + "\n"
diff --git a/kspread/kspread_format.cc b/kspread/kspread_format.cc
index 587bf500..ecebff60 100644
--- a/kspread/kspread_format.cc
+++ b/kspread/kspread_format.cc
@@ -3282,7 +3282,7 @@ namespace Currency_LNS
     { "EUR", I18N_NOOP("Portugal"), I18N_NOOP("Euro"), I18N_NOOP("EUR") },
     { "PTE", I18N_NOOP("Portugal"), I18N_NOOP("Escudo"), I18N_NOOP("Esc.") },
     { "USD", I18N_NOOP("Puerto Rico"), I18N_NOOP("US Dollar"), I18N_NOOP("USD") },
-    { "TQAR", I18N_NOOP("Qatar"), I18N_NOOP("Qatari Rial"), I18N_NOOP("TQAR") },
+    { "QAR", I18N_NOOP("Qatar"), I18N_NOOP("Qatari Rial"), I18N_NOOP("QAR") },
     { "ROL", I18N_NOOP("Romania"), I18N_NOOP("Leu"), I18N_NOOP("LEI") },
     { "RUR", I18N_NOOP("Russian Federation"), I18N_NOOP("Russian Ruble"), I18N_NOOP("RUR") },
     { "RUB", I18N_NOOP("Russian Federation"), I18N_NOOP("Russian Ruble"), I18N_NOOP("RUB") },
diff --git a/kspread/kspread_functions_math.cc b/kspread/kspread_functions_math.cc
index 814226ae..8ee54a1a 100644
--- a/kspread/kspread_functions_math.cc
+++ b/kspread/kspread_functions_math.cc
@@ -172,7 +172,7 @@ void RegisterMathFunctions()
   f = new Function ("POWER",         func_pow);
   f->setParamCount (2);
   repo->add (f);
-  f = new Function ("TQUOTIENT",      func_quotient);
+  f = new Function ("QUOTIENT",      func_quotient);
   f->setParamCount (2);
   repo->add (f);
   f = new Function ("RAND",          func_rand);
diff --git a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
index bbaf97d6..544f7990 100644
--- a/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
+++ b/kword/mailmerge/sql/KWQtSqlPowerSerialDataSource.cpp
@@ -96,7 +96,7 @@ void KWQtSqlPowerSerialDataSource::save( TQDomDocument &doc, TQDomElement &paren
                 defEnt.setAttribute(TQString::tqfromLatin1("username"),username);
                 def.appendChild(defEnt);
 
-		defEnt=doc.createElement(TQString::tqfromLatin1("TQUERY"));
+		defEnt=doc.createElement(TQString::tqfromLatin1("QUERY"));
 		defEnt.setAttribute(TQString::tqfromLatin1("value"),query);
 		def.appendChild(defEnt);
 
@@ -131,7 +131,7 @@ void KWQtSqlPowerSerialDataSource::load( TQDomElement& parentElem )
 				username=dbEnt.attribute(TQString::tqfromLatin1("username"));
 			}
 		}
-		TQDomNode queryNd=def.namedItem("TQUERY");
+		TQDomNode queryNd=def.namedItem("QUERY");
 		if (!queryNd.isNull())
 		{
 			query=queryNd.toElement().attribute(TQString::tqfromLatin1("value"));
diff --git a/lib/kofficecore/KoFrame.cpp b/lib/kofficecore/KoFrame.cpp
index 906e73f4..4909e1e0 100644
--- a/lib/kofficecore/KoFrame.cpp
+++ b/lib/kofficecore/KoFrame.cpp
@@ -97,8 +97,8 @@ void KoFrame::setState( State s )
   {
       /*
       kdDebug(30003) << "KoFrame::setView setMaximumSize "
-              << "TQMAX32767(" << d->m_view->maximumWidth() + 2 * border() << "," << d->m_view->maximumWidth() << "), "
-              << "TQMAX32767(" << d->m_view->maximumHeight() + 2 * border() << "," <<  d->m_view->maximumHeight() << ")"
+              << "QMAX32767(" << d->m_view->maximumWidth() + 2 * border() << "," << d->m_view->maximumWidth() << "), "
+              << "QMAX32767(" << d->m_view->maximumHeight() + 2 * border() << "," <<  d->m_view->maximumHeight() << ")"
               << endl;
       */
       setMaximumSize( TQMAX32767( d->m_view->maximumWidth() + 2 * border(), d->m_view->maximumWidth() ),