diff options
Diffstat (limited to 'kiten/dict.cpp')
| -rw-r--r-- | kiten/dict.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/kiten/dict.cpp b/kiten/dict.cpp index 723e4c13..90af2878 100644 --- a/kiten/dict.cpp +++ b/kiten/dict.cpp @@ -26,7 +26,7 @@ #include <tqfileinfo.h> #include <tqregexp.h> -#include <textcodec.h> +#include <tqtextcodec.h> #include "dict.h" @@ -41,7 +41,7 @@ void msgerr(const TQString &msg, const TQString &dict = TQString()) { TQString output = msg; if (!dict.isNull()) - output = msg.arg(dict); + output = msg.tqarg(dict); KMessageBox::error(0, output); } } @@ -50,7 +50,7 @@ using namespace Dict; TextType Dict::textType(const TQString &text) { - ushort first = text.at(0).unicode(); + ushort first = text.tqat(0).tqunicode(); if (first < 0x3000) return Text_Latin; @@ -487,7 +487,7 @@ TQRegExp Dict::Index::createRegExp(SearchType type, const TQString &text, Dictio regExp = "%1"; } - return TQRegExp(regExp.arg(text), caseSensitive); + return TQRegExp(regExp.tqarg(text), caseSensitive); } int Index::stringCompare(File &file, int index, TQCString str) @@ -769,8 +769,8 @@ TQString Dict::firstEntryText(Dict::SearchResult result) /////////////////////////////////////////////////////////////// Entry::Entry(const TQString & kanji, const TQString & reading, const TQStringList &meanings) - : DictName(TQString::fromLatin1("__NOTSET")) - , Header(TQString::fromLatin1("__NOTSET")) + : DictName(TQString::tqfromLatin1("__NOTSET")) + , Header(TQString::tqfromLatin1("__NOTSET")) , Meanings(meanings) , Kanji(kanji) , KanaOnly(reading.isEmpty()) @@ -784,8 +784,8 @@ Entry::Entry(const TQString & kanji, const TQString & reading, const TQStringLis } Entry::Entry(const TQString &kanji, TQStringList &readings, TQStringList &meanings, unsigned int grade, unsigned int freq, unsigned int strokes, unsigned int miscount) - : DictName(TQString::fromLatin1("__NOTSET")) - , Header(TQString::fromLatin1("__NOTSET")) + : DictName(TQString::tqfromLatin1("__NOTSET")) + , Header(TQString::tqfromLatin1("__NOTSET")) , Meanings(meanings) , Kanji(kanji) , KanaOnly(false) @@ -806,7 +806,7 @@ Entry::Entry(const TQString &dictname) } Entry::Entry(const TQString &headername, bool) - : DictName(TQString::fromLatin1("__NOTSET")) + : DictName(TQString::tqfromLatin1("__NOTSET")) , Header(headername) , KanaOnly(true) , ExtendedKanjiInfo(false) |