diff options
Diffstat (limited to 'kiten/kiten.cpp')
| -rw-r--r-- | kiten/kiten.cpp | 36 |
1 files changed, 18 insertions, 18 deletions
diff --git a/kiten/kiten.cpp b/kiten/kiten.cpp index 574baa56..82fcdaf7 100644 --- a/kiten/kiten.cpp +++ b/kiten/kiten.cpp @@ -34,9 +34,9 @@ #include <kstandarddirs.h> #include <kstatusbar.h> -#include <tqclipboard.h> +#include <clipboard.h> #include <tqregexp.h> -#include <tqtextcodec.h> +#include <textcodec.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").tqarg(toAddKanji.kanji())); + StatusBar->message(i18n("%1 added to learn list of all open learn windows").arg(toAddKanji.kanji())); emit add(toAddKanji); } @@ -257,12 +257,12 @@ void TopLevel::handleSearchResult(Dict::SearchResult results) addAction->setEnabled(true); - _ResultView->append(TQString("<p>%1</p>").tqarg(i18n("HTML Entity: %1").tqarg(TQString("&#x%1;").tqarg(TQString::number(toAddKanji.kanji().tqat(0).tqunicode(), 16))))); // show html entity + _ResultView->append(TQString("<p>%1</p>").arg(i18n("HTML Entity: %1").arg(TQString("&#x%1;").arg(TQString::number(toAddKanji.kanji().at(0).unicode(), 16))))); // show html entity // now show some compounds in which this kanji appears TQString kanji = toAddKanji.kanji(); - _ResultView->addHeader(i18n("%1 in compounds").tqarg(kanji)); + _ResultView->addHeader(i18n("%1 in compounds").arg(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 ").tqarg(strokesString), regexp); + doSearch(TQString("S%1 ").arg(strokesString), regexp); } void TopLevel::gradeSearch() @@ -519,7 +519,7 @@ void TopLevel::gradeSearch() return; } - TQString text = TQString("G%1 ").tqarg(grade); + TQString text = TQString("G%1 ").arg(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->tqclipboard()->setSelectionMode(true); - TQString text = kapp->tqclipboard()->text().stripWhiteSpace(); - kapp->tqclipboard()->setSelectionMode(false); + kapp->clipboard()->setSelectionMode(true); + TQString text = kapp->clipboard()->text().stripWhiteSpace(); + kapp->clipboard()->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").tqarg(fullNum); + str += i18n(" out of %1").arg(fullNum); StatusBar->message(str); setCaption(str); @@ -681,7 +681,7 @@ TQRegExp TopLevel::readingSearchItems(bool kanji) else regexp = "\\[%1\\]"; - regexp = regexp.tqarg(text); + regexp = regexp.arg(text); return TQRegExp(regexp, Config::caseSensitive()); } @@ -699,7 +699,7 @@ TQRegExp TopLevel::kanjiSearchItems(bool beginning) else regexp = "^%1\\W"; - regexp = regexp.tqarg(text); + regexp = regexp.arg(text); return TQRegExp(regexp, Config::caseSensitive()); } @@ -717,7 +717,7 @@ TQRegExp TopLevel::searchItems() else regexp = "%1"; - regexp = regexp.tqarg(text); + regexp = regexp.arg(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").tqarg(prettyRadicalString); + hist.text = i18n("Radical(s): %1").arg(prettyRadicalString); if (strokes) - hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").tqarg(prettyRadicalString).tqarg(strokes), true)); + hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1 and %2 strokes").arg(prettyRadicalString).arg(strokes), true)); else - hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").tqarg(prettyRadicalString), true)); + hist.list.append(Dict::Entry(i18n("Kanji with radical(s) %1").arg(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 ").tqarg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked()); + Dict::SearchResult results = _Asyndeta.retrieveIndex()->searchKanji(TQRegExp(strokes? (TQString("S%1 ").arg(strokesString)) : (TQString("^") + (*it)) ), (*it), comCB->isChecked()); hist.outOf += results.outOf; if (results.count < 1) |