summaryrefslogtreecommitdiffstats
path: root/src/codecs/qjiscodec.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <[email protected]>2012-03-02 02:11:59 -0600
committerTimothy Pearson <[email protected]>2012-03-02 02:11:59 -0600
commit9a75b154bf0732aa3a501b6e31e566e06c5f8a31 (patch)
treedf1e10cc7504665622d096f9ba80dc9e56f3afb8 /src/codecs/qjiscodec.cpp
parenta830bf10b7d4ed2c83ffe68c0b22d7c4ba9860b0 (diff)
downloadqt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.tar.gz
qt3-9a75b154bf0732aa3a501b6e31e566e06c5f8a31.zip
Undo prior accidental commit
Diffstat (limited to 'src/codecs/qjiscodec.cpp')
-rw-r--r--src/codecs/qjiscodec.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/src/codecs/qjiscodec.cpp b/src/codecs/qjiscodec.cpp
index e685ab3..19cc94e 100644
--- a/src/codecs/qjiscodec.cpp
+++ b/src/codecs/qjiscodec.cpp
@@ -387,17 +387,17 @@ const char* QJisCodec::mimeName() const
/*! \internal */
int QJisCodec::heuristicNameMatch(const char* hint) const
{
- if ( tqstrnicmp( hint, "ISO-2022-JP", 11 ) == 0 )
+ if ( qstrnicmp( hint, "ISO-2022-JP", 11 ) == 0 )
return 10000;
if ( simpleHeuristicNameMatch( "ISO-2022-JP-2", hint ) > 0 )
return 10;
int score = 0;
bool ja = FALSE;
- if (tqstrnicmp(hint, "ja_JP", 5) == 0 || tqstrnicmp(hint, "japan", 5) == 0) {
+ if (qstrnicmp(hint, "ja_JP", 5) == 0 || qstrnicmp(hint, "japan", 5) == 0) {
score += 3;
ja = TRUE;
- } else if (tqstrnicmp(hint, "ja", 2) == 0) {
+ } else if (qstrnicmp(hint, "ja", 2) == 0) {
score += 2;
ja = TRUE;
}
@@ -412,8 +412,8 @@ int QJisCodec::heuristicNameMatch(const char* hint) const
p = hint;
}
if (p) {
- if ((tqstricmp(p, "JIS") == 0) ||
- (tqstricmp(p, "JIS7") == 0) ||
+ if ((qstricmp(p, "JIS") == 0) ||
+ (qstricmp(p, "JIS7") == 0) ||
(simpleHeuristicNameMatch("ISO-2022-JP", p) > 0)) {
return score + 4;
}