rename the following methods:

tqparent parent
tqmask mask


git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/applications/kvirc@1246260 283d02a7-25f6-0310-bc7c-ecb5cbfe19da

1 files changed, 8 insertions, 8 deletions

diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp
index d7adeb2e..e961359d 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/kvi_mediatype.cpp
@@ -98,13 +98,13 @@ KviMediaType * KviMediaManager::findMediaTypeByIanaType(const char * ianaType)
 	return 0;
 }
 
-KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filetqmask)
+KviMediaType * KviMediaManager::findMediaTypeByFileMask(const char * filemask)
 {
 	__range_valid(locked());
 	for(KviMediaType * mt = m_pMediaTypeList->first();mt;mt = m_pMediaTypeList->next())
 	{
 // FIXME: #warning "Should this be case sensitive ?"
-		if(kvi_strEqualCI(mt->szFileMask.ptr(),filetqmask))return mt;
+		if(kvi_strEqualCI(mt->szFileMask.ptr(),filemask))return mt;
 	}
 
 	return 0;
@@ -137,7 +137,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 	{
 		if(iWildCount)
 		{
-			// the new tqmask has wildcards... if the current one has none, skip it
+			// the new mask has wildcards... if the current one has none, skip it
 			int iWildCountExisting = mt->szFileMask.occurences('*');
 			if(iWildCountExisting)
 			{
@@ -164,7 +164,7 @@ void KviMediaManager::insertMediaType(KviMediaType * m)
 				}
 			} // else the current has no wildcards...skip
 		} else {
-			// the new tqmask has no wildcards....
+			// the new mask has no wildcards....
 			if(mt->szFileMask.contains('*'))
 			{
 				// current one has wildcards...insert
@@ -433,7 +433,7 @@ KviMediaType * KviMediaManager::findMediaTypeForRegularFile(const char * szFullP
 
 typedef struct _KviDefaultMediaType
 {
-	const char * filetqmask;
+	const char * filemask;
 	const char * magicbytes;
 	const char * ianatype;
 	const char * description;
@@ -489,12 +489,12 @@ void KviMediaManager::load(const char * filename)
 		insertMediaType(m);
 	}
 
-	for(int u = 0;g_defMediaTypes[u].filetqmask;u++)
+	for(int u = 0;g_defMediaTypes[u].filemask;u++)
 	{
-		if(!findMediaTypeByFileMask(g_defMediaTypes[u].filetqmask))
+		if(!findMediaTypeByFileMask(g_defMediaTypes[u].filemask))
 		{
 			KviMediaType * m = new KviMediaType;
-			m->szFileMask = g_defMediaTypes[u].filetqmask;
+			m->szFileMask = g_defMediaTypes[u].filemask;
 			m->szMagicBytes = g_defMediaTypes[u].magicbytes;
 			m->szIanaType = g_defMediaTypes[u].ianatype;
 			m->szDescription = g_defMediaTypes[u].description;