diff options
Diffstat (limited to 'kexi/kexiutils/identifier.cpp')
| -rw-r--r-- | kexi/kexiutils/identifier.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/kexi/kexiutils/identifier.cpp b/kexi/kexiutils/identifier.cpp index da5f7f96..ed1afdcb 100644 --- a/kexi/kexiutils/identifier.cpp +++ b/kexi/kexiutils/identifier.cpp @@ -27,7 +27,7 @@ bool KexiUtils::isIdentifier(const TQString& s) { uint i; for (i=0; i<s.length(); i++) { - TQChar c = s.tqat(i).lower(); + TQChar c = s.at(i).lower(); if (!((int)c=='_' || (int)c>='a' && (int)c<='z' || i>0 && (int)c>='0' && (int)c<='9')) break; } @@ -45,10 +45,10 @@ TQString KexiUtils::string2FileName(const TQString &s) inline TQString char2Identifier(const TQChar& c) { - if (c.tqunicode() >= TRANSLITERATION_TABLE_SIZE) + if (c.unicode() >= TRANSLITERATION_TABLE_SIZE) return TQString(TQChar('_')); - const char *const s = transliteration_table[c.tqunicode()]; - return s ? TQString::tqfromLatin1(s) : TQString(TQChar('_')); + const char *const s = transliteration_table[c.unicode()]; + return s ? TQString::fromLatin1(s) : TQString(TQChar('_')); } TQString KexiUtils::string2Identifier(const TQString &s) @@ -87,8 +87,8 @@ TQString KexiUtils::string2Identifier(const TQString &s) TQString KexiUtils::identifierExpectedMessage(const TQString &valueName, const TQVariant& v) { - return "<p>"+i18n("Value of \"%1\" column must be an identifier.").tqarg(valueName) - +"</p><p>"+i18n("\"%1\" is not a valid identifier.").tqarg(v.toString())+"</p>"; + return "<p>"+i18n("Value of \"%1\" column must be an identifier.").arg(valueName) + +"</p><p>"+i18n("\"%1\" is not a valid identifier.").arg(v.toString())+"</p>"; } //-------------------------------------------------------------------------------- |