TQt4 port kdeedu

This enables compilation under both Qt3 and Qt4


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdeedu@1236073 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 43 insertions, 43 deletions

diff --git a/kvoctrain/kvoctrain/kva_header.cpp b/kvoctrain/kvoctrain/kva_header.cpp
index d1572659..7faa3dad 100644
--- a/kvoctrain/kvoctrain/kva_header.cpp
+++ b/kvoctrain/kvoctrain/kva_header.cpp
@@ -53,7 +53,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
     header_m->insertItem(SmallIconSet("sort_num"), i18n(SORT_NUM), (header << 16) | IDH_SORT_COL_NUM);
 
     connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+    connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
 
     header_m->exec(TQPoint (x, y));
     return;
@@ -90,15 +90,15 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
         (header << 16) | (i << (16+8)) | IDH_SET_LANG);
   }
   connect (langs_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotSetHeaderProp(int)));
-  connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  connect (langs_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
 
   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_QUERY);
+    header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), (header << 16) | IDH_START_TQUERY);
     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_QUERY,  doc->numLangs() > 1);
+    header_m->setItemEnabled((header << 16) | IDH_START_TQUERY,  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);
@@ -134,27 +134,27 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
       if((j = langset.indexShortId(doc->getIdent(i))) >= 0
          && !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_QUERY);  // hack: IDs => header-ids + cmd
+        query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(names[i-1]),
+            (i << (16+8)) |  IDH_START_TQUERY);  // hack: IDs => header-ids + cmd
       }
       else {
-        query_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_QUERY);
+        query_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_TQUERY);
       }
     }
     header_m->insertItem(SmallIconSet("run_query"), i18n("Create Random &Query"), query_m, (3 << 16) | IDH_NULL);
     connect (query_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+    connect (query_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
     for (int i = 1; i < (int) doc->numLangs(); i++) {
       // show pixmap and long name if available
       int j;
       if((j = langset.indexShortId(doc->getIdent(i))) >= 0
          && !langset.PixMapFile(j).isEmpty()
          && !langset.longId(j).isEmpty() ) {
-        multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").arg(names[i-1]),
+        multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(names[i-1]),
             (i << (16+8)) |  IDH_START_MULTIPLE);  // hack: IDs => header-ids + cmd
       }
       else {
-        multiple_m->insertItem(i18n("From %1").arg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_MULTIPLE);
+        multiple_m->insertItem(i18n("From %1").tqarg(doc->getIdent(i)), (i << (16+8)) |  IDH_START_MULTIPLE);
       }
     }
     header_m->insertItem(SmallIconSet("run_multi"), i18n("Create &Multiple Choice"), multiple_m, (4 << 16) | IDH_NULL);
@@ -168,7 +168,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
     header_m->insertItem(i18n("E&xamples"), (header << 16) | IDH_START_EXAMPLE);
     header_m->insertItem(i18n("&Paraphrase"), (header << 16) | IDH_START_PARAPHRASE);
     connect (multiple_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-    connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+    connect (multiple_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
 
     header_m->insertSeparator();
     header_m->insertItem(SmallIconSet("sort_incr"), i18n(SORT_ALPHA), (header+KV_EXTRA_COLS << 16) | IDH_SORT_COL_ALPHA);
@@ -176,7 +176,7 @@ void kvoctrainApp::slotHeaderMenu(int header, int x, int y) /*FOLD00*/
   }
 
   connect (header_m, TQT_SIGNAL(activated(int)), this, TQT_SLOT(slotHeaderCallBack(int)));
-  connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeaderStatus(int)));
+  connect (header_m, TQT_SIGNAL(highlighted(int)), this, TQT_SLOT(slotHeadertqStatus(int)));
   header_m->exec(TQPoint(x, y));
 }
 
@@ -226,7 +226,7 @@ void kvoctrainApp::slotSetHeaderProp (int header_and_id) /*FOLD00*/
 }
 
 
-void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
+void kvoctrainApp::slotHeadertqStatus (int header_and_cmd) /*FOLD00*/
 {
   int header1 = (header_and_cmd >> 16) & 0xFF;
   int header2 = header_and_cmd >> (16+8);
@@ -238,7 +238,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
     case IDH_NULL:
     break;
 
-    case ID_RESUME_QUERY:
+    case ID_RESUME_TQUERY:
         slotStatusHelpMsg(i18n("Resumes random query with existing selection"));
     break;
 
@@ -262,11 +262,11 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       TQString msg;
       if (header1 == 0) {
         TQString format = i18n("Sets %1 as language for original");
-        msg = format.arg(from);
+        msg = format.tqarg(from);
       }
       else {
         TQString format = i18n("Sets %1 as language for translation %2");
-        msg = format.arg(from).arg(header1);
+        msg = format.tqarg(from).tqarg(header1);
       }
       slotStatusHelpMsg(msg);
     }
@@ -282,7 +282,7 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       else if (header1 < (int) langset.size() ) {
         TQString from = langset.longId(header1);
         TQString format = i18n("Appends %1 as new language");
-        msg = format.arg(from);
+        msg = format.tqarg(from);
         slotStatusHelpMsg(msg);
       }
     }
@@ -294,12 +294,12 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
         from = langset.findLongId(from);
       TQString msg;
       TQString format = i18n("Removes %1 irrevocably from dictionary");
-      msg = format.arg(from);
+      msg = format.tqarg(from);
       slotStatusHelpMsg(msg);
     }
     break;
 
-    case IDH_START_QUERY:
+    case IDH_START_TQUERY:
     case IDH_START_MULTIPLE: {
       TQString to = header1 ? doc->getIdent(header1) : doc->getOriginalIdent();
       if (!langset.findLongId(to).isEmpty())
@@ -313,18 +313,18 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       TQString format;
 
       if (doc->numLangs() == 1) {
-        if (cmd == IDH_START_QUERY)
+        if (cmd == IDH_START_TQUERY)
           format = i18n("Creates and starts query to %1");
         else
           format = i18n("Creates and starts multiple choice to %1");
-        msg = format.arg(to);
+        msg = format.tqarg(to);
       }
       else {
-        if (cmd == IDH_START_QUERY)
+        if (cmd == IDH_START_TQUERY)
           format = i18n("Creates and starts query from %1 to %2");
         else
           format = i18n("Creates and starts multiple choice from %1 to %2");
-        msg = format.arg(from).arg(to);
+        msg = format.tqarg(from).tqarg(to);
       }
 
       slotStatusHelpMsg(msg);
@@ -376,13 +376,13 @@ void kvoctrainApp::slotHeaderStatus (int header_and_cmd) /*FOLD00*/
       if (!langset.findLongId(from).isEmpty())
         from = langset.findLongId(from);
       TQString format = i18n("Resets all properties for %1");
-      TQString msg = format.arg(from);
+      TQString msg = format.tqarg(from);
       slotStatusHelpMsg(msg);
     }
     break;
 
     default:
-      kdError() << "kvoctrainApp::slotHeaderStatus: got unknown command :" << cmd << endl;
+      kdError() << "kvoctrainApp::slotHeadertqStatus: got unknown command :" << cmd << endl;
   }
 }
 
@@ -421,13 +421,13 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     case IDH_NULL:
     break;
 
-    case ID_RESUME_QUERY:
-      queryType = QT_Random;
+    case ID_RESUME_TQUERY:
+      queryType = TQT_Random;
       slotRestartQuery();
     break;
 
     case ID_RESUME_MULTIPLE:
-      queryType = QT_Multiple;
+      queryType = TQT_Multiple;
       slotRestartQuery();
     break;
 
@@ -443,7 +443,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
 
       TQString format = i18n("You are about to delete a language completely.\n"
                             "Do you really want to delete \"%1\"?");
-      msg = format.arg(name);
+      msg = format.tqarg(name);
 
       int exit = KMessageBox::warningContinueCancel(this, msg,
                     kapp->makeStdCaption(""),KStdGuiItem::del());
@@ -455,10 +455,10 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     }
     break;
 
-    case IDH_START_QUERY:
+    case IDH_START_TQUERY:
       delete randomQueryDlg;
       randomQueryDlg = 0;
-      queryType = QT_Random;
+      queryType = TQT_Random;
       slotStartQuery(header1 ? doc->getIdent(header1) : doc->getOriginalIdent(),
                      header2 ? doc->getIdent(header2) : doc->getOriginalIdent(), true);
     break;
@@ -466,7 +466,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     case IDH_START_MULTIPLE:
       delete mcQueryDlg;
       mcQueryDlg = 0;
-      queryType = QT_Multiple;
+      queryType = TQT_Multiple;
       slotStartQuery(header1 ? doc->getIdent(header1) : doc->getOriginalIdent(),
                      header2 ? doc->getIdent(header2) : doc->getOriginalIdent(), true);
     break;
@@ -474,52 +474,52 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
     case IDH_START_VERB: {
       delete verbQueryDlg;
       verbQueryDlg = 0;
-      queryType = QT_Conjugation;
-      slotStartTypeQuery (header1, QM_VERB);
+      queryType = TQT_Conjugation;
+      slotStartTypeQuery (header1, TQM_VERB);
     }
     break;
 
     case IDH_START_ARTICLE: {
       delete artQueryDlg;
       artQueryDlg = 0;
-      queryType = QT_Articles;
-      slotStartTypeQuery (header1, QM_NOUN);
+      queryType = TQT_Articles;
+      slotStartTypeQuery (header1, TQM_NOUN);
     }
     break;
 
     case IDH_START_ADJECTIVE: {
       delete adjQueryDlg;
       adjQueryDlg = 0;
-      queryType = QT_Comparison;
-      slotStartTypeQuery (header1, QM_ADJ);
+      queryType = TQT_Comparison;
+      slotStartTypeQuery (header1, TQM_ADJ);
     }
     break;
 
     case IDH_START_SYNONYM: {
       delete simpleQueryDlg;
       simpleQueryDlg = 0;
-      slotStartPropertyQuery (header1, QT_Synonym);
+      slotStartPropertyQuery (header1, TQT_Synonym);
     }
     break;
 
     case IDH_START_ANTONYM: {
       delete simpleQueryDlg;
       simpleQueryDlg = 0;
-      slotStartPropertyQuery (header1, QT_Antonym);
+      slotStartPropertyQuery (header1, TQT_Antonym);
     }
     break;
 
     case IDH_START_EXAMPLE: {
       delete simpleQueryDlg;
       simpleQueryDlg = 0;
-      slotStartPropertyQuery (header1, QT_Example);
+      slotStartPropertyQuery (header1, TQT_Example);
     }
     break;
 
     case IDH_START_PARAPHRASE: {
       delete simpleQueryDlg;
       simpleQueryDlg = 0;
-      slotStartPropertyQuery (header1, QT_Paraphrase);
+      slotStartPropertyQuery (header1, TQT_Paraphrase);
     }
     break;
 
@@ -548,7 +548,7 @@ void kvoctrainApp::slotHeaderCallBack (int header_and_cmd) /*FOLD00*/
                       "lesson.\n\nDo you really want to reset \"%1\"?");
       }
 
-      msg = format.arg(name);
+      msg = format.tqarg(name);
 
       int exit = KMessageBox::warningContinueCancel(this, msg,
                     kapp->makeStdCaption(""),i18n("Reset"));