1 files changed, 30 insertions, 30 deletions

diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp
index e15496b..3296222 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.cpp
+++ b/src/kvirc/kernel/kvi_texticonmanager.cpp
@@ -35,8 +35,8 @@
 #include "kvi_app.h"
 #include "kvi_confignames.h"
 
-#include <qpixmap.h>
-#include <qfile.h>
+#include <tqpixmap.h>
+#include <tqfile.h>
 
 KVIRC_API KviTextIconManager * g_pTextIconManager = 0;
 
@@ -49,16 +49,16 @@ KviTextIcon::KviTextIcon(KviTextIcon* icon)
 void KviTextIcon::setId(int id)
 {
 	m_iId=id;
-	m_szFilename=QString::null;
+	m_szFilename=TQString();
 }
 
-void KviTextIcon::setFilename(QString filename)
+void KviTextIcon::setFilename(TQString filename)
 {
 	m_iId=-1;
 	m_szFilename=filename;
 }
 
-QPixmap * KviTextIcon::pixmap()
+TQPixmap * KviTextIcon::pixmap()
 {
 	if(m_iId>=0)
 	{
@@ -73,9 +73,9 @@ QPixmap * KviTextIcon::pixmap()
 }
 
 KviTextIconManager::KviTextIconManager()
-: QObject()
+: TQObject()
 {
-	m_pTextIconDict = new KviPointerHashTable<QString,KviTextIcon>(47,false);
+	m_pTextIconDict = new KviPointerHashTable<TQString,KviTextIcon>(47,false);
 	m_pTextIconDict->setAutoDelete(true);
 }
 
@@ -89,15 +89,15 @@ void KviTextIconManager::clear()
 	m_pTextIconDict->clear();
 }
 
-void KviTextIconManager::insert(const QString &name,int id)
+void KviTextIconManager::insert(const TQString &name,int id)
 {
-	m_pTextIconDict->replace(name,new KviTextIcon(id));
+	m_pTextIconDict->tqreplace(name,new KviTextIcon(id));
 	emit changed();
 }
 
-void KviTextIconManager::insert(const QString &name,KviTextIcon& icon)
+void KviTextIconManager::insert(const TQString &name,KviTextIcon& icon)
 {
-	m_pTextIconDict->replace(name,new KviTextIcon(&icon));
+	m_pTextIconDict->tqreplace(name,new KviTextIcon(&icon));
 	emit changed();
 }
 
@@ -129,8 +129,8 @@ void KviTextIconManager::checkDefaultAssociations()
 {
 	for(int i=0;default_associations[i].name;i++)
 	{
-		if(!m_pTextIconDict->find(default_associations[i].name))
-			insert(QString::fromUtf8(default_associations[i].name),default_associations[i].iVal);
+		if(!m_pTextIconDict->tqfind(default_associations[i].name))
+			insert(TQString::fromUtf8(default_associations[i].name),default_associations[i].iVal);
 	}
     emit changed();
 }
@@ -151,20 +151,20 @@ void KviTextIconManager::load()
 	if(upd == TEXTICONMANAGER_CURRENT_CONFIG_UPDATE)return;
 
 	// do a merge of the texticons if we have a new config version
-	QString tmp;
+	TQString tmp;
 	g_pApp->getGlobalKvircDirectory(tmp,KviApp::Config,KVI_CONFIGFILE_TEXTICONS);
-	if(QFile::exists(tmp))load(tmp,true);
+	if(TQFile::exists(tmp))load(tmp,true);
 }
 
 void KviTextIconManager::save()
 {
-	QString tmp;
+	TQString tmp;
 	g_pApp->getLocalKvircDirectory(tmp,KviApp::Config,KVI_CONFIGFILE_TEXTICONS);
 	save(tmp);
 }
 
 // returns the config update
-int KviTextIconManager::load(const QString &filename,bool bMerge)
+int KviTextIconManager::load(const TQString &filename,bool bMerge)
 {
 	if(!bMerge)m_pTextIconDict->clear();
 	KviConfig cfg(filename,KviConfig::Read);
@@ -172,27 +172,27 @@ int KviTextIconManager::load(const QString &filename,bool bMerge)
 	cfg.setGroup("Manager");
 	int upd = cfg.readIntEntry("ConfigUpdate",0);
 
-	KviConfigGroup * dict = cfg.dict()->find("TextIcons");
+	KviConfigGroup * dict = cfg.dict()->tqfind("TextIcons");
 	if(dict)
 	{
 		KviConfigGroupIterator it(*dict);
 	
-		KviPointerList<QString> names;
+		KviPointerList<TQString> names;
 		names.setAutoDelete(true);
 	
 		while(it.current())
 		{
-			names.append(new QString(it.currentKey()));
+			names.append(new TQString(it.currentKey()));
 			++it;
 		}
 	
 		cfg.setGroup("TextIcons");
 	
-		for(QString * s = names.first();s;s = names.next())
+		for(TQString * s = names.first();s;s = names.next())
 		{
 			int id = cfg.readIntEntry(*s,-1);
-			QString szTmp;
-			QPixmap * pix=0;
+			TQString szTmp;
+			TQPixmap * pix=0;
 //			debug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,id);
 			if(id!=-1)
 				pix = g_pIconManager->getSmallIcon(id);
@@ -209,16 +209,16 @@ int KviTextIconManager::load(const QString &filename,bool bMerge)
 			{
 				if(bMerge)
 				{
-					if(!m_pTextIconDict->find(*s))
+					if(!m_pTextIconDict->tqfind(*s))
 						if(id!=-1)
-							m_pTextIconDict->replace(*s,new KviTextIcon(id));
+							m_pTextIconDict->tqreplace(*s,new KviTextIcon(id));
 						else
-							m_pTextIconDict->replace(*s,new KviTextIcon(szTmp));
+							m_pTextIconDict->tqreplace(*s,new KviTextIcon(szTmp));
 				} else {
 					if(id!=-1)
-						m_pTextIconDict->replace(*s,new KviTextIcon(id));
+						m_pTextIconDict->tqreplace(*s,new KviTextIcon(id));
 					else
-						m_pTextIconDict->replace(*s,new KviTextIcon(szTmp));
+						m_pTextIconDict->tqreplace(*s,new KviTextIcon(szTmp));
 				}
 			}
 		}
@@ -230,7 +230,7 @@ int KviTextIconManager::load(const QString &filename,bool bMerge)
 	return upd;
 }
 
-void KviTextIconManager::save(const QString &filename)
+void KviTextIconManager::save(const TQString &filename)
 {
 	KviConfig cfg(filename,KviConfig::Write);
 
@@ -240,7 +240,7 @@ void KviTextIconManager::save(const QString &filename)
 
 	cfg.setGroup("TextIcons");
 
-	KviPointerHashTableIterator<QString,KviTextIcon> it(*m_pTextIconDict);
+	KviPointerHashTableIterator<TQString,KviTextIcon> it(*m_pTextIconDict);
 	while(KviTextIcon * i = it.current())
 	{
 		if(i->id()!=-1)