diff options
author | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:20 -0600 |
---|---|---|
committer | Timothy Pearson <kb9vqf@pearsoncomputing.net> | 2011-12-16 09:57:20 -0600 |
commit | c6611272c2bc4a42580848946c8c5d81bb0409c7 (patch) | |
tree | 0fd5b58844663dfcd00fb2b79cf67dd0fd429c62 /src/modules/str/libkvistr.cpp | |
parent | 805c2821ceaddada48b346c6d11bd0dc1351a539 (diff) | |
download | kvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.tar.gz kvirc-c6611272c2bc4a42580848946c8c5d81bb0409c7.zip |
Revert "Rename a number of old tq methods that are no longer tq specific"
This reverts commit 805c2821ceaddada48b346c6d11bd0dc1351a539.
Diffstat (limited to 'src/modules/str/libkvistr.cpp')
-rw-r--r-- | src/modules/str/libkvistr.cpp | 46 |
1 files changed, 23 insertions, 23 deletions
diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp index b6643d0f..de2236c1 100644 --- a/src/modules/str/libkvistr.cpp +++ b/src/modules/str/libkvistr.cpp @@ -35,7 +35,7 @@ #include "kvi_kvs_arraycast.h" #include <tqregexp.h> -#include <clipboard.h> +#include <tqclipboard.h> #ifdef COMPILE_SSL_SUPPORT #include <openssl/evp.h> @@ -102,7 +102,7 @@ static bool str_kvs_fnc_fromclipboard(KviKvsModuleFunctionCall * c) TQString szString; KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETERS_END(c) - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); szString = cb->text(TQClipboard::Clipboard); c->returnValue()->setString(szString); return true; @@ -132,7 +132,7 @@ static bool str_kvs_cmd_toClipboard(KviKvsModuleCommandCall * c) KVSM_PARAMETERS_BEGIN(c) KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue) KVSM_PARAMETERS_END(c) - TQClipboard *cb = TQApplication::clipboard(); + TQClipboard *cb = TQApplication::tqclipboard(); cb->setText(szValue, TQClipboard::Clipboard ); return true; } @@ -1360,17 +1360,17 @@ static bool str_kvs_fnc_word(KviKvsModuleFunctionCall * c) int len = szString.length(); while (idx<len) { - TQChar szTmp = szString[idx].unicode(); + TQChar szTmp = szString[idx].tqunicode(); while (szTmp.isSpace()) { idx++; - szTmp = szString[idx].unicode(); + szTmp = szString[idx].tqunicode(); } begin = idx; while (idx<len && !szTmp.isSpace()) { idx++; - szTmp = szString[idx].unicode(); + szTmp = szString[idx].tqunicode(); } if (iOccurence == (kvs_int_t)cnt) { @@ -1433,18 +1433,18 @@ static bool str_kvs_fnc_token(KviKvsModuleFunctionCall * c) int len = szString.length(); while (idx<len) { - TQChar szTmp = szString[idx].unicode(); + TQChar szTmp = szString[idx].tqunicode(); // while (szTmp==sep) while (sep.contains(szTmp)) { idx++; - szTmp = szString[idx].unicode(); + szTmp = szString[idx].tqunicode(); } begin = idx; while (idx<len && !sep.contains(szTmp)) { idx++; - szTmp = szString[idx].unicode(); + szTmp = szString[idx].tqunicode(); } if (n == cnt) { @@ -1489,13 +1489,13 @@ static bool str_kvs_fnc_charsum(KviKvsModuleFunctionCall * c) { while(idx < len) { - sum += szString[idx].lower().unicode(); + sum += szString[idx].lower().tqunicode(); idx++; } } else { while(idx < len) { - sum += szString[idx].unicode(); + sum += szString[idx].tqunicode(); idx++; } } @@ -1963,7 +1963,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) if(fmt) { TQChar * buffer = (TQChar *)kvi_malloc(sizeof(TQChar) * allocsize); - //TQChar * p = (TQChar *)s.unicode(); + //TQChar * p = (TQChar *)s.tqunicode(); //9999999999999999999999999999999\0 char numberBuffer[1024]; @@ -1993,12 +1993,12 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) pVar = vArgs.first(); - for(; fmt->unicode() ; ++fmt) + for(; fmt->tqunicode() ; ++fmt) { if(reallen == allocsize)INCREMENT_MEM //copy up to a '?' - if(fmt->unicode() != '?') + if(fmt->tqunicode() != '?') { *p++ = *fmt; reallen++; @@ -2006,7 +2006,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) } ++fmt; //skip this '?' - switch(fmt->unicode()) + switch(fmt->tqunicode()) { case 's': { @@ -2015,7 +2015,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) if(sz.isEmpty())continue; int len = sz.length(); if((allocsize - reallen) < len)INCREMENT_MEM_BY(len) - const TQChar * ch = sz.unicode(); + const TQChar * ch = sz.tqunicode(); while(len--)*p++ = *ch++; reallen += sz.length(); pVar = vArgs.next(); @@ -2149,7 +2149,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) } case '?': { - if(fmt->unicode()) + if(fmt->tqunicode()) { if(reallen == allocsize)INCREMENT_MEM *p++ = *fmt; @@ -2171,15 +2171,15 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) int idx = 2; - while((fmt->unicode() >= '0') && (fmt->unicode() <= '9') && (idx < 6)) + while((fmt->tqunicode() >= '0') && (fmt->tqunicode() <= '9') && (idx < 6)) { uPrecision *= 10; - fmtbuffer[idx] = fmt->unicode(); + fmtbuffer[idx] = fmt->tqunicode(); uPrecision += fmtbuffer[idx] - '0'; fmt++; idx++; } - fmtbuffer[idx] = fmt->unicode(); + fmtbuffer[idx] = fmt->tqunicode(); fmtbuffer[idx+1] = 0; if(pVar) @@ -2193,7 +2193,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) c->warning(__tr2qs("Missing argument for a floating point escape sequence, 0.0 assumed")); argRValue = 0; } - switch(fmt->unicode()) + switch(fmt->tqunicode()) { case 'e': case 'E': @@ -2212,7 +2212,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) fmt = save; *p++ = '?'; //write it reallen++; - if(fmt->unicode()) + if(fmt->tqunicode()) { if(reallen == allocsize)INCREMENT_MEM *p++ = *fmt; @@ -2228,7 +2228,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c) { *p++ = '?'; //write it reallen++; - if(fmt->unicode()) + if(fmt->tqunicode()) { if(reallen == allocsize)INCREMENT_MEM *p++ = *fmt; |