Fix inadvertent "TQ" changes.

12 files changed, 43 insertions, 43 deletions

diff --git a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
index 96f84a85..7fd5ab72 100644
--- a/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
+++ b/kvoctrain/kvoctrain/common-dialogs/queryoptions.h
@@ -23,8 +23,8 @@
  *                                                                         *
  ***************************************************************************/
 
-#ifndef TQUERYOPTIONS_H
-#define TQUERYOPTIONS_H
+#ifndef QUERYOPTIONS_H
+#define QUERYOPTIONS_H
 
 #include "queryoptionsbase.h"
 
diff --git a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
index 78554297..4f086cb2 100644
--- a/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
+++ b/kvoctrain/kvoctrain/entry-dialogs/PhoneticEntryPage.cpp
@@ -116,7 +116,7 @@ KV_Unicode_Ref kv_unicode_ref[] = {
    {0x0282, "LATIN SMALL LETTER S WITH HOOK",     I18N_NOOP_maybe("voiceless retroflex fricative")},
    {0x0283, "LATIN SMALL LETTER ESH",     I18N_NOOP_maybe("voiceless postalveolar fricative")},
    {0x0284, "LATIN SMALL LETTER DOTLESS J WITH STROKE AND HOOK",     I18N_NOOP_maybe("implosive palatal stop")},
-   {0x0285, "LATIN SMALL LETTER STQUAT REVERSED ESH",     I18N_NOOP_maybe("apical retroflex vowel")},
+   {0x0285, "LATIN SMALL LETTER SQUAT REVERSED ESH",     I18N_NOOP_maybe("apical retroflex vowel")},
    {0x0286, "LATIN SMALL LETTER ESH WITH CURL",     I18N_NOOP_maybe("palatalized voiceless postalveolar fricative")},
    {0x0287, "LATIN SMALL LETTER TURNED T",     I18N_NOOP_maybe("dental click")},
    {0x0288, "LATIN SMALL LETTER T WITH RETROFLEX HOOK",     I18N_NOOP_maybe("voiceless retroflex stop")},
diff --git a/kvoctrain/kvoctrain/kv_resource.h b/kvoctrain/kvoctrain/kv_resource.h
index 59318424..6f704913 100644
--- a/kvoctrain/kvoctrain/kv_resource.h
+++ b/kvoctrain/kvoctrain/kv_resource.h
@@ -51,7 +51,7 @@ static const char *IDS_DEFAULT =  I18N_NOOP("Ready.");
 #define IDH_NULL                        0
 #define IDH_REMOVE                      1
 #define IDH_APPEND                      2
-#define IDH_START_TQUERY                 3
+#define IDH_START_QUERY                 3
 #define IDH_RESET_GRADE                 4
 #define IDH_CREATE_LESSON               5
 #define IDH_SET_LANG                    6
@@ -65,7 +65,7 @@ static const char *IDS_DEFAULT =  I18N_NOOP("Ready.");
 #define IDH_START_ANTONYM              14
 #define IDH_START_EXAMPLE              15
 #define IDH_START_PARAPHRASE           16
-#define ID_RESUME_TQUERY             13070
+#define ID_RESUME_QUERY             13070
 #define ID_RESUME_MULTIPLE          13110
 
 
diff --git a/kvoctrain/kvoctrain/kva_config.cpp b/kvoctrain/kvoctrain/kva_config.cpp
index c5ebcfc3..a04ed0ca 100644
--- a/kvoctrain/kvoctrain/kva_config.cpp
+++ b/kvoctrain/kvoctrain/kva_config.cpp
@@ -123,7 +123,7 @@ void kvoctrainApp::saveProperties(KConfig *config )
     config->writeEntry(CFG_TITLE,doc->getTitle());
     config->writeEntry(CFG_MODIFIED,doc->isModified());
 
-    config->writeEntry(CFG_TQUERYMODE, querymode);
+    config->writeEntry(CFG_QUERYMODE, querymode);
 
     TQString filename=doc->URL().path();
     TQString tempname = kapp->tempSaveName(filename);
@@ -135,7 +135,7 @@ void kvoctrainApp::saveProperties(KConfig *config )
 
 void kvoctrainApp::readProperties(KConfig *config)
 {
-  querymode = config->readBoolEntry(CFG_TQUERYMODE, 0);
+  querymode = config->readBoolEntry(CFG_QUERYMODE, 0);
 
   TQString filename = config->readEntry(CFG_FILENAME);
   TQString title = config->readEntry(CFG_TITLE);
diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index 54f7a7ee..04988b9b 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -95,10 +95,10 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
   header_m = new TQPopupMenu();
 
   if (header != KV_COL_ORG - KV_EXTRA_COLS ) {
-    header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_TQUERY);
+    header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_QUERY);
     header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), (header << 16) | IDH_START_MULTIPLE);
     header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, doc->numLangs() > 1);
-    header_m->setItemEnabled((header << 16) | IDH_START_TQUERY,  doc->numLangs() > 1);
+    header_m->setItemEnabled((header << 16) | IDH_START_QUERY,  doc->numLangs() > 1);
     header_m->insertSeparator();
     header_m->insertItem(i18n("&Verbs"), (header << 16) | IDH_START_VERB);
     header_m->insertItem(i18n("&Articles"), (header << 16) | IDH_START_ARTICLE);
@@ -135,10 +135,10 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
          && !langset.PixMapFile(j).isEmpty()
          && !langset.longId(j).isEmpty() ) {
         query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
-            (i << (16+8)) |  IDH_START_TQUERY);  // hack: IDs => header-ids + cmd
+            (i << (16+8)) |  IDH_START_QUERY);  // hack: IDs => header-ids + cmd
       }
       else {
-        query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_TQUERY);
+        query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_QUERY);
       }
     }
     header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
@@ -238,7 +238,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
     case IDH_NULL:
     break;
 
-    case ID_RESUME_TQUERY:
+    case ID_RESUME_QUERY:
         slotStatusHelpMsg(i18n("Resumes random query with existing selection"));
     break;
 
@@ -299,7 +299,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
     }
     break;
 
-    case IDH_START_TQUERY:
+    case IDH_START_QUERY:
     case IDH_START_MULTIPLE: {
       TQString to = header1 ? doc->getIdent(header1) : doc->getOriginalIdent();
       if (!langset.findLongId(to).isEmpty())
@@ -313,14 +313,14 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       TQString format;
 
       if (doc->numLangs() == 1) {
-        if (cmd == IDH_START_TQUERY)
+        if (cmd == IDH_START_QUERY)
           format = i18n("Creates and starts query to %1");
         else
           format = i18n("Creates and starts multiple choice to %1");
         msg = format.arg(to);
       }
       else {
-        if (cmd == IDH_START_TQUERY)
+        if (cmd == IDH_START_QUERY)
           format = i18n("Creates and starts query from %1 to %2");
         else
           format = i18n("Creates and starts multiple choice from %1 to %2");
@@ -421,7 +421,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     case IDH_NULL:
     break;
 
-    case ID_RESUME_TQUERY:
+    case ID_RESUME_QUERY:
       queryType = TQT_Random;
       slotRestartQuery();
     break;
@@ -455,7 +455,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     }
     break;
 
-    case IDH_START_TQUERY:
+    case IDH_START_QUERY:
       delete randomQueryDlg;
       randomQueryDlg = 0;
       queryType = TQT_Random;
diff --git a/kvoctrain/kvoctrain/kva_query.cpp b/kvoctrain/kvoctrain/kva_query.cpp
index 564566c9..e181936f 100644
--- a/kvoctrain/kvoctrain/kva_query.cpp
+++ b/kvoctrain/kvoctrain/kva_query.cpp
@@ -36,7 +36,7 @@
 #include "query-dialogs/SimpleQueryDlg.h"
 #include "prefs.h"
 
-#define MAX_TQUERY_TIMEOUT 3
+#define MAX_QUERY_TIMEOUT 3
 
 
 static const char not_answered[] = I18N_NOOP(
@@ -205,7 +205,7 @@ void kvoctrainApp::slotTimeOutProperty(QueryDlgBase::Result res)
   doc->setModified();
   switch (res) {
     case QueryDlgBase::Timeout:
-      if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) {
+      if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) {
         slotStopQuery(true);
         KMessageBox::information(this, i18n(not_answered),
                                  kapp->makeStdCaption(i18n("Stopping Query")));
@@ -411,7 +411,7 @@ void kvoctrainApp::slotTimeOutType(QueryDlgBase::Result res)
   doc->setModified();
   switch (res) {
     case QueryDlgBase::Timeout:
-      if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) {
+      if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) {
         slotStopQuery(true);
         KMessageBox::information(this, i18n(not_answered),
                                  kapp->makeStdCaption(i18n("Stopping Query")));
@@ -715,7 +715,7 @@ void kvoctrainApp::slotTimeOutQuery(QueryDlgBase::Result res)
 
   switch (res) {
     case QueryDlgBase::Timeout:
-      if (++num_queryTimeout >= MAX_TQUERY_TIMEOUT) {
+      if (++num_queryTimeout >= MAX_QUERY_TIMEOUT) {
         slotStopQuery(true);
         KMessageBox::information(this, i18n(not_answered),
                                  kapp->makeStdCaption(i18n("Stopping Query")));
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index c9be7784..31be75df 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -1114,11 +1114,11 @@ void kvoctrainApp::aboutToShowLearn()
     int j;
     header_m = new TQPopupMenu();
     if (header != 0 ) {
-      header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_TQUERY);
+      header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_QUERY);
       header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), (header << 16) | IDH_START_MULTIPLE);
 
       header_m->setItemEnabled((header << 16) | IDH_START_MULTIPLE, doc->numLangs() > 1);
-      header_m->setItemEnabled((header << 16) | IDH_START_TQUERY,  doc->numLangs() > 1);
+      header_m->setItemEnabled((header << 16) | IDH_START_QUERY,  doc->numLangs() > 1);
       header_m->insertSeparator();
 
       header_m->insertItem(i18n("&Verbs"), (header << 16) | IDH_START_VERB);
@@ -1141,10 +1141,10 @@ void kvoctrainApp::aboutToShowLearn()
            && !langset.PixMapFile(j).isEmpty()
            && !langset.longId(j).isEmpty() ) {
           query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(main_names[i]),
-              (i << (16+8)) |  IDH_START_TQUERY);  // hack: IDs => header-ids + cmd
+              (i << (16+8)) |  IDH_START_QUERY);  // hack: IDs => header-ids + cmd
         }
         else {
-          query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_TQUERY);
+          query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_QUERY);
         }
       }
 
@@ -1197,10 +1197,10 @@ void kvoctrainApp::aboutToShowLearn()
   }
 
   learn_menu->insertSeparator();
-  learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_TQUERY );
+  learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_QUERY );
   learn_menu->insertItem(SmallIconSet("run_multi"), i18n("Resume &Multiple Choice"), ID_RESUME_MULTIPLE );
 
-  learn_menu->setItemEnabled(ID_RESUME_TQUERY,  query_num != 0);
+  learn_menu->setItemEnabled(ID_RESUME_QUERY,  query_num != 0);
   learn_menu->setItemEnabled(ID_RESUME_MULTIPLE,  query_num != 0);
 
 }
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
index f1c4bbc3..4a3bdb7b 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rb_kvtml1.cpp
@@ -466,7 +466,7 @@ bool kvoctrainDoc::extract_O_T_attr (
       pronunce = (*first).stringValue();
     }
 
-    else if ((*first).name () == KV_TQUERY) {
+    else if ((*first).name () == KV_QUERY) {
       query_id = (*first).stringValue();
     }
 
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
index edaa945f..90cb7cb3 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_rh_kvtml.cpp
@@ -143,7 +143,7 @@ bool kvoctrainDoc::extract_L_DESCR_attr (XmlReader &xml,
       no = (*first).intValue();
     else if ((*first).name () == KV_LESS_CURR)
       isCurr = (*first).intValue() != 0;
-    else if ((*first).name () == KV_LESS_TQUERY)
+    else if ((*first).name () == KV_LESS_QUERY)
       inQuery = (*first).intValue() != 0;
     else {
       if (!unknownAttribute(xml.lineNumber(), "descr", (*first).name ()))
diff --git a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
index 55e4491f..d30598b1 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
+++ b/kvoctrain/kvoctrain/kvt-core/kvd_wkvtml.cpp
@@ -126,7 +126,7 @@ bool kvoctrainDoc::saveLessonKvtMl (XmlWriter &xml)
       if (getCurrentLesson() == lfn+1)
         xml.addAttribute (KV_LESS_CURR, (TQString) "1" );
       if (lfn < (int) lessons_in_query.size() && lessons_in_query[lfn])
-        xml.addAttribute (KV_LESS_TQUERY, (TQString) "1" );
+        xml.addAttribute (KV_LESS_QUERY, (TQString) "1" );
       xml.closeTag();
       xml.writeText (lesson_descr[lfn]);
       xml.endTag (KV_LESS_DESC, true);
@@ -759,9 +759,9 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
          s = "original";
       xml.addAttribute (KV_LANG, s);
       if (s == q_org)
-        xml.addAttribute (KV_TQUERY, (TQString) KV_O);
+        xml.addAttribute (KV_QUERY, (TQString) KV_O);
       else if (s == q_trans)
-        xml.addAttribute (KV_TQUERY, (TQString) KV_T);
+        xml.addAttribute (KV_QUERY, (TQString) KV_T);
 
     }
 
@@ -841,9 +841,9 @@ bool kvoctrainDoc::saveToKvtMl (TQTextStream& os, TQString &title) {
         }
         xml.addAttribute (KV_LANG, s);
         if (s == q_org)
-          xml.addAttribute (KV_TQUERY, (TQString) KV_O);
+          xml.addAttribute (KV_QUERY, (TQString) KV_O);
         else if (s == q_trans)
-          xml.addAttribute (KV_TQUERY, (TQString) KV_T);
+          xml.addAttribute (KV_QUERY, (TQString) KV_T);
       }
 
       TQString s1, s2;
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h
index d2403e7a..defdcf2b 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraincore.h
@@ -58,8 +58,8 @@
 
 #define       CFG_LESSONSIZE           "LessonSize"
 
-#define      CFG_TQUERYPROP            "QueryProperties"
-#define       CFG_TQUERYMODE            "QueryMode"
+#define      CFG_QUERYPROP            "QueryProperties"
+#define       CFG_QUERYMODE            "QueryMode"
 #define       CFG_DEFTRANS             "DefaultTranslation"
 #define       CFG_DEFORG               "DefaultOriginal"
 
@@ -72,11 +72,11 @@
 #define       CFG_L_FONT               "Font"
 #define       CFG_L_STDFONT            "SpecialFont"
 
-#define      CFG_TQUERYMANAG           "QueryManager"
+#define      CFG_QUERYMANAG           "QueryManager"
 #define       CFG_TQM_DATE_ITEM         "DateItem"
 #define       CFG_TQM_DATE_COMP         "DateComp"
-#define       CFG_TQM_TQUERY_ITEM        "QueryItem"
-#define       CFG_TQM_TQUERY_COMP        "QueryComp"
+#define       CFG_TQM_QUERY_ITEM        "QueryItem"
+#define       CFG_TQM_QUERY_COMP        "QueryComp"
 #define       CFG_TQM_BAD_ITEM          "BadItem"
 #define       CFG_TQM_BAD_COMP          "BadComp"
 #define       CFG_TQM_TYPE_ITEM         "TypeItem"
@@ -88,12 +88,12 @@
 #define       CFG_TQM_BLOCK_ITEM        "BlockItem"
 #define       CFG_TQM_EXPIRE_ITEM       "ExpireItem"
 
-#define      CFG_TQUERY_PRESETTING     "QueryPreSettings"
+#define      CFG_QUERY_PRESETTING     "QueryPreSettings"
 #define       CFG_TQP_NUM               "NumPreSetting"
 #define       CFG_TQP_NAME              "Name"
 #define       CFG_TQP_THRESH            "Threshhold"
 #define       CFG_TQP_BLOCK             "Blocking"
-#define       CFG_TQP_TQUERY             "Query"
+#define       CFG_TQP_QUERY             "Query"
 
 #define KVTML_EXT        "kvtml"
 #define VT5_LEX_EXT      "lex"
diff --git a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
index cf2b7c5c..d92f6524 100644
--- a/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
+++ b/kvoctrain/kvoctrain/kvt-core/kvoctraindoc.h
@@ -59,7 +59,7 @@
 #define KV_ORG         "o"         // original expression in specified language
 #define KV_TRANS       "t"         // translated expression in specified language
 #define KV_LANG        "l"         // language: en, de, it, fr ...
-#define KV_TQUERY       "q"         // query: org or translation
+#define KV_QUERY       "q"         // query: org or translation
 #define KV_O           "o"         // org
 #define KV_T           "t"         // translation
 #define KV_GRADE       "g"         // grade of knowledge: 0=well known, x=not known for x times
@@ -115,7 +115,7 @@
 #define KV_LESS_GRP    "lesson"    // lesson descriptor group
 #define KV_LESS_CURR   "current"   // is current lesson
 #define KV_LESS_DESC   "desc"      // lesson descriptor
-#define KV_LESS_TQUERY  "query"     // lesson contained in query
+#define KV_LESS_QUERY  "query"     // lesson contained in query
 #define KV_LESS_NO     "no"        // lesson descriptor number
 
 /*