cleaned code

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5043 17fca916-40b9-46aa-a4ea-0a15b648b75c

22 files changed, 131 insertions, 157 deletions

diff --git a/src/kvilib/ext/kvi_config.cpp b/src/kvilib/ext/kvi_config.cpp
index d8347e01d..59396f4bf 100644
--- a/src/kvilib/ext/kvi_config.cpp
+++ b/src/kvilib/ext/kvi_config.cpp
@@ -581,42 +581,19 @@ void KviConfig::writeEntry(const QString & szKey,const QString & szValue)
 	p_group->replace(szKey,p_data);
 }
 
-// FIXME: #warning "We have probs here ?"
-
-QString KviConfig::readEntry(const QString & szKey,const QString & szDefault)
+QString KviConfig::readEntry(const QString & szKey, const QString & szDefault)
 {
-	KviConfigGroup * p_group = getCurrentGroup();
-	QString * p_str = p_group->find(szKey);
-	if(!p_str)
+	KviConfigGroup * pGroup = getCurrentGroup();
+	QString * pStr = pGroup->find(szKey);
+	if(!pStr)
 	{
 		m_szStrBuffer = szDefault;
 	} else {
-		m_szStrBuffer = *p_str;
+		m_szStrBuffer = *pStr;
 	}
 	return m_szStrBuffer;
 }
 
-//////////////////////////////////// QString
-
-/*
-QString KviConfig::readQStringEntry(const char *szKey,const QString &szDefault)
-{
-	KviStrDict * p_group = getCurrentGroup();
-	KviStr * p_str = p_group->find(szKey);
-	if(!p_str)return szDefault;
-	return QString::fromUtf8(p_str->ptr());
-}
-*/
-
-/*
-void KviConfig::writeEntry(const char *szKey,const QString &szValue)
-{
-	m_bDirty = true;
-	KviStrDict * p_group = getCurrentGroup();
-	p_group->replace(szKey,new KviStr(szValue.toUtf8().data()));
-}
-*/
-
 ////////////////////////////////// QStringList
 
 static QString g_szConfigStringListSeparator(",\\[ITEM],");
diff --git a/src/kvilib/ext/kvi_config.h b/src/kvilib/ext/kvi_config.h
index 1b2e269f4..3d7ea154b 100644
--- a/src/kvilib/ext/kvi_config.h
+++ b/src/kvilib/ext/kvi_config.h
@@ -127,9 +127,6 @@ public:
 	void writeEntry(const QString & szKey,const QStringList &list);
 	QList<int> readIntListEntry(const QString &,const QList<int> &list);
 	void writeEntry(const QString & szKey,const QList<int> &list);
-	QString readQStringEntry(const QString & szKey,const QString &szDefault = QString())
-		{ return readEntry(szKey,szDefault); };
-	//void writeEntry(const QString & szKey,const QString &szValue);
 	//void writeEntry(const char *szKey,unsigned long lValue);
 	//unsigned long readULongEntry(const char *szKey,unsigned long lDefault);
 	//void writeEntry(const char *szKey,long lValue);
diff --git a/src/kvilib/ext/kvi_sharedfiles.cpp b/src/kvilib/ext/kvi_sharedfiles.cpp
index 897062ef7..031b75604 100644
--- a/src/kvilib/ext/kvi_sharedfiles.cpp
+++ b/src/kvilib/ext/kvi_sharedfiles.cpp
@@ -345,11 +345,11 @@ void KviSharedFilesManager::load(const QString &filename)
 	{
 		QString tmp;
 		KviQString::sprintf(tmp,"%dFName",idx);
-		QString szName = cfg.readQStringEntry(tmp,"");
+		QString szName = cfg.readEntry(tmp,"");
 		KviQString::sprintf(tmp,"%dFilePath",idx);
-		QString szPath = cfg.readQStringEntry(tmp,"");
+		QString szPath = cfg.readEntry(tmp,"");
 		KviQString::sprintf(tmp,"%dUserMask",idx);
-		QString szMask = cfg.readQStringEntry(tmp,"");
+		QString szMask = cfg.readEntry(tmp,"");
 		if(!szMask.isEmpty() && !szPath.isEmpty() && !szName.isEmpty())
 			addSharedFile(szName,szPath,szMask,0);
 	}
diff --git a/src/kvilib/irc/kvi_avatarcache.cpp b/src/kvilib/irc/kvi_avatarcache.cpp
index ad866a2db..0ce72e863 100644
--- a/src/kvilib/irc/kvi_avatarcache.cpp
+++ b/src/kvilib/irc/kvi_avatarcache.cpp
@@ -140,7 +140,7 @@ void KviAvatarCache::load(const QString &szFileName)
 		kvi_time_t tLastAccess = cfg.readUIntEntry("LastAccess",0);
 		if((tNow - tLastAccess) < MAX_UNACCESSED_TIME)
 		{
-			QString szIdString = cfg.readQStringEntry("Avatar","");
+			QString szIdString = cfg.readEntry("Avatar","");
 
 			if(!szIdString.isEmpty())
 			{
diff --git a/src/kvilib/irc/kvi_identityprofile.cpp b/src/kvilib/irc/kvi_identityprofile.cpp
index 004e119f5..84d1eb3e9 100644
--- a/src/kvilib/irc/kvi_identityprofile.cpp
+++ b/src/kvilib/irc/kvi_identityprofile.cpp
@@ -70,28 +70,28 @@ bool KviIdentityProfile::load(KviConfig * pCfg, const QString & szPrefix)
 	QString szTmp;
 
 	KviQString::sprintf(szTmp,"%QName",&szPrefix);
-	m_szName = KviQString::trimmed(pCfg->readQStringEntry(szTmp));
+	m_szName = KviQString::trimmed(pCfg->readEntry(szTmp));
 	if(m_szName.isEmpty())
 		return false;
 
 	KviQString::sprintf(szTmp,"%QNetwork",&szPrefix);
-	m_szNetwork = pCfg->readQStringEntry(szTmp);
+	m_szNetwork = pCfg->readEntry(szTmp);
 	if(m_szNetwork.isEmpty())
 		return false;
 
 	KviQString::sprintf(szTmp,"%QNick",&szPrefix);
-	m_szNick = pCfg->readQStringEntry(szTmp);
+	m_szNick = pCfg->readEntry(szTmp);
 	if(m_szNick.isEmpty())
 		return false;
 
 	KviQString::sprintf(szTmp,"%QAltNick",&szPrefix);
-	m_szAltNick = pCfg->readQStringEntry(szTmp);
+	m_szAltNick = pCfg->readEntry(szTmp);
 
 	KviQString::sprintf(szTmp,"%QUserName",&szPrefix);
-	m_szUserName = pCfg->readQStringEntry(szTmp);
+	m_szUserName = pCfg->readEntry(szTmp);
 
 	KviQString::sprintf(szTmp,"%QRealName",&szPrefix);
-	m_szRealName = pCfg->readQStringEntry(szTmp);
+	m_szRealName = pCfg->readEntry(szTmp);
 	
 	return true;
 }
diff --git a/src/kvilib/irc/kvi_ircserver.cpp b/src/kvilib/irc/kvi_ircserver.cpp
index 2df64428e..e3ba52751 100644
--- a/src/kvilib/irc/kvi_ircserver.cpp
+++ b/src/kvilib/irc/kvi_ircserver.cpp
@@ -189,27 +189,27 @@ bool KviServer::load(KviConfig * cfg, const QString & szPrefix)
 {
 	QString szTmp;
 	KviQString::sprintf(szTmp,"%QHostname",&szPrefix);
-	m_szHostname = cfg->readQStringEntry(szTmp);
+	m_szHostname = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QIp",&szPrefix);
-	m_szIp = cfg->readQStringEntry(szTmp);
+	m_szIp = cfg->readEntry(szTmp);
 	if(m_szHostname.isEmpty() && m_szIp.isEmpty())	return false;
 
 	KviQString::sprintf(szTmp,"%QDescription",&szPrefix);
-	m_szDescription = cfg->readQStringEntry(szTmp);
+	m_szDescription = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QUser",&szPrefix);
-	m_szUser = cfg->readQStringEntry(szTmp);
+	m_szUser = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QPass",&szPrefix);
-	m_szPass = cfg->readQStringEntry(szTmp);
+	m_szPass = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QNick",&szPrefix);
-	m_szNick = cfg->readQStringEntry(szTmp);
+	m_szNick = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QSaslPass",&szPrefix);
-	m_szSaslPass = cfg->readQStringEntry(szTmp);
+	m_szSaslPass = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QSaslNick",&szPrefix);
-	m_szSaslNick = cfg->readQStringEntry(szTmp);
+	m_szSaslNick = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QRealName",&szPrefix);
-	m_szRealName = cfg->readQStringEntry(szTmp);
+	m_szRealName = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QInitUmode",&szPrefix);
-	m_szInitUMode = cfg->readQStringEntry(szTmp);
+	m_szInitUMode = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QAutoJoinChannels",&szPrefix);
 	QStringList l = cfg->readStringListEntry(szTmp,QStringList());
 	if(l.count() > 0) setAutoJoinChannelList(new QStringList(l));
@@ -217,19 +217,19 @@ bool KviServer::load(KviConfig * cfg, const QString & szPrefix)
 	KviQString::sprintf(szTmp,"%QAutoConnect",&szPrefix);
 	m_bAutoConnect = cfg->readBoolEntry(szTmp,false);
 	KviQString::sprintf(szTmp,"%QEncoding",&szPrefix);
-	m_szEncoding = cfg->readQStringEntry(szTmp);
+	m_szEncoding = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QTextEncoding",&szPrefix);
-	m_szTextEncoding = cfg->readQStringEntry(szTmp);
+	m_szTextEncoding = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QOnConnectCommand",&szPrefix);
-	m_szOnConnectCommand = cfg->readQStringEntry(szTmp);
+	m_szOnConnectCommand = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QOnLoginCommand",&szPrefix);
-	m_szOnLoginCommand = cfg->readQStringEntry(szTmp);
+	m_szOnLoginCommand = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QLinkFilter",&szPrefix);
-	m_szLinkFilter = cfg->readQStringEntry(szTmp);
+	m_szLinkFilter = cfg->readEntry(szTmp);
 	KviQString::sprintf(szTmp,"%QPort",&szPrefix);
 	m_uPort = cfg->readUIntEntry(szTmp,6667);
 	KviQString::sprintf(szTmp,"%QId",&szPrefix);
-	m_szId = cfg->readQStringEntry(szTmp);
+	m_szId = cfg->readEntry(szTmp);
 	if(m_szId.isEmpty()) generateUniqueId();
 
 	KviQString::sprintf(szTmp,"%QIPv6",&szPrefix);
@@ -247,7 +247,7 @@ bool KviServer::load(KviConfig * cfg, const QString & szPrefix)
 	KviQString::sprintf(szTmp,"%QProxy",&szPrefix);
 	setProxy(cfg->readIntEntry(szTmp,-2));
 	KviQString::sprintf(szTmp,"%QUserIdentityId",&szPrefix);
-	m_szUserIdentityId = cfg->readQStringEntry(szTmp);
+	m_szUserIdentityId = cfg->readEntry(szTmp);
 	return true;
 }
 
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp
index c0ea7221b..39b75c8d1 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/kvi_ircserverdb.cpp
@@ -370,7 +370,7 @@ void KviServerDataBase::importFromMircIni(const QString & filename, const QStrin
 	if(mircCfg.hasGroup("mirc"))
 	{
 		mircCfg.setGroup("mirc");
-		szDefaultServer = mircCfg.readQStringEntry("host");
+		szDefaultServer = mircCfg.readEntry("host");
 	}
 
 	KviConfig cfg(filename,KviConfig::Read,true);
@@ -465,18 +465,18 @@ void KviServerDataBase::load(const QString & filename)
 			KviNetwork * pNewNet = new KviNetwork(it.currentKey());
 			addNetwork(pNewNet);
 			cfg.setGroup(it.currentKey());
-			pNewNet->m_szEncoding = cfg.readQStringEntry("Encoding");
-			pNewNet->m_szTextEncoding = cfg.readQStringEntry("TextEncoding");
-			pNewNet->m_szDescription = cfg.readQStringEntry("Description");
-			pNewNet->m_szNickName = cfg.readQStringEntry("NickName");
-			pNewNet->m_szRealName = cfg.readQStringEntry("RealName");
-			pNewNet->m_szUserName = cfg.readQStringEntry("UserName");
-			pNewNet->m_szPass = cfg.readQStringEntry("Pass");
-			pNewNet->m_szOnConnectCommand = cfg.readQStringEntry("OnConnectCommand");
-			pNewNet->m_szOnLoginCommand = cfg.readQStringEntry("OnLoginCommand");
+			pNewNet->m_szEncoding = cfg.readEntry("Encoding");
+			pNewNet->m_szTextEncoding = cfg.readEntry("TextEncoding");
+			pNewNet->m_szDescription = cfg.readEntry("Description");
+			pNewNet->m_szNickName = cfg.readEntry("NickName");
+			pNewNet->m_szRealName = cfg.readEntry("RealName");
+			pNewNet->m_szUserName = cfg.readEntry("UserName");
+			pNewNet->m_szPass = cfg.readEntry("Pass");
+			pNewNet->m_szOnConnectCommand = cfg.readEntry("OnConnectCommand");
+			pNewNet->m_szOnLoginCommand = cfg.readEntry("OnLoginCommand");
 			pNewNet->m_pNickServRuleSet = KviNickServRuleSet::load(&cfg,QString());
 			pNewNet->m_bAutoConnect = cfg.readBoolEntry("AutoConnect",false);
-			pNewNet->m_szUserIdentityId = cfg.readQStringEntry("UserIdentityId");
+			pNewNet->m_szUserIdentityId = cfg.readEntry("UserIdentityId");
 			if(pNewNet->m_bAutoConnect)
 			{
 				if(!m_pAutoConnectOnStartupNetworks)
diff --git a/src/kvilib/irc/kvi_nickserv.cpp b/src/kvilib/irc/kvi_nickserv.cpp
index 20a9a7f6b..f4b9a64cb 100644
--- a/src/kvilib/irc/kvi_nickserv.cpp
+++ b/src/kvilib/irc/kvi_nickserv.cpp
@@ -279,18 +279,18 @@ bool KviNickServRule::load(KviConfig * cfg,const QString &prefix)
 {
 	QString tmp;
 	KviQString::sprintf(tmp,"%QRegisteredNick",&prefix);
-	m_szRegisteredNick = KviQString::trimmed(cfg->readQStringEntry(tmp));
+	m_szRegisteredNick = KviQString::trimmed(cfg->readEntry(tmp));
 	if(m_szRegisteredNick.isEmpty())return false;
 	KviQString::sprintf(tmp,"%QNickServMask",&prefix);
-	m_szNickServMask = cfg->readQStringEntry(tmp);
+	m_szNickServMask = cfg->readEntry(tmp);
 	if(m_szNickServMask.isEmpty())return false;
 	KviQString::sprintf(tmp,"%QServerMask",&prefix);
-	m_szServerMask = cfg->readQStringEntry(tmp,QString());
+	m_szServerMask = cfg->readEntry(tmp,QString());
 	KviQString::sprintf(tmp,"%QMessageRegexp",&prefix);
-	m_szMessageRegexp = cfg->readQStringEntry(tmp);
+	m_szMessageRegexp = cfg->readEntry(tmp);
 	if(m_szMessageRegexp.isEmpty())return false;
 	KviQString::sprintf(tmp,"%QIdentifyCommand",&prefix);
-	m_szIdentifyCommand = cfg->readQStringEntry(tmp);
+	m_szIdentifyCommand = cfg->readEntry(tmp);
 	return !m_szIdentifyCommand.isEmpty();
 }
 
diff --git a/src/kvilib/irc/kvi_useridentity.cpp b/src/kvilib/irc/kvi_useridentity.cpp
index ca2bdfa03..d9edcdc2b 100644
--- a/src/kvilib/irc/kvi_useridentity.cpp
+++ b/src/kvilib/irc/kvi_useridentity.cpp
@@ -41,25 +41,25 @@ KviUserIdentity::~KviUserIdentity()
 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.readEntry("NickName");
+	m_szAltNickName1 = cfg.readEntry("AltNickName1");
+	m_szAltNickName2 = cfg.readEntry("AltNickName2");
+	m_szAltNickName3 = cfg.readEntry("AltNickName3");
+	m_szUserName = cfg.readEntry("UserName");
 	// FIXME: At least scramble the pass ?
-	m_szPassword = cfg.readQStringEntry("Password");
+	m_szPassword = cfg.readEntry("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.readEntry("PartMessage");
+	m_szQuitMessage= cfg.readEntry("QuitMessage");
+	m_szAge = cfg.readEntry("Age");
+	m_szGender = cfg.readEntry("Gender");
+	m_szLocation = cfg.readEntry("Location");
+	m_szLanguages = cfg.readEntry("Languages");
+	m_szOtherInfo = cfg.readEntry("OtherInfo");
+	m_szUserMode = cfg.readEntry("UserMode");
+	m_szOnConnectCommand = cfg.readEntry("OnConnectCommand");
+	m_szOnLoginCommand = cfg.readEntry("OnLoginCommand");
 	return !(m_szId.isEmpty() || m_szNickName.isEmpty());
 }
 
@@ -196,7 +196,7 @@ void KviUserIdentityManager::load(const QString &szFileName)
 
 	cfg.setGroup("KVIrc");
 
-	m_szDefaultIdentity = cfg.readQStringEntry("DefaultIdentity","");
+	m_szDefaultIdentity = cfg.readEntry("DefaultIdentity","");
 
 	KviConfigIterator it(*(cfg.dict()));
 	KviConfigGroup * grp;
diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
index c314b603e..1847d2f3a 100644
--- a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
@@ -185,17 +185,17 @@ bool KviCustomToolBarDescriptor::load(KviConfig * cfg)
 {
 	m_pActions->clear();
 	m_szId = cfg->group();
-	QString szLabelCode = cfg->readQStringEntry("Label");
+	QString szLabelCode = cfg->readEntry("Label");
 	if(szLabelCode.isEmpty())szLabelCode = "$tr(Unnamed)";
 	delete m_pLabelScript;
 	createLabelScript(szLabelCode);
-	m_szIconId = cfg->readQStringEntry("IconId","");
+	m_szIconId = cfg->readEntry("IconId","");
 	unsigned int n = cfg->readUIntEntry("Count",0);
 	QString tmp;
 	for(unsigned int i=0;i<n;i++)
 	{
 		tmp.setNum(i);
-		QString * p = new QString(cfg->readQStringEntry(tmp));
+		QString * p = new QString(cfg->readEntry(tmp));
 		if(p->isEmpty())delete p;
 		else m_pActions->append(p);
 	}
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 9fb720c49..7587cad0a 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -912,7 +912,7 @@ void KviApp::loadOptions()
 
 		READ_OPTIONS(KVI_NUM_RECT_OPTIONS,g_rectOptionsTable,readRectEntry)
 		READ_OPTIONS(KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable,readBoolEntry)
-		READ_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable,readQStringEntry)
+		READ_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable,readEntry)
 		READ_OPTIONS(KVI_NUM_COLOR_OPTIONS,g_colorOptionsTable,readColorEntry)
 		READ_OPTIONS(KVI_NUM_PIXMAP_OPTIONS,g_pixmapOptionsTable,readPixmapEntry)
 		READ_OPTIONS(KVI_NUM_UINT_OPTIONS,g_uintOptionsTable,readUIntEntry)
@@ -1196,7 +1196,7 @@ namespace KviTheme
 
 		READ_OPTIONS(KVI_NUM_RECT_OPTIONS,g_rectOptionsTable,readRectEntry)
 		READ_OPTIONS(KVI_NUM_BOOL_OPTIONS,g_boolOptionsTable,readBoolEntry)
-		READ_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable,readQStringEntry)
+		READ_OPTIONS(KVI_NUM_STRING_OPTIONS,g_stringOptionsTable,readEntry)
 		READ_OPTIONS(KVI_NUM_COLOR_OPTIONS,g_colorOptionsTable,readColorEntry)
 		READ_OPTIONS(KVI_NUM_UINT_OPTIONS,g_uintOptionsTable,readUIntEntry)
 		READ_OPTIONS(KVI_NUM_FONT_OPTIONS,g_fontOptionsTable,readFontEntry)
@@ -1217,7 +1217,7 @@ namespace KviTheme
 			{
 				if(cfg.hasKey(g_pixmapOptionsTable[i].name))
 				{
-					QString szVal = cfg.readQStringEntry(g_pixmapOptionsTable[i].name,"");
+					QString szVal = cfg.readEntry(g_pixmapOptionsTable[i].name,"");
 					szVal.trimmed();
 					QString szBuffer;
 					if(!szVal.isEmpty())
diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/kvi_theme.cpp
index f48b1ac69..f221d330d 100644
--- a/src/kvirc/kernel/kvi_theme.cpp
+++ b/src/kvirc/kernel/kvi_theme.cpp
@@ -62,7 +62,7 @@ bool KviThemeInfo::load(const QString &szThemeFileName)
 
 	cfg.setGroup(KVI_THEMEINFO_CONFIG_GROUP);
 
-	m_szThemeEngineVersion = cfg.readQStringEntry("ThemeEngineVersion","1.0.0");
+	m_szThemeEngineVersion = cfg.readEntry("ThemeEngineVersion","1.0.0");
 	if(KviMiscUtils::compareVersions(m_szThemeEngineVersion,KVI_CURRENT_THEME_ENGINE_VERSION) < 0)
 	{
 		KviQString::sprintf(m_szLastError,__tr2qs("This KVIrc executable is too old for this theme (minimum theme engine version required is %Q while this theme engine has version %s)"),&m_szThemeEngineVersion,KVI_CURRENT_THEME_ENGINE_VERSION);
@@ -70,7 +70,7 @@ bool KviThemeInfo::load(const QString &szThemeFileName)
 	}
 
 	// mandatory fields
-	m_szName = cfg.readQStringEntry("Name","");
+	m_szName = cfg.readEntry("Name","");
 
 	if(m_szName.isEmpty())
 	{
@@ -79,18 +79,18 @@ bool KviThemeInfo::load(const QString &szThemeFileName)
 	}
 
 	// optional fields
-	m_szVersion = cfg.readQStringEntry("Version","");
+	m_szVersion = cfg.readEntry("Version","");
 	if(m_szVersion.isEmpty())
 		m_szVersion = "?.?.?";
-	m_szAuthor = cfg.readQStringEntry("Author","");
+	m_szAuthor = cfg.readEntry("Author","");
 	QString szUnknown = __tr2qs("Unknown");
 	if(m_szAuthor.isEmpty())
 		m_szAuthor = szUnknown;
-	m_szDescription = cfg.readQStringEntry("Description","");
-	m_szDate = cfg.readQStringEntry("Date","");
+	m_szDescription = cfg.readEntry("Description","");
+	m_szDate = cfg.readEntry("Date","");
 	if(m_szDate.isEmpty())
 		m_szDate = szUnknown;
-	m_szApplication = cfg.readQStringEntry("Application","");
+	m_szApplication = cfg.readEntry("Application","");
 	if(m_szApplication.isEmpty())
 		m_szApplication = szUnknown;
 
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
index 2ba96cd71..fda039c4f 100644
--- a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
@@ -145,7 +145,7 @@ void KviKvsAliasManager::load(const QString & filename)
 	for(QString * s = l.first();s;s = l.next())
 	{
 		cfg.setGroup(*s);
-		QString szCode = cfg.readQStringEntry("_Buffer","");
+		QString szCode = cfg.readEntry("_Buffer","");
 		if(!szCode.isEmpty())
 		{
 			KviKvsScript * m = new KviKvsScript(*s,szCode);
diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
index 91ee0fe58..051c2df7e 100644
--- a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
@@ -542,9 +542,9 @@ void KviKvsEventManager::loadRawEvents(const QString &szFileName)
 				for(unsigned int index = 0;index < nHandlers;index++)
 				{
 					KviQString::sprintf(tmp,"Name%u",index);
-					QString szName = cfg.readQStringEntry(tmp,"unnamed");
+					QString szName = cfg.readEntry(tmp,"unnamed");
 					KviQString::sprintf(tmp,"Buffer%u",index);
-					QString szCode = cfg.readQStringEntry(tmp,"");
+					QString szCode = cfg.readEntry(tmp,"");
 					KviQString::sprintf(tmp,"RawEvent%u::%Q",index,&szName);
 					KviKvsScriptEventHandler * s = new KviKvsScriptEventHandler(szName,tmp,szCode);
 					KviQString::sprintf(tmp,"Enabled%u",index);
@@ -612,9 +612,9 @@ void KviKvsEventManager::loadAppEvents(const QString &szFileName)
 				{
 					QString tmp;
 					KviQString::sprintf(tmp,"Name%u",index);
-					QString szName = cfg.readQStringEntry(tmp,"unnamed");
+					QString szName = cfg.readEntry(tmp,"unnamed");
 					KviQString::sprintf(tmp,"Buffer%u",index);
-					QString szCode = cfg.readQStringEntry(tmp,"");
+					QString szCode = cfg.readEntry(tmp,"");
 					KviQString::sprintf(tmp,"Enabled%u",index);
 					bool bEnabled = cfg.readBoolEntry(tmp,false);
 					QString szCntx;
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index ae7fd6c3c..64648c151 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -926,15 +926,15 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 		for(idx = 0;idx < cnt;idx++)
 		{
 			KviQString::sprintf(tmp,"%Q_Prologue%d",&(prefix),idx);
-			QString pr = cfg->readQStringEntry(tmp,"");
+			QString pr = cfg->readEntry(tmp,"");
 			KviQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx);
-			QString itemName = cfg->readQStringEntry(tmp,"");
+			QString itemName = cfg->readEntry(tmp,"");
 			if(!pr.isEmpty())addPrologue(itemName,pr);
 		}
 	} else {
 		// Might be old version!
 		KviQString::sprintf(tmp,"%Q_Prologue",&(prefix));
-		QString pr = cfg->readQStringEntry(tmp,"");
+		QString pr = cfg->readEntry(tmp,"");
 		if(!pr.isEmpty())addPrologue(QString(),pr);
 	}
 
@@ -946,15 +946,15 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 		for(idx = 0;idx < cnt;idx++)
 		{
 			KviQString::sprintf(tmp,"%Q_Epilogue%d",&prefix,idx);
-			QString ep = cfg->readQStringEntry(tmp,"");
+			QString ep = cfg->readEntry(tmp,"");
 			KviQString::sprintf(tmp,"%Q_PrologueId%d",&(prefix),idx);
-			QString itemName = cfg->readQStringEntry(tmp,"");
+			QString itemName = cfg->readEntry(tmp,"");
 			if(!ep.isEmpty())addEpilogue(itemName,ep);
 		}
 	} else {
 		// Might be old version!
 		KviQString::sprintf(tmp,"%Q_Epilogue",&prefix);
-		QString ep = cfg->readQStringEntry(tmp,"");
+		QString ep = cfg->readEntry(tmp,"");
 		if(!ep.isEmpty())addEpilogue(QString(),ep);
 	}
 
@@ -969,7 +969,7 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 		KviQString::sprintf(pre,"%Q_%d",&prefix,idx);
 
 		KviQString::sprintf(tmp,"%Q_Id",&pre);
-		QString itemName = cfg->readQStringEntry(tmp,QString());
+		QString itemName = cfg->readEntry(tmp,QString());
 		KviQString::sprintf(tmp,"%Q_Type",&pre);
 
 		int type = cfg->readIntEntry(tmp,3);
@@ -979,7 +979,7 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 			{
 				QString expr;
 				KviQString::sprintf(tmp,"%Q_Expr",&pre);
-				expr = cfg->readQStringEntry(tmp,"");
+				expr = cfg->readEntry(tmp,"");
 				addSeparator(itemName,expr);
 			}
 			break;
@@ -987,13 +987,13 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 			{
 				QString text,icon,code,expr;
 				KviQString::sprintf(tmp,"%Q_Text",&pre);
-				text = cfg->readQStringEntry(tmp,"Unnamed");
+				text = cfg->readEntry(tmp,"Unnamed");
 				KviQString::sprintf(tmp,"%Q_Icon",&pre);
-				icon = cfg->readQStringEntry(tmp,"");
+				icon = cfg->readEntry(tmp,"");
 				KviQString::sprintf(tmp,"%Q_Code",&pre);
-				code = cfg->readQStringEntry(tmp,"");
+				code = cfg->readEntry(tmp,"");
 				KviQString::sprintf(tmp,"%Q_Expr",&pre);
-				expr = cfg->readQStringEntry(tmp,"");
+				expr = cfg->readEntry(tmp,"");
 				addItem(itemName,code,text,icon,expr);
 			}
 			break;
@@ -1001,11 +1001,11 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 			{
 				QString text,icon,expr;
 				KviQString::sprintf(tmp,"%Q_Text",&pre);
-				text = cfg->readQStringEntry(tmp,"Unnamed");
+				text = cfg->readEntry(tmp,"Unnamed");
 				KviQString::sprintf(tmp,"%Q_Icon",&pre);
-				icon = cfg->readQStringEntry(tmp,"");
+				icon = cfg->readEntry(tmp,"");
 				KviQString::sprintf(tmp,"%Q_Expr",&pre);
-				expr = cfg->readQStringEntry(tmp,"");
+				expr = cfg->readEntry(tmp,"");
 				KviKvsPopupMenu * pop = addPopup(itemName,text,icon,expr);
 				pop->load(pre,cfg);
 			}
@@ -1014,11 +1014,11 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 			{
 				QString text,icon,expr;
 				KviQString::sprintf(tmp,"%Q_Text",&pre);
-				text = cfg->readQStringEntry(tmp,"Unnamed");
+				text = cfg->readEntry(tmp,"Unnamed");
 				KviQString::sprintf(tmp,"%Q_Icon",&pre);
-				icon = cfg->readQStringEntry(tmp,"");
+				icon = cfg->readEntry(tmp,"");
 				KviQString::sprintf(tmp,"%Q_Expr",&pre);
-				expr = cfg->readQStringEntry(tmp,"");
+				expr = cfg->readEntry(tmp,"");
 				addLabel(itemName,text,icon,expr);
 			}
 			break;
@@ -1026,13 +1026,13 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 			{
 				QString text,icon,code,expr;
 				KviQString::sprintf(tmp,"%Q_Text",&pre);
-				text = cfg->readQStringEntry(tmp,"Unnamed");
+				text = cfg->readEntry(tmp,"Unnamed");
 				KviQString::sprintf(tmp,"%Q_Icon",&pre);
-				icon = cfg->readQStringEntry(tmp,"");
+				icon = cfg->readEntry(tmp,"");
 				KviQString::sprintf(tmp,"%Q_ExtName",&pre);
-				code = cfg->readQStringEntry(tmp,"");
+				code = cfg->readEntry(tmp,"");
 				KviQString::sprintf(tmp,"%Q_Expr",&pre);
-				expr = cfg->readQStringEntry(tmp,"");
+				expr = cfg->readEntry(tmp,"");
 				addExtPopup(itemName,code,text,icon,expr);
 			}
 			break;
diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
index 10fd08da5..768a68543 100644
--- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
@@ -133,19 +133,19 @@ bool KviKvsScriptAddon::load(KviConfig * cfg,const QString &szName)
 {
 	m_szName = szName;
 	cfg->setGroup(m_szName);
-	m_szVersion = cfg->readQStringEntry("Version");
-	m_szIconId = cfg->readQStringEntry("IconId");
+	m_szVersion = cfg->readEntry("Version");
+	m_szIconId = cfg->readEntry("IconId");
 	if(m_szVersion.isEmpty())return false;
 	QString tmp1,tmp2,tmp3;
-	tmp1 = cfg->readQStringEntry("VisibleNameCode");
-	tmp2 = cfg->readQStringEntry("DescriptionCode");
-	tmp3 = cfg->readQStringEntry("UninstallCallback");
+	tmp1 = cfg->readEntry("VisibleNameCode");
+	tmp2 = cfg->readEntry("DescriptionCode");
+	tmp3 = cfg->readEntry("UninstallCallback");
 	if(tmp1.isEmpty())return false;
 	allocateScripts(tmp1,tmp2,tmp3);
-	tmp1 = cfg->readQStringEntry("ConfigureCallback");
+	tmp1 = cfg->readEntry("ConfigureCallback");
 	if(!tmp1.isEmpty())
 		setConfigureCallback(tmp1);
-	tmp1 = cfg->readQStringEntry("HelpCallback");
+	tmp1 = cfg->readEntry("HelpCallback");
 	if(!tmp1.isEmpty())
 		setHelpCallback(tmp1);
 	m_lInstalledFiles = cfg->readStringListEntry("InstalledFiles");
diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp
index 436a6df63..aaa31f748 100644
--- a/src/kvirc/kvs/kvi_kvs_useraction.cpp
+++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp
@@ -309,7 +309,7 @@ bool KviKvsUserAction::load(KviConfig * cfg)
 {
 	m_szName = cfg->group();
 	if(m_szName.isEmpty())return false;
-	m_szVisibleName = cfg->readQStringEntry("VisibleName");
+	m_szVisibleName = cfg->readEntry("VisibleName");
 	if(m_szVisibleName.isEmpty())return false;
 	QString szKvsName = "action::";
 	szKvsName += m_szName;
@@ -320,7 +320,7 @@ bool KviKvsUserAction::load(KviConfig * cfg)
 	m_pVisibleNameScript = new KviKvsScript(szTmp,m_szVisibleName,KviKvsScript::Parameter);
 
 	if(m_szVisibleName.isEmpty())return false;
-	m_szDescription = cfg->readQStringEntry("Description");
+	m_szDescription = cfg->readEntry("Description");
 	szTmp = szKvsName;
 	szTmp += "::description";
 
@@ -328,14 +328,14 @@ bool KviKvsUserAction::load(KviConfig * cfg)
 	m_pDescriptionScript = new KviKvsScript(szTmp,m_szDescription,KviKvsScript::Parameter);
 
 
-	m_szBigIconId = cfg->readQStringEntry("BigIcon");
-	m_szSmallIconId = cfg->readQStringEntry("SmallIcon");
-	m_szKeySequence = cfg->readQStringEntry("KeySequence");
-	m_szCategory = cfg->readQStringEntry("Category");
+	m_szBigIconId = cfg->readEntry("BigIcon");
+	m_szSmallIconId = cfg->readEntry("SmallIcon");
+	m_szKeySequence = cfg->readEntry("KeySequence");
+	m_szCategory = cfg->readEntry("Category");
 	m_pCategory = KviActionManager::instance()->category(m_szCategory);
 	m_uFlags = cfg->readUIntEntry("Flags",0);
 
-	QString szCode = cfg->readQStringEntry("Code");
+	QString szCode = cfg->readEntry("Code");
 	if(szCode.isEmpty())return false;
 
 	m_szScript = QString(szCode);
diff --git a/src/kvirc/ui/kvi_input_history.cpp b/src/kvirc/ui/kvi_input_history.cpp
index e8288af53..4fc050db5 100644
--- a/src/kvirc/ui/kvi_input_history.cpp
+++ b/src/kvirc/ui/kvi_input_history.cpp
@@ -89,7 +89,7 @@ void KviInputHistory::load(const QString & szFileName)
 	for(int i=0; i<iCount; i++)
 	{
 		szTmp.sprintf("S%d",i);
-		QString szEntry = c.readQStringEntry(szTmp.ptr(),"");
+		QString szEntry = c.readEntry(szTmp.ptr(),"");
 		if(!szEntry.isEmpty())
 			add(new QString(szEntry));
 	}
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 73c2c2596..a3594cfbf 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -595,7 +595,7 @@ void KviWindow::loadProperties(KviConfig *cfg)
 {
 	QString szKey = "TextEncoding_";
 	szKey += m_szName;
-	setTextEncoding(cfg->readQStringEntry(szKey,KviQString::Empty).toUtf8().data());
+	setTextEncoding(cfg->readEntry(szKey,KviQString::Empty).toUtf8().data());
 	if(m_pInput)
 	{
 		m_pInput->setButtonsHidden(cfg->readBoolEntry("inputToolButtonsHidden",KVI_OPTION_BOOL(KviOption_boolHideInputToolButtons)));
diff --git a/src/modules/classeditor/classeditor.cpp b/src/modules/classeditor/classeditor.cpp
index 9b080632c..662b018a0 100644
--- a/src/modules/classeditor/classeditor.cpp
+++ b/src/modules/classeditor/classeditor.cpp
@@ -1747,18 +1747,18 @@ void KviClassEditor::loadNotBuiltClasses()
 
 				if(KviQString::equalCI(*pszTmp,"@Inherits"))
 				{
-					pClassItem->setInheritsClass(cfg.readQStringEntry(*pszTmp,""));
+					pClassItem->setInheritsClass(cfg.readEntry(*pszTmp,""));
 					continue;
 				}
                                 if((*pszTmp).left(9) == "@Reminder")
 					continue;
-                                QString szCode = cfg.readQStringEntry(*pszTmp,"");
+                                QString szCode = cfg.readEntry(*pszTmp,"");
 				KviClassEditorTreeWidgetItem * pFunctionItem = findFunction(*pszTmp, pClassItem);
 				if(!pFunctionItem)
 					pFunctionItem = new KviClassEditorTreeWidgetItem(pClassItem,KviClassEditorTreeWidgetItem::Method,*pszTmp);
 				pFunctionItem->setBuffer(szCode);
                                 QString szEntry = "@Reminder|" + (*pszTmp);
-                                QString szReminder = cfg.readQStringEntry(szEntry,"");
+                                QString szReminder = cfg.readEntry(szEntry,"");
                                 pFunctionItem->setReminder(szReminder);
 			}
 		}
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index 2680e0b12..6a8d66d82 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -401,8 +401,8 @@ void KviListWindow::importList()
 			m_pItemList->append(
 					new KviChannelTreeWidgetItemData(
 						it.currentKey(),
-						cfg.readQStringEntry("users","0"),
-						cfg.readQStringEntry("topic","")
+						cfg.readEntry("users","0"),
+						cfg.readEntry("topic","")
 					)
 				);
 			++it;
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index 7f383d6c2..8c2b99174 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -621,16 +621,16 @@ KviSetupWizard::KviSetupWizard()
 				{
 					g_bFoundMirc = true;
 					cfg.setGroup("mirc");
-					m_pNickSelector->setText(cfg.readQStringEntry("nick",KVI_OPTION_STRING(KviOption_stringNickname1)));
-					m_pRealNameSelector->setText(cfg.readQStringEntry("user",KVI_OPTION_STRING(KviOption_stringRealname)));
+					m_pNickSelector->setText(cfg.readEntry("nick",KVI_OPTION_STRING(KviOption_stringNickname1)));
+					m_pRealNameSelector->setText(cfg.readEntry("user",KVI_OPTION_STRING(KviOption_stringRealname)));
 					KVI_OPTION_STRING(KviOption_stringNickname2) =
-						cfg.readQStringEntry("anick",KVI_OPTION_STRING(KviOption_stringNickname2));
+						cfg.readEntry("anick",KVI_OPTION_STRING(KviOption_stringNickname2));
 					KVI_OPTION_STRING(KviOption_stringUsername)  =
-						cfg.readQStringEntry("email",KVI_OPTION_STRING(KviOption_stringUsername)).section('@',0,0);
+						cfg.readEntry("email",KVI_OPTION_STRING(KviOption_stringUsername)).section('@',0,0);
 
 					if(cfg.hasGroup("files"))
 					{
-						m_szMircServerIniFile = cfg.readQStringEntry("servers","servers.ini");
+						m_szMircServerIniFile = cfg.readEntry("servers","servers.ini");
 						m_szMircServerIniFile.prepend('/');
 						m_szMircServerIniFile.prepend(szMircDir);
 						if(KviFileUtils::fileExists(m_szMircServerIniFile))