TQt4 port kvirc

This enables compilation under both Qt3 and Qt4


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

1 files changed, 29 insertions, 29 deletions

diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/kvi_useridentity.cpp
index d4791333..67887e9c 100644
--- a/src/kvilib/irc/kvi_useridentity.cpp
+++ b/src/kvilib/irc/kvi_useridentity.cpp
@@ -33,25 +33,25 @@
 bool KviUserIdentity::load(KviConfig &cfg)
 {
 	m_szId = cfg.group();
-	m_szNickName = cfg.readQStringEntry("NickName");
-	m_szAltNickName1 = cfg.readQStringEntry("AltNickName1");
-	m_szAltNickName2 = cfg.readQStringEntry("AltNickName2");
-	m_szAltNickName3 = cfg.readQStringEntry("AltNickName3");
-	m_szUserName = cfg.readQStringEntry("UserName");
+	m_szNickName = cfg.readTQStringEntry("NickName");
+	m_szAltNickName1 = cfg.readTQStringEntry("AltNickName1");
+	m_szAltNickName2 = cfg.readTQStringEntry("AltNickName2");
+	m_szAltNickName3 = cfg.readTQStringEntry("AltNickName3");
+	m_szUserName = cfg.readTQStringEntry("UserName");
 	// FIXME: At least scramble the pass ?
-	m_szPassword = cfg.readQStringEntry("Password");
+	m_szPassword = cfg.readTQStringEntry("Password");
 	KviPixmap def;
 	m_pixAvatar = cfg.readPixmapEntry("Avatar",def);
-	m_szPartMessage = cfg.readQStringEntry("PartMessage");
-	m_szQuitMessage= cfg.readQStringEntry("QuitMessage");
-	m_szAge = cfg.readQStringEntry("Age");
-	m_szGender = cfg.readQStringEntry("Gender");
-	m_szLocation = cfg.readQStringEntry("Location");
-	m_szLanguages = cfg.readQStringEntry("Languages");
-	m_szOtherInfo = cfg.readQStringEntry("OtherInfo");
-	m_szUserMode = cfg.readQStringEntry("UserMode");
-	m_szOnConnectCommand = cfg.readQStringEntry("OnConnectCommand");
-	m_szOnLoginCommand = cfg.readQStringEntry("OnLoginCommand");
+	m_szPartMessage = cfg.readTQStringEntry("PartMessage");
+	m_szQuitMessage= cfg.readTQStringEntry("QuitMessage");
+	m_szAge = cfg.readTQStringEntry("Age");
+	m_szGender = cfg.readTQStringEntry("Gender");
+	m_szLocation = cfg.readTQStringEntry("Location");
+	m_szLanguages = cfg.readTQStringEntry("Languages");
+	m_szOtherInfo = cfg.readTQStringEntry("OtherInfo");
+	m_szUserMode = cfg.readTQStringEntry("UserMode");
+	m_szOnConnectCommand = cfg.readTQStringEntry("OnConnectCommand");
+	m_szOnLoginCommand = cfg.readTQStringEntry("OnLoginCommand");
 	return !(m_szId.isEmpty() || m_szNickName.isEmpty());
 }
 
@@ -121,7 +121,7 @@ KviUserIdentityManager * KviUserIdentityManager::m_pInstance = 0;
 KviUserIdentityManager::KviUserIdentityManager()
 : KviHeapObject()
 {
-	m_pIdentityDict = new KviPointerHashTable<QString,KviUserIdentity>();
+	m_pIdentityDict = new KviPointerHashTable<TQString,KviUserIdentity>();
 	m_pIdentityDict->setAutoDelete(true);
 }
 
@@ -148,13 +148,13 @@ const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
 	KviUserIdentity * ret;
 	if(!m_szDefaultIdentity.isEmpty())
 	{
-		ret = m_pIdentityDict->find(m_szDefaultIdentity);
+		ret = m_pIdentityDict->tqfind(m_szDefaultIdentity);
 		if(ret)return ret;
 	}
 
 	// the default identity is borken :/
 	// grab the first one
-	KviPointerHashTableIterator<QString,KviUserIdentity> it(*m_pIdentityDict);
+	KviPointerHashTableIterator<TQString,KviUserIdentity> it(*m_pIdentityDict);
 	ret = it.current();
 	if(ret)
 	{
@@ -172,14 +172,14 @@ const KviUserIdentity * KviUserIdentityManager::defaultIdentity()
 	ret->setUserName(KVI_DEFAULT_USERNAME);
 	ret->setRealName(KVI_DEFAULT_REALNAME);
 	ret->setPartMessage(KVI_DEFAULT_PART_MESSAGE);
-	ret->setQuitMessage(KVI_DEFAULT_QUIT_MESSAGE);
+	ret->setQuitMessage(KVI_DEFAULT_TQUIT_MESSAGE);
 	
-	m_pIdentityDict->replace(ret->id(),ret);
+	m_pIdentityDict->tqreplace(ret->id(),ret);
 	
 	return ret;
 }
 
-void KviUserIdentityManager::load(const QString &szFileName)
+void KviUserIdentityManager::load(const TQString &szFileName)
 {
 	m_pIdentityDict->clear();
 
@@ -187,18 +187,18 @@ void KviUserIdentityManager::load(const QString &szFileName)
 
 	cfg.setGroup("KVIrc");
 	
-	m_szDefaultIdentity = cfg.readQStringEntry("DefaultIdentity","");
+	m_szDefaultIdentity = cfg.readTQStringEntry("DefaultIdentity","");
 
 	KviConfigIterator it(*(cfg.dict()));
 	while(KviConfigGroup * grp = it.current())
 	{
-		if(!KviQString::equalCI(it.currentKey(),"KVIrc"))
+		if(!KviTQString::equalCI(it.currentKey(),"KVIrc"))
 		{
 			cfg.setGroup(it.currentKey());
 
 			KviUserIdentity * id = new KviUserIdentity();
 			if(id->load(cfg))
-				m_pIdentityDict->replace(id->id(),id);
+				m_pIdentityDict->tqreplace(id->id(),id);
 			else
 				delete id;
 		}
@@ -206,7 +206,7 @@ void KviUserIdentityManager::load(const QString &szFileName)
 	}
 }
 
-void KviUserIdentityManager::save(const QString &szFileName)
+void KviUserIdentityManager::save(const TQString &szFileName)
 {
 	KviConfig cfg(szFileName,KviConfig::Write);
 	cfg.clear();
@@ -215,7 +215,7 @@ void KviUserIdentityManager::save(const QString &szFileName)
 
 	cfg.writeEntry("DefaultIdentity",m_szDefaultIdentity);
 	
-	KviPointerHashTableIterator<QString,KviUserIdentity> it(*m_pIdentityDict);
+	KviPointerHashTableIterator<TQString,KviUserIdentity> it(*m_pIdentityDict);
 	while(KviUserIdentity * id = it.current())
 	{
 		id->save(cfg);
@@ -227,12 +227,12 @@ void KviUserIdentityManager::copyFrom(KviUserIdentityManager * pWorkingCopy)
 {
 	m_pIdentityDict->clear();
 	m_szDefaultIdentity = pWorkingCopy->m_szDefaultIdentity;
-	KviPointerHashTableIterator<QString,KviUserIdentity> it(*(pWorkingCopy->m_pIdentityDict));
+	KviPointerHashTableIterator<TQString,KviUserIdentity> it(*(pWorkingCopy->m_pIdentityDict));
 	while(KviUserIdentity * id = it.current())
 	{
 		KviUserIdentity * pNew = new KviUserIdentity();
 		pNew->copyFrom(*id);
-		m_pIdentityDict->replace(pNew->id(),pNew);
+		m_pIdentityDict->tqreplace(pNew->id(),pNew);
 		++it;
 	}
 }