summaryrefslogtreecommitdiffstats
path: root/kvoctrain/kvoctrain/kvoctrain.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'kvoctrain/kvoctrain/kvoctrain.cpp')
-rw-r--r--kvoctrain/kvoctrain/kvoctrain.cpp92
1 files changed, 46 insertions, 46 deletions
diff --git a/kvoctrain/kvoctrain/kvoctrain.cpp b/kvoctrain/kvoctrain/kvoctrain.cpp
index 62d2e901..1469c354 100644
--- a/kvoctrain/kvoctrain/kvoctrain.cpp
+++ b/kvoctrain/kvoctrain/kvoctrain.cpp
@@ -96,13 +96,13 @@ void kvoctrainApp::slotCurrentCellChanged(int row, int col)
if (rem_label != 0)
rem_label->setText(i18n("Abbreviation for R)emark","R: %1")
- .arg(noData ? TQString::null : expr->getRemark(col)));
+ .tqarg(noData ? TQString() : expr->getRemark(col)));
if (pron_label != 0)
pron_label->setText(i18n("Abbreviation for P)ronouncation","P: %1")
- .arg(noData ? TQString::null : expr->getPronunce(col)));
+ .tqarg(noData ? TQString() : expr->getPronunce(col)));
if (type_label != 0)
type_label->setText(i18n("Abbreviation for T)ype of word", "T: %1")
- .arg(noData ? TQString::null : QueryManager::typeStr(expr->getType(col))));
+ .tqarg(noData ? TQString() : QueryManager::typeStr(expr->getType(col))));
if (entryDlg != 0) {
if (noData)
@@ -144,7 +144,7 @@ void kvoctrainApp::slotEditCallBack(int res)
{
int lesson = doc->getEntry(row)->getLesson();
if (lesson >= lessons->count())
- lesson = QMAX (0, lessons->count()-1);
+ lesson = TQMAX (0, lessons->count()-1);
slotChooseLesson(lesson);
TQString exp;
@@ -219,8 +219,8 @@ void kvoctrainApp::commitEntryDlg(bool force)
expr->setFauxAmi (col, entryDlg->getToFauxAmi(), true);
expr->setGrade(col, entryDlg->getFromGrade(), false);
expr->setGrade(col, entryDlg->getToGrade(), true);
- expr->setQueryCount(col, entryDlg->getFromQCount(), false);
- expr->setQueryCount(col, entryDlg->getToQCount(), true);
+ expr->setQueryCount(col, entryDlg->getFromTQCount(), false);
+ expr->setQueryCount(col, entryDlg->getToTQCount(), true);
expr->setBadCount(col, entryDlg->getFromBCount(), false);
expr->setBadCount(col, entryDlg->getToBCount(), true);
expr->setQueryDate(col, entryDlg->getFromDate(), false);
@@ -258,10 +258,10 @@ void kvoctrainApp::commitEntryDlg(bool force)
if (entryDlg->toGradeDirty() )
expr->setGrade(col, entryDlg->getToGrade(), true);
- if (entryDlg->fromQCountDirty() )
- expr->setQueryCount(col, entryDlg->getFromQCount(), false);
- if (entryDlg->toQCountDirty() )
- expr->setQueryCount(col, entryDlg->getToQCount(), true);
+ if (entryDlg->fromTQCountDirty() )
+ expr->setQueryCount(col, entryDlg->getFromTQCount(), false);
+ if (entryDlg->toTQCountDirty() )
+ expr->setQueryCount(col, entryDlg->getToTQCount(), true);
if (entryDlg->fromBCountDirty() )
expr->setBadCount(col, entryDlg->getFromBCount(), false);
@@ -315,7 +315,7 @@ void kvoctrainApp::createEntryDlg(int row, int col)
int lesson = doc->getEntry(row)->getLesson();
if (lesson >= lessons->count())
- lesson = QMAX (0, lessons->count()-1);
+ lesson = TQMAX (0, lessons->count()-1);
if (col < KV_EXTRA_COLS) {
title = i18n("Edit General Properties");
@@ -333,21 +333,21 @@ void kvoctrainApp::createEntryDlg(int row, int col)
0,
0,
0,
- TQString::null,
- TQString::null,
- TQString::null,
+ TQString(),
+ TQString(),
+ TQString(),
lesson,
lessons,
doc->getOriginalIdent(),
langset,
- TQString::null,
+ TQString(),
doc->getEntry(row)->getType(col),
- TQString::null,
- TQString::null,
- TQString::null,
- TQString::null,
- TQString::null,
- TQString::null,
+ TQString(),
+ TQString(),
+ TQString(),
+ TQString(),
+ TQString(),
+ TQString(),
doc->getConjugation(0),
Conjugation(),
doc->getArticle(0),
@@ -474,7 +474,7 @@ void kvoctrainApp::setDataEntryDlg (int row, int col)
int lesson = expr->getLesson();
if (lesson >= lessons->count())
- lesson = QMAX (0, lessons->count()-1);
+ lesson = TQMAX (0, lessons->count()-1);
bool hasSel = hasSelection();
@@ -492,21 +492,21 @@ void kvoctrainApp::setDataEntryDlg (int row, int col)
0,
0,
0,
- TQString::null,
- TQString::null,
- TQString::null,
+ TQString(),
+ TQString(),
+ TQString(),
lesson,
lessons,
doc->getOriginalIdent(),
langset,
- TQString::null,
+ TQString(),
doc->getEntry(row)->getType(0),
- TQString::null,
- TQString::null,
- TQString::null,
- TQString::null,
- TQString::null,
- TQString::null,
+ TQString(),
+ TQString(),
+ TQString(),
+ TQString(),
+ TQString(),
+ TQString(),
doc->getConjugation(0),
Conjugation(),
doc->getArticle(0),
@@ -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_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);
@@ -1140,17 +1140,17 @@ void kvoctrainApp::aboutToShowLearn()
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(main_names[i]),
- (i << (16+8)) | IDH_START_QUERY); // hack: IDs => header-ids + cmd
+ query_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(main_names[i]),
+ (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
@@ -1158,11 +1158,11 @@ void kvoctrainApp::aboutToShowLearn()
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(main_names[i]),
+ multiple_m->insertItem(TQPixmap(langset.PixMapFile(j)), i18n("From %1").tqarg(main_names[i]),
(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);
@@ -1178,11 +1178,11 @@ void kvoctrainApp::aboutToShowLearn()
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)));
}
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)));
TQString id = header == 0 ? doc->getOriginalIdent()
: doc->getIdent(header);
@@ -1197,10 +1197,10 @@ void kvoctrainApp::aboutToShowLearn()
}
learn_menu->insertSeparator();
- learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_QUERY );
+ learn_menu->insertItem(SmallIconSet("run_query"), i18n("Resume &Query"), ID_RESUME_TQUERY );
learn_menu->insertItem(SmallIconSet("run_multi"), i18n("Resume &Multiple Choice"), ID_RESUME_MULTIPLE );
- learn_menu->setItemEnabled(ID_RESUME_QUERY, query_num != 0);
+ learn_menu->setItemEnabled(ID_RESUME_TQUERY, query_num != 0);
learn_menu->setItemEnabled(ID_RESUME_MULTIPLE, query_num != 0);
}
@@ -1264,7 +1264,7 @@ void kvoctrainApp::aboutToShowVocabSetLanguage()
}
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)));
if (header == 0)
set_m->insertItem(i18n("&Original"), langs_m, (2 << 16) | IDH_NULL);
@@ -1272,7 +1272,7 @@ void kvoctrainApp::aboutToShowVocabSetLanguage()
if (doc->numLangs() <= 2)
set_m->insertItem(i18n("&Translation"), langs_m, (2 << 16) | IDH_NULL);
else
- set_m->insertItem(i18n("&%1. Translation").arg(header), langs_m, (2 << 16) | IDH_NULL);
+ set_m->insertItem(i18n("&%1. Translation").tqarg(header), langs_m, (2 << 16) | IDH_NULL);
}
}
}