From 2dd6d32bd821b303aa7b25edda76d1ef7c14b2bf Mon Sep 17 00:00:00 2001
From: Timothy Pearson <kb9vqf@pearsoncomputing.net>
Date: Wed, 21 Dec 2011 14:06:29 -0600
Subject: Rename obsolete tq methods to standard names

---
 src/modules/str/libkvistr.cpp | 44 +++++++++++++++++++++----------------------
 1 file changed, 22 insertions(+), 22 deletions(-)

(limited to 'src/modules/str')

diff --git a/src/modules/str/libkvistr.cpp b/src/modules/str/libkvistr.cpp
index de2236c1..b7ea2e7c 100644
--- a/src/modules/str/libkvistr.cpp
+++ b/src/modules/str/libkvistr.cpp
@@ -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::tqclipboard();
+	TQClipboard *cb = TQApplication::clipboard();
         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::tqclipboard();
+	TQClipboard *cb = TQApplication::clipboard();
 	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].tqunicode();
+		TQChar szTmp = szString[idx].unicode();
 		while (szTmp.isSpace())
 		{
 			idx++;
-			 szTmp = szString[idx].tqunicode();
+			 szTmp = szString[idx].unicode();
 		}
 		begin = idx;
 		while (idx<len && !szTmp.isSpace())
 		{
 			idx++;
-			szTmp = szString[idx].tqunicode();
+			szTmp = szString[idx].unicode();
 		}
 		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].tqunicode();
+		TQChar szTmp = szString[idx].unicode();
 //		while (szTmp==sep)
 		while (sep.contains(szTmp))
 		{
 			idx++;
-			 szTmp = szString[idx].tqunicode();
+			 szTmp = szString[idx].unicode();
 		}
 		begin = idx;
 		while (idx<len && !sep.contains(szTmp))
 		{
 			idx++;
-			szTmp = szString[idx].tqunicode();
+			szTmp = szString[idx].unicode();
 		}
 		if (n == cnt)
 		{
@@ -1489,13 +1489,13 @@ static bool str_kvs_fnc_charsum(KviKvsModuleFunctionCall * c)
 	{
 		while(idx < len)
 		{
-			sum += szString[idx].lower().tqunicode();
+			sum += szString[idx].lower().unicode();
 			idx++;
 		}
 	} else {
 		while(idx < len)
 		{
-			sum += szString[idx].tqunicode();
+			sum += szString[idx].unicode();
 			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.tqunicode();
+		//TQChar * p = (TQChar *)s.unicode();
 	
 		//9999999999999999999999999999999\0
 		char numberBuffer[1024];
@@ -1993,12 +1993,12 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 	
 		pVar = vArgs.first();
 
-		for(; fmt->tqunicode() ; ++fmt)
+		for(; fmt->unicode() ; ++fmt)
 		{
 			if(reallen == allocsize)INCREMENT_MEM
 	
 			//copy up to a '?'
-			if(fmt->tqunicode() != '?')
+			if(fmt->unicode() != '?')
 			{
 				*p++ = *fmt;
 				reallen++;
@@ -2006,7 +2006,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 			}
 	
 			++fmt; //skip this '?'
-			switch(fmt->tqunicode())
+			switch(fmt->unicode())
 			{
 				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.tqunicode();
+					const TQChar * ch = sz.unicode();
 					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->tqunicode())
+					if(fmt->unicode())
 					{
 						if(reallen == allocsize)INCREMENT_MEM
 						*p++ = *fmt;
@@ -2171,15 +2171,15 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 	
 					int idx = 2;
 					
-					while((fmt->tqunicode() >= '0') && (fmt->tqunicode() <= '9') && (idx < 6))
+					while((fmt->unicode() >= '0') && (fmt->unicode() <= '9') && (idx < 6))
 					{
 						uPrecision *= 10;
-						fmtbuffer[idx] = fmt->tqunicode();
+						fmtbuffer[idx] = fmt->unicode();
 						uPrecision += fmtbuffer[idx] - '0';
 						fmt++;
 						idx++;
 					}
-					fmtbuffer[idx] = fmt->tqunicode();
+					fmtbuffer[idx] = fmt->unicode();
 					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->tqunicode())
+					switch(fmt->unicode())
 					{
 						case 'e':
 						case 'E':
@@ -2212,7 +2212,7 @@ static bool str_kvs_fnc_printf(KviKvsModuleFunctionCall * c)
 							fmt = save;
 							*p++ = '?';  //write it
 							reallen++;
-							if(fmt->tqunicode())
+							if(fmt->unicode())
 							{
 								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->tqunicode())
+					if(fmt->unicode())
 					{
 						if(reallen == allocsize)INCREMENT_MEM
 						*p++ = *fmt;
-- 
cgit v1.2.1