diff options
author | Timothy Pearson <[email protected]> | 2011-12-16 09:57:51 -0600 |
---|---|---|
committer | Timothy Pearson <[email protected]> | 2011-12-16 09:57:51 -0600 |
commit | 2781e27b871150395a5a82e221684108641002b2 (patch) | |
tree | 57f4d7c01a48faef1a840fbe0de8f4ec1e5f606f /src/tellico_utils.cpp | |
parent | 031454e56009d576589c28757f6c6fcf4884095e (diff) | |
download | tellico-2781e27b871150395a5a82e221684108641002b2.tar.gz tellico-2781e27b871150395a5a82e221684108641002b2.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 031454e56009d576589c28757f6c6fcf4884095e.
Diffstat (limited to 'src/tellico_utils.cpp')
-rw-r--r-- | src/tellico_utils.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/tellico_utils.cpp b/src/tellico_utils.cpp index 275c096..f04036a 100644 --- a/src/tellico_utils.cpp +++ b/src/tellico_utils.cpp @@ -35,7 +35,7 @@ namespace { TQColor Tellico::contrastColor; TQString Tellico::decodeHTML(TQString text) { - TQRegExp rx(TQString::fromLatin1("&(.+);")); + TQRegExp rx(TQString::tqfromLatin1("&(.+);")); rx.setMinimal(true); int pos = rx.search(text); while(pos > -1) { @@ -51,7 +51,7 @@ TQString Tellico::decodeHTML(TQString text) { TQString Tellico::uid(int l, bool prefix) { TQString uid; if(prefix) { - uid = TQString::fromLatin1("Tellico"); + uid = TQString::tqfromLatin1("Tellico"); } uid.append(kapp->randomString(TQMAX(l - uid.length(), 0))); return uid; @@ -80,7 +80,7 @@ uint Tellico::toUInt(const TQString& s, bool* ok) { TQString Tellico::i18nReplace(TQString text) { // Because TQDomDocument sticks in random newlines, go ahead and grab them too - static TQRegExp rx(TQString::fromLatin1("(?:\\n+ *)*<i18n>([^<]*)</i18n>(?: *\\n+)*")); + static TQRegExp rx(TQString::tqfromLatin1("(?:\\n+ *)*<i18n>([^<]*)</i18n>(?: *\\n+)*")); int pos = rx.search(text); while(pos > -1) { text.replace(pos, rx.matchedLength(), i18n(rx.cap(1).utf8())); @@ -118,7 +118,7 @@ int Tellico::stringHash(const TQString& str) { uint h = 0; uint g = 0; for(uint i = 0; i < str.length(); ++i) { - h = (h << 4) + str.unicode()[i].cell(); + h = (h << 4) + str.tqunicode()[i].cell(); if((g = h & 0xf0000000)) { h ^= g >> 24; } |