summaryrefslogtreecommitdiffstats
path: root/kiten/kiten.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:43 -0600
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2011-12-16 09:58:43 -0600
commit2d7b541a4e0095d40e37aaefbf9c4a9b9d149302 (patch)
tree628c1676b27475e583cfd0c2105bb41b646654bf /kiten/kiten.cpp
parent6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3 (diff)
downloadtdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.tar.gz
tdeedu-2d7b541a4e0095d40e37aaefbf9c4a9b9d149302.zip
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 6c3f7a55fb7888efc80a7350ef0c2f46ee02baa3.
Diffstat (limited to 'kiten/kiten.cpp')
-rw-r--r--kiten/kiten.cpp36
1 files changed, 18 insertions, 18 deletions
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp
index 82fcdaf7..574baa56 100644
--- a/kiten/kiten.cpp
+++ b/kiten/kiten.cpp
@@ -34,9 +34,9 @@
#include <kstandarddirs.h>
#include <kstatusbar.h>
-#include <clipboard.h>
+#include <tqclipboard.h>
#include <tqregexp.h>
-#include <textcodec.h>
+#include <tqtextcodec.h>
#include <tqtimer.h>
#include "kiten.h"
@@ -172,7 +172,7 @@ void TopLevel::addToList()
if (learnList.isEmpty())
createLearn();
else
- StatusBar->message(i18n("%1 added to learn list of all open learn windows").arg(toAddKanji.kanji()));
+ StatusBar->message(i18n("%1 added to learn list of all open learn windows").tqarg(toAddKanji.kanji()));
emit add(toAddKanji);
}
@@ -257,12 +257,12 @@ void TopLevel::handleSearchResult(Dict::SearchResult results)
addAction->setEnabled(true);
- _ResultView->append(TQString("<p>%1</p>").arg(i18n("HTML Entity: %1").arg(TQString("&amp;#x%1;").arg(TQString::number(toAddKanji.kanji().at(0).unicode(), 16))))); // show html entity
+ _ResultView->append(TQString("<p>%1</p>").tqarg(i18n("HTML Entity: %1").tqarg(TQString("&amp;#x%1;").tqarg(TQString::number(toAddKanji.kanji().tqat(0).tqunicode(), 16))))); // show html entity
// now show some compounds in which this kanji appears
TQString kanji = toAddKanji.kanji();
- _ResultView->addHeader(i18n("%1 in compounds").arg(kanji));
+ _ResultView->addHeader(i18n("%1 in compounds").tqarg(kanji));
Dict::SearchResult compounds = _Asyndeta.retrieveIndex()->search(TQRegExp(kanji), kanji, true);
bool common = true;
@@ -498,7 +498,7 @@ void TopLevel::strokeSearch()
// must be in kanjidic mode
kanjiCB->setChecked(true);
- doSearch(TQString("S%1 ").arg(strokesString), regexp);
+ doSearch(TQString("S%1 ").tqarg(strokesString), regexp);
}
void TopLevel::gradeSearch()
@@ -519,7 +519,7 @@ void TopLevel::gradeSearch()
return;
}
- TQString text = TQString("G%1 ").arg(grade);
+ TQString text = TQString("G%1 ").tqarg(grade);
TQRegExp regexp = TQRegExp(text);
kanjiCB->setChecked(true);
@@ -529,9 +529,9 @@ void TopLevel::gradeSearch()
TQString TopLevel::clipBoardText() // gets text from clipboard for globalaccels
{
- kapp->clipboard()->setSelectionMode(true);
- TQString text = kapp->clipboard()->text().stripWhiteSpace();
- kapp->clipboard()->setSelectionMode(false);
+ kapp->tqclipboard()->setSelectionMode(true);
+ TQString text = kapp->tqclipboard()->text().stripWhiteSpace();
+ kapp->tqclipboard()->setSelectionMode(false);
return text;
}
@@ -585,7 +585,7 @@ void TopLevel::setResults(unsigned int results, unsigned int fullNum)
TQString str = i18n("%n result","%n results",results);
if (results < fullNum)
- str += i18n(" out of %1").arg(fullNum);
+ str += i18n(" out of %1").tqarg(fullNum);
StatusBar->message(str);
setCaption(str);
@@ -681,7 +681,7 @@ TQRegExp TopLevel::readingSearchItems(bool kanji)
else
regexp = "\\[%1\\]";
- regexp = regexp.arg(text);
+ regexp = regexp.tqarg(text);
return TQRegExp(regexp, Config::caseSensitive());
}
@@ -699,7 +699,7 @@ TQRegExp TopLevel::kanjiSearchItems(bool beginning)
else
regexp = "^%1\\W";
- regexp = regexp.arg(text);
+ regexp = regexp.tqarg(text);
return TQRegExp(regexp, Config::caseSensitive());
}
@@ -717,7 +717,7 @@ TQRegExp TopLevel::searchItems()
else
regexp = "%1";
- regexp = regexp.arg(text);
+ regexp = regexp.tqarg(text);
return TQRegExp(regexp, Config::caseSensitive());
}
@@ -772,12 +772,12 @@ void TopLevel::radSearch(const TQStringList &_list, unsigned int strokes, unsign
already = true;
}
- hist.text = i18n("Radical(s): %1").arg(prettyRadicalString);
+ hist.text = i18n("Radical(s): %1").tqarg(prettyRadicalString);
if (strokes)
- hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").arg(prettyRadicalString).arg(strokes), true));
+ hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").tqarg(prettyRadicalString).tqarg(strokes), true));
else
- hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").arg(prettyRadicalString), true));
+ hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").tqarg(prettyRadicalString), true));
TQString strokesString;
if (strokes)
@@ -800,7 +800,7 @@ void TopLevel::radSearch(const TQStringList &_list, unsigned int strokes, unsign
for (it = list.begin(); it != list.end(); ++it)
{
- Dict::SearchResult results = _Asyndeta.retrieveIndex()->searchKanji(TQRegExp(strokes? (TQString("S%1 ").arg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked());
+ Dict::SearchResult results = _Asyndeta.retrieveIndex()->searchKanji(TQRegExp(strokes? (TQString("S%1 ").tqarg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked());
hist.outOf += results.outOf;
if (results.count < 1)