2 files changed, 15 insertions, 15 deletions

diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp
index 1ad09d60..1668999d 100644
--- a/src/kvilib/file/kvi_fileutils.cpp
+++ b/src/kvilib/file/kvi_fileutils.cpp
@@ -108,7 +108,7 @@ namespace KviFileUtils
 #ifdef COMPILE_USE_QT4
 		int idx = dir.indexOf(':');
 #else
-		int idx = dir.tqfind(':');
+		int idx = dir.find(':');
 #endif
 		if(idx == 1)
 		{
@@ -212,20 +212,20 @@ namespace KviFileUtils
 	void adjustFilePath(TQString &szPath)
 	{
 #ifdef COMPILE_ON_WINDOWS
-		szPath.tqreplace('/',"\\");
+		szPath.replace('/',"\\");
 #ifdef COMPILE_USE_QT4
-		szPath.tqreplace("\\\\","\\");
+		szPath.replace("\\\\","\\");
 #else
-		while(szPath.tqfind("\\\\") != -1)szPath.tqreplace("\\\\","\\");
+		while(szPath.find("\\\\") != -1)szPath.replace("\\\\","\\");
 #endif
 		// FIXME: Use the default drive here ?
 		if(szPath.startsWith("\\"))szPath.prepend("C:");
 #else
-		szPath.tqreplace('\\',"/");
+		szPath.replace('\\',"/");
 #ifdef COMPILE_USE_QT4
-		szPath.tqreplace("//","/");
+		szPath.replace("//","/");
 #else
-		while(KviTQString::tqfind(szPath,"//") != -1)szPath.tqreplace("//","/");
+		while(KviTQString::find(szPath,"//") != -1)szPath.replace("//","/");
 #endif
 		// deal with windows paths
 		if((szPath.length() > 2) && (szPath.at(0) != TQChar('/')))
diff --git a/src/kvilib/file/kvi_packagefile.cpp b/src/kvilib/file/kvi_packagefile.cpp
index 5700f4e8..fa3a91d4 100644
--- a/src/kvilib/file/kvi_packagefile.cpp
+++ b/src/kvilib/file/kvi_packagefile.cpp
@@ -196,12 +196,12 @@ KviPackageWriter::~KviPackageWriter()
 
 void KviPackageWriter::addInfoField(const TQString &szName,const TQString &szValue)
 {
-	m_pStringInfoFields->tqreplace(szName,new TQString(szValue));
+	m_pStringInfoFields->replace(szName,new TQString(szValue));
 }
 
 void KviPackageWriter::addInfoField(const TQString &szName,TQByteArray * pValue)
 {
-	m_pBinaryInfoFields->tqreplace(szName,pValue);
+	m_pBinaryInfoFields->replace(szName,pValue);
 }
 
 bool KviPackageWriter::addFile(const TQString &szLocalFileName,const TQString &szTargetFileName,kvi_u32_t uAddFileFlags)
@@ -696,7 +696,7 @@ bool KviPackageReader::readHeaderInternal(KviFile * pFile,const TQString &szLoca
 			{
 				TQString szValue;
 				if(!pFile->load(szValue))return readError();
-				m_pStringInfoFields->tqreplace(szKey,new TQString(szValue));
+				m_pStringInfoFields->replace(szKey,new TQString(szValue));
 			}
 			break;
 			case KVI_PACKAGE_INFOFIELD_TYPE_BINARYBUFFER:
@@ -707,7 +707,7 @@ bool KviPackageReader::readHeaderInternal(KviFile * pFile,const TQString &szLoca
 					delete pbValue;
 					return readError();
 				}
-				m_pBinaryInfoFields->tqreplace(szKey,pbValue);
+				m_pBinaryInfoFields->replace(szKey,pbValue);
 			}
 			break;
 			default:
@@ -757,12 +757,12 @@ bool KviPackageReader::unpackFile(KviFile * pFile,const TQString &szUnpackPath)
 	szFileName += szPath;
 
 	// no attacks please :)
-	szFileName.tqreplace(TQString("..\\"),TQString(""));
-	szFileName.tqreplace(TQString("..//"),TQString(""));
+	szFileName.replace(TQString("..\\"),TQString(""));
+	szFileName.replace(TQString("..//"),TQString(""));
 	
 	KviFileUtils::adjustFilePath(szFileName);
 
-	int idx = KviTQString::tqfindRev(szFileName,TQChar(KVI_PATH_SEPARATOR_CHAR));
+	int idx = KviTQString::findRev(szFileName,TQChar(KVI_PATH_SEPARATOR_CHAR));
 	if(idx != -1)
 	{
 		TQString szPrefixPath = szFileName.left(idx);
@@ -960,7 +960,7 @@ bool KviPackageReader::unpackFile(KviFile * pFile,const TQString &szUnpackPath)
 
 bool KviPackageReader::getStringInfoField(const TQString &szName,TQString &szBuffer)
 {
-	TQString * pVal = m_pStringInfoFields->tqfind(szName);
+	TQString * pVal = m_pStringInfoFields->find(szName);
 	if(!pVal)return false;
 	szBuffer = *pVal;
 	return true;