moved KviIrcNetwork to KviNetwork and KviIrcServer to KviServer

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

27 files changed, 219 insertions, 222 deletions

diff --git a/src/kvilib/irc/kvi_ircserver.cpp b/src/kvilib/irc/kvi_ircserver.cpp
index aac7aad94..6797e7832 100644
--- a/src/kvilib/irc/kvi_ircserver.cpp
+++ b/src/kvilib/irc/kvi_ircserver.cpp
@@ -44,8 +44,7 @@
 
 //extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 
-// FIXME: This should be renamed to KviServer or sth like that
-KviIrcServer::KviIrcServer()
+KviServer::KviServer()
 {
 	m_pReconnectInfo=0;
 	m_uFlags = 0;
@@ -55,7 +54,7 @@ KviIrcServer::KviIrcServer()
 	m_iProxy = -1;
 }
 
-KviProxy* KviIrcServer::proxyServer(KviProxyDataBase * pDb)
+KviProxy* KviServer::proxyServer(KviProxyDataBase * pDb)
 {
 	int i=0;
 	if(proxy()<0) return 0;
@@ -68,7 +67,7 @@ KviProxy* KviIrcServer::proxyServer(KviProxyDataBase * pDb)
 	return 0;
 }
 
-KviIrcServer::KviIrcServer(const KviIrcServer &serv)
+KviServer::KviServer(const KviServer &serv)
 {
 	m_pReconnectInfo     = 0;
 	m_szHostname         = serv.m_szHostname;
@@ -94,7 +93,7 @@ KviIrcServer::KviIrcServer(const KviIrcServer &serv)
 	m_bAutoConnect       = serv.m_bAutoConnect;
 }
 
-void KviIrcServer::operator=(const KviIrcServer &serv)
+void KviServer::operator=(const KviServer &serv)
 {
 	m_szHostname         = serv.m_szHostname;
 	m_szIp               = serv.m_szIp;
@@ -121,20 +120,20 @@ void KviIrcServer::operator=(const KviIrcServer &serv)
 }
 
 
-KviIrcServer::~KviIrcServer()
+KviServer::~KviServer()
 {
 	if(m_pChannelList)delete m_pChannelList;
 	if(m_pReconnectInfo) delete m_pReconnectInfo;
 }
 
-void KviIrcServer::generateUniqueId()
+void KviServer::generateUniqueId()
 {
 	struct timeval tv;
 	kvi_gettimeofday(&tv,0);
 	KviQString::sprintf(m_szId,"myserver%d%d%d",tv.tv_usec,rand() % 1000,rand() % 1000);
 }
 
-QString KviIrcServer::ircUri()
+QString KviServer::ircUri()
 {
 	QString uri("irc");
 	if(useSSL())uri += "s";
@@ -152,14 +151,14 @@ QString KviIrcServer::ircUri()
 	return uri;
 }
 
-void KviIrcServer::setAutoJoinChannelList(QStringList * pNewChannelList)
+void KviServer::setAutoJoinChannelList(QStringList * pNewChannelList)
 {
 	if(m_pChannelList)delete m_pChannelList;
 	m_pChannelList = pNewChannelList;
 }
 
 
-bool KviIrcServer::load(KviConfig * cfg,const QString &prefix)
+bool KviServer::load(KviConfig * cfg,const QString &prefix)
 {
 	QString tmp;
 	KviQString::sprintf(tmp,"%QHostname",&prefix);
@@ -198,7 +197,7 @@ bool KviIrcServer::load(KviConfig * cfg,const QString &prefix)
 	m_szId = cfg->readQStringEntry(tmp);
 	if(m_szId.isEmpty())generateUniqueId();
 	KviQString::sprintf(tmp,"%QIpV6",&prefix);
-	setIpV6(cfg->readBoolEntry(tmp,false));
+	setIPv6(cfg->readBoolEntry(tmp,false));
 	KviQString::sprintf(tmp,"%QCacheIp",&prefix);
 	setCacheIp(cfg->readBoolEntry(tmp,false)); // true ?
 	KviQString::sprintf(tmp,"%QSSL",&prefix);
@@ -210,7 +209,7 @@ bool KviIrcServer::load(KviConfig * cfg,const QString &prefix)
 	return true;
 }
 
-void KviIrcServer::save(KviConfig * cfg,const QString &prefix)
+void KviServer::save(KviConfig * cfg,const QString &prefix)
 {
 	QString tmp;
 	KviQString::sprintf(tmp,"%QHostname",&prefix);
@@ -315,14 +314,14 @@ void KviIrcServer::save(KviConfig * cfg,const QString &prefix)
 }
 
 
-KviIrcNetwork::KviIrcNetwork(const KviIrcNetwork &src)
+KviNetwork::KviNetwork(const KviNetwork &src)
 {
 	m_pChannelList = 0;
 	m_pNickServRuleSet = 0;
 	copyFrom(src);
 }
 
-KviIrcNetwork::KviIrcNetwork(const QString &name)
+KviNetwork::KviNetwork(const QString &name)
 {
 	m_szName = name;
 	m_pChannelList = 0;
@@ -331,25 +330,25 @@ KviIrcNetwork::KviIrcNetwork(const QString &name)
 	// m_szEncoding = QString::null; // set by default
 }
 
-KviIrcNetwork::~KviIrcNetwork()
+KviNetwork::~KviNetwork()
 {
 	if(m_pChannelList)delete m_pChannelList;
 	if(m_pNickServRuleSet)delete m_pNickServRuleSet;
 }
 
-void KviIrcNetwork::setAutoJoinChannelList(QStringList * pNewChannelList)
+void KviNetwork::setAutoJoinChannelList(QStringList * pNewChannelList)
 {
 	if(m_pChannelList)delete m_pChannelList;
 	m_pChannelList = pNewChannelList;
 }
 
-void KviIrcNetwork::setNickServRuleSet(KviNickServRuleSet * s)
+void KviNetwork::setNickServRuleSet(KviNickServRuleSet * s)
 {
 	if(m_pNickServRuleSet)delete m_pNickServRuleSet;
 	m_pNickServRuleSet = s;
 }
 
-void KviIrcNetwork::copyFrom(const KviIrcNetwork &src)
+void KviNetwork::copyFrom(const KviNetwork &src)
 {
 	m_szName = src.m_szName;
 	m_szEncoding = src.m_szEncoding;
diff --git a/src/kvilib/irc/kvi_ircserver.h b/src/kvilib/irc/kvi_ircserver.h
index 426aac264..46dc4974d 100644
--- a/src/kvilib/irc/kvi_ircserver.h
+++ b/src/kvilib/irc/kvi_ircserver.h
@@ -36,13 +36,13 @@ class KviConfig;
 class KviNickServRuleSet;
 class KviProxy;
 class KviProxyDataBase;
-class KviIrcServer;
+class KviServer;
 
 #define KVI_IRCSERVER_FLAG_IPV6 1
 #define KVI_IRCSERVER_FLAG_CACHEIP 2
 #define KVI_IRCSERVER_FLAG_SSL 4
 
-class KVILIB_API KviIrcServerReconnectInfo {
+class KVILIB_API KviServerReconnectInfo {
 public:
 	QString               m_szNick;
 	QString               m_szAwayReason;
@@ -51,14 +51,14 @@ public:
 	bool                  m_bIsAway;
 };
 
-class KVILIB_API KviIrcServer : public KviHeapObject
+class KVILIB_API KviServer : public KviHeapObject
 {
 public:
-	KviIrcServer();
-	KviIrcServer(const KviIrcServer &serv);
-	~KviIrcServer();
+	KviServer();
+	KviServer(const KviServer &serv);
+	~KviServer();
 public:
-	KviIrcServerReconnectInfo *m_pReconnectInfo;
+	KviServerReconnectInfo *m_pReconnectInfo;
 	QString            m_szHostname;          // the server hostname (or ip eventually)
 	QString            m_szIp;                // the server's cached ip (if we're caching)
 	QString            m_szDescription;       // the server description
@@ -126,7 +126,7 @@ public:
 	void setAutoJoinChannelList(QStringList * pNewChannelList);
 	void setAutoConnect(bool autoconnect) { m_bAutoConnect = autoconnect; };
 	void setUserIdentityId(const QString &szUserIdentityId){ m_szUserIdentityId = szUserIdentityId; };
-	void setIpV6(bool bSet)
+	void setIPv6(bool bSet)
 	{
 		if(bSet)m_uFlags |= KVI_IRCSERVER_FLAG_IPV6;
 		else m_uFlags &= ((unsigned short)~KVI_IRCSERVER_FLAG_IPV6);
@@ -141,7 +141,7 @@ public:
 		if(bSet)m_uFlags |= KVI_IRCSERVER_FLAG_CACHEIP;
 		else m_uFlags &= ((unsigned short)~KVI_IRCSERVER_FLAG_CACHEIP);
 	};
-	void operator =(const KviIrcServer &s);
+	void operator =(const KviServer &s);
 
 	bool load(KviConfig * cfg,const QString &prefix);
 	void save(KviConfig * cfg,const QString &prefix);
@@ -152,13 +152,13 @@ public:
 	QString ircUri();
 };
 
-class KVILIB_API KviIrcNetwork : public KviHeapObject
+class KVILIB_API KviNetwork : public KviHeapObject
 {
-	friend class KviIrcServerDataBase;
+	friend class KviServerDataBase;
 public:
-	KviIrcNetwork(const KviIrcNetwork &src);
-	KviIrcNetwork(const QString &name);
-	~KviIrcNetwork();
+	KviNetwork(const KviNetwork &src);
+	KviNetwork(const QString &name);
+	~KviNetwork();
 protected:
 	QString              m_szName;
 	QString              m_szDescription;
@@ -187,7 +187,7 @@ public:
 	QStringList* autoJoinChannelList(){ return m_pChannelList; };
 	KviNickServRuleSet * nickServRuleSet(){ return m_pNickServRuleSet; };
 	void setNickServRuleSet(KviNickServRuleSet * s);
-	void copyFrom(const KviIrcNetwork &d);
+	void copyFrom(const KviNetwork &d);
 	void setName(const QString &szName){ m_szName = szName; };
 	void setEncoding(const QString &szEncoding){ m_szEncoding = szEncoding; };
 	void setDescription(const QString &szDescription){ m_szDescription = szDescription; };
diff --git a/src/kvilib/irc/kvi_ircserverdb.cpp b/src/kvilib/irc/kvi_ircserverdb.cpp
index ff8e3cfa7..ebf2d879c 100644
--- a/src/kvilib/irc/kvi_ircserverdb.cpp
+++ b/src/kvilib/irc/kvi_ircserverdb.cpp
@@ -36,28 +36,28 @@
 #include "kvi_netutils.h"
 #include "kvi_nickserv.h"
 
-KviIrcServerDataBaseRecord::KviIrcServerDataBaseRecord(KviIrcNetwork * n)
+KviServerDataBaseRecord::KviServerDataBaseRecord(KviNetwork * n)
 {
 	m_pNetwork = n;
-	m_pServerList = new KviPointerList<KviIrcServer>;
+	m_pServerList = new KviPointerList<KviServer>;
 	m_pServerList->setAutoDelete(true);
 	m_pCurrentServer = 0;
 }
 
-KviIrcServerDataBaseRecord::~KviIrcServerDataBaseRecord()
+KviServerDataBaseRecord::~KviServerDataBaseRecord()
 {
 	delete m_pNetwork;
 	delete m_pServerList;
 }
 
-void KviIrcServerDataBaseRecord::insertServer(KviIrcServer *srv)
+void KviServerDataBaseRecord::insertServer(KviServer *srv)
 {
 	m_pServerList->append(srv);
 }
 
-KviIrcServer * KviIrcServerDataBaseRecord::findServer(const KviIrcServer * pServer)
+KviServer * KviServerDataBaseRecord::findServer(const KviServer * pServer)
 {
-	for(KviIrcServer *s=m_pServerList->first();s;s=m_pServerList->next())
+	for(KviServer *s=m_pServerList->first();s;s=m_pServerList->next())
 	{
 		if(KviQString::equalCI(s->m_szHostname,pServer->m_szHostname) &&
 			(s->m_uPort == pServer->m_uPort) &&
@@ -67,12 +67,12 @@ KviIrcServer * KviIrcServerDataBaseRecord::findServer(const KviIrcServer * pServ
 	return 0;
 }
 
-void KviIrcServerDataBaseRecord::setCurrentServer(KviIrcServer *srv)
+void KviServerDataBaseRecord::setCurrentServer(KviServer *srv)
 {
 	if(m_pServerList->findRef(srv) != -1)m_pCurrentServer = srv;
 }
 
-KviIrcServer * KviIrcServerDataBaseRecord::currentServer()
+KviServer * KviServerDataBaseRecord::currentServer()
 {
 	if(m_pCurrentServer)return m_pCurrentServer;
 	m_pCurrentServer = m_pServerList->first();
@@ -80,80 +80,80 @@ KviIrcServer * KviIrcServerDataBaseRecord::currentServer()
 }
 
 
-KviIrcServerDataBase::KviIrcServerDataBase()
+KviServerDataBase::KviServerDataBase()
 {
-	m_pRecords = new KviPointerHashTable<QString,KviIrcServerDataBaseRecord>(17,false);
+	m_pRecords = new KviPointerHashTable<QString,KviServerDataBaseRecord>(17,false);
 	m_pRecords->setAutoDelete(true);
 	m_pAutoConnectOnStartupServers = 0;
 	m_pAutoConnectOnStartupNetworks = 0;
 }
 
-KviIrcServerDataBase::~KviIrcServerDataBase()
+KviServerDataBase::~KviServerDataBase()
 {
 	delete m_pRecords;
 	if(m_pAutoConnectOnStartupServers)delete m_pAutoConnectOnStartupServers;
 	if(m_pAutoConnectOnStartupNetworks)delete m_pAutoConnectOnStartupNetworks;
 }
 
-void KviIrcServerDataBase::clearAutoConnectOnStartupServers()
+void KviServerDataBase::clearAutoConnectOnStartupServers()
 {
 	if(!m_pAutoConnectOnStartupServers)return;
 	delete m_pAutoConnectOnStartupServers;
 	m_pAutoConnectOnStartupServers = 0;
 }
 
-void KviIrcServerDataBase::clearAutoConnectOnStartupNetworks()
+void KviServerDataBase::clearAutoConnectOnStartupNetworks()
 {
 	if(!m_pAutoConnectOnStartupNetworks)return;
 	delete m_pAutoConnectOnStartupNetworks;
 	m_pAutoConnectOnStartupNetworks = 0;
 }
 
-void KviIrcServerDataBase::clear()
+void KviServerDataBase::clear()
 {
 	m_pRecords->clear();
 	m_szCurrentNetwork = "";
 }
 
-KviIrcServerDataBaseRecord * KviIrcServerDataBase::insertNetwork(KviIrcNetwork *n)
+KviServerDataBaseRecord * KviServerDataBase::insertNetwork(KviNetwork *n)
 {
-	KviIrcServerDataBaseRecord * r = new KviIrcServerDataBaseRecord(n);
+	KviServerDataBaseRecord * r = new KviServerDataBaseRecord(n);
 	m_pRecords->replace(n->name(),r);
 	return r;
 }
 
-KviIrcServerDataBaseRecord * KviIrcServerDataBase::findRecord(const QString &szNetName)
+KviServerDataBaseRecord * KviServerDataBase::findRecord(const QString &szNetName)
 {
 	return m_pRecords->find(szNetName);
 }
 
 
-KviIrcNetwork * KviIrcServerDataBase::findNetwork(const QString &szName)
+KviNetwork * KviServerDataBase::findNetwork(const QString &szName)
 {
-	KviIrcServerDataBaseRecord * r = m_pRecords->find(szName);
+	KviServerDataBaseRecord * r = m_pRecords->find(szName);
 	if(!r)return 0;
 	return r->network();
 }
 
-KviIrcServerDataBaseRecord * KviIrcServerDataBase::currentRecord()
+KviServerDataBaseRecord * KviServerDataBase::currentRecord()
 {
-	KviIrcServerDataBaseRecord * r = 0;
+	KviServerDataBaseRecord * r = 0;
 	if(!m_szCurrentNetwork.isEmpty())r = m_pRecords->find(m_szCurrentNetwork);
 	if(r)return r;
 
-	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*m_pRecords);
+	KviPointerHashTableIterator<QString,KviServerDataBaseRecord> it(*m_pRecords);
 	r = it.current();
 	if(!r)return 0;
 	m_szCurrentNetwork = r->network()->name();
 	return r;
 }
 
-void KviIrcServerDataBase::updateServerIp(KviIrcServer * pServer,const QString & ip)
+void KviServerDataBase::updateServerIp(KviServer * pServer,const QString & ip)
 {
-	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*m_pRecords);
-	while(KviIrcServerDataBaseRecord * r = it.current())
+	KviPointerHashTableIterator<QString,KviServerDataBaseRecord> it(*m_pRecords);
+	while(KviServerDataBaseRecord * r = it.current())
 	{
-		KviIrcServer * srv = r->findServer(pServer);
+		KviServer * srv = r->findServer(pServer);
 		if(srv)
 		{
 			srv->m_szIp = ip;
@@ -163,7 +163,7 @@ void KviIrcServerDataBase::updateServerIp(KviIrcServer * pServer,const QString &
 	}
 }
 
-bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const QString &szNetName,KviIrcServerDataBaseRecord * r,QString &szError)
+bool KviServerDataBase::makeCurrentBestServerInNetwork(const QString &szNetName,KviServerDataBaseRecord * r,QString &szError)
 {
 	m_szCurrentNetwork = szNetName;
 	// find a round-robin server in that network
@@ -174,7 +174,7 @@ bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const QString &szNetNa
 		return false;
 	}
 
-	for(KviIrcServer * s = r->m_pServerList->first();s;s = r->m_pServerList->next())
+	for(KviServer * s = r->m_pServerList->first();s;s = r->m_pServerList->next())
 	{
 		if(s->m_szDescription.contains("random",Qt::CaseInsensitive) ||
 			(s->m_szDescription.contains("round",Qt::CaseInsensitive) && s->m_szDescription.contains("robin",Qt::CaseInsensitive)))
@@ -192,7 +192,7 @@ bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const QString &szNetNa
 	KviQString::sprintf(tryAlso2,"irc.%Q.net",&szNetName);
 	KviQString::sprintf(tryAlso3,"irc.%Q.com",&szNetName);
 
-	for(KviIrcServer * ss = r->m_pServerList->first();ss;ss = r->m_pServerList->next())
+	for(KviServer * ss = r->m_pServerList->first();ss;ss = r->m_pServerList->next())
 	{
 		if(KviQString::equalCI(ss->m_szHostname,tryAlso1) ||
 			KviQString::equalCI(ss->m_szHostname,tryAlso2) ||
@@ -208,20 +208,20 @@ bool KviIrcServerDataBase::makeCurrentBestServerInNetwork(const QString &szNetNa
 }
 
 
-bool KviIrcServerDataBase::makeCurrentServer(KviIrcServerDefinition * d,QString &szError)
+bool KviServerDataBase::makeCurrentServer(KviServerDefinition * d,QString &szError)
 {
-	KviIrcServer * pServer = 0;
+	KviServer * pServer = 0;
 
-	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*m_pRecords);
-	KviIrcServerDataBaseRecord * r = 0;
-	KviIrcServer * srv;
+	KviPointerHashTableIterator<QString,KviServerDataBaseRecord> it(*m_pRecords);
+	KviServerDataBaseRecord * r = 0;
+	KviServer * srv;
 
 	if(KviQString::equalCIN(d->szServer,"net:",4))
 	{
 		// net:networkname form
 		QString szNet = d->szServer;
 		szNet.remove(0,4);
-		KviIrcServerDataBaseRecord * r = m_pRecords->find(szNet);
+		KviServerDataBaseRecord * r = m_pRecords->find(szNet);
 		if(r)return makeCurrentBestServerInNetwork(szNet,r,szError);
 		szError = __tr2qs("The server specification seems to be in the net:<string> but the network couln't be found in the database");
 		return false;
@@ -333,7 +333,7 @@ search_finished:
 		if(!d->szServer.contains('.'))
 		{
 			// assume it is a network name!
-			KviIrcServerDataBaseRecord * r = m_pRecords->find(d->szServer);
+			KviServerDataBaseRecord * r = m_pRecords->find(d->szServer);
 			if(r)return makeCurrentBestServerInNetwork(d->szServer,r,szError);
 			// else probably not a network name
 		}
@@ -344,11 +344,11 @@ search_finished:
 	r = m_pRecords->find(__tr2qs("Standalone Servers"));
 	if(!r)
 	{
-		r = new KviIrcServerDataBaseRecord(new KviIrcNetwork(__tr2qs("Standalone Servers")));
+		r = new KviServerDataBaseRecord(new KviNetwork(__tr2qs("Standalone Servers")));
 		m_pRecords->replace(r->network()->name(),r);
 	}
 
-	KviIrcServer * s = new KviIrcServer();
+	KviServer * s = new KviServer();
 	s->m_szHostname = d->szServer;
 	if(bIsValidIpV4)
 	{
@@ -371,7 +371,7 @@ search_finished:
 	s->m_szPass= d->szPass;
 	s->m_szNick= d->szNick;
 	s->m_szInitUMode = d->szInitUMode;
-	s->setIpV6(d->bIpV6);
+	s->setIPv6(d->bIpV6);
 	s->setUseSSL(d->bSSL);
 	r->insertServer(s);
 	m_szCurrentNetwork = r->network()->name();
@@ -414,7 +414,7 @@ QString& szDescription,QString& szHost,QString& szPort,bool& bSsl,kvi_u32_t& uPo
 	}
 }
 
-void KviIrcServerDataBase::loadFromMircIni(const QString & filename, const QString & szMircIni, QStringList& recentServers)
+void KviServerDataBase::loadFromMircIni(const QString & filename, const QString & szMircIni, QStringList& recentServers)
 {
 	clear();
 	recentServers.clear();
@@ -478,14 +478,14 @@ void KviIrcServerDataBase::loadFromMircIni(const QString & filename, const QStri
 				parseMircServerRecord(entry,szNet,
 						   szDescription,szHost,szPort,bSsl,uPort);
 
-				KviIrcServerDataBaseRecord * r = findRecord(szNet);
+				KviServerDataBaseRecord * r = findRecord(szNet);
 
 				if(!r) {
-					KviIrcNetwork * n = new KviIrcNetwork(szNet);
+					KviNetwork * n = new KviNetwork(szNet);
 					r = insertNetwork(n);
 				}
 
-				KviIrcServer *s = new KviIrcServer();
+				KviServer *s = new KviServer();
 				s->m_szHostname = szHost;
 				s->m_szDescription = szDescription;
 				s->m_uPort = uPort;
@@ -503,7 +503,7 @@ void KviIrcServerDataBase::loadFromMircIni(const QString & filename, const QStri
 }
 
 
-void KviIrcServerDataBase::load(const QString & filename)
+void KviServerDataBase::load(const QString & filename)
 {
 	clear();
 	KviConfig cfg(filename,KviConfig::Read);
@@ -516,8 +516,8 @@ void KviIrcServerDataBase::load(const QString & filename)
 	{
 		if(it.current()->count() > 0)
 		{
-			KviIrcNetwork * n = new KviIrcNetwork(it.currentKey());
-			KviIrcServerDataBaseRecord * r = insertNetwork(n);
+			KviNetwork * n = new KviNetwork(it.currentKey());
+			KviServerDataBaseRecord * r = insertNetwork(n);
 			cfg.setGroup(it.currentKey());
 			n->m_szEncoding = cfg.readQStringEntry("Encoding");
 			n->m_szDescription = cfg.readQStringEntry("Description");
@@ -533,7 +533,7 @@ void KviIrcServerDataBase::load(const QString & filename)
 			{
 				if(!m_pAutoConnectOnStartupNetworks)
 				{
-					m_pAutoConnectOnStartupNetworks = new KviPointerList<KviIrcServerDataBaseRecord>;
+					m_pAutoConnectOnStartupNetworks = new KviPointerList<KviServerDataBaseRecord>;
 					m_pAutoConnectOnStartupNetworks->setAutoDelete(false);
 				}
 				m_pAutoConnectOnStartupNetworks->append(r);
@@ -546,7 +546,7 @@ void KviIrcServerDataBase::load(const QString & filename)
 			int nServers = cfg.readIntEntry("NServers",0);
 			for(int i=0;i < nServers;i++)
 			{
-				KviIrcServer *s = new KviIrcServer();
+				KviServer *s = new KviServer();
 				KviQString::sprintf(tmp,"%d_",i);
 				if(s->load(&cfg,tmp))
 				{
@@ -557,7 +557,7 @@ void KviIrcServerDataBase::load(const QString & filename)
 					{
 						if(!m_pAutoConnectOnStartupServers)
 						{
-							m_pAutoConnectOnStartupServers = new KviPointerList<KviIrcServer>;
+							m_pAutoConnectOnStartupServers = new KviPointerList<KviServer>;
 							m_pAutoConnectOnStartupServers->setAutoDelete(false);
 						}
 						m_pAutoConnectOnStartupServers->append(s);
@@ -570,19 +570,19 @@ void KviIrcServerDataBase::load(const QString & filename)
 	}
 }
 
-void KviIrcServerDataBase::save(const QString &filename)
+void KviServerDataBase::save(const QString &filename)
 {
 	KviConfig cfg(filename,KviConfig::Write);
 
 	cfg.clear(); // clear any old entry
 
-	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*m_pRecords);
+	KviPointerHashTableIterator<QString,KviServerDataBaseRecord> it(*m_pRecords);
 
 	QString tmp;
 
-	while(KviIrcServerDataBaseRecord * r = it.current())
+	while(KviServerDataBaseRecord * r = it.current())
 	{
-		KviIrcNetwork * n = r->network();
+		KviNetwork * n = r->network();
 		cfg.setGroup(n->m_szName);
 		cfg.writeEntry("NServers",r->m_pServerList->count());
 		if(n->m_bAutoConnect)
@@ -608,7 +608,7 @@ void KviIrcServerDataBase::save(const QString &filename)
 		if(!n->m_szUserIdentityId.isEmpty())
 			cfg.writeEntry("UserIdentityId",n->m_szUserIdentityId);
 		int i=0;
-		for(KviIrcServer *s = r->m_pServerList->first();s;s = r->m_pServerList->next())
+		for(KviServer *s = r->m_pServerList->first();s;s = r->m_pServerList->next())
 		{
 			KviQString::sprintf(tmp,"%d_",i);
 			s->save(&cfg,tmp);
diff --git a/src/kvilib/irc/kvi_ircserverdb.h b/src/kvilib/irc/kvi_ircserverdb.h
index dac2ab296..8617fd632 100644
--- a/src/kvilib/irc/kvi_ircserverdb.h
+++ b/src/kvilib/irc/kvi_ircserverdb.h
@@ -30,10 +30,10 @@
 
 #include "kvi_pointerhashtable.h"
 
-typedef struct _KviIrcServerDefinition
+typedef struct _KviServerDefinition
 {
 	QString            szServer;
-	kvi_u32_t	   uPort;
+	kvi_u32_t          uPort;
 	bool               bPortIsValid;
 	bool               bIpV6;
 	bool               bSSL;
@@ -41,38 +41,38 @@ typedef struct _KviIrcServerDefinition
 	QString            szPass;
 	QString            szNick;
 	QString            szInitUMode;
-} KviIrcServerDefinition;
+} KviServerDefinition;
 
 
 
-class KVILIB_API KviIrcServerDataBaseRecord
+class KVILIB_API KviServerDataBaseRecord
 {
-	friend class KviIrcServerDataBase;
+	friend class KviServerDataBase;
 public:
-	KviIrcServerDataBaseRecord(KviIrcNetwork * n);
-	~KviIrcServerDataBaseRecord();
+	KviServerDataBaseRecord(KviNetwork * n);
+	~KviServerDataBaseRecord();
 protected:
-	KviIrcNetwork            * m_pNetwork;
-	KviPointerList<KviIrcServer> * m_pServerList;
+	KviNetwork            * m_pNetwork;
+	KviPointerList<KviServer> * m_pServerList;
 
-	KviIrcServer             * m_pCurrentServer;
+	KviServer             * m_pCurrentServer;
 public:
-	KviIrcNetwork * network(){ return m_pNetwork; };
-	KviPointerList<KviIrcServer> * serverList(){ return m_pServerList; };
-	KviIrcServer * currentServer();
-	void insertServer(KviIrcServer *srv);
-	KviIrcServer * findServer(const KviIrcServer * pServer);
-	void setCurrentServer(KviIrcServer *srv);
+	KviNetwork * network(){ return m_pNetwork; };
+	KviPointerList<KviServer> * serverList(){ return m_pServerList; };
+	KviServer * currentServer();
+	void insertServer(KviServer *srv);
+	KviServer * findServer(const KviServer * pServer);
+	void setCurrentServer(KviServer *srv);
 };
 
 
-class KVILIB_API KviIrcServerDataBase
+class KVILIB_API KviServerDataBase
 {
 public:
-	KviIrcServerDataBase();
-	~KviIrcServerDataBase();
+	KviServerDataBase();
+	~KviServerDataBase();
 private:
-	KviPointerHashTable<QString,KviIrcServerDataBaseRecord> * m_pRecords;
+	KviPointerHashTable<QString,KviServerDataBaseRecord> * m_pRecords;
 	QString                             m_szCurrentNetwork;
 	// This list is computed when the data are loaded from disk
 	// during the startup and is used by KviApp to
@@ -82,27 +82,27 @@ private:
 	// because it contains shallow pointers to the servers
 	// really contained in the server/network list
 	// and it is never updated later
-	KviPointerList<KviIrcServer>                * m_pAutoConnectOnStartupServers;
-	KviPointerList<KviIrcServerDataBaseRecord>  * m_pAutoConnectOnStartupNetworks;
+	KviPointerList<KviServer>                * m_pAutoConnectOnStartupServers;
+	KviPointerList<KviServerDataBaseRecord>  * m_pAutoConnectOnStartupNetworks;
 public:
 	void clear();
-	KviPointerHashTable<QString,KviIrcServerDataBaseRecord> * recordDict(){ return m_pRecords; };
-	KviPointerList<KviIrcServer> * autoConnectOnStartupServers(){ return m_pAutoConnectOnStartupServers; };
-	KviPointerList<KviIrcServerDataBaseRecord> * autoConnectOnStartupNetworks(){ return m_pAutoConnectOnStartupNetworks; };
+	KviPointerHashTable<QString,KviServerDataBaseRecord> * recordDict(){ return m_pRecords; };
+	KviPointerList<KviServer> * autoConnectOnStartupServers(){ return m_pAutoConnectOnStartupServers; };
+	KviPointerList<KviServerDataBaseRecord> * autoConnectOnStartupNetworks(){ return m_pAutoConnectOnStartupNetworks; };
 	void clearAutoConnectOnStartupServers();
 	void clearAutoConnectOnStartupNetworks();
 	void setCurrentNetwork(const QString &szNetName){ m_szCurrentNetwork = szNetName; };
 	const QString & currentNetworkName(){ return m_szCurrentNetwork; };
-	KviIrcServerDataBaseRecord * currentRecord();
-	KviIrcServerDataBaseRecord * findRecord(const QString &szNetName);
-	KviIrcNetwork * findNetwork(const QString &name);
+	KviServerDataBaseRecord * currentRecord();
+	KviServerDataBaseRecord * findRecord(const QString &szNetName);
+	KviNetwork * findNetwork(const QString &name);
 	void loadFromMircIni(const QString & filename, const QString & szMircIni, QStringList& recentServers);
 	void load(const QString & filename);
 	void save(const QString & filename);
-	KviIrcServerDataBaseRecord * insertNetwork(KviIrcNetwork * n);
-	void updateServerIp(KviIrcServer * pServer,const QString &ip);
-	bool makeCurrentServer(KviIrcServerDefinition * d,QString &szError);
-	bool makeCurrentBestServerInNetwork(const QString &szNetName,KviIrcServerDataBaseRecord * d,QString &szError);
+	KviServerDataBaseRecord * insertNetwork(KviNetwork * n);
+	void updateServerIp(KviServer * pServer,const QString &ip);
+	bool makeCurrentServer(KviServerDefinition * d,QString &szError);
+	bool makeCurrentBestServerInNetwork(const QString &szNetName,KviServerDataBaseRecord * d,QString &szError);
 };
 
 #endif //_KVI_IRCSERVERDB_H_
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index 2d67ab7a3..d5cb4b769 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -108,7 +108,7 @@
 KVIRC_API KviApp                       * g_pApp                    = 0; // global application pointer
 
 KviConfig                              * g_pWinPropertiesConfig    = 0;
-KVIRC_API KviIrcServerDataBase         * g_pIrcServerDataBase      = 0;
+KVIRC_API KviServerDataBase         * g_pIrcServerDataBase      = 0;
 KVIRC_API KviProxyDataBase             * g_pProxyDataBase          = 0;
 
 // Global windows
@@ -212,7 +212,6 @@ void KviApp::setup()
 #endif
 
 	// Setup our filesystem and initalize locale
-	
 	loadDirectories();
 	KviStringConversion::init(m_szGlobalKvircDir,m_szLocalKvircDir);
 
@@ -229,7 +228,6 @@ void KviApp::setup()
 
 	// check if we want to permanently disable the splash screen
 	// we do it once for every version: the user should see the new splash screens at least once
-
 	QString szSplashDisableFile;
 	getLocalKvircDirectory(szSplashDisableFile,Pics,"disable-splash." KVI_VERSION);
 
@@ -279,8 +277,8 @@ void KviApp::setup()
 
 	// Create the module manager early: so the other managers can load modules
 	g_pModuleExtensionManager = new KviModuleExtensionManager();
-        
-      	KVI_SPLASH_SET_PROGRESS(4);
+
+	KVI_SPLASH_SET_PROGRESS(4);
 
 	g_pModuleManager = new KviModuleManager();
 
@@ -324,7 +322,7 @@ void KviApp::setup()
 	KVI_SPLASH_SET_PROGRESS(50)
 
 	// Load the server database
-	g_pIrcServerDataBase   = new KviIrcServerDataBase();
+	g_pIrcServerDataBase   = new KviServerDataBase();
 	if(getReadOnlyConfigPath(tmp,KVI_CONFIGFILE_SERVERDB))
 		g_pIrcServerDataBase->load(tmp);
 
@@ -1525,10 +1523,10 @@ void KviApp::saveConfiguration()
 
 void KviApp::autoConnectToServers()
 {
-	KviPointerList<KviIrcServer> * l = g_pIrcServerDataBase->autoConnectOnStartupServers();
+	KviPointerList<KviServer> * l = g_pIrcServerDataBase->autoConnectOnStartupServers();
 	if(l)
 	{
-		for(KviIrcServer * s = l->first();s;s = l->next())
+		for(KviServer * s = l->first();s;s = l->next())
 		{
 			QString szCommand = "server -u \"id:";
 			if(s->id().isEmpty())s->generateUniqueId();
@@ -1539,10 +1537,10 @@ void KviApp::autoConnectToServers()
 		g_pIrcServerDataBase->clearAutoConnectOnStartupServers();
 	}
 
-	KviPointerList<KviIrcServerDataBaseRecord> * lr = g_pIrcServerDataBase->autoConnectOnStartupNetworks();
+	KviPointerList<KviServerDataBaseRecord> * lr = g_pIrcServerDataBase->autoConnectOnStartupNetworks();
 	if(lr)
 	{
-		for(KviIrcServerDataBaseRecord * r = lr->first();r;r = lr->next())
+		for(KviServerDataBaseRecord * r = lr->first();r;r = lr->next())
 		{
 			QString szCommandx = "server -u \"net:";
 			szCommandx += r->network()->name();
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index 01acd75a9..ce8307e1f 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -58,7 +58,7 @@ class KviConsole;
 class KviConfig;
 class KviRegisteredUser;
 class KviIrcConnection;
-class KviIrcServerDataBase;
+class KviServerDataBase;
 
 typedef struct _KviPendingAvatarChange
 {
@@ -338,7 +338,7 @@ signals:
 
 #ifndef _KVI_APP_CPP_
 	extern KVIRC_API KviApp * g_pApp;
-	extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase;
+	extern KVIRC_API KviServerDataBase * g_pIrcServerDataBase;
 #endif
 
 #endif //_KVI_APP_H_
diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
index 8fa4e3d7a..442427b89 100644
--- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
+++ b/src/kvirc/kernel/kvi_asynchronousconnectiondata.h
@@ -48,7 +48,7 @@ public:
 	QString            szPass;
 	QString            szNick;
 	QString            szInitUMode;
-	KviIrcServerReconnectInfo * m_pReconnectInfo;
+	KviServerReconnectInfo * m_pReconnectInfo;
 };
 
 #endif //!_KVI_ASYNCHRONOUSCONNECTIONDATA_H_
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index 55c342d53..87561966f 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -69,7 +69,7 @@
 #include <QTimer>
 #include <QTextCodec>
 
-extern KVIRC_API KviIrcServerDataBase           * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase           * g_pIrcServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 extern KVIRC_API KviGarbageCollector            * g_pGarbageCollector;
 
@@ -240,7 +240,7 @@ const QString & KviIrcConnection::currentUserName()
 	return userInfo()->userName();
 }
 
-KviIrcServer * KviIrcConnection::server()
+KviServer * KviIrcConnection::server()
 {
 	return m_pTarget->server();
 }
@@ -859,8 +859,8 @@ void KviIrcConnection::hostNameLookupTerminated(KviDns *pDns)
 
 void KviIrcConnection::loginToIrcServer()
 {
-	KviIrcServer * pServer = target()->server();
-	KviIrcNetwork * pNet = target()->network();
+	KviServer * pServer = target()->server();
+	KviNetwork * pNet = target()->network();
 
 	// Username
 	pServer->m_szUser.trimmed();
diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h
index b4ebc8b43..f46a33c4f 100644
--- a/src/kvirc/kernel/kvi_ircconnection.h
+++ b/src/kvirc/kernel/kvi_ircconnection.h
@@ -33,8 +33,8 @@
 #include <QObject>
 
 class KviConsole;
-class KviIrcNetworkData;
-class KviIrcServer;
+class KviNetworkData;
+class KviServer;
 class KviProxy;
 class KviIrcSocket;
 class KviIrcLink;
@@ -127,7 +127,7 @@ public:
 	// never null
 	KviIrcContext * context(){ return m_pContext; };
 	// forwarder from KviIrcConnectionTarget, never null
-	KVI_DEPRECATED KviIrcServer * server();
+	KVI_DEPRECATED KviServer * server();
 	// forwarder from KviIrcConnectionTarget, may be null
 	KVI_DEPRECATED KviProxy * proxy();
 	// never null!
diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
index ad956c9e8..95119a2e5 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
@@ -28,13 +28,13 @@
 #include "kvi_ircserver.h"
 #include "kvi_proxydb.h"
 
-KviIrcConnectionTarget::KviIrcConnectionTarget(const KviIrcNetwork * pNetwork,
-							const KviIrcServer * pServer,
+KviIrcConnectionTarget::KviIrcConnectionTarget(const KviNetwork * pNetwork,
+							const KviServer * pServer,
 							const KviProxy * pProxy,
 							const QString &szBindAddress)
 {
-	m_pNetwork = new KviIrcNetwork(*pNetwork);
-	m_pServer = new KviIrcServer(*pServer);
+	m_pNetwork = new KviNetwork(*pNetwork);
+	m_pServer = new KviServer(*pServer);
 	m_pProxy = pProxy ? new KviProxy(*pProxy) : 0;
 	m_szBindAddress = szBindAddress;
 }
diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.h b/src/kvirc/kernel/kvi_ircconnectiontarget.h
index ae1a9a59a..0363cada5 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontarget.h
+++ b/src/kvirc/kernel/kvi_ircconnectiontarget.h
@@ -28,8 +28,8 @@
 #include "kvi_qstring.h"
 #include "kvi_heapobject.h"
 
-class KviIrcNetwork;
-class KviIrcServer;
+class KviNetwork;
+class KviServer;
 class KviProxy;
 
 class KVIRC_API KviIrcConnectionTarget : public KviHeapObject
@@ -38,19 +38,19 @@ class KVIRC_API KviIrcConnectionTarget : public KviHeapObject
 public:
 	// pServer is a shallow pointer: this class makes a copy of it internally, must NOT be null
 	// pProxy may be null if a proxy is not desired. this class makes a copy of it internally
-	KviIrcConnectionTarget(const KviIrcNetwork * pNetwork,
-							const KviIrcServer * pServer,
+	KviIrcConnectionTarget(const KviNetwork * pNetwork,
+							const KviServer * pServer,
 							const KviProxy * pProxy = 0,
 							const QString &szBindAddress = QString::null);
 	~KviIrcConnectionTarget();
 private:
-	KviIrcNetwork      * m_pNetwork;        // owned, never null
-	KviIrcServer       * m_pServer;         // owned, never null
+	KviNetwork      * m_pNetwork;        // owned, never null
+	KviServer       * m_pServer;         // owned, never null
 	KviProxy           * m_pProxy;          // owned, may be null
 	QString              m_szBindAddress;   // forced bind address
 public:
-	KviIrcServer * server(){ return m_pServer; };
-	KviIrcNetwork * network(){ return m_pNetwork; };
+	KviServer * server(){ return m_pServer; };
+	KviNetwork * network(){ return m_pNetwork; };
 	KviProxy * proxy(){ return m_pProxy; };
 	const QString & bindAddress(){ return m_szBindAddress; };
 	bool hasBindAddress(){ return (!m_szBindAddress.isEmpty()); };
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index 8a406bc6a..53bbdc13c 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -54,7 +54,7 @@
 
 #include <QTimer>
 
-extern KVIRC_API KviIrcServerDataBase           * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase           * g_pIrcServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 extern KVIRC_API KviGarbageCollector            * g_pGarbageCollector;
 
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index 75e962596..ceffcddfd 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -61,7 +61,7 @@
 // the irc context identifiers start from 1
 static unsigned int g_uNextIrcContextId = 1;
 
-extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase * g_pIrcServerDataBase;
 extern KVIRC_API KviProxyDataBase * g_pProxyDataBase;
 
 
@@ -448,7 +448,7 @@ void KviIrcContext::connectToCurrentServer()
 		{
 			// ok , have a server to look for in the db
 			// FIXME: this is a bit ugly... could it be managed in some completly different and nicer way ?
-			KviIrcServerDefinition d;
+			KviServerDefinition d;
 			d.szServer = m_pAsynchronousConnectionData->szServer;
 			d.bPortIsValid = m_pAsynchronousConnectionData->bPortIsOk;
 			d.uPort = m_pAsynchronousConnectionData->uPort;
@@ -468,10 +468,10 @@ void KviIrcContext::connectToCurrentServer()
 		} // else we just connect to the globally selected irc server in the options dialog
 	}
 
-	KviIrcServerDataBaseRecord * rec = g_pIrcServerDataBase->currentRecord();
+	KviServerDataBaseRecord * rec = g_pIrcServerDataBase->currentRecord();
 	
-	KviIrcNetwork * net;
-	KviIrcServer  * srv;
+	KviNetwork * net;
+	KviServer  * srv;
 	
 	net = rec ? rec->network() : 0;
 	srv = net ? rec->currentServer() : 0;
@@ -609,7 +609,7 @@ void KviIrcContext::connectionFailed(int iError)
 				m_pConsole->outputNoFmt(KVI_OUT_SYSTEMMESSAGE,tmp);
 			}
 	
-			KviIrcServer oldServer(*(connection()->server()));
+			KviServer oldServer(*(connection()->server()));
 			QString oldNickname = connection()->userInfo()->isAway() ? connection()->userInfo()->nickNameBeforeAway() : connection()->userInfo()->nickName();
 	
 			KviAsynchronousConnectionData * d = new KviAsynchronousConnectionData();
@@ -684,16 +684,16 @@ void KviIrcContext::connectionEstabilished()
 
 	// save the last server this console used
 	//if(m_pLastIrcServer)delete m_pLastIrcServer;
-	//m_pLastIrcServer = new KviIrcServer(*(connection()->server()));
+	//m_pLastIrcServer = new KviServer(*(connection()->server()));
 }
 
 void KviIrcContext::connectionTerminated()
 {
 	if(!m_pConnection)return; // this may happen in the destructor!
 
-	KviIrcServer oldServer(*(connection()->server()));
+	KviServer oldServer(*(connection()->server()));
 	if(oldServer.m_pReconnectInfo) delete oldServer.m_pReconnectInfo;
-	KviIrcServerReconnectInfo* pInfo = new KviIrcServerReconnectInfo();
+	KviServerReconnectInfo* pInfo = new KviServerReconnectInfo();
 	pInfo->m_szNick = connection()->userInfo()->isAway() ? connection()->userInfo()->nickNameBeforeAway() : connection()->userInfo()->nickName();
 	pInfo->m_bIsAway=connection()->userInfo()->isAway();
 	pInfo->m_szAwayReason=connection()->userInfo()->awayReason();
diff --git a/src/kvirc/kernel/kvi_irccontext.h b/src/kvirc/kernel/kvi_irccontext.h
index e50340811..b5fafb365 100644
--- a/src/kvirc/kernel/kvi_irccontext.h
+++ b/src/kvirc/kernel/kvi_irccontext.h
@@ -39,8 +39,8 @@ class KviIrcDataStreamMonitor;
 class KviWindow;
 class QTimer;
 class KviConsole;
-class KviIrcNetwork;
-class KviIrcServer;
+class KviNetwork;
+class KviServer;
 /*
 	KviIrcContext is the structure that groups the objects and resources
 	usable for a single irc connection: a console, a set of channels and queries,
diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp
index cac5d2b26..a5193a34e 100644
--- a/src/kvirc/kernel/kvi_irclink.cpp
+++ b/src/kvirc/kernel/kvi_irclink.cpp
@@ -52,7 +52,7 @@
 
 #include <QTimer>
 
-extern KVIRC_API KviIrcServerDataBase           * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase           * g_pIrcServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 extern KVIRC_API KviGarbageCollector            * g_pGarbageCollector;
 
diff --git a/src/kvirc/kernel/kvi_irclink.h b/src/kvirc/kernel/kvi_irclink.h
index 54ae8e035..d47207d56 100644
--- a/src/kvirc/kernel/kvi_irclink.h
+++ b/src/kvirc/kernel/kvi_irclink.h
@@ -29,7 +29,7 @@
 #include <QObject>
 
 class KviConsole;
-class KviIrcServer;
+class KviServer;
 class KviProxy;
 class KviIrcSocket;
 class KviDns;
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index fe2054579..a5279e996 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -239,7 +239,7 @@ void KviIrcSocket::raiseError(int iError)
 		outputSocketError(KviError::getDescription(iError));
 }
 
-int KviIrcSocket::startConnection(KviIrcServer *srv,KviProxy * prx,const char * bindAddress)
+int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bindAddress)
 {
 	// Attempts to estabilish an IRC connection
 	// to the server specified by *srv.
@@ -257,7 +257,7 @@ int KviIrcSocket::startConnection(KviIrcServer *srv,KviProxy * prx,const char *
 	}
 
 	// Copy the server
-	m_pIrcServer = new KviIrcServer(*srv);
+	m_pIrcServer = new KviServer(*srv);
 
 	bool bTargetIpV6 = false;
 	bool bNeedServerIp = !prx;
diff --git a/src/kvirc/kernel/kvi_ircsocket.h b/src/kvirc/kernel/kvi_ircsocket.h
index cb03039a8..b3584a5d3 100644
--- a/src/kvirc/kernel/kvi_ircsocket.h
+++ b/src/kvirc/kernel/kvi_ircsocket.h
@@ -32,7 +32,7 @@
 
 #include <QObject>
 
-class KviIrcServer;
+class KviServer;
 class KviProxy;
 class KviIrcConnection;
 class KviIrcConnectionTarget;
@@ -86,7 +86,7 @@ protected:
 	SocketState              m_state;
 	QSocketNotifier      * m_pWsn;
 	QSocketNotifier      * m_pRsn;
-	KviIrcServer         * m_pIrcServer;
+	KviServer         * m_pIrcServer;
 	KviProxy             * m_pProxy;
 	QTimer               * m_pTimeoutTimer;
 	unsigned int           m_uReadBytes;
@@ -117,7 +117,7 @@ public:
 	unsigned int sentPackets(){ return m_uSentPackets; };
 	SocketState state(){ return m_state; };
 	bool isConnected(){ return m_state == Connected; };
-	int startConnection(KviIrcServer * srv,KviProxy * prx = 0,const char * bindAddress = 0);
+	int startConnection(KviServer * srv,KviProxy * prx = 0,const char * bindAddress = 0);
 
 	//bool sendData(const char *buffer,int buflen = -1) KVI_DEPRECATED;
 	//bool sendFmtData(const char *fmt,...) KVI_DEPRECATED;
diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp
index 47899042c..99c5b60a7 100644
--- a/src/kvirc/kernel/kvi_ircurl.cpp
+++ b/src/kvirc/kernel/kvi_ircurl.cpp
@@ -210,7 +210,7 @@ void KviIrcUrl::split(QString url, KviIrcUrlParts& result)
 
 }
 
-void KviIrcUrl::join(QString &uri, KviIrcServer* server)
+void KviIrcUrl::join(QString &uri, KviServer* server)
 {
 	if(server)
 	{	
@@ -312,7 +312,7 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole)
 		szCommand.append(QString("%1 %2 ").arg(parts.szHost).arg(parts.iPort));
 
 		if(pConsole->connection()) {
-			KviIrcServer* server = pConsole->connection()->target()->server();
+			KviServer* server = pConsole->connection()->target()->server();
 			if(
 				( server->hostName() != parts.szHost ) ||
 				( server->port() != parts.iPort ) ||
diff --git a/src/kvirc/kernel/kvi_ircurl.h b/src/kvirc/kernel/kvi_ircurl.h
index bbf8f4631..09cbb63e2 100644
--- a/src/kvirc/kernel/kvi_ircurl.h
+++ b/src/kvirc/kernel/kvi_ircurl.h
@@ -27,7 +27,7 @@
 #include "kvi_string.h"
 #include "kvi_inttypes.h"
 
-class KviIrcServer;
+class KviServer;
 class KviConsole;
 
 #include <QStringList>
@@ -71,7 +71,7 @@ namespace KviIrcUrl
 	extern KVIRC_API int  run(const QString& url,int contextSpec = FirstFreeContext,KviConsole* pConsole = 0);
 
 	extern KVIRC_API void split(QString url, KviIrcUrlParts& parts);
-	extern KVIRC_API void join(QString &url, KviIrcServer* server);
+	extern KVIRC_API void join(QString &url, KviServer* server);
 	extern KVIRC_API void makeJoinCmd(const QStringList& chans, QString& szJoinCommand);
 }
 
diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
index f7c8ea387..faf7a2e47 100644
--- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
@@ -40,7 +40,7 @@
 #include <QStringList>
 
 namespace KviKvsParameterProcessor
-{	
+{
 	void setDefaultValue(KviKvsParameterProcessor::ParameterFormat * pFmtArray)
 	{
 		switch(pFmtArray->uType)
diff --git a/src/kvirc/module/kvi_mexserverimport.h b/src/kvirc/module/kvi_mexserverimport.h
index 838861f5b..320ab1c00 100644
--- a/src/kvirc/module/kvi_mexserverimport.h
+++ b/src/kvirc/module/kvi_mexserverimport.h
@@ -40,7 +40,7 @@ public:
 	virtual void start() = 0;
 	virtual void die() = 0;
 signals:
-	void server(const KviIrcServer &s,const QString &network);
+	void server(const KviServer &s,const QString &network);
 };
 
 #endif //!_KVI_MEXSERVERIMPORT_H_
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index b512998c0..59603780d 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -95,7 +95,7 @@
 #include "kvi_debug.h"
 
 
-extern KVIRC_API KviIrcServerDataBase           * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase           * g_pIrcServerDataBase;
 extern KVIRC_API KviProxyDataBase               * g_pProxyDataBase;
 extern KVIRC_API KviGarbageCollector            * g_pGarbageCollector;
 
@@ -494,7 +494,7 @@ void KviConsole::updateUri()
 	QString uri;
 	if(connection())
 	{
-		KviIrcServer* server = connection()->target()->server();
+		KviServer* server = connection()->target()->server();
 		if(server)
 		{
 			KviIrcUrl::join(uri,server);
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
index 1db34adbb..d7d9aca19 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/kvi_console.h
@@ -43,8 +43,8 @@ class KviAvatar;
 class KviDns;
 class KviIrcUserDataBase;
 class KviIrcUserEntry;
-class KviIrcServer;
-class KviIrcNetwork;
+class KviServer;
+class KviNetwork;
 class KviProxy;
 class KviUserListView;
 class KviNotifyListManager;
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 947d85bc9..42c7f67a6 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -98,7 +98,7 @@ int KviMircServersIniImport::doImport(const QString& filename)
 				if(entry.isEmpty())entry = __tr2qs("Standalone Servers");
 				if(!serv.isEmpty())
 				{
-					KviIrcServer s;
+					KviServer s;
 					s.m_szHostname = serv;
 					s.m_szDescription = description;
 					s.m_uPort = uPort;
@@ -346,7 +346,7 @@ static bool mircimport_module_can_unload(KviModule * m)
 }
 
 /*
-KVIMODULEEXPORTFUNC KviIrcServerImport * mircimport_module_createIrcServerImport(const char *filterName)
+KVIMODULEEXPORTFUNC KviServerImport * mircimport_module_createIrcServerImport(const char *filterName)
 {
 	if(kvi_strEqualCI(filterName,__tr("Import from servers.ini")))
 	{
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 0d7508743..9c2662ad0 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -63,7 +63,7 @@
 #include <QIcon>
 
 
-KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n)
+KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviNetwork * n)
 	: QDialog(par)
 {
 	setModal(true);
@@ -373,7 +373,7 @@ void KviNetworkDetailsWidget::enableDisableNickServControls()
 	m_pEditRuleButton->setEnabled(bEnabled);
 }
 
-void KviNetworkDetailsWidget::fillData(KviIrcNetwork * n)
+void KviNetworkDetailsWidget::fillData(KviNetwork * n)
 {
 	n->setUserName(m_pUserEditor->text());
 	n->setNickName(m_pNickEditor->text());
@@ -423,7 +423,7 @@ void KviNetworkDetailsWidget::fillData(KviIrcNetwork * n)
 }
 
 
-KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
+KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviServer * s)
     : QDialog(par)//,"server_details",true)
 {
 	setModal(true);
@@ -823,7 +823,7 @@ void KviServerDetailsWidget::setHeaderLabelText()
 	m_pHeaderLabel->setText(szTmp);
 }
 
-void KviServerDetailsWidget::fillData(KviIrcServer * s)
+void KviServerDetailsWidget::fillData(KviServer * s)
 {
 	s->setUserName(m_pUserEditor->text());
 	s->setPassword(m_pPassEditor->text());
@@ -866,9 +866,9 @@ void KviServerDetailsWidget::fillData(KviIrcServer * s)
 	if(!bOk)uPort = 6667;
 	s->m_uPort = uPort;
 #ifdef COMPILE_IPV6_SUPPORT
-	s->setIpV6(m_pUseIPV6Check->isChecked());
+	s->setIPv6(m_pUseIPV6Check->isChecked());
 #else
-	s->setIpV6(false);
+	s->setIPv6(false);
 #endif
 
 	if(m_pIpEditor)
@@ -934,23 +934,23 @@ void KviServerDetailsWidget::useDefaultInitUModeToggled(bool b)
 }
 
 // kvi_app.cpp
-extern KVIRC_API KviIrcServerDataBase * g_pIrcServerDataBase;
+extern KVIRC_API KviServerDataBase * g_pIrcServerDataBase;
 
-KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n)
+KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,const KviNetwork *n)
     : KviTalTreeWidgetItem(parent)
 {
 	setIcon(0,QIcon(pm));
 	m_pServerData = 0;
-	m_pNetworkData = new KviIrcNetwork(*n);
+	m_pNetworkData = new KviNetwork(*n);
 	setText(0,n->name());
 	setText(1,n->description());
 }
 
-KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s)
+KviServerOptionsTreeWidgetItem::KviServerOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s)
     : KviTalTreeWidgetItem(parent)
 {
 	setIcon(0,QIcon(pm));
-	m_pServerData = new KviIrcServer(*s);
+	m_pServerData = new KviServer(*s);
 	setText(0,s->hostName());
 	setText(1,s->description());
 	m_pNetworkData = 0;
@@ -1231,15 +1231,15 @@ void KviServerOptionsWidget::fillServerList()
 	KviServerOptionsTreeWidgetItem * srv;
 	KviServerOptionsTreeWidgetItem * cur = 0;
 
-	KviPointerHashTableIterator<QString,KviIrcServerDataBaseRecord> it(*(g_pIrcServerDataBase->recordDict()));
+	KviPointerHashTableIterator<QString,KviServerDataBaseRecord> it(*(g_pIrcServerDataBase->recordDict()));
 
-	while(KviIrcServerDataBaseRecord * r = it.current())
+	while(KviServerDataBaseRecord * r = it.current())
 	{
 		net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),r->network());
-		KviPointerList<KviIrcServer> * sl = r->serverList();
+		KviPointerList<KviServer> * sl = r->serverList();
 		bool bCurrent = r->network()->name() == g_pIrcServerDataBase->currentNetworkName().toUtf8().data();
 		net->setExpanded(bCurrent);
-		for(KviIrcServer * s = sl->first();s;s = sl->next())
+		for(KviServer * s = sl->first();s;s = sl->next())
 		{
 			srv = new KviServerOptionsTreeWidgetItem(net,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),s);
 
@@ -1323,14 +1323,14 @@ void KviServerOptionsWidget::commit()
 	{
 		network=(KviServerOptionsTreeWidgetItem *) m_pTreeWidget->topLevelItem(i);
 		QString tmp = network->m_pNetworkData->name();
-		KviIrcNetwork * net = 0;
-		KviIrcServerDataBaseRecord * r = g_pIrcServerDataBase->findRecord(tmp);
+		KviNetwork * net = 0;
+		KviServerDataBaseRecord * r = g_pIrcServerDataBase->findRecord(tmp);
 		if(r)
 		{
 			net = r->network();
 			net->copyFrom(*(network->m_pNetworkData));
 		} else {
-			net = new KviIrcNetwork(tmp);
+			net = new KviNetwork(tmp);
 			net->copyFrom(*(network->m_pNetworkData));
 			r = g_pIrcServerDataBase->insertNetwork(net);
 		}
@@ -1340,7 +1340,7 @@ void KviServerOptionsWidget::commit()
 		for (int j=0;j<network->childCount();j++)
 		{
 			//KviServerOptionsTreeWidgetItem * ch;// = (KviServerOptionsTreeWidgetItem *)it->firstChild();
-			KviIrcServer *srv;
+			KviServer *srv;
 			ch=(KviServerOptionsTreeWidgetItem *)network->child(j);
 		//	while(ch)
 		//	{
@@ -1351,7 +1351,7 @@ void KviServerOptionsWidget::commit()
 					srv = r->findServer(ch->m_pServerData);
 					if(!srv)
 					{
-						srv = new KviIrcServer(*(ch->m_pServerData));
+						srv = new KviServer(*(ch->m_pServerData));
 						r->insertServer(srv);
 					} else *srv = *(ch->m_pServerData);
 					if(srv->id().isEmpty())srv->generateUniqueId();
@@ -1455,7 +1455,7 @@ void KviServerOptionsWidget::importPopupActivated(int id)
 		return;
 	}
 
-	connect(m_pImportFilter,SIGNAL(server(const KviIrcServer &,const QString&)),this,SLOT(importServer(const KviIrcServer &,const QString&)));
+	connect(m_pImportFilter,SIGNAL(server(const KviServer &,const QString&)),this,SLOT(importServer(const KviServer &,const QString&)));
 	connect(m_pImportFilter,SIGNAL(destroyed()),this,SLOT(importerDead()));
 
 	m_pImportFilter->start();
@@ -1466,12 +1466,12 @@ void KviServerOptionsWidget::importerDead()
 	m_pImportFilter = 0;
 }
 
-void KviServerOptionsWidget::importServer(const KviIrcServer &s,const QString &network)
+void KviServerOptionsWidget::importServer(const KviServer &s,const QString &network)
 {
 	KviServerOptionsTreeWidgetItem * net = findNetItem(network);
 	if(!net)
 	{
-		KviIrcNetwork d(network);
+		KviNetwork d(network);
 		net = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
 		net->setExpanded(true);
 	}
@@ -1508,7 +1508,7 @@ void KviServerOptionsWidget::importServer(const KviIrcServer &s,const QString &n
 
 void KviServerOptionsWidget::newNetwork()
 {
-	KviIrcNetwork d(__tr2qs_ctx("New Network","options"));
+	KviNetwork d(__tr2qs_ctx("New Network","options"));
 	KviServerOptionsTreeWidgetItem * it = new KviServerOptionsTreeWidgetItem(m_pTreeWidget,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)),&d);
 	it->setExpanded(true);
 	it->setSelected(true);
@@ -1527,7 +1527,7 @@ void KviServerOptionsWidget::newServer()
 		}
 		else net = m_pLastEditedItem;
 
-		KviIrcServer tmp;
+		KviServer tmp;
 		tmp.m_szHostname = __tr2qs_ctx("irc.unknown.net","options");
 		tmp.setCacheIp(false);
 		tmp.generateUniqueId();
@@ -1547,7 +1547,7 @@ void KviServerOptionsWidget::copyServer()
 	{
 		if(m_pLastEditedItem->m_pServerData)
 		{
-			if(!m_pClipboard)m_pClipboard = new KviIrcServer();
+			if(!m_pClipboard)m_pClipboard = new KviServer();
 			*m_pClipboard = *(m_pLastEditedItem->m_pServerData);
 			m_pPasteServerButton->setEnabled(true);
 		}
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index 949175d5f..5de91f72a 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -39,26 +39,26 @@ class QLineEdit;
 class QComboBox;
 class QPushButton;
 class KviIpEditor;
-class KviIrcServer;
+class KviServer;
 class KviTalPopupMenu;
 class KviScriptEditor;
 class KviNickServRule;
 class KviNickServRuleEditor;
-class KviIrcServer;
-class KviIrcNetwork;
-class KviIrcNetworkData;
+class KviServer;
+class KviNetwork;
+class KviNetworkData;
 class KviMexServerImport;
 
 
 class KviServerOptionsTreeWidgetItem : public KviTalTreeWidgetItem
 {
 public:
-	KviServerOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,const KviIrcNetwork *n);
-	KviServerOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,const QPixmap &pm,const KviIrcServer *s);
+	KviServerOptionsTreeWidgetItem(KviTalTreeWidget *parent,const QPixmap &pm,const KviNetwork *n);
+	KviServerOptionsTreeWidgetItem(KviTalTreeWidgetItem *parent,const QPixmap &pm,const KviServer *s);
 	~KviServerOptionsTreeWidgetItem();
 public:
-	KviIrcServer * m_pServerData;
-	KviIrcNetwork * m_pNetworkData;
+	KviServer * m_pServerData;
+	KviNetwork * m_pNetworkData;
 public:
 	void updateVisibleStrings();
 };
@@ -68,7 +68,7 @@ class KviNetworkDetailsWidget : public QDialog
 {
 	Q_OBJECT
 public:
-	KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * d);
+	KviNetworkDetailsWidget(QWidget * par,KviNetwork * d);
 	~KviNetworkDetailsWidget();
 protected:
 	KviScriptEditor       * m_pOnConnectEditor;
@@ -93,7 +93,7 @@ protected:
 	QStringList             m_lstChannels;
 	KviChannelListSelector * m_pChannelListSelector;
 public:
-	void fillData(KviIrcNetwork * d);
+	void fillData(KviNetwork * d);
 protected slots:
 	void enableDisableNickServControls();
 	void addNickServRule();
@@ -105,7 +105,7 @@ class KviServerDetailsWidget : public QDialog
 {
 	Q_OBJECT
 public:
-	KviServerDetailsWidget(QWidget * par,KviIrcServer * s);
+	KviServerDetailsWidget(QWidget * par,KviServer * s);
 	~KviServerDetailsWidget();
 protected:
 	QString                 m_szHostname;
@@ -140,7 +140,7 @@ protected slots:
 	void useIPV6CheckToggled(bool);
 public:
 	void setHeaderLabelText();
-	void fillData(KviIrcServer *s);
+	void fillData(KviServer *s);
 };
 
 
@@ -166,7 +166,7 @@ protected:
 	KviTalPopupMenu                   * m_pRecentPopup;
 	KviTalPopupMenu                   * m_pContextPopup;
 	KviTalPopupMenu                   * m_pImportPopup;
-	KviIrcServer                 * m_pClipboard;
+	KviServer                 * m_pClipboard;
 	//QCheckBox                    * m_pIpV6Check;
 	QPushButton                  * m_pConnectCurrent;
 	QPushButton                  * m_pConnectNew;
@@ -187,7 +187,7 @@ private:
 	KviServerOptionsTreeWidgetItem * findNetItem(const QString &netname);
 protected slots:
 	void importerDead();
-	void importServer(const KviIrcServer & s,const QString &network);
+	void importServer(const KviServer & s,const QString &network);
 	void importPopupAboutToShow();
 	void currentItemChanged(KviTalTreeWidgetItem *cur,KviTalTreeWidgetItem *prev);
 	void customContextMenuRequested(const QPoint &pnt);