cleaning&tidying:) and user-contributed patch for bitrate grabbing from amarok

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

235 files changed, 663 insertions, 993 deletions

diff --git a/src/kvilib/ext/kvi_mediatype.cpp b/src/kvilib/ext/kvi_mediatype.cpp
index b35686234..f0f64587b 100644
--- a/src/kvilib/ext/kvi_mediatype.cpp
+++ b/src/kvilib/ext/kvi_mediatype.cpp
@@ -238,7 +238,7 @@ KviMediaType * KviMediaManager::findMediaType(const char * filename,bool bCheckM
 	__range_valid(locked());
 
 	KviStr szFullPath = filename;
-	if(!kvi_isAbsolutePath(szFullPath.ptr()))
+	if(!KviFileUtils::isAbsolutePath(szFullPath.ptr()))
 	{
 		KviStr tmp = QDir::currentPath();
 		tmp.ensureLastCharIs('/');
diff --git a/src/kvilib/file/kvi_fileutils.cpp b/src/kvilib/file/kvi_fileutils.cpp
index 91b19e513..56d520eed 100644
--- a/src/kvilib/file/kvi_fileutils.cpp
+++ b/src/kvilib/file/kvi_fileutils.cpp
@@ -198,12 +198,6 @@ namespace KviFileUtils
 		return true;

 	}

 

-	bool loadFile(const char* path,QString &szBuffer,bool bUtf8)

-	{

-		QString szPath=QString::fromUtf8(path);

-		return loadFile(szPath,szBuffer,bUtf8);

-	}

-

 	void adjustFilePath(QString &szPath)

 	{

 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)

@@ -227,25 +221,6 @@ namespace KviFileUtils
 

 	}

 

-	bool directoryExists(const QString &szPath)

-	{

-		QFileInfo f(szPath);

-		return (f.exists() && f.isDir());

-	}

-

-	bool directoryExists(const char* path)

-	{

-		QString szPath=QString::fromUtf8(path);

-		QFileInfo f(szPath);

-		return (f.exists() && f.isDir());

-	}

-

-	bool fileExists(const char* path)

-	{

-		QString szPath=QString::fromUtf8(path);

-		return fileExists(szPath);

-	}

-

 	bool removeFile(const QString &szPath)

 	{

 		QDir d;

@@ -410,6 +385,12 @@ namespace KviFileUtils
 		return buffer.count()!= 0;

 	}

 

+	bool directoryExists(const QString &szPath)

+	{

+		QFileInfo f(szPath);

+		return (f.exists() && f.isDir());

+	}

+

 	bool isReadable(const QString &szFname)

 	{

 		QFileInfo f(szFname);

@@ -427,63 +408,35 @@ namespace KviFileUtils
 		QFileInfo f(szPath);

 		return !f.isRelative();

 	}

-};

 

 static char hexchars[16] = { '0' , '1' , '2' , '3' , '4' , '5' , '6' , '7' , '8' , '9' , 'A' , 'B' , 'C' , 'D' , 'E' , 'F' };

 

 

-void kvi_encodeFileName(KviStr & path)

-{

-	QString szPath(path.ptr());

-	kvi_encodeFileName(szPath);

-	path=szPath;

-}

-

-void kvi_encodeFileName(QString & path)

-{

-	QString src(path);

-	path="";

-	for(int i=0;i<src.length();i++)

+	void encodeFileName(QString & path)

 	{

-		QChar cur=src[i];

-		if( ! (cur.isLetter() || cur.isDigit() || cur==' ' || cur=='_' || cur=='.' || cur=='#' || cur=='%') )

+		QString src(path);

+		path="";

+		for(int i=0;i<src.length();i++)

 		{

-			if(cur.row()!=0)

+			QChar cur=src[i];

+			if( ! (cur.isLetter() || cur.isDigit() || cur==' ' || cur=='_' || cur=='.' || cur=='#' || cur=='%') )

 			{

+				if(cur.row()!=0)

+				{

+					path+='%';

+					path+=hexchars[cur.row() >> 4];

+					path+=hexchars[cur.row() & 15];

+				}

 				path+='%';

-				path+=hexchars[cur.row() >> 4];

-				path+=hexchars[cur.row() & 15];

+				path+=hexchars[cur.cell() >> 4];

+				path+=hexchars[cur.cell() & 15];

+			} else if (cur=='%')

+			{

+				path+="%%";

+			} else {

+				path+=cur;

 			}

-			path+='%';

-			path+=hexchars[cur.cell() >> 4];

-			path+=hexchars[cur.cell() & 15];

-		} else if (cur=='%')

-		{

-			path+="%%";

-		} else {

-			path+=cur;

 		}

 	}

-}

-

-//================ kvi_isAbsolutePath ===============//

-

-bool kvi_isAbsolutePath(const char *path)

-{

-	if(*path == '/')return true;

-	if(isalpha(*path))

-	{

-		if((*(path + 1)) == ':')return true;

-	}

-	return false;

-}

-

-//=================== kvi_readLine =====================//

 

-bool kvi_readLine(QFile *f,KviStr &str)

-{

-	QTextStream stream(f);

-	QString szBuff=stream.readLine();

-	str=szBuff;

-	return szBuff.isNull() ? 1 : 0;

-}

+};

diff --git a/src/kvilib/file/kvi_fileutils.h b/src/kvilib/file/kvi_fileutils.h
index 4bec6dbb9..f7bb572a2 100644
--- a/src/kvilib/file/kvi_fileutils.h
+++ b/src/kvilib/file/kvi_fileutils.h
@@ -49,15 +49,12 @@ namespace KviFileUtils
 
 	// loads the file at szPath to szBuffer eventually converting from utf8
 	extern KVILIB_API bool loadFile(const QString &szPath,QString &szBuffer,bool bUtf8 = true);
-	extern KVILIB_API bool loadFile(const char* szPath,QString &szBuffer,bool bUtf8 = true);
 	// adjusts the file path to the current platform
 	extern KVILIB_API void adjustFilePath(QString &szPath);
 	// returns true if szPath points to an existing directory
 	extern KVILIB_API bool directoryExists(const QString &szPath);
-	extern KVILIB_API bool directoryExists(const char* path);
 	// returns true if szPath points to an existing file
 	inline bool fileExists(const QString &szPath) {	return QFile::exists(szPath); };
-	extern KVILIB_API bool fileExists(const char* szPath);
 	// removes a file
 	extern KVILIB_API bool removeFile(const QString &szPath);
 	extern KVILIB_API bool removeFile(const char* path);
@@ -93,20 +90,15 @@ namespace KviFileUtils
 	extern KVILIB_API bool readLines(QFile * f,QStringList &buffer,int iStartLine = 0, int iCount = -1, bool bUtf8 = true);
 	extern KVILIB_API bool isReadable(const QString &szFname);
 	extern KVILIB_API bool isAbsolutePath(const QString &szPath);
+
+	// Translates ANY string into a valid filename (with no path!)
+	// There is NO way to come back to the original string
+	// the algo is one-way only
+	KVILIB_API extern void encodeFileName(QString & path);
 };
 
 // ALL THIS STUFF BELOW SHOULD DIE: IF YOU SEE IT, REPLACE WITH THE FUNCTIONS IN THE NAMESPACE ABOVE
 
-// Returns true if the path begins with '/'
-KVILIB_API extern bool kvi_isAbsolutePath(const char *path);
-// Translates ANY string into a valid filename (with no path!)
-// There is NO way to come back to the original string
-// the algo is one-way only
-KVILIB_API extern void kvi_encodeFileName(KviStr & path);
-KVILIB_API extern void kvi_encodeFileName(QString & path);
 
-// Reads a single line from the file and returns false if EOF was encountered.
-KVILIB_API extern bool kvi_readLine(QFile *f,KviStr &str);
-// Removes a file
 
 #endif //_KVI_FILEUTILS_H_INCLUDED_
diff --git a/src/kvilib/net/kvi_http.cpp b/src/kvilib/net/kvi_http.cpp
index c3898c580..750243518 100644
--- a/src/kvilib/net/kvi_http.cpp
+++ b/src/kvilib/net/kvi_http.cpp
@@ -103,7 +103,7 @@ void KviHttpRequest::resetData()
 	m_szFileName = "";
 	m_eProcessingType = WholeFile;
 	m_eExistingFileAction = RenameIncoming;
-	m_url = "";
+	m_url = QString("");
 	m_uMaxContentLength = 0;
 	m_uContentOffset = 0;
 	m_bChunkedTransferEncoding = false;
@@ -161,14 +161,14 @@ bool KviHttpRequest::start()
 		return false;
 	}
 
-	if((!kvi_strEqualCI(m_url.protocol().ptr(),"http")) && (!kvi_strEqualCI(m_url.protocol().ptr(),"https")))
+	if((m_url.protocol()!="http") && (m_url.protocol()!="https"))
 	{
 		resetInternalStatus();
-		m_szLastError=__tr2qs("Unsupported protocol %1").arg(m_url.protocol().ptr());
+		m_szLastError=__tr2qs("Unsupported protocol %1").arg(m_url.protocol());
 		return false;
 	}
 
-	if(kvi_isValidStringIp(m_url.host().ptr()))
+	if(KviNetUtils::isValidStringIp(m_url.host()))
 	{
 		m_szIp = m_url.host();
 		QTimer::singleShot(10,this,SLOT(haveServerIp()));
@@ -183,7 +183,7 @@ bool KviHttpRequest::startDnsLookup()
 	m_pDns = new KviDns();
 	connect(m_pDns,SIGNAL(lookupDone(KviDns *)),this,SLOT(dnsLookupDone(KviDns *)));
 
-	if(!m_pDns->lookup(m_url.host().ptr(),KviDns::IPv4))
+	if(!m_pDns->lookup(m_url.host(),KviDns::IPv4))
 	{
 		resetInternalStatus();
 		m_szLastError = __tr2qs("Unable to start the DNS lookup");
@@ -191,10 +191,10 @@ bool KviHttpRequest::startDnsLookup()
 	}
 
 	QString tmp;
-	KviQString::sprintf(tmp,__tr2qs("Looking up host %s"),m_url.host().ptr());
+	KviQString::sprintf(tmp,__tr2qs("Looking up host %Q"),&(m_url.host()));
 	emit status(tmp); // FIXME
 
-	emit resolvingHost(QString(m_url.host().ptr()));
+	emit resolvingHost(m_url.host());
 
 	return true;
 }
@@ -207,7 +207,7 @@ void KviHttpRequest::dnsLookupDone(KviDns *d)
 		delete m_pDns;
 		m_pDns = 0;
 		QString tmp;
-		KviQString::sprintf(tmp,__tr2qs("Host %s resolved to %Q"),m_url.host().ptr(),&m_szIp);
+		KviQString::sprintf(tmp,__tr2qs("Host %Q resolved to %Q"),&(m_url.host()),&m_szIp);
 		emit status(tmp);
 		haveServerIp();
 	} else {
@@ -231,14 +231,14 @@ void KviHttpRequest::haveServerIp()
 
 	m_pThread = new KviHttpRequestThread(
 						this,
-						m_url.host().ptr(),
+						m_url.host(),
 						m_szIp,
 						uPort,
-						m_url.path().ptr(),
+						m_url.path(),
 						m_uContentOffset,
 						(m_eProcessingType == HeadersOnly) ? KviHttpRequestThread::Head : (m_szPostData.isEmpty() ? KviHttpRequestThread::Get : KviHttpRequestThread::Post),
 						m_szPostData,
-						kvi_strEqualCI(m_url.protocol().ptr(),"https"));
+						m_url.protocol()=="https");
 
 	if(!m_pThread->start())
 	{
diff --git a/src/kvilib/net/kvi_netutils.cpp b/src/kvilib/net/kvi_netutils.cpp
index d60cf0966..d9de65433 100644
--- a/src/kvilib/net/kvi_netutils.cpp
+++ b/src/kvilib/net/kvi_netutils.cpp
@@ -189,6 +189,14 @@ bool kvi_binaryIpToStringIp(struct in_addr in,QString &szBuffer)
 
 #else //HAVE_INET_NTOA
 
+bool kvi_isValidStringIp(const char *szIp)
+{
+	struct in_addr address;
+	if(!szIp)return false;
+	if(!isdigit(*szIp))return false;
+	return kvi_stringIpToBinaryIp(szIp,&address);
+}
+
 bool kvi_binaryIpToStringIp(struct in_addr in,QString &szBuffer)f
 {
 // FIXME: #warning "This is NOT thread safe!"
@@ -439,19 +447,6 @@ const char* inet_ntop(int AF, const void *CP, char *BUF, size_t LEN)
 }
 #endif
 
-bool kvi_stringIpToBinaryIp_V6(const char *szIp,struct in6_addr *address)
-{
-	if(!szIp)return false;
-	return (inet_pton(AF_INET6,szIp,(void *)address) == 1);
-}
-
-bool kvi_isValidStringIp_V6(const char *szIp)
-{
-	struct in6_addr address;
-	if(!szIp)return false;
-	return kvi_stringIpToBinaryIp_V6(szIp,&address);
-}
-
 bool kvi_binaryIpToStringIp_V6(struct in6_addr in,QString &szBuffer)
 {
 	char buf[46];
@@ -460,6 +455,7 @@ bool kvi_binaryIpToStringIp_V6(struct in6_addr in,QString &szBuffer)
 	szBuffer= buf;
 	return bRet;
 }
+
 #endif
 
 #include <errno.h>
diff --git a/src/kvilib/net/kvi_netutils.h b/src/kvilib/net/kvi_netutils.h
index fa486d648..e1979a597 100644
--- a/src/kvilib/net/kvi_netutils.h
+++ b/src/kvilib/net/kvi_netutils.h
@@ -46,17 +46,6 @@
 
 #include "kvi_string.h"
 
-
-KVILIB_API extern bool kvi_isValidStringIp(const char * szIp);
-KVILIB_API extern bool kvi_stringIpToBinaryIp(const char * szIp,struct in_addr * address);
-KVILIB_API extern bool kvi_binaryIpToStringIp(struct in_addr in,QString &szBuffer);
-
-#ifdef COMPILE_IPV6_SUPPORT
-	KVILIB_API extern bool kvi_isValidStringIp_V6(const char * szIp);
-	KVILIB_API extern bool kvi_stringIpToBinaryIp_V6(const char * szIp,struct in6_addr * address);
-	KVILIB_API extern bool kvi_binaryIpToStringIp_V6(struct in6_addr in,QString &szBuffer);
-#endif
-
 class KVILIB_API KviSockaddr
 {
 public:
diff --git a/src/kvilib/net/kvi_url.cpp b/src/kvilib/net/kvi_url.cpp
index 152d2645c..e84cf6ea4 100644
--- a/src/kvilib/net/kvi_url.cpp
+++ b/src/kvilib/net/kvi_url.cpp
@@ -24,6 +24,7 @@
 
 
 #include "kvi_url.h"
+#include <QUrl>
 
 KviUrl::KviUrl()
 {
@@ -36,7 +37,7 @@ KviUrl::KviUrl(const KviUrl & u)
 
 KviUrl::KviUrl(const char * szUrl)
 {
-	m_szUrl = szUrl;
+	m_szUrl = QString::fromLocal8Bit(szUrl);
 	parse();
 }
 
@@ -53,95 +54,17 @@ KviUrl::~KviUrl()
 
 void KviUrl::parse()
 {
-	m_szProtocol = "";
-	m_szHost = "";
-	m_szPath = "";
-	m_szUser = "";
-	m_szPass = "";
-
-	m_szUrl.trimmed();
-
-	KviStr u = m_szUrl;
-
-	// proto
-
-	kvi_u32_t uDefaultPort = 80;
-
-	int i = u.findFirstIdx(":/");
-	if(i != -1)
-	{
-		// there is a protocol path
-		m_szProtocol = u.left(i);
-		u.cutLeft(i + 2);
-		u.stripLeft('/');
-		u.trimmed();
-
-		// fix the default ports
-		if(kvi_strEqualCI(m_szProtocol,"https"))uDefaultPort = 443;
-		else if(kvi_strEqualCI(m_szProtocol,"ftp"))uDefaultPort = 21;
-	} else {
-		// no proto... assume http
-		u.stripLeft('/');
-		m_szProtocol = "http";
-	}
-
-	m_uPort = uDefaultPort;
-
-	// user and pass
-
-	i = u.findFirstIdx('@');
-
-	if(i != -1)
-	{
-		KviStr szUserPass = u.left(i);
-		szUserPass.trimmed();
-		u.cutLeft(i + 1);
-
-		i = szUserPass.findFirstIdx(':');
-		if(i != -1)
-		{
-			m_szUser = szUserPass.left(i);
-			szUserPass.cutLeft(i + 1);
-			m_szPass = szUserPass;
-			m_szPass.trimmed();
-		} else {
-			m_szUser = szUserPass;
-		}
-	}
-
-	// host
-
-	i = u.findFirstIdx('/');
-	if(i != -1)
-	{
-		KviStr h = u.left(i);
-		u.cutLeft(i + 1);
-		i = h.findFirstIdx(':');
-		if(i != -1)
-		{
-			// has a port part
-			m_szHost = h.left(i);
-			h.cutLeft(i + 1);
-			h.trimmed();
-			bool bOk;
-			m_uPort = h.toUInt(&bOk);
-			if(!bOk)m_uPort = uDefaultPort;
-		} else {
-			// no port : assume default
-			m_szHost = h;
-		}
-		m_szPath = u;
-	} else {
-		m_szHost = u;
-	}
-
-	m_szHost.trimmed();
-	m_szPath.trimmed();
-	if(!m_szPath.firstCharIs('/'))m_szPath.prepend('/');
+	QUrl url(m_szUrl);
+	m_szProtocol = url.scheme();
+	m_szHost = url.host();
+	m_szPath = url.path();
+	m_szUser = url.userName();
+	m_szPass = url.password();
+	m_uPort = url.port() > 0 ? url.port() : 80 ;
 }
 
 
-KviUrl & KviUrl::operator=(const char * szUrl)
+KviUrl & KviUrl::operator=(const QString& szUrl)
 {
 	m_szUrl = szUrl;
 	parse();
diff --git a/src/kvilib/net/kvi_url.h b/src/kvilib/net/kvi_url.h
index 0aa124a2c..e58e2ae9e 100644
--- a/src/kvilib/net/kvi_url.h
+++ b/src/kvilib/net/kvi_url.h
@@ -35,26 +35,26 @@ public:
 	KviUrl(const KviUrl &u);
 	~KviUrl();
 protected:
-	KviStr             m_szUrl;
+	QString             m_szUrl;
 
-	KviStr             m_szProtocol;
-	KviStr             m_szHost;
-	KviStr             m_szPath;
-	KviStr             m_szUser;
-	KviStr             m_szPass;
-	kvi_u32_t          m_uPort;
+	QString             m_szProtocol;
+	QString             m_szHost;
+	QString             m_szPath;
+	QString             m_szUser;
+	QString             m_szPass;
+	kvi_u32_t           m_uPort;
 protected:
 	void parse();
 public:
-	const KviStr & url() const { return m_szUrl; };
-	const KviStr & protocol() const { return m_szProtocol; };
-	const KviStr & host() const { return m_szHost; };
-	const KviStr & path() const { return m_szPath; };
-	const KviStr & user() const { return m_szUser; };
-	const KviStr & pass() const { return m_szPass; };
+	const QString & url() const { return m_szUrl; };
+	const QString & protocol() const { return m_szProtocol; };
+	const QString & host() const { return m_szHost; };
+	const QString & path() const { return m_szPath; };
+	const QString & user() const { return m_szUser; };
+	const QString & pass() const { return m_szPass; };
 	kvi_u32_t port() const { return m_uPort; };
 
-	KviUrl & operator = (const char * szUrl);
+	KviUrl & operator = (const QString& szUrl);
 	KviUrl & operator = (const KviUrl &u);
 
 };
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index f442ec1d7..d8e52b9a9 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -22,7 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
 
 #include "kvi_action.h"
 #include "kvi_customtoolbar.h"
diff --git a/src/kvirc/kernel/kvi_actionmanager.cpp b/src/kvirc/kernel/kvi_actionmanager.cpp
index 1ea024f58..7854df2cb 100644
--- a/src/kvirc/kernel/kvi_actionmanager.cpp
+++ b/src/kvirc/kernel/kvi_actionmanager.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_actionmanager.h"
 #include "kvi_modulemanager.h"
 #include "kvi_coreactions.h"
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index adaf1e7d8..767c98406 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -22,7 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
 #define _KVI_APP_CPP_
 
 #include "kvi_socket.h"
diff --git a/src/kvirc/kernel/kvi_app_fs.cpp b/src/kvirc/kernel/kvi_app_fs.cpp
index ec2a557da..e7fea1798 100644
--- a/src/kvirc/kernel/kvi_app_fs.cpp
+++ b/src/kvirc/kernel/kvi_app_fs.cpp
@@ -22,7 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
 
 #include "kvi_debug.h"
 #include "kvi_app.h"
diff --git a/src/kvirc/kernel/kvi_app_setup.cpp b/src/kvirc/kernel/kvi_app_setup.cpp
index 64faab87a..f6d76f8b2 100644
--- a/src/kvirc/kernel/kvi_app_setup.cpp
+++ b/src/kvirc/kernel/kvi_app_setup.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 //#define _KVI_DEBUG_CHECK_RANGE_
 //#include "kvi_debug.h"
diff --git a/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp b/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp
index d332f0d77..b944cb470 100644
--- a/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp
+++ b/src/kvirc/kernel/kvi_asynchronousconnectiondata.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_asynchronousconnectiondata.h"
 
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index d3bbab22f..07d533224 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_coreactions.h"
 #include "kvi_frame.h"
diff --git a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
index 6efba86af..c5b7affca 100644
--- a/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbardescriptor.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_customtoolbardescriptor.h"
 #include "kvi_customtoolbar.h"
diff --git a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
index a258c436a..28afecca8 100644
--- a/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
+++ b/src/kvirc/kernel/kvi_customtoolbarmanager.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_customtoolbarmanager.h"
 #include "kvi_customtoolbardescriptor.h"
diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
index 234d0264b..85458e347 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
@@ -21,7 +21,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 //=============================================================================
-#define __KVIRC__
+
 #include "kvi_filetransfer.h"
 #include "kvi_moduleextension.h"
 #include "kvi_window.h"
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index 176ec8cbe..1e5fc22b5 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -22,7 +22,7 @@
 //
 //================================================================================
 
-#define __KVIRC__
+
 #define _KVI_ICONMANAGER_CPP_
 
 #include "kvi_iconmanager.h"
diff --git a/src/kvirc/kernel/kvi_internalcmd.cpp b/src/kvirc/kernel/kvi_internalcmd.cpp
index 367503796..1ad963533 100644
--- a/src/kvirc/kernel/kvi_internalcmd.cpp
+++ b/src/kvirc/kernel/kvi_internalcmd.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #define _KVI_INTERNALCMD_CPP_
 
 #include "kvi_internalcmd.h"
diff --git a/src/kvirc/kernel/kvi_ipc.cpp b/src/kvirc/kernel/kvi_ipc.cpp
index 1f487ba59..206ac5de6 100644
--- a/src/kvirc/kernel/kvi_ipc.cpp
+++ b/src/kvirc/kernel/kvi_ipc.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include <qmetatype.h>
 #include "kvi_ipc.h"
diff --git a/src/kvirc/kernel/kvi_ircconnection.cpp b/src/kvirc/kernel/kvi_ircconnection.cpp
index b7a3649ee..401744f40 100644
--- a/src/kvirc/kernel/kvi_ircconnection.cpp
+++ b/src/kvirc/kernel/kvi_ircconnection.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectiontarget.h"
@@ -79,7 +79,6 @@ KviIrcConnection::KviIrcConnection(KviIrcContext * pContext,KviIrcConnectionTarg
 	m_bIdentdAttached = false;
 	m_pContext = pContext;
 	m_pConsole = pContext->console();
-	m_pFrame = m_pConsole->frame();
 	m_pTarget = pTarget;
 	m_pUserIdentity = pIdentity;
 	m_pChannelList = new KviPointerList<KviChannel>;
@@ -251,22 +250,7 @@ void KviIrcConnection::serverInfoReceived(const QString &szServerName,const QStr
 	serverInfo()->setSupportedUserModes(szUserModes);
 	serverInfo()->setSupportedChannelModes(szChanModes);
 	m_pConsole->updateCaption(); // for server name
-	m_pFrame->childConnectionServerInfoChange(this);
-}
-
-const QString & KviIrcConnection::currentServerName()
-{
-	return serverInfo()->name();
-}
-
-const QString & KviIrcConnection::currentNickName()
-{
-	return userInfo()->nickName();
-}
-
-const QString & KviIrcConnection::currentUserName()
-{
-	return userInfo()->userName();
+	m_pConsole->frame()->childConnectionServerInfoChange(this);
 }
 
 KviServer * KviIrcConnection::server()
@@ -425,7 +409,7 @@ void KviIrcConnection::closeAllChannels()
 {
 	while(m_pChannelList->first())
 	{
-		m_pFrame->closeWindow(m_pChannelList->first());
+		m_pChannelList->first()->close();
 	}
 }
 
@@ -433,7 +417,7 @@ void KviIrcConnection::closeAllQueries()
 {
 	while(m_pQueryList->first())
 	{
-		m_pFrame->closeWindow(m_pQueryList->first());
+		m_pQueryList->first()->close();
 	}
 }
 
@@ -449,8 +433,8 @@ KviChannel * KviIrcConnection::createChannel(const QString &szName)
 			c->setFocus();
 		}
 	} else {
-		c = new KviChannel(m_pFrame,m_pConsole,szName);
-		m_pFrame->addWindow(c,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedChannels));
+		c = new KviChannel(m_pConsole->frame(),m_pConsole,szName);
+		m_pConsole->frame()->addWindow(c,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedChannels));
 		if(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedChannels)) c->minimize();
 	}
 	return c;
@@ -473,8 +457,8 @@ KviQuery * KviIrcConnection::createQuery(const QString &szNick)
 			q->setFocus();
 		}
 	} else {
-		q = new KviQuery(m_pFrame,m_pConsole,szNick);
-		m_pFrame->addWindow(q,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedQuery));
+		q = new KviQuery(m_pConsole->frame(),m_pConsole,szNick);
+		m_pConsole->frame()->addWindow(q,!KVI_OPTION_BOOL(KviOption_boolCreateMinimizedQuery));
 		if(KVI_OPTION_BOOL(KviOption_boolCreateMinimizedQuery))q->minimize();
 	}
 	return q;
@@ -744,7 +728,7 @@ void KviIrcConnection::changeAwayState(bool bAway)
 	else m_pUserInfo->setBack();
 
 	m_pConsole->updateCaption();
-	m_pFrame->childConnectionAwayStateChange(this);
+	m_pConsole->frame()->childConnectionAwayStateChange(this);
 
 	emit awayStateChanged();
 }
@@ -1101,7 +1085,7 @@ void KviIrcConnection::nickChange(const QString &szNewNick)
 	m_pUserInfo->setNickName(szNewNick);
 	m_pConsole->output(KVI_OUT_NICK,__tr2qs("You have changed your nickname to %Q"),&szNewNick);
 	m_pConsole->updateCaption();
-	m_pFrame->childConnectionNickNameChange(this);
+	m_pConsole->frame()->childConnectionNickNameChange(this);
 	emit nickNameChanged();
 	g_pApp->addRecentNickname(szNewNick);
 }
@@ -1118,7 +1102,7 @@ bool KviIrcConnection::changeUserMode(char mode,bool bSet)
 		m_pUserInfo->removeUserMode(mode);
 	}
 	m_pConsole->updateCaption();
-	m_pFrame->childConnectionUserModeChange(this);
+	console()->frame()->childConnectionUserModeChange(this);
 	emit userModeChanged();
 	return true;
 }
@@ -1197,7 +1181,7 @@ void KviIrcConnection::loginComplete(const QString &szNickName)
 	restartLagMeter();
 
 	if(KVI_OPTION_BOOL(KviOption_boolShowChannelsJoinOnIrc))
-		m_pFrame->executeInternalCommand(KVI_INTERNALCOMMAND_CHANNELSJOIN_OPEN);
+		m_pConsole->frame()->executeInternalCommand(KVI_INTERNALCOMMAND_CHANNELSJOIN_OPEN);
 
 
 	// join saved channels
diff --git a/src/kvirc/kernel/kvi_ircconnection.h b/src/kvirc/kernel/kvi_ircconnection.h
index 40d39b040..d7e60473f 100644
--- a/src/kvirc/kernel/kvi_ircconnection.h
+++ b/src/kvirc/kernel/kvi_ircconnection.h
@@ -29,6 +29,8 @@
 #include "kvi_qcstring.h"
 #include "kvi_pointerlist.h"
 #include "kvi_time.h"
+#include "kvi_ircconnectionuserinfo.h"
+#include "kvi_ircconnectionserverinfo.h"
 
 #include <QObject>
 
@@ -77,21 +79,20 @@ public:
 public:
 	enum State { Idle, Connecting, Connected };
 private:
-	KviFrame                             * m_pFrame;                // shallow, never null
 	KviConsole                           * m_pConsole;              // shallow, never null
 	KviIrcContext                        * m_pContext;              // shallow, never null
-	
+
 	State                                  m_eState;
 	bool                                   m_bIdentdAttached;
 
 	KviIrcConnectionTarget               * m_pTarget;               // owned, never null
 
 	KviIrcLink                           * m_pLink;                 // owned, never null
-	
+
 	// The initial informations about the user we'll send out to the server
 	// Note that the ACTUAL user informations are in m_pUserInfo instead
 	KviUserIdentity                      * m_pUserIdentity;         // owned, never null
-	
+
 	// The ACTUAL user informations
 	KviIrcConnectionUserInfo             * m_pUserInfo;             // owned, never null
 	// The ACTUAL server informations
@@ -103,7 +104,7 @@ private:
 	KviPointerList<KviQuery>                 * m_pQueryList;            // owned, never null, elements shallow
 
 	KviIrcUserDataBase                   * m_pUserDataBase;         // owned, never null
-	
+
 	KviNotifyListManager                 * m_pNotifyListManager;    // owned, see restartNotifyList()
 	QTimer                               * m_pNotifyListTimer;      // delayed startup timer for the notify lists
 
@@ -112,65 +113,63 @@ private:
 	KviIrcConnectionAntiCtcpFloodData    * m_pAntiCtcpFloodData;    // owned, never null
 	KviIrcConnectionNetsplitDetectorData * m_pNetsplitDetectorData; // owned, never null
 	KviIrcConnectionAsyncWhoisData       * m_pAsyncWhoisData;       // owned, never null
-	
+
 	KviIrcConnectionStatistics           * m_pStatistics;           // owned, never null
 
 	KviDns                               * m_pLocalhostDns;         // FIXME: this should go to an aux structure
 
-	QTextCodec                           * m_pSrvCodec;             // connection codec: never null	
+	QTextCodec                           * m_pSrvCodec;             // connection codec: never null
 	QTextCodec                           * m_pTextCodec;            // connection codec: never null
 public:
 	// returns a pointer to the owning console
 	// the pointer is NEVER null
-	KviConsole * console(){ return m_pConsole; };
-	// never null
-	KviFrame * frame(){ return m_pFrame; };
+	inline KviConsole * console(){ return m_pConsole; };
 	// never null
-	KviIrcContext * context(){ return m_pContext; };
+	inline KviIrcContext * context(){ return m_pContext; };
 	// forwarder from KviIrcConnectionTarget, never null
 	KVI_DEPRECATED KviServer * server();
 	// forwarder from KviIrcConnectionTarget, may be null
 	KVI_DEPRECATED KviProxy * proxy();
 	// never null!
-	KviIrcConnectionTarget * target(){ return m_pTarget; };
+	inline KviIrcConnectionTarget * target(){ return m_pTarget; };
 	// never null!
-	KviIrcLink * link(){ return m_pLink; };
+	inline KviIrcLink * link(){ return m_pLink; };
 	// this should not be used...
 	KviIrcSocket * socket() KVI_DEPRECATED;
 	// the current state
-	State state(){ return m_eState; };
+	inline State state(){ return m_eState; };
 	// forwarder from KviIrcConnectionTarget, always non-empty string
 	const QString & networkName();
 	// never null!
-	KviIrcUserDataBase * userDataBase(){ return m_pUserDataBase; };
+	inline KviIrcUserDataBase * userDataBase(){ return m_pUserDataBase; };
 	// never null. Use #include "kvi_ircconnectionuserinfo.h"
-	KviIrcConnectionUserInfo * userInfo(){ return m_pUserInfo; };
+	inline KviIrcConnectionUserInfo * userInfo(){ return m_pUserInfo; };
 	// never null. Use #include "kvi_ircconnectionserverinfo.h"
-	KviIrcConnectionServerInfo * serverInfo(){ return m_pServerInfo; };
+	inline KviIrcConnectionServerInfo * serverInfo(){ return m_pServerInfo; };
 	// never null. Use #include "kvi_ircconnectionstatedata.h"
-	KviIrcConnectionStateData * stateData(){ return m_pStateData; };
+	inline KviIrcConnectionStateData * stateData(){ return m_pStateData; };
 	// never null. Use #include "kvi_ircconnectionantictcpflooddata.h"
-	KviIrcConnectionAntiCtcpFloodData * antiCtcpFloodData(){ return m_pAntiCtcpFloodData; };
-	// never null. Use #include "kvi_ircconnectionnetsplitdetectordata.h" 
-	KviIrcConnectionNetsplitDetectorData * netsplitDetectorData(){ return m_pNetsplitDetectorData; };
+	inline KviIrcConnectionAntiCtcpFloodData * antiCtcpFloodData(){ return m_pAntiCtcpFloodData; };
+	// never null. Use #include "kvi_ircconnectionnetsplitdetectordata.h"
+	inline KviIrcConnectionNetsplitDetectorData * netsplitDetectorData(){ return m_pNetsplitDetectorData; };
 	// never null. Use #include "kvi_ircconnectionasyncwhoisdata.h"
-	KviIrcConnectionAsyncWhoisData * asyncWhoisData(){ return m_pAsyncWhoisData; };
+	inline KviIrcConnectionAsyncWhoisData * asyncWhoisData(){ return m_pAsyncWhoisData; };
 	// never null. Use #include "kvi_ircconnectionstatistics.h"
-	KviIrcConnectionStatistics * statistics(){ return m_pStatistics; };
+	inline KviIrcConnectionStatistics * statistics(){ return m_pStatistics; };
 	// may be null
-	KviNotifyListManager * notifyListManager(){ return m_pNotifyListManager; };
+	inline KviNotifyListManager * notifyListManager(){ return m_pNotifyListManager; };
 	// may be null (when not running)
-	KviLagMeter * lagMeter(){ return m_pLagMeter; };
+	inline KviLagMeter * lagMeter(){ return m_pLagMeter; };
 	// should be never null.. but if really everything goes wrong, it might be...
-	QTextCodec * textCodec(){ return m_pTextCodec; };
-	QTextCodec * srvCodec(){ return m_pSrvCodec; };
+	inline QTextCodec * textCodec(){ return m_pTextCodec; };
+	inline QTextCodec * srvCodec(){ return m_pSrvCodec; };
 public:
 	// helper (really common access to userInfo()->nickName())
-	const QString & currentNickName();
+	inline const QString & currentNickName();
 	// helper (really common access to userInfo()->userName())
-	const QString & currentUserName();
+	inline const QString & currentUserName();
 	// helper (really common access to serverInfo()->name())
-	const QString & currentServerName();
+	inline const QString & currentServerName();
 
 	// world interface: the following three functions use m_pLink->sendPacket()
 	bool sendData(const char *buffer,int buflen = -1);
@@ -180,7 +179,7 @@ public:
 	//
 	// ----> KviChannelManager ?
 	KviChannel * findChannel(const QString &name);
-	KviPointerList<KviChannel> * channelList(){ return m_pChannelList; };
+	inline KviPointerList<KviChannel> * channelList(){ return m_pChannelList; };
 	int getCommonChannels(const QString &nick,QString &szChansBuffer,bool bAddEscapeSequences = true);
 	KviChannel * createChannel(const QString &name);
 	void registerChannel(KviChannel *c);
@@ -200,7 +199,7 @@ public:
 	//
 	// ----> KviQueryManager ?
 	KviQuery * findQuery(const QString &nick);
-	KviPointerList<KviQuery> * queryList(){ return m_pQueryList; };
+	inline KviPointerList<KviQuery> * queryList(){ return m_pQueryList; };
 	KviQuery * createQuery(const QString &nick);
 	void registerQuery(KviQuery *q);
 	void unregisterQuery(KviQuery *q);
@@ -281,6 +280,20 @@ private:
 
 // TODO: KviIdentity
 
+inline const QString & KviIrcConnection::currentServerName()
+{
+	return serverInfo()->name();
+}
+
+inline const QString & KviIrcConnection::currentNickName()
+{
+	return userInfo()->nickName();
+}
+
+inline const QString & KviIrcConnection::currentUserName()
+{
+	return userInfo()->userName();
+}
 
 #endif //!_KVI_IRCCONNECTION_H_
 
diff --git a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp b/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp
index 70ef7bd56..72ba6626a 100644
--- a/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionantictcpflooddata.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnectionantictcpflooddata.h"
 
diff --git a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
index c8dbef002..9da892835 100644
--- a/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionasyncwhoisdata.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnectionasyncwhoisdata.h"
 #include "kvi_kvs_script.h"
diff --git a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp b/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp
index b3b1278ce..f7666b458 100644
--- a/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionnetsplitdetectordata.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnectionnetsplitdetectordata.h"
 
diff --git a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
index d065219cb..2e3cb233e 100644
--- a/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionserverinfo.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp b/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp
index f06111a43..083ab0dbc 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionstatedata.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnectionstatedata.h"
 
diff --git a/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp b/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp
index f0243597e..94457e801 100644
--- a/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionstatistics.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnectionstatistics.h"
 
diff --git a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
index 95119a2e5..af5299e18 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontarget.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnectiontarget.h"
 #include "kvi_ircserver.h"
diff --git a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
index 3f761987c..95ba70554 100644
--- a/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectiontargetresolver.cpp
@@ -22,7 +22,7 @@
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnectiontargetresolver.h"
 #include "kvi_dns.h"
@@ -181,10 +181,10 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 #ifdef COMPILE_IPV6_SUPPORT
 	if(m_pTarget->proxy()->isIPv6())
 	{
-		bValidIp = kvi_isValidStringIp_V6(m_pTarget->proxy()->m_szIp.toUtf8().data());
+		bValidIp = KviNetUtils::isValidStringIp_V6(m_pTarget->proxy()->m_szIp);
 	} else {
 #endif
-		bValidIp = kvi_isValidStringIp(m_pTarget->proxy()->m_szIp.toUtf8().data());
+		bValidIp = KviNetUtils::isValidStringIp(m_pTarget->proxy()->m_szIp);
 #ifdef COMPILE_IPV6_SUPPORT
 	}
 #endif
@@ -203,10 +203,10 @@ void KviIrcConnectionTargetResolver::lookupProxyHostname()
 #ifdef COMPILE_IPV6_SUPPORT
 		if(m_pTarget->proxy()->isIPv6())
 		{
-			bValidIp = kvi_isValidStringIp_V6(m_pTarget->proxy()->m_szHostname.toUtf8().data());
+			bValidIp = KviNetUtils::isValidStringIp_V6(m_pTarget->proxy()->m_szHostname);
 		} else {
 #endif
-			bValidIp = kvi_isValidStringIp(m_pTarget->proxy()->m_szHostname.toUtf8().data());
+			bValidIp = KviNetUtils::isValidStringIp(m_pTarget->proxy()->m_szHostname);
 #ifdef COMPILE_IPV6_SUPPORT
 		}
 #endif
@@ -273,7 +273,7 @@ void KviIrcConnectionTargetResolver::proxyLookupTerminated(KviDns *)
 				__tr2qs("Proxy hostname resolved to %Q"),&szFirstIpAddress);
 
 		m_pTarget->proxy()->m_szIp = m_pProxyDns->firstIpAddress();
-		g_pProxyDataBase->updateProxyIp(m_pTarget->proxy()->m_szIp.toUtf8().data(),szFirstIpAddress.toUtf8().data());
+		g_pProxyDataBase->updateProxyIp(m_pTarget->proxy()->m_szIp,szFirstIpAddress.toUtf8().data());
 
 		if(m_pProxyDns->hostnameCount() > 1)
 		{
diff --git a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
index bc3a68eeb..03bd14f5a 100644
--- a/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
+++ b/src/kvirc/kernel/kvi_ircconnectionuserinfo.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircconnectionuserinfo.h"
 
diff --git a/src/kvirc/kernel/kvi_irccontext.cpp b/src/kvirc/kernel/kvi_irccontext.cpp
index 7d41b3ce4..8b65739bc 100644
--- a/src/kvirc/kernel/kvi_irccontext.cpp
+++ b/src/kvirc/kernel/kvi_irccontext.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_irccontext.h"
 #include "kvi_console.h"
diff --git a/src/kvirc/kernel/kvi_irccontext.h b/src/kvirc/kernel/kvi_irccontext.h
index b5fafb365..7fd5edfbb 100644
--- a/src/kvirc/kernel/kvi_irccontext.h
+++ b/src/kvirc/kernel/kvi_irccontext.h
@@ -45,12 +45,12 @@ 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,
 	and a KviIrcConnection object.
-	
+
 	The objects grouped here are mostly permanent across connections.
-	
+
 	Each irc context has its own unique numeric identifier. The identifiers start
 	from 1 so 0 is an invalid irc context id (this is useful in the scripting engine).
-	
+
 	The irc context is created in the KviConsole constructor and destroyed
 	in the KviConsole destructor. No other class can allocate KviIrcContext objects.
 */
@@ -80,9 +80,9 @@ protected:
 	KviIrcConnection                 * m_pConnection;
 
 	unsigned int                       m_uId;                  // this irc context id
-	
+
 	State                              m_eState;               // this context state
-	
+
 	// helper pointers
 	KviFrame                         * m_pFrame;               // the owning frame, shallow, never null
 
@@ -103,20 +103,20 @@ protected:
 	KviPointerList<KviQuery>             * m_pDeadQueries;
 	// other context bound windows
 	KviPointerList<KviWindow>            * m_pContextWindows;
-	
+
 	int                                m_iHeartbeatTimerId;
 public:
-	unsigned int id(){ return m_uId; };
+	inline unsigned int id(){ return m_uId; };
 	// never null and always the same!
-	KviConsole * console(){ return m_pConsole; };
+	inline KviConsole * console(){ return m_pConsole; };
 	// never null and always the same
-	KviFrame * frame(){ return m_pFrame; };
+	inline KviFrame * frame(){ return m_pFrame; };
 	// may be null and may change!
-	KviIrcConnection * connection(){ return m_pConnection; };
+	inline KviIrcConnection * connection(){ return m_pConnection; };
 	// state
-	State state(){ return m_eState; }; 
-	bool isConnected(){ return m_eState == Connected; };
-	bool isLoggingIn(){ return m_eState == LoggingIn; };
+	inline State state(){ return m_eState; };
+	inline bool isConnected(){ return m_eState == Connected; };
+	inline bool isLoggingIn(){ return m_eState == LoggingIn; };
 	// dead channels and queries
 	void closeAllDeadChannels();
 	void closeAllDeadQueries();
@@ -132,26 +132,26 @@ public:
 	void registerContextWindow(KviWindow * pWnd);
 	bool unregisterContextWindow(KviWindow * pWnd);
 
-	KviPointerList<KviIrcDataStreamMonitor> * monitorList(){ return m_pMonitorList; };
+	inline KviPointerList<KviIrcDataStreamMonitor> * monitorList(){ return m_pMonitorList; };
 
 	// links window
 	void createLinksWindow();
-	void setLinksWindowPointer(KviExternalServerDataParser * l){ m_pLinksWindow = l; };
-	KviExternalServerDataParser * linksWindow(){ return m_pLinksWindow; };
+	inline void setLinksWindowPointer(KviExternalServerDataParser * l){ m_pLinksWindow = l; };
+	inline KviExternalServerDataParser * linksWindow(){ return m_pLinksWindow; };
 
 	// list window
 	void createListWindow();
-	void setListWindowPointer(KviExternalServerDataParser * l){ m_pListWindow = l; };
-	KviExternalServerDataParser * listWindow(){ return m_pListWindow; };
+	inline void setListWindowPointer(KviExternalServerDataParser * l){ m_pListWindow = l; };
+	inline KviExternalServerDataParser * listWindow(){ return m_pListWindow; };
 
 	void setAsynchronousConnectionData(KviAsynchronousConnectionData * d);
-	KviAsynchronousConnectionData * asynchronousConnectionData(){ return m_pAsynchronousConnectionData; };
+	inline KviAsynchronousConnectionData * asynchronousConnectionData(){ return m_pAsynchronousConnectionData; };
 	void destroyAsynchronousConnectionData();
 	// used by KviConsole (for now) and KviUserParser
 	void connectToCurrentServer();
-	
+
 	void beginAsynchronousConnect(unsigned int uDelayInMSecs);
-	
+
 	void registerDataStreamMonitor(KviIrcDataStreamMonitor * m);
 	void unregisterDataStreamMonitor(KviIrcDataStreamMonitor *m);
 
diff --git a/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp b/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp
index 50c4c14e6..f7ce3b1a3 100644
--- a/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp
+++ b/src/kvirc/kernel/kvi_ircdatastreammonitor.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircdatastreammonitor.h"
 #include "kvi_irccontext.h"
diff --git a/src/kvirc/kernel/kvi_irclink.cpp b/src/kvirc/kernel/kvi_irclink.cpp
index ffd33515b..621b3538e 100644
--- a/src/kvirc/kernel/kvi_irclink.cpp
+++ b/src/kvirc/kernel/kvi_irclink.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_irclink.h"
 #include "kvi_dns.h"
diff --git a/src/kvirc/kernel/kvi_ircsocket.cpp b/src/kvirc/kernel/kvi_ircsocket.cpp
index 945a91a47..b7429646c 100644
--- a/src/kvirc/kernel/kvi_ircsocket.cpp
+++ b/src/kvirc/kernel/kvi_ircsocket.cpp
@@ -22,7 +22,6 @@
 //
 /////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
-#define __KVIRC__
 
 #include "kvi_ircsocket.h"
 #include "kvi_ircserver.h"
@@ -156,7 +155,7 @@ void KviIrcSocket::reset()
 	}
 
 	m_bInProcessData             = false;
-	
+
 	m_uReadBytes                 = 0;
 	m_uSentBytes                 = 0;
 	m_uSentPackets               = 0;
@@ -201,7 +200,7 @@ void KviIrcSocket::outputProxyError(const QString &szMsg)
 		QString szTemporary = (*it).trimmed();
 		m_pConsole->output(KVI_OUT_SOCKETERROR,__tr2qs("[PROXY ERROR]: %Q"),&(szTemporary));
 	}
-	
+
 }
 
 void KviIrcSocket::outputSocketMessage(const QString &szMsg)
@@ -264,7 +263,7 @@ int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bin
 	if(prx) bNeedServerIp = (
 		prx->protocol() != KviProxy::Http && prx->protocol() != KviProxy::Socks5
 		);
-	
+
 	// We're going to check the addresses now
 
 	// check the proxy stuff...
@@ -278,7 +277,7 @@ int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bin
 			// IPv6 proxy :) (STILL QUITE UNTESTED ?)
 #ifdef COMPILE_IPV6_SUPPORT
 			bTargetIPv6 = true;
-			if(!kvi_isValidStringIp_V6(m_pProxy->ip()))return KviError_invalidProxyAddress;
+			if(!KviNetUtils::isValidStringIp_V6(m_pProxy->ip()))return KviError_invalidProxyAddress;
 			// SOCKSv4 does not support IPV6 addresses
 			if(m_pProxy->protocol() == KviProxy::Socks4)return KviError_socksV4LacksIPv6Support;
 #else
@@ -286,10 +285,10 @@ int KviIrcSocket::startConnection(KviServer *srv,KviProxy * prx,const char * bin
 #endif
 		} else {
 			// IPv4 proxy
-			if(!kvi_isValidStringIp(m_pProxy->ip()))return KviError_invalidProxyAddress;
+			if(!KviNetUtils::isValidStringIp(m_pProxy->ip()))return KviError_invalidProxyAddress;
 		}
 	}
-	
+
 	if(bNeedServerIp)
 	{
 		// check the irc host ip
@@ -461,7 +460,7 @@ void KviIrcSocket::connectedToProxy()
 	}
 
 	m_pRsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Read);
-		
+
 	QObject::connect(m_pRsn,SIGNAL(activated(int)),this,SLOT(readProxyData(int)));
 
 	switch(m_pProxy->protocol())
@@ -482,14 +481,14 @@ void KviIrcSocket::readHttpProxyErrorData(int)
 {
 	char buffer[256];
 	int readLength;
-	
+
 	readLength = kvi_socket_recv(m_sock,buffer,255);
 	if(readLength <= 0)
 	{
 		handleInvalidSocketRead(readLength);
 		return;
 	}
-	
+
 	outputProxyMessage(m_pConsole->decodeText(buffer));
 }
 
@@ -636,7 +635,7 @@ void KviIrcSocket::proxyLoginHttp()
 	// Then expect a server reply header (2 newlines)
 	// HTTP 200 = Success
 	// HTTP Anything else = Failure
-	
+
 	if(_OUTPUT_VERBOSE)
 		outputProxyMessage(__tr2qs("Using HTTP protocol."));
 
@@ -684,7 +683,7 @@ void KviIrcSocket::proxyLoginV4()
 	// consulting IDENT, cf. RFC 1413.  If the request is granted, the SOCKS
 	// server makes a connection to the specified port of the destination host.
 	// A reply packet is sent to the client when this connection is established,
-	// or when the request is rejected or the operation fails. 
+	// or when the request is rejected or the operation fails.
 	//
 	if(_OUTPUT_VERBOSE)
 		outputProxyMessage(__tr2qs("Using SOCKSv4 protocol."));
@@ -708,7 +707,7 @@ void KviIrcSocket::proxyLoginV4()
 
 	struct in_addr ircInAddr;
 
-	if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip().toUtf8().data(),&ircInAddr))
+	if(!KviNetUtils::stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr))
 		debug("SOCKET INTERNAL ERROR IN IPV4 (SOCKS4) ADDR CONVERSION");
 
 	quint32 host=(quint32)ircInAddr.s_addr;
@@ -884,9 +883,9 @@ void KviIrcSocket::proxySendTargetDataV5()
 	//
 	//   The address is a version-6 IP address, with a length of 16 octets.
 	bool bRemoteDns=!(
-		
+
 		(
-		KviNetUtils::isValidStringIp(m_pIrcServer->ip()) 
+		KviNetUtils::isValidStringIp(m_pIrcServer->ip())
 		#ifdef COMPILE_IPV6_SUPPORT
 			|| KviNetUtils::isValidStringIp_V6(m_pIrcServer->ip())
 		#endif
@@ -900,12 +899,12 @@ void KviIrcSocket::proxySendTargetDataV5()
 	bufToSend[0]=(unsigned char)5;           //Proto 5
 	bufToSend[1]=(unsigned char)1;           //CONNECT
 	bufToSend[2]=(unsigned char)0;           //RSV
-	
+
 	if(bRemoteDns)
 	{
 		bRemoteDns=true;
 		bufToSend[3]=3;
-		bufToSend[4]=m_pIrcServer->hostName().toUtf8().length();		
+		bufToSend[4]=m_pIrcServer->hostName().toUtf8().length();
 	} else {
 		bufToSend[3]=(unsigned char)m_pIrcServer->isIPv6() ? 4 : 1; // IPV6 : IPV4
 	}
@@ -921,7 +920,7 @@ void KviIrcSocket::proxySendTargetDataV5()
 #ifdef COMPILE_IPV6_SUPPORT
 		struct in6_addr ircInAddr;
 
-		if(!kvi_stringIpToBinaryIp_V6(m_pIrcServer->ip().toUtf8().data(),&ircInAddr))debug("SOCKET INTERNAL ERROR IN IPV6 ADDR CONVERSION");
+		if(!KviNetUtils::stringIpToBinaryIp_V6(m_pIrcServer->ip(),&ircInAddr))debug("SOCKET INTERNAL ERROR IN IPV6 ADDR CONVERSION");
 		kvi_memmove((void *)(bufToSend + 4),(void *)(&ircInAddr),4);
 		quint16 port = (quint16)htons(m_pIrcServer->port());
 		kvi_memmove((void *)(bufToSend + 20),(void *)&port,2);
@@ -929,7 +928,7 @@ void KviIrcSocket::proxySendTargetDataV5()
 	} else {
 		struct in_addr ircInAddr;
 
-		if(!kvi_stringIpToBinaryIp(m_pIrcServer->ip().toUtf8().data(),&ircInAddr))debug("SOCKET INTERNAL ERROR IN IPV4 ADDR CONVERSION");
+		if(!KviNetUtils::stringIpToBinaryIp(m_pIrcServer->ip(),&ircInAddr))debug("SOCKET INTERNAL ERROR IN IPV4 ADDR CONVERSION");
 		quint32 host = (quint32)ircInAddr.s_addr;
 		kvi_memmove((void *)(bufToSend + 4),(void *)&host,4);
 		quint16 port = (quint16)htons(m_pIrcServer->port());
@@ -1088,7 +1087,7 @@ void KviIrcSocket::proxyHandleV4FinalReply(unsigned char reply)
 	// If the request is granted, the SOCKS
 	// server makes a connection to the specified port of the destination host.
 	// A reply packet is sent to the client when this connection is established,
-	// or when the request is rejected or the operation fails. 
+	// or when the request is rejected or the operation fails.
 	//
 	//
 	//                +----+----+----+----+----+----+----+----+
@@ -1165,14 +1164,14 @@ void KviIrcSocket::proxyHandleHttpFinalReply(const char * buffer,int bufLen)
 				return;
 			}
 		}
-		
+
 	}
 
 	outputProxyError(__tr2qs("Proxy said something about: \n"));
 	outputProxyMessage(m_pConsole->decodeText(buffer));
-	
+
 	//Read HTTP error page and show it
-	
+
 	if(m_pWsn)
 	{
 		delete m_pWsn;
@@ -1188,9 +1187,9 @@ void KviIrcSocket::proxyHandleHttpFinalReply(const char * buffer,int bufLen)
 	m_pRsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Read);
 	QObject::connect(m_pRsn,SIGNAL(activated(int)),this,SLOT(readHttpProxyErrorData(int)));
 	m_pRsn->setEnabled(true);
-	
+
 	setState(ProxyHttpError);
-	
+
 //	raiseError(KviError_proxyHttpFailure);
 //	reset();
 }
@@ -1350,7 +1349,7 @@ void KviIrcSocket::linkUp()
 	m_pRsn = new QSocketNotifier((int)m_sock,QSocketNotifier::Read);
 	QObject::connect(m_pRsn,SIGNAL(activated(int)),this,SLOT(readData(int)));
 	m_pRsn->setEnabled(true);
-	
+
 	// yahoo!
 }
 
@@ -1399,7 +1398,7 @@ void KviIrcSocket::readData(int)
 					reset();
 					return;
 				break;
-	
+
 			}
 			handleInvalidSocketRead(readLength);
 			return;
@@ -1501,7 +1500,7 @@ void KviIrcSocket::processData(char * buffer,int)
 			//   the disconnect and thus destroying the irc context).
 			// For now we try to rely on the remaining parts to handle correctly
 			// such conditions. Let's see...
-			
+
 			m_pConsole->incomingMessage(messageBuffer);
 
 			if(m_state != Connected)
@@ -1769,7 +1768,7 @@ void KviIrcSocket::flushSendQueue()
 
 					// Partial send...need to finish it later
 					m_pSendQueueHead->pData->remove(result);
-					
+
 					m_uSentBytes += result;
 					if(_OUTPUT_VERBOSE)
 						outputSocketWarning(__tr2qs("Partial socket write: packet broken into smaller pieces."));
@@ -1819,7 +1818,7 @@ bool KviIrcSocket::getLocalHostIp(QString &szIp,bool bIPv6)
 		if(!kvi_socket_getsockname(m_sock, (struct sockaddr *)&name,&len))return false;
 		//I assume that getsockname returns data in Network byte order...
 		//The man page misses to specify that...
-		if(!kvi_binaryIpToStringIp_V6(name.sin6_addr,szIp))return false;
+		if(!KviNetUtils::binaryIpToStringIp_V6(name.sin6_addr,szIp))return false;
 		return true;
 #else
 		return false; // no support
@@ -1830,7 +1829,7 @@ bool KviIrcSocket::getLocalHostIp(QString &szIp,bool bIPv6)
 	if(!kvi_socket_getsockname(m_sock, (struct sockaddr *)&name,&len))return false;
 	//I assume that getsockname returns data in Network byte order...
 	//The man page misses to specify that...
-	if(!kvi_binaryIpToStringIp(name.sin_addr,szIp))return false;
+	if(!KviNetUtils::binaryIpToStringIp(name.sin_addr,szIp))return false;
 	return true;
 }
 
diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp
index 1892dbcb1..034c2c292 100644
--- a/src/kvirc/kernel/kvi_ircurl.cpp
+++ b/src/kvirc/kernel/kvi_ircurl.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #include "kvi_string.h"
 #include "kvi_inttypes.h"
 #include "kvi_qstring.h"
diff --git a/src/kvirc/kernel/kvi_lagmeter.cpp b/src/kvirc/kernel/kvi_lagmeter.cpp
index ef59f5c2d..b94f7c2d5 100644
--- a/src/kvirc/kernel/kvi_lagmeter.cpp
+++ b/src/kvirc/kernel/kvi_lagmeter.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_lagmeter.h"
 #include "kvi_options.h"
diff --git a/src/kvirc/kernel/kvi_main.cpp b/src/kvirc/kernel/kvi_main.cpp
index 3b4c50c3b..2a8917b42 100644
--- a/src/kvirc/kernel/kvi_main.cpp
+++ b/src/kvirc/kernel/kvi_main.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_app.h"
 #include "kvi_string.h"
diff --git a/src/kvirc/kernel/kvi_notifylist.cpp b/src/kvirc/kernel/kvi_notifylist.cpp
index c4ccb6b59..57c921770 100644
--- a/src/kvirc/kernel/kvi_notifylist.cpp
+++ b/src/kvirc/kernel/kvi_notifylist.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 
 #include "kvi_debug.h"
diff --git a/src/kvirc/kernel/kvi_options.cpp b/src/kvirc/kernel/kvi_options.cpp
index 41658f1a7..41f40836f 100644
--- a/src/kvirc/kernel/kvi_options.cpp
+++ b/src/kvirc/kernel/kvi_options.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #define _KVI_OPTIONS_CPP_
 
diff --git a/src/kvirc/kernel/kvi_sslmaster.cpp b/src/kvirc/kernel/kvi_sslmaster.cpp
index 69504b717..7234bb4b8 100644
--- a/src/kvirc/kernel/kvi_sslmaster.cpp
+++ b/src/kvirc/kernel/kvi_sslmaster.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 
 #include "kvi_sslmaster.h"
 
diff --git a/src/kvirc/kernel/kvi_texticonmanager.cpp b/src/kvirc/kernel/kvi_texticonmanager.cpp
index b1c553457..20f32db2e 100644
--- a/src/kvirc/kernel/kvi_texticonmanager.cpp
+++ b/src/kvirc/kernel/kvi_texticonmanager.cpp
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#define __KVIRC__
+
 
 #define _KVI_TEXTICONMANAGER_CPP_
 
diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/kvi_theme.cpp
index 018ee8970..9fa43fd0d 100644
--- a/src/kvirc/kernel/kvi_theme.cpp
+++ b/src/kvirc/kernel/kvi_theme.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #include "kvi_theme.h"
 #include "kvi_fileutils.h"
 #include "kvi_config.h"
diff --git a/src/kvirc/kernel/kvi_useraction.cpp b/src/kvirc/kernel/kvi_useraction.cpp
index fa3c7a0df..b188e17cd 100644
--- a/src/kvirc/kernel/kvi_useraction.cpp
+++ b/src/kvirc/kernel/kvi_useraction.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_useraction.h"
 
diff --git a/src/kvirc/kernel/kvi_userinput.cpp b/src/kvirc/kernel/kvi_userinput.cpp
index c50baa2b2..01f551d92 100644
--- a/src/kvirc/kernel/kvi_userinput.cpp
+++ b/src/kvirc/kernel/kvi_userinput.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_userinput.h"
 #include "kvi_kvs_variantlist.h"
diff --git a/src/kvirc/kvs/kvi_kvs.cpp b/src/kvirc/kvs/kvi_kvs.cpp
index c3ef18a25..c037b7c5e 100644
--- a/src/kvirc/kvs/kvi_kvs.cpp
+++ b/src/kvirc/kvs/kvi_kvs.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs.h"
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_aliasmanager.h"
diff --git a/src/kvirc/kvs/kvi_kvs_action.cpp b/src/kvirc/kvs/kvi_kvs_action.cpp
index 7035f5887..c07a6c3c7 100644
--- a/src/kvirc/kvs/kvi_kvs_action.cpp
+++ b/src/kvirc/kvs/kvi_kvs_action.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_action.h"
 #include "kvi_kvs_script.h"
diff --git a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
index 984af9338..1750554a4 100644
--- a/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_aliasmanager.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_aliasmanager.h"
 #include "kvi_config.h"
diff --git a/src/kvirc/kvs/kvi_kvs_array.cpp b/src/kvirc/kvs/kvi_kvs_array.cpp
index 33251a6e3..982ea16be 100644
--- a/src/kvirc/kvs/kvi_kvs_array.cpp
+++ b/src/kvirc/kvs/kvi_kvs_array.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_array.h"
 #include "kvi_malloc.h"
diff --git a/src/kvirc/kvs/kvi_kvs_arraycast.cpp b/src/kvirc/kvs/kvi_kvs_arraycast.cpp
index c6732a295..f25ee9be4 100644
--- a/src/kvirc/kvs/kvi_kvs_arraycast.cpp
+++ b/src/kvirc/kvs/kvi_kvs_arraycast.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_arraycast.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
index fc78b9778..3c79a4d05 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_asyncdnsoperation.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_asyncdnsoperation.h"
 #include "kvi_dns.h"
diff --git a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
index ff503c02c..c71d47466 100644
--- a/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_asyncoperation.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_asyncoperation.h"
 #include "kvi_kvs_kernel.h"
diff --git a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
index e2baa1995..2c5abf3a1 100644
--- a/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
+++ b/src/kvirc/kvs/kvi_kvs_callbackobject.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_callbackobject.h"
 #include "kvi_console.h"
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
index 21b48d6a7..e3156e4a7 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_corecallbackcommands.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
index e12da6d57..79e5047ea 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_corefunctions.h"
 #include "kvi_kvs_kernel.h"
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
index bb2aaa093..83b69b512 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_af.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_corefunctions.h"
 #include "kvi_kvs_kernel.h"
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
index e4ede2777..8084cfc0b 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_gl.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_corefunctions.h"
 #include "kvi_kvs_kernel.h"
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
index 9d82e3a3c..90ad36ab9 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_mr.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_corefunctions.h"
 #include "kvi_kvs_kernel.h"
diff --git a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
index 201b8cc58..69ecf69e4 100644
--- a/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corefunctions_sz.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_corefunctions.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
index b24b85907..531f1b025 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_ircconnectionserverinfo.h"
 #include "kvi_kvs_coresimplecommands.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index 9222fc4fb..88ab9854d 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_coresimplecommands.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index 2ccd532a7..60920db49 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_coresimplecommands.h"
 
 #include "kvi_kvs_timermanager.h"
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index 692ad554c..237e88110 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_coresimplecommands.h"
 
 #include "kvi_window.h"
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
index 6a212a179..34e2579ca 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_sz.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_coresimplecommands.h"
 
 #include "kvi_kvs_popupmanager.h"
diff --git a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
index bfca60eb0..a220feaf0 100644
--- a/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_dnsmanager.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_dnsmanager.h"
 #include "kvi_dns.h"
 #include "kvi_app.h"
diff --git a/src/kvirc/kvs/kvi_kvs_event.cpp b/src/kvirc/kvs/kvi_kvs_event.cpp
index d86f3e885..33dc1f2d8 100644
--- a/src/kvirc/kvs/kvi_kvs_event.cpp
+++ b/src/kvirc/kvs/kvi_kvs_event.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_event.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp b/src/kvirc/kvs/kvi_kvs_eventhandler.cpp
index 5bfe26712..bd50ca012 100644
--- a/src/kvirc/kvs/kvi_kvs_eventhandler.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventhandler.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_eventhandler.h"
 
 KviKvsEventHandler::KviKvsEventHandler(Type t)
diff --git a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
index 9d23cf268..8fd8afb26 100644
--- a/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventmanager.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_eventmanager.h"
 #include "kvi_config.h"
 #include "kvi_kvs_script.h"
diff --git a/src/kvirc/kvs/kvi_kvs_eventtable.cpp b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
index 11621f593..aac257232 100644
--- a/src/kvirc/kvs/kvi_kvs_eventtable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_eventtable.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_event.h"
 #include "kvi_kvs_eventtable.h"
 #include "kvi_kvs_eventmanager.h"
diff --git a/src/kvirc/kvs/kvi_kvs_hash.cpp b/src/kvirc/kvs/kvi_kvs_hash.cpp
index 09ce85cf5..cccda7d71 100644
--- a/src/kvirc/kvs/kvi_kvs_hash.cpp
+++ b/src/kvirc/kvs/kvi_kvs_hash.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_hash.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_kernel.cpp b/src/kvirc/kvs/kvi_kvs_kernel.cpp
index e775484e0..c81354c1b 100644
--- a/src/kvirc/kvs/kvi_kvs_kernel.cpp
+++ b/src/kvirc/kvs/kvi_kvs_kernel.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_kernel.h"
 #include "kvi_kvs_parser.h"
 #include "kvi_kvs_hash.h"
diff --git a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
index 948bac1b0..6f83e70c9 100644
--- a/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
+++ b/src/kvirc/kvs/kvi_kvs_moduleinterface.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_moduleinterface.h"
 #include "kvi_kvs_eventmanager.h"
 #include "kvi_module.h"
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index f3a72a568..c439f95c7 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_object.h"
 #include "kvi_kvs_hash.h"
 #include "kvi_kvs_kernel.h"
diff --git a/src/kvirc/kvs/kvi_kvs_object_class.cpp b/src/kvirc/kvs/kvi_kvs_object_class.cpp
index ea25f83f8..32a48ca30 100644
--- a/src/kvirc/kvs/kvi_kvs_object_class.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_class.cpp
@@ -22,8 +22,6 @@
 //

 //=============================================================================

 

-#define __KVIRC__

-

 #include "kvi_kvs_object_class.h"

 #include "kvi_kvs_object_controller.h"

 #include "kvi_kvs_object.h"

diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index de2e3ff90..b5dede5ff 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_object_controller.h"
 #include "kvi_modulemanager.h"
 #include "kvi_fileutils.h"
diff --git a/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp b/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp
index 3ef242360..ae4ef8302 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_functioncall.cpp
@@ -22,7 +22,5 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_object_functioncall.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp
index 173d86fbf..b031c5522 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_functionhandler.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_object_functionhandler.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp
index bff1a1267..2584d80d3 100644
--- a/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_functionhandlerimpl.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_object_functionhandlerimpl.h"
 #include "kvi_kvs_object_functioncall.h"
 #include "kvi_kvs_script.h"
diff --git a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
index faf7a2e47..46123cf50 100644
--- a/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parameterprocessor.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_parameterprocessor.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_runtimecontext.h"
diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp
index ad676bc1b..24ceea69f 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser.cpp
@@ -22,9 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
-
 #include "kvi_kvs_parser.h"
 #include "kvi_kvs_treenode.h"
 #include "kvi_kvs_report.h"
diff --git a/src/kvirc/kvs/kvi_kvs_parser_command.cpp b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
index 66ac33f87..c7b46a177 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
@@ -22,9 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
-
 #include "kvi_kvs_parser.h"
 #include "kvi_kvs_treenode.h"
 #include "kvi_kvs_report.h"
diff --git a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
index 1d7cc9caa..691d7a589 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_comment.cpp
@@ -22,9 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
-
 #include "kvi_kvs_parser.h"
 #include "kvi_kvs_treenode.h"
 #include "kvi_kvs_report.h"
diff --git a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
index 7c3decd47..dddf3994c 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_dollar.cpp
@@ -22,9 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
-
 #include "kvi_kvs_parser.h"
 #include "kvi_kvs_treenode.h"
 #include "kvi_kvs_report.h"
diff --git a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
index 1f56227a5..95211553f 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_expression.cpp
@@ -22,9 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
-
 #include "kvi_kvs_parser.h"
 #include "kvi_kvs_treenode.h"
 #include "kvi_kvs_report.h"
diff --git a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
index 523044ce4..eff39398b 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_lside.cpp
@@ -22,9 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
-
 #include "kvi_kvs_parser.h"
 #include "kvi_kvs_treenode.h"
 #include "kvi_kvs_report.h"
diff --git a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
index c1a2ad577..9e14792ac 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_specialcommands.cpp
@@ -22,9 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
-
 #include "kvi_kvs_parser.h"
 #include "kvi_kvs_treenode.h"
 #include "kvi_kvs_report.h"
diff --git a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
index 363cf2220..a312675c7 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmanager.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_popupmanager.h"
 #include "kvi_locale.h"
 #include "kvi_config.h"
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 75284df5b..97f6c8c92 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_popupmenu.h"
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
index 9a28af9a4..4911f0c91 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_processmanager.h"
 #include "kvi_window.h"
 #include "kvi_out.h"
diff --git a/src/kvirc/kvs/kvi_kvs_report.cpp b/src/kvirc/kvs/kvi_kvs_report.cpp
index aa4c15706..3aa7a71ab 100644
--- a/src/kvirc/kvs/kvi_kvs_report.cpp
+++ b/src/kvirc/kvs/kvi_kvs_report.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_report.h"
 #include "kvi_mirccntrl.h"
 #include "kvi_window.h"
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp b/src/kvirc/kvs/kvi_kvs_runtimecall.cpp
index af7e5e18b..38348635f 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_runtimecall.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_runtimecall.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
index d5e2d27fc..b5e2946b1 100644
--- a/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
+++ b/src/kvirc/kvs/kvi_kvs_runtimecontext.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_kernel.h"
diff --git a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp
index 1871fbbf8..945860b30 100644
--- a/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp
+++ b/src/kvirc/kvs/kvi_kvs_rwevaluationresult.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_rwevaluationresult.h"
 #include "kvi_kvs_hash.h"
diff --git a/src/kvirc/kvs/kvi_kvs_script.cpp b/src/kvirc/kvs/kvi_kvs_script.cpp
index 6d1295cc7..8e4a21483 100644
--- a/src/kvirc/kvs/kvi_kvs_script.cpp
+++ b/src/kvirc/kvs/kvi_kvs_script.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_parser.h"
 #include "kvi_kvs_report.h"
diff --git a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
index d581d43b0..f65fdf96c 100644
--- a/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_scriptaddonmanager.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_scriptaddonmanager.h"
 #include "kvi_kvs_script.h"
 #include "kvi_config.h"
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
index 050690256..9d783ac13 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_switchlist.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_timermanager.cpp b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
index 0ea6f54e9..2665e3c0f 100644
--- a/src/kvirc/kvs/kvi_kvs_timermanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_timermanager.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_timermanager.h"
 
 #include "kvi_kvs_script.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp
index 0b452b1f1..9b1c2e537 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_aliasfunctioncall.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_aliasfunctioncall.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_aliasmanager.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
index f0d55c6dc..a0e09d912 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_aliassimplecommand.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_aliassimplecommand.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_switchlist.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp
index 00305918b..8529060ff 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arraycount.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_arraycount.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_runtimecontext.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp
index 34f01876e..9d8b8c174 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayelement.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_arrayelement.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp
index d95b45d8a..4d0dbd808 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayorhashelement.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_arrayorhashelement.h"
 
 KviKvsTreeNodeArrayOrHashElement::KviKvsTreeNodeArrayOrHashElement(const QChar * pLocation,KviKvsTreeNodeData * pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp
index 3327f677e..96cf7abce 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_arrayreferenceassert.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_arrayreferenceassert.h"
 #include "kvi_kvs_rwevaluationresult.h"
 #include "kvi_kvs_runtimecontext.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp b/src/kvirc/kvs/kvi_kvs_treenode_base.cpp
index 0131b44af..ea4439d81 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_base.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_base.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_treenode_base.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp
index 93b2f2234..b0aacce63 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_baseobjectfunctioncall.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_baseobjectfunctioncall.h"
 #include "kvi_qstring.h"
 #include "kvi_kvs_object.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp
index 4bd167e10..e284df010 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_callbackcommand.cpp
@@ -22,9 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
-
 #include "kvi_kvs_treenode_callbackcommand.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_script.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp
index cdb31d9c6..f54ad28ae 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_command.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_command.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_command.h"
 #include "kvi_kvs_treenode_switchlist.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp
index a9389978e..63252a2d3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_commandevaluation.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_commandevaluation.h"
 
 #include "kvi_kvs_runtimecontext.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp
index bed5ddca4..1eea8194c 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_commandwithparameters.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_commandwithparameters.h"
 #include "kvi_kvs_treenode_datalist.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
index b517ce2c0..dc06813ed 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_compositedata.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_compositedata.h"
 #include "kvi_qstring.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp
index 9a55602bc..c498c436d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_constantdata.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_constantdata.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp
index e5b891716..4153bd8d0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_corecallbackcommand.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_corecallbackcommand.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_switchlist.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp
index 009f72bd2..2b814d44c 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_corefunctioncall.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_corefunctioncall.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp
index b01cc7761..c6c04654d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_coresimplecommand.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_coresimplecommand.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_switchlist.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp
index d92b733a0..c4884e442 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_data.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_data.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_locale.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
index 25df94284..8dbc810cd 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_datalist.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
index 4947ed8de..7014278f1 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_expression.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_locale.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp
index faa1e9c71..e7c07fff6 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_expressionreturn.cpp
@@ -22,7 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
 #include "kvi_kvs_treenode_expressionreturn.h"
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_runtimecontext.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
index 08ef07d9e..c54cc16cd 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_extendedscopevariable.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_extendedscopevariable.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp
index c15c8ee54..9d9c0e9f2 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_functioncall.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_functioncall.h"
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
index b145e011b..c40685d93 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_globalvariable.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_globalvariable.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp
index 2db8a1ddf..dcc16f440 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashcount.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_hashcount.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_runtimecontext.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
index 7e18ff0a7..c80a6f5ca 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashelement.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_hashelement.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp
index dd50449a3..001545bdd 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_hashreferenceassert.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_hashreferenceassert.h"
 #include "kvi_kvs_rwevaluationresult.h"
 #include "kvi_kvs_runtimecontext.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp
index c1f405052..80c8f5792 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_indirectdata.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_indirectdata.h"
 
 KviKvsTreeNodeIndirectData::KviKvsTreeNodeIndirectData(const QChar * pLocation,KviKvsTreeNodeData * pSource)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp
index 5e1657053..8b9362b26 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_instruction.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_treenode_instruction.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
index 38c83ce76..c7197a70e 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_instructionblock.cpp
@@ -22,9 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
-
 #include "kvi_kvs_treenode_instructionblock.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
index 71cfd5bc0..9c3fb855a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_localvariable.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_localvariable.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp
index e1ec09410..402354f4c 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_modulecallbackcommand.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_modulecallbackcommand.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_switchlist.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp
index 7c06a25d5..61750ab52 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_modulefunctioncall.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_modulefunctioncall.h"
 #include "kvi_kvs_treenode_datalist.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp
index 038edb135..f1918c001 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_modulesimplecommand.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_modulesimplecommand.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_treenode_switchlist.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp
index aeb9406f9..74f1a9bc3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_multipleparameteridentifier.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_multipleparameteridentifier.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_variant.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
index 757c997d3..73d3fba8c 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfield.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_objectfield.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_object.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp
index 3eebda942..5dc51a3e3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_objectfunctioncall.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_objectfunctioncall.h"
 
 KviKvsTreeNodeObjectFunctionCall::KviKvsTreeNodeObjectFunctionCall(const QChar * pLocation,const QString &szFncName,KviKvsTreeNodeDataList * pParams)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
index e363801c9..5c86e876b 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_operation.h"
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_kvs_runtimecontext.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp
index c301e9423..9bbf65f20 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_parameterreturn.cpp
@@ -22,7 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
 #include "kvi_kvs_treenode_parameterreturn.h"
 #include "kvi_kvs_treenode_datalist.h"
 #include "kvi_kvs_runtimecontext.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp
index 58e56b282..ef09a650b 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_rebindingswitch.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_rebindingswitch.h"
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_window.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp
index fc82b567a..9c8d29526 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_scopeoperator.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_scopeoperator.h"
 
 #include "kvi_qstring.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp
index a5614866d..24284b50c 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_simplecommand.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_simplecommand.h"
 #include "kvi_kvs_treenode_datalist.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp
index aaba03210..f4cf15236 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_singleparameteridentifier.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_singleparameteridentifier.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_variant.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp
index 42cb66a96..f9ed63018 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommand.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_treenode_specialcommand.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp
index 316f3240f..56d06d425 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandbreak.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommandbreak.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
index ddccb7c57..e32d3b905 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandclass.cpp
@@ -21,8 +21,6 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 //=============================================================================
-#define __KVIRC__
-
 #include "kvi_locale.h"
 #include "kvi_kvs_variantlist.h"
 #include "kvi_kvs_variant.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp
index c81a4a269..86d2c0db9 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandcontinue.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommandcontinue.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
index 0318d80cb..bf16818e3 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddefpopup.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommanddefpopup.h"
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp
index 082b5ad79..2678383d0 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommanddo.cpp
@@ -23,8 +23,6 @@
 //=============================================================================
 
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommanddo.h"
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp
index 3898be880..af5d653f7 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandfor.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommandfor.h"
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
index 4e28e9090..556e278bf 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandforeach.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommandforeach.h"
 #include "kvi_kvs_treenode_data.h"
 #include "kvi_kvs_treenode_datalist.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp
index 994b8811f..3f257047d 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandif.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommandif.h"
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
index 25b07926a..d288ccc11 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommandswitch.h"
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
index 05f75b9d1..19a3faf09 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandunset.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommandunset.h"
 #include "kvi_kvs_runtimecontext.h"
 #include "kvi_kvs_rwevaluationresult.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp
index 77e962f04..2fdea573a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandwhile.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_specialcommandwhile.h"
 #include "kvi_kvs_treenode_expression.h"
 #include "kvi_kvs_treenode_instruction.h"
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp
index 740cb1d0b..49bec19fd 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_stringcast.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_stringcast.h"
 #include "kvi_qstring.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
index 8eed5a89a..e336f1aae 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_switchlist.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_switchlist.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp
index a4e57a2ba..f58e25429 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_thisobjectfunctioncall.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_thisobjectfunctioncall.h"
 #include "kvi_kvs_object.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp b/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp
index 3ee5cb1e8..56badfb0f 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_variable.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_variable.h"
 
 KviKvsTreeNodeVariable::KviKvsTreeNodeVariable(const QChar * pLocation,const QString &szIdentifier)
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp
index f500e1830..0ee0e447b 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_voidfunctioncall.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_treenode_voidfunctioncall.h"
 #include "kvi_kvs_runtimecontext.h"
 
diff --git a/src/kvirc/kvs/kvi_kvs_useraction.cpp b/src/kvirc/kvs/kvi_kvs_useraction.cpp
index e582e6511..55b5281fd 100644
--- a/src/kvirc/kvs/kvi_kvs_useraction.cpp
+++ b/src/kvirc/kvs/kvi_kvs_useraction.cpp
@@ -22,8 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
-
 #include "kvi_kvs_useraction.h"
 #include "kvi_kvs_script.h"
 #include "kvi_config.h"
diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp
index a69b5250b..016f6078f 100644
--- a/src/kvirc/kvs/kvi_kvs_variant.cpp
+++ b/src/kvirc/kvs/kvi_kvs_variant.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_variant.h"
 #include "kvi_kvs_arraycast.h"
diff --git a/src/kvirc/kvs/kvi_kvs_variantlist.cpp b/src/kvirc/kvs/kvi_kvs_variantlist.cpp
index 3ff6907a7..6ba3d4f92 100644
--- a/src/kvirc/kvs/kvi_kvs_variantlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_variantlist.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_kvs_variantlist.h"
 
diff --git a/src/kvirc/module/kvi_mexlinkfilter.cpp b/src/kvirc/module/kvi_mexlinkfilter.cpp
index 602de49fb..5a5b48ee8 100644
--- a/src/kvirc/module/kvi_mexlinkfilter.cpp
+++ b/src/kvirc/module/kvi_mexlinkfilter.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #include "kvi_mexlinkfilter.h"
 
 KviMexLinkFilter::KviMexLinkFilter(KviModuleExtensionDescriptor * d)
diff --git a/src/kvirc/module/kvi_mexserverimport.cpp b/src/kvirc/module/kvi_mexserverimport.cpp
index a9c6cf8cf..f298d6170 100644
--- a/src/kvirc/module/kvi_mexserverimport.cpp
+++ b/src/kvirc/module/kvi_mexserverimport.cpp
@@ -20,7 +20,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#define __KVIRC__
+
 #include "kvi_mexserverimport.h"
 
 KviMexServerImport::KviMexServerImport(KviModuleExtensionDescriptor * d)
diff --git a/src/kvirc/module/kvi_mextoolbar.cpp b/src/kvirc/module/kvi_mextoolbar.cpp
index a2e8d01f6..3458b7662 100644
--- a/src/kvirc/module/kvi_mextoolbar.cpp
+++ b/src/kvirc/module/kvi_mextoolbar.cpp
@@ -20,7 +20,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#define __KVIRC__
+
 
 #include "kvi_mextoolbar.h"
 #include "kvi_frame.h"
diff --git a/src/kvirc/module/kvi_module.cpp b/src/kvirc/module/kvi_module.cpp
index 2cab19565..35efc746b 100644
--- a/src/kvirc/module/kvi_module.cpp
+++ b/src/kvirc/module/kvi_module.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_module.h"
 #include "kvi_app.h"
diff --git a/src/kvirc/module/kvi_moduleextension.cpp b/src/kvirc/module/kvi_moduleextension.cpp
index 5ded00b79..1741c0d0f 100644
--- a/src/kvirc/module/kvi_moduleextension.cpp
+++ b/src/kvirc/module/kvi_moduleextension.cpp
@@ -20,7 +20,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#define __KVIRC__
+
 #define _KVI_MODULEEXTENSION_CPP_
 
 #include "kvi_moduleextension.h"
diff --git a/src/kvirc/module/kvi_modulemanager.cpp b/src/kvirc/module/kvi_modulemanager.cpp
index 8c9fe0a4d..d95df1726 100644
--- a/src/kvirc/module/kvi_modulemanager.cpp
+++ b/src/kvirc/module/kvi_modulemanager.cpp
@@ -21,7 +21,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 //=============================================================================
-#define __KVIRC__
+
 
 #define _KVI_MODULEMANAGER_CPP_
 
diff --git a/src/kvirc/sparser/kvi_antispam.cpp b/src/kvirc/sparser/kvi_antispam.cpp
index 289f8504a..726d97cd0 100644
--- a/src/kvirc/sparser/kvi_antispam.cpp
+++ b/src/kvirc/sparser/kvi_antispam.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #define _KVI_ANTISPAM_CPP_
 
 #include "kvi_antispam.h"
diff --git a/src/kvirc/sparser/kvi_ircmessage.cpp b/src/kvirc/sparser/kvi_ircmessage.cpp
index 002c4b898..4b580f472 100644
--- a/src/kvirc/sparser/kvi_ircmessage.cpp
+++ b/src/kvirc/sparser/kvi_ircmessage.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircmessage.h"
 #include "kvi_ircconnection.h"
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index d1e83c26e..ce99dc54e 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 // FIXME: #warning "CTCP BEEP == WAKEUP == AWAKE"
 // FIXME: #warning "CTCP AVATARREQ or QUERYAVATAR"
 
diff --git a/src/kvirc/sparser/kvi_sp_literal.cpp b/src/kvirc/sparser/kvi_sp_literal.cpp
index e78eb9ee0..d443fa6b4 100644
--- a/src/kvirc/sparser/kvi_sp_literal.cpp
+++ b/src/kvirc/sparser/kvi_sp_literal.cpp
@@ -22,7 +22,7 @@
 //
 //====================================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_sparser.h"
 #include "kvi_window.h"
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index 0b83a592e..3b854a277 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_sparser.h"
 #include "kvi_window.h"
diff --git a/src/kvirc/sparser/kvi_sp_tables.cpp b/src/kvirc/sparser/kvi_sp_tables.cpp
index 8089909db..d623eb20a 100644
--- a/src/kvirc/sparser/kvi_sp_tables.cpp
+++ b/src/kvirc/sparser/kvi_sp_tables.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 
 #include "kvi_sparser.h"
 
diff --git a/src/kvirc/sparser/kvi_sparser.cpp b/src/kvirc/sparser/kvi_sparser.cpp
index e94d2cb38..367b2e484 100644
--- a/src/kvirc/sparser/kvi_sparser.cpp
+++ b/src/kvirc/sparser/kvi_sparser.cpp
@@ -21,7 +21,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 //=============================================================================
-#define __KVIRC__
+
 #define _KVI_SPARSER_CPP_
  
 #include "kvi_sparser.h"
diff --git a/src/kvirc/ui/kvi_actiondrawer.cpp b/src/kvirc/ui/kvi_actiondrawer.cpp
index 90d363b0c..c4d3b6032 100644
--- a/src/kvirc/ui/kvi_actiondrawer.cpp
+++ b/src/kvirc/ui/kvi_actiondrawer.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_app.h"
 #include "kvi_actiondrawer.h"
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index 09fb95537..5c672ec80 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -26,7 +26,7 @@
 // Channel widget : abstraction of an IRC channel
 //
 
-#define __KVIRC__
+
 
 #include "kvi_toolwindows_container.h"
 #include "kvi_channel.h"
diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp
index 2bf05bd34..a1f42beb8 100644
--- a/src/kvirc/ui/kvi_colorwin.cpp
+++ b/src/kvirc/ui/kvi_colorwin.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_colorwin.h"
 #include "kvi_app.h"
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 9ce4c0c93..b86253114 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircurl.h"
 #include "kvi_app.h"
diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp
index d4e72c84d..d9c33d818 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.cpp
+++ b/src/kvirc/ui/kvi_cryptcontroller.cpp
@@ -20,7 +20,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#define __KVIRC__
+
 
 #include "kvi_settings.h"
 
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp
index 32684bd10..859333e81 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.cpp
+++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp
@@ -20,7 +20,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#define __KVIRC__
+
 
 #include "kvi_ctcppagedialog.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index fbc5f97e9..17e30b799 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_customtoolbar.h"
 #include "kvi_frame.h"
diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp
index 5ade20cc9..15cfe97a4 100644
--- a/src/kvirc/ui/kvi_debugwindow.cpp
+++ b/src/kvirc/ui/kvi_debugwindow.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #include "kvi_debugwindow.h"
 #include "kvi_console.h"
 #include "kvi_iconmanager.h"
diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp
index 2235d9ff9..54059fced 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.cpp
+++ b/src/kvirc/ui/kvi_dynamictooltip.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #include "kvi_dynamictooltip.h"
 
 KviDynamicToolTipHelper::KviDynamicToolTipHelper(QWidget * parent,KviDynamicToolTip * parToolTip)
diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp
index 63dfef94e..52e4c0800 100644
--- a/src/kvirc/ui/kvi_filedialog.cpp
+++ b/src/kvirc/ui/kvi_filedialog.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #include "kvi_filedialog.h"
 #include "kvi_mediatype.h"
 #include "kvi_iconmanager.h"
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index e33499ae3..a9d7d89a1 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -22,7 +22,7 @@
 //

 //=============================================================================

 

-#define __KVIRC__

+

 #define _KVI_FRAME_CPP_

 

 #include "kvi_debug.h"

diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp
index 0709dea8c..36529c47a 100644
--- a/src/kvirc/ui/kvi_historywin.cpp
+++ b/src/kvirc/ui/kvi_historywin.cpp
@@ -23,7 +23,7 @@
 //
 
 
-#define __KVIRC__
+
 
 #include "kvi_historywin.h"
 #include "kvi_app.h"
diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp
index 40fed238b..89c622b23 100644
--- a/src/kvirc/ui/kvi_htmldialog.cpp
+++ b/src/kvirc/ui/kvi_htmldialog.cpp
@@ -21,7 +21,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 //=============================================================================
-#define __KVIRC__
+
 
 #include "kvi_htmldialog.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp
index 63e1a9aa1..80250cdb5 100644
--- a/src/kvirc/ui/kvi_imagedialog.cpp
+++ b/src/kvirc/ui/kvi_imagedialog.cpp
@@ -20,7 +20,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#define __KVIRC__
+
 #include "kvi_imagedialog.h"
 #include "kvi_fileutils.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index 5612dc7e3..a27d32e19 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
 
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
index 8db64f314..1f428f648 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/kvi_ipeditor.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #include "kvi_ipeditor.h"
 #include "kvi_qcstring.h"
 
diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp
index 878c1e028..c4db95331 100644
--- a/src/kvirc/ui/kvi_irctoolbar.cpp
+++ b/src/kvirc/ui/kvi_irctoolbar.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #include "kvi_irctoolbar.h"
 #include "kvi_console.h"
 #include "kvi_frame.h"
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 7c4bca517..4fbab0ca7 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 // Damn complex class ...but it works :)
 // #include <brain.h>
 //
diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp
index dfb0b39d2..efd57f161 100644
--- a/src/kvirc/ui/kvi_ircviewtools.cpp
+++ b/src/kvirc/ui/kvi_ircviewtools.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_ircviewtools.h"
 #include "kvi_ircview.h"
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index e4cf558e7..7b044503c 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #include "kvi_maskeditor.h"
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index 83fbda7c6..240fd989c 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -22,7 +22,7 @@
 //
 //=================================================================================================
 
-#define __KVIRC__
+
 
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index d69ed7ad9..affda8ead 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -21,7 +21,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 //=============================================================================
-#define __KVIRC__
+
 
 #define _KVI_DEBUG_CHECK_RANGE_
 #include "kvi_debug.h"
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index c76a0ca58..85cd4dcc4 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_debug.h"
 #include "kvi_settings.h"
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index b999e0d66..f41f58173 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #include "kvi_menubar.h"
 #include "kvi_app.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp
index 76640aeae..62a001c16 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/kvi_modeeditor.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #include "kvi_modeeditor.h"
 #include "kvi_iconmanager.h"
 #include "kvi_locale.h"
diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp
index 557641d3f..c653b3701 100755
--- a/src/kvirc/ui/kvi_modew.cpp
+++ b/src/kvirc/ui/kvi_modew.cpp
@@ -20,7 +20,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 //============================================================================
-#define __KVIRC__
+
 
 #include "kvi_themedlabel.h"
 #include "kvi_channel.h"
diff --git a/src/kvirc/ui/kvi_msgbox.cpp b/src/kvirc/ui/kvi_msgbox.cpp
index 2107c7649..ec5fbb38f 100644
--- a/src/kvirc/ui/kvi_msgbox.cpp
+++ b/src/kvirc/ui/kvi_msgbox.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #include "kvi_msgbox.h"
 #include "kvi_malloc.h"
 #include "kvi_string.h"
diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index 6abdc24aa..6fb969298 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_optionswidget.h"
 
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index fa72855f8..47e98c858 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #include "kvi_query.h"
 #include "kvi_console.h"
 #include "kvi_iconmanager.h"
diff --git a/src/kvirc/ui/kvi_scriptbutton.cpp b/src/kvirc/ui/kvi_scriptbutton.cpp
index fbda34d2c..101296788 100644
--- a/src/kvirc/ui/kvi_scriptbutton.cpp
+++ b/src/kvirc/ui/kvi_scriptbutton.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #include "kvi_scriptbutton.h"
 #include "kvi_irctoolbar.h"
 #include "kvi_window.h"
diff --git a/src/kvirc/ui/kvi_scripteditor.cpp b/src/kvirc/ui/kvi_scripteditor.cpp
index 85fce505f..645b45641 100644
--- a/src/kvirc/ui/kvi_scripteditor.cpp
+++ b/src/kvirc/ui/kvi_scripteditor.cpp
@@ -20,7 +20,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#define __KVIRC__
+
 #define _KVI_SCRIPTEDITOR_CPP_
 #define _KVI_DEBUG_CHECK_RANGE_
 
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index 1ea3a3f7b..1d0388165 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #define _KVI_SELECTORS_CPP_
 
 #include "kvi_selectors.h"
diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp
index 0e255573d..96ad66df5 100644
--- a/src/kvirc/ui/kvi_splash.cpp
+++ b/src/kvirc/ui/kvi_splash.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #include "kvi_string.h"
 #include "kvi_app.h"
 #include "kvi_defaults.h"
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index afc7124a0..0c9cc1a59 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_statusbar.h"
 #include "kvi_frame.h"
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp
index 24b606c28..6e0a8fc66 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/kvi_statusbarapplet.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_statusbarapplet.h"
 #include "kvi_frame.h"
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index 8d61374af..2b0dfb637 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -22,7 +22,7 @@
 //
 //===============================================================================================
 
-#define __KVIRC__
+
 //#define KVI_TASKBARBUTTON_MIN_WIDTH 100
 #define KVI_TASKBARBUTTON_CONTEXTINDICATORHEIGHT 6
 #define KVI_TASKBAR_MIN_WIDTH 120
diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp
index bf4fd777b..1b1dfbeb9 100644
--- a/src/kvirc/ui/kvi_texticonwin.cpp
+++ b/src/kvirc/ui/kvi_texticonwin.cpp
@@ -22,7 +22,7 @@
 //

 //=============================================================================

 

-#define __KVIRC__

+

 

 #include "kvi_texticonwin.h"

 #include "kvi_texticonmanager.h"

diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp
index 05601a089..7ece5797a 100644
--- a/src/kvirc/ui/kvi_themedlabel.cpp
+++ b/src/kvirc/ui/kvi_themedlabel.cpp
@@ -19,7 +19,7 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
-#define __KVIRC__
+
 #include "kvi_themedlabel.h"
 #include "kvi_options.h"
 #include "kvi_settings.h"
diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp
index 429513182..ddc26b643 100644
--- a/src/kvirc/ui/kvi_toolbar.cpp
+++ b/src/kvirc/ui/kvi_toolbar.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_toolbar.h"
 #include "kvi_frame.h"
diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp
index 791790553..5cdf11108 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.cpp
+++ b/src/kvirc/ui/kvi_toolwindows_container.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_toolwindows_container.h"
 #include "kvi_iconmanager.h"
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index 53938e669..ca8ba5bf2 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 
 #include "kvi_topicw.h"
 #include "kvi_options.h"
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index 576a9ed31..a35a81265 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#define __KVIRC__
+
 #define _KVI_USERLISTVIEW_CPP_
 
 #include "kvi_debug.h"
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index d1a94807c..646a5406b 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -22,7 +22,6 @@
 //
 //=============================================================================
 
-#define __KVIRC__
 #define KVI_WINDOW_MIN_WIDTH 100
 #define KVI_WINDOW_MIN_HEIGHT 100
 
@@ -176,11 +175,6 @@ void KviWindow::toggleButtonContainer()
 	}
 }
 
-KviIrcConnection * KviWindow::connection()
-{
-	return m_pContext ? m_pContext->connection() : 0;
-}
-
 void KviWindow::reloadImages()
 {
 	updateIcon();
@@ -307,29 +301,6 @@ bool KviWindow::setTextEncoding(const QString &szTextEncoding)
 	return false;
 }
 
-QTextCodec * KviWindow::defaultTextCodec()
-{
-	// if we have a connection try to inherit from there...
-	if(connection())
-	{
-		QTextCodec * c = connection()->textCodec();
-		if(c)return c;
-	}
-	return KviApp::defaultTextCodec();
-}
-
-KviQCString KviWindow::encodeText(const QString &szText)
-{
-	if(!m_pTextCodec)return defaultTextCodec()->fromUnicode(szText);
-	return m_pTextCodec->fromUnicode(szText);
-}
-
-QString KviWindow::decodeText(const char * szText)
-{
-	if(!m_pTextCodec)return defaultTextCodec()->toUnicode(szText);
-	return m_pTextCodec->toUnicode(szText);
-}
-
 QTextEncoder * KviWindow::makeEncoder()
 {
 	if(!m_pTextCodec)return defaultTextCodec()->makeEncoder();
@@ -567,7 +538,7 @@ void KviWindow::getDefaultLogFileName(QString &buffer)
 	date=dt.toString("yyyy.MM.dd");
 	QString base;
 	getBaseLogFileName(base);
-	kvi_encodeFileName(base);
+	KviFileUtils::encodeFileName(base);
 	base.replace("%%2e","%2e");
 	base=base.toLower();
 	QString tmp;
@@ -1396,6 +1367,17 @@ void KviWindow::preprocessMessage(QString & szMessage)
 	szMessage=strings.join(" ");
 }
 
+QTextCodec * KviWindow::defaultTextCodec()
+{
+	// if we have a connection try to inherit from there...
+	if(connection())
+	{
+		QTextCodec * c = connection()->textCodec();
+		if(c)return c;
+	}
+	return KviApp::defaultTextCodec();
+}
+
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "kvi_window.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index 82eb59ff4..bd5865ebc 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -24,6 +24,7 @@
 //
 //=============================================================================
 
+#include "kvi_app.h"
 #include "kvi_string.h"
 #include "kvi_qstring.h"
 #include "kvi_qcstring.h"
@@ -31,6 +32,8 @@
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_widgetstack.h"
 #include "kvi_accel.h"
+#include "kvi_irccontext.h"
+#include "kvi_ircconnection.h"
 
 #ifdef COMPILE_ON_WINDOWS
 	// The brain-damaged MSVC compiler can't instantiate QList templates without a destructor definition
@@ -53,7 +56,6 @@ class KviConfig;
 class KviIrcView;
 class KviInput;
 class KviConsole;
-class KviIrcContext;
 class KviIrcConnection;
 class KviWindowToolPageButton;
 class KviTalPopupMenu;
@@ -198,7 +200,7 @@ public:
 	// same as above
 	inline KviIrcContext * context(){ return m_pContext; };
 	// the current IRC connection (if any)
-	KviIrcConnection * connection();
+	inline KviIrcConnection * connection();
 	// The splitter of this window: it *shouldn't* be null... but ... well.. who knows ? :D ...better check it
 	inline QSplitter * splitter(){ return m_pSplitter; };
 	// The window has ALWAYS a taskbar item
@@ -233,14 +235,14 @@ public:
 	const QString & lastLineOfText();
 	const QString & lastMessageText();
 
-	const QString &textEncoding(){ return m_szTextEncoding; };
+	inline const QString &textEncoding(){ return m_szTextEncoding; };
 	// returns true if the encoding could be succesfully set
 	bool setTextEncoding(const QString &szTextEncoding);
 	// this must return a default text codec suitable for this window
 	virtual QTextCodec * defaultTextCodec();
 	// encode the text from szSource by using m_uTextEncoding
-	KviQCString encodeText(const QString &szText);
-	QString decodeText(const char * szText);
+	inline KviQCString encodeText(const QString &szText);
+	inline QString decodeText(const char * szText);
 	//return a text encoder
 	QTextEncoder * makeEncoder();
 
@@ -381,4 +383,28 @@ protected:
 	extern KVIRC_API KviWindow * g_pActiveWindow;
 #endif
 
+inline KviQCString KviWindow::encodeText(const QString &szText)
+{
+	if(m_pTextCodec) {
+		return m_pTextCodec->fromUnicode(szText);
+	} else {
+		return defaultTextCodec()->fromUnicode(szText);
+	}
+}
+
+inline QString KviWindow::decodeText(const char * szText)
+{
+	if(m_pTextCodec) {
+		return m_pTextCodec->toUnicode(szText);
+	} else {
+		return defaultTextCodec()->toUnicode(szText);
+	}
+}
+
+inline KviIrcConnection * KviWindow::connection()
+{
+	return m_pContext ? m_pContext->connection() : 0;
+}
+
+
 #endif //_KVI_WINDOW_H_
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 533a3456f..d68a69eb9 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -216,7 +216,7 @@ void KviDccChat::connectionInProgress()
 
 			//FIXME: #warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned number)"
 			struct in_addr a;
-			if(kvi_stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr));
+			if(KviNetUtils::stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr));
 
 			QString szReq = QString("PRIVMSG %1 :%2DCC %3 chat %4 %5").arg(m_pDescriptor->szNick).arg((char)0x01).arg(m_pDescriptor->szType).arg(ip.ptr()).arg(port);
 
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 628889e45..693c77434 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -121,10 +121,10 @@ int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTime
 void KviDccMarshal::doListen()
 {
 	// Check the address type
-	if(!kvi_isValidStringIp(m_szIp.toUtf8().data()))
+	if(!KviNetUtils::isValidStringIp(m_szIp))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		if(!kvi_isValidStringIp_V6(m_szIp.toUtf8().data()))
+		if(!KviNetUtils::isValidStringIp_V6(m_szIp))
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
@@ -295,10 +295,10 @@ int KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout
 void KviDccMarshal::doConnect()
 {
 	// Check the address type
-	if(!kvi_isValidStringIp(m_szIp.toUtf8().data()))
+	if(!KviNetUtils::isValidStringIp(m_szIp))
 	{
 #ifdef COMPILE_IPV6_SUPPORT
-		if(!kvi_isValidStringIp_V6(m_szIp.toUtf8().data()))
+		if(!KviNetUtils::isValidStringIp_V6(m_szIp))
 		{
 			emit error(KviError_invalidIpAddress);
 			return;
@@ -445,12 +445,12 @@ void KviDccMarshal::snActivated(int)
 			if(m_bIPv6)
 			{
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in6 *)addr)->sin6_port));
-				if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
+				if(!KviNetUtils::binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
 					m_szSecondaryIp = "localhost";
 			} else {
 #endif
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in *)addr)->sin_port));
-				if(!kvi_binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
+				if(!KviNetUtils::binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
 					m_szSecondaryIp = "localhost";
 #ifdef COMPILE_IPV6_SUPPORT
 			}
@@ -468,12 +468,12 @@ void KviDccMarshal::snActivated(int)
 			if(m_bIPv6)
 			{
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in6 *)addr)->sin6_port));
-				if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
+				if(!KviNetUtils::binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
 					m_szSecondaryIp = __tr2qs_ctx("unknown","dcc");
 			} else {
 #endif
 				m_szSecondaryPort.setNum(ntohs(((struct sockaddr_in *)addr)->sin_port));
-				if(!kvi_binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
+				if(!KviNetUtils::binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
 					m_szSecondaryIp = __tr2qs_ctx("unknown","dcc");
 #ifdef COMPILE_IPV6_SUPPORT
 			}
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index dc31a8045..830c8884d 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -167,7 +167,7 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
 	{
 		addr.s_addr = htonl((unsigned long)ipaddr.toULong());
 		QString tmp;
-		if(!kvi_binaryIpToStringIp(addr,tmp))
+		if(!KviNetUtils::binaryIpToStringIp(addr,tmp))
 		{
 			if(!dcc->ctcpMsg->msg->haltOutput())
 			{
@@ -179,11 +179,12 @@ static bool dcc_module_normalize_target_data(KviDccRequest * dcc,KviStr &ipaddr,
 		}
 		ipaddr = tmp;
 	} else {
-		if(!kvi_stringIpToBinaryIp(ipaddr,&addr))
+		//FIXME: KviStr -> QString
+		if(!KviNetUtils::stringIpToBinaryIp(QString(ipaddr),&addr))
 		{
 #ifdef COMPILE_IPV6_SUPPORT
 			struct in6_addr addr6;
-			if(kvi_stringIpToBinaryIp_V6(ipaddr,&addr6))
+			if(KviNetUtils::stringIpToBinaryIp_V6(QString(ipaddr),&addr6))
 			{
 				dcc->bIPv6 = true;
 				return true; // IPV6 address.
diff --git a/src/modules/dcc/utils.cpp b/src/modules/dcc/utils.cpp
index bf57e8102..6fe529834 100644
--- a/src/modules/dcc/utils.cpp
+++ b/src/modules/dcc/utils.cpp
@@ -111,7 +111,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 		KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).trimmed();
 		if(!KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).isEmpty())
 		{
-			if(kvi_isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
+			if(KviNetUtils::isValidStringIp(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
 			{
 				if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface),"0.0.0.0"))
 				{
@@ -128,7 +128,7 @@ bool dcc_kvs_get_listen_ip_address(KviKvsModuleCommandCall *c,KviConsole * pCons
 				return true;
 			}
 #ifdef COMPILE_IPV6_SUPPORT
-			if(kvi_isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
+			if(KviNetUtils::isValidStringIp_V6(KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface).toUtf8().data()))
 			{
 				szListenIp = KVI_OPTION_STRING(KviOption_stringDccListenDefaultInterface);
 			} else {
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index a8d6116cb..58f0815ae 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -752,16 +752,18 @@ void KviDccVoice::connectionInProgress()
 
 		if(m_pDescriptor->bSendRequest)
 		{
-			KviStr ip     = !m_pDescriptor->szFakeIp.isEmpty() ? m_pDescriptor->szFakeIp : m_pDescriptor->szListenIp;
+			QString ip     = !m_pDescriptor->szFakeIp.isEmpty() ? m_pDescriptor->szFakeIp : m_pDescriptor->szListenIp;
 			KviStr port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
 //#warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned nuumber)"
 			struct in_addr a;
-			if(kvi_stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr));
+			if(KviNetUtils::stringIpToBinaryIp(ip,&a)) {
+				ip.setNum(htonl(a.s_addr));
+			}
 
-			m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC VOICE %s %s %s %d%c",
+			m_pDescriptor->console()->connection()->sendFmtData("PRIVMSG %s :%cDCC VOICE %s %Q %s %d%c",
 					m_pDescriptor->console()->connection()->encodeText(m_pDescriptor->szNick).data(),
 					0x01,m_pDescriptor->szCodec.ptr(),
-					ip.ptr(),port.ptr(),m_pDescriptor->iSampleRate,0x01);
+					&ip,port.ptr(),m_pDescriptor->iSampleRate,0x01);
 			output(KVI_OUT_DCCMSG,__tr2qs_ctx("Sent DCC VOICE (%s) request to %Q, waiting for the remote client to connect...","dcc"),
 					m_pDescriptor->szCodec.ptr(),&(m_pDescriptor->szNick));
 		} else output(KVI_OUT_DCCMSG,__tr2qs_ctx("DCC VOICE request not sent: awaiting manual connections","dcc"));
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 19900a2aa..619ba185c 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -151,7 +151,7 @@ void KviHttpFileTransfer::displayPaint(QPainter * p,int column, QRect rect)
 
 			int iY = rect.top() + 4;
 
-			p->drawText(rect.left() + 4 + daW1,iY,width - (8 + daW1),height - 8,Qt::AlignTop | Qt::AlignLeft,m_pHttpRequest->url().url().ptr());
+			p->drawText(rect.left() + 4 + daW1,iY,width - (8 + daW1),height - 8,Qt::AlignTop | Qt::AlignLeft,m_pHttpRequest->url().url());
 			iY += iLineSpacing;
 			if(!(m_pHttpRequest->fileName().isEmpty()))
 			{
@@ -441,7 +441,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 		m_eGeneralStatus = Success;
 		displayUpdate();
 		if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICSUCCESS,__tr2qs_ctx("[HTTP %d]: Transfer completed","http"),id());
-		g_pApp->fileDownloadTerminated(true,m_pHttpRequest->url().url().ptr(),m_pHttpRequest->fileName(),QString::null,QString::null,!m_bNotifyCompletion);
+		g_pApp->fileDownloadTerminated(true,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString::null,QString::null,!m_bNotifyCompletion);
 	} else {
 		m_szStatusString = __tr2qs_ctx("Transfer failed","http");
 		m_szStatusString += ": ";
@@ -449,7 +449,7 @@ void KviHttpFileTransfer::transferTerminated(bool bSuccess)
 		m_eGeneralStatus = Failure;
 		displayUpdate();
 		if(out && (!m_bNoOutput))out->output(KVI_OUT_GENERICERROR,__tr2qs_ctx("[HTTP %d]: Transfer failed: %Q","http"),id(),&(m_pHttpRequest->lastError()));
-		g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url().ptr(),m_pHttpRequest->fileName(),QString::null,m_pHttpRequest->lastError(),!m_bNotifyCompletion);
+		g_pApp->fileDownloadTerminated(false,m_pHttpRequest->url().url(),m_pHttpRequest->fileName(),QString::null,m_pHttpRequest->lastError(),!m_bNotifyCompletion);
 	}
 	
 	if(m_bAutoClean)
diff --git a/src/modules/mediaplayer/mp_amarokinterface.cpp b/src/modules/mediaplayer/mp_amarokinterface.cpp
index 2db7a4af4..af2f0e71f 100644
--- a/src/modules/mediaplayer/mp_amarokinterface.cpp
+++ b/src/modules/mediaplayer/mp_amarokinterface.cpp
@@ -1,188 +1,196 @@
-//=============================================================================
-//
-//   File : mp_amarokinterface.cpp
-//   Created on Sun 27 Mar 2005 16:55:09 by Szymon Stefanek
-//
-//   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net>
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "mp_amarokinterface.h"
-
-#ifdef COMPILE_KDE3_SUPPORT
-
-#include "kvi_app.h"
-#include "kvi_locale.h"
-
-#include "dcopclient.h"
-#include "kurl.h"
-
-#include <QDataStream>
-#include <QLinkedList>
-
-MP_IMPLEMENT_DESCRIPTOR(
-	KviAmarokInterface,
-	"amarok",
-	__tr2qs_ctx(
-		"An interface to the AmaroK KDE media player."
-		,
-		"mediaplayer"
-	)
-)
-
-
-KviAmarokInterface::KviAmarokInterface()
-	: KviDCOPHelper(true, "amarok")
-{
-}
-
-KviAmarokInterface::~KviAmarokInterface()
-{
-}
-
-int KviAmarokInterface::detect(bool bStart){ return detectApp("amarok",bStart,95,99); }
-
-bool KviAmarokInterface::prev(){ return voidRetVoidDCOPCall("player","prev()"); }
-bool KviAmarokInterface::next(){ return voidRetVoidDCOPCall("player","next()"); }
-bool KviAmarokInterface::play(){ return voidRetVoidDCOPCall("player","play()"); }
-bool KviAmarokInterface::stop(){ return voidRetVoidDCOPCall("player","stop()"); }
-bool KviAmarokInterface::pause(){ return voidRetVoidDCOPCall("player","pause()"); }
-bool KviAmarokInterface::mute(){ return voidRetVoidDCOPCall("player","mute()"); }
-bool KviAmarokInterface::quit(){ return voidRetVoidDCOPCall("MainApplication-Interface","quit()"); }
-
-bool KviAmarokInterface::jumpTo(kvs_int_t &iPos)
-{
-	return voidRetIntDCOPCall("player","seek(int)",iPos/1000);
-}
-bool KviAmarokInterface::setVol(kvs_int_t &iVol)
-{
-	return voidRetIntDCOPCall("player","setVolume(int)",100*iVol/255);
-}
-
-#define MP_DCOP_STRING_CALL(_fncname,_iface,_fnc) \
-QString KviAmarokInterface::_fncname() \
-{ \
-	QString ret; \
-	if(!stringRetVoidDCOPCall(_iface,_fnc,ret))return false; \
-	return ret; \
-}
-
-MP_DCOP_STRING_CALL(nowPlaying,"player","nowPlaying()")
-MP_DCOP_STRING_CALL(artist,"player","artist()")
-MP_DCOP_STRING_CALL(title,"player","title()")
-MP_DCOP_STRING_CALL(genre,"player","genre()")
-MP_DCOP_STRING_CALL(year,"player","year()")
-MP_DCOP_STRING_CALL(comment,"player","comment()")
-MP_DCOP_STRING_CALL(album,"player","album()")
-
-int KviAmarokInterface::getVol()
-{
-	int ret;
-	if(!intRetVoidDCOPCall("player","getVolume()",ret))return false;
-	return ret * 255 / 100;
-}
-
-int KviAmarokInterface::sampleRate()
-{
-	int ret;
-	if(!intRetVoidDCOPCall("player","sampleRate()",ret))return false;
-	return ret;
-}
-
-int KviAmarokInterface::length()
-{
-	int ret;
-	if(!intRetVoidDCOPCall("player","trackTotalTime()",ret))return false;
-	return ret * 1000;
-}
-
-int KviAmarokInterface::position()
-{
-	int ret;
-	if(!intRetVoidDCOPCall("player","trackCurrentTime()",ret))return false;
-	return ret * 1000;
-}
-
-bool KviAmarokInterface::getRepeat()
-{
-	bool ret;
-	if(!boolRetVoidDCOPCall("player","repeatTrackStatus()",ret))return false;
-	return ret;
-}
-
-bool KviAmarokInterface::getShuffle()
-{
-	bool ret;
-	if(!boolRetVoidDCOPCall("player","randomModeStatus()",ret))return false;
-	return ret;
-}
-
-bool KviAmarokInterface::setRepeat(bool &bVal)
-{
-	return voidRetBoolDCOPCall("player","enableRepeatTrack(bool)",bVal);
-}
-
-bool KviAmarokInterface::setShuffle(bool &bVal)
-{
-	return voidRetBoolDCOPCall("player","enableRandomMode(bool)",bVal);
-}
-
-KviMediaPlayerInterface::PlayerStatus KviAmarokInterface::status()
-{
-	int ret;
-	if(!intRetVoidDCOPCall("player","status()",ret))return KviMediaPlayerInterface::Unknown;
-	switch(ret)
-	{
-		case 0:
-			return KviMediaPlayerInterface::Stopped;
-		break;
-		case 1:
-			return KviMediaPlayerInterface::Paused;
-		break;
-		case 2:
-			return KviMediaPlayerInterface::Playing;
-		break;
-		default:
-			return KviMediaPlayerInterface::Unknown;
-		break;
-	}
-	return KviMediaPlayerInterface::Unknown;
-}
-
-QString KviAmarokInterface::mrl()
-{
-	QString ret;
-	if(!stringRetVoidDCOPCall("player","encodedURL()",ret))return false;
-	KURL url(ret);
-	return url.prettyURL();
-}
-
-bool KviAmarokInterface::playMrl(const QString &mrl)
-{
-	QString title;
-	QByteArray data, replyData;
-	KviQCString replyType;
-	QDataStream arg(data,IO_WriteOnly);
-	arg << KURL(mrl);
-	if(!g_pApp->dcopClient()->call(m_szAppId,"playlist","playMedia(KURL)",data,replyType,replyData))
-		return false;
-	return true;
-}
-
-
-#endif //COMPILE_KDE_SUPPORT
+//=============================================================================

+//

+//   File : mp_amarokinterface.cpp

+//   Created on Sun 27 Mar 2005 16:55:09 by Szymon Stefanek

+//

+//   This file is part of the KVIrc IRC client distribution

+//   Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net>

+//

+//   This program is FREE software. You can redistribute it and/or

+//   modify it under the terms of the GNU General Public License

+//   as published by the Free Software Foundation; either version 2

+//   of the License, or (at your opinion) any later version.

+//

+//   This program is distributed in the HOPE that it will be USEFUL,

+//   but WITHOUT ANY WARRANTY; without even the implied warranty of

+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+//   See the GNU General Public License for more details.

+//

+//   You should have received a copy of the GNU General Public License

+//   along with this program. If not, write to the Free Software Foundation,

+//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+//

+//=============================================================================

+

+#include "mp_amarokinterface.h"

+

+#ifdef COMPILE_KDE3_SUPPORT

+

+#include "kvi_app.h"

+#include "kvi_locale.h"

+

+#include "dcopclient.h"

+#include "kurl.h"

+

+#include <QDataStream>

+#include <QLinkedList>

+

+MP_IMPLEMENT_DESCRIPTOR(

+	KviAmarokInterface,

+	"amarok",

+	__tr2qs_ctx(

+		"An interface to the AmaroK KDE media player."

+		,

+		"mediaplayer"

+	)

+)

+

+

+KviAmarokInterface::KviAmarokInterface()

+	: KviDCOPHelper(true, "amarok")

+{

+}

+

+KviAmarokInterface::~KviAmarokInterface()

+{

+}

+

+int KviAmarokInterface::detect(bool bStart){ return detectApp("amarok",bStart,95,99); }

+

+bool KviAmarokInterface::prev(){ return voidRetVoidDCOPCall("player","prev()"); }

+bool KviAmarokInterface::next(){ return voidRetVoidDCOPCall("player","next()"); }

+bool KviAmarokInterface::play(){ return voidRetVoidDCOPCall("player","play()"); }

+bool KviAmarokInterface::stop(){ return voidRetVoidDCOPCall("player","stop()"); }

+bool KviAmarokInterface::pause(){ return voidRetVoidDCOPCall("player","pause()"); }

+bool KviAmarokInterface::mute(){ return voidRetVoidDCOPCall("player","mute()"); }

+bool KviAmarokInterface::quit(){ return voidRetVoidDCOPCall("MainApplication-Interface","quit()"); }

+

+bool KviAmarokInterface::jumpTo(kvs_int_t &iPos)

+{

+	return voidRetIntDCOPCall("player","seek(int)",iPos/1000);

+}

+bool KviAmarokInterface::setVol(kvs_int_t &iVol)

+{

+	return voidRetIntDCOPCall("player","setVolume(int)",100*iVol/255);

+}

+

+#define MP_DCOP_STRING_CALL(_fncname,_iface,_fnc) \

+QString KviAmarokInterface::_fncname() \

+{ \

+	QString ret; \

+	if(!stringRetVoidDCOPCall(_iface,_fnc,ret))return false; \

+	return ret; \

+}

+

+MP_DCOP_STRING_CALL(nowPlaying,"player","nowPlaying()")

+MP_DCOP_STRING_CALL(artist,"player","artist()")

+MP_DCOP_STRING_CALL(title,"player","title()")

+MP_DCOP_STRING_CALL(genre,"player","genre()")

+MP_DCOP_STRING_CALL(year,"player","year()")

+MP_DCOP_STRING_CALL(comment,"player","comment()")

+MP_DCOP_STRING_CALL(album,"player","album()")

+

+int KviAmarokInterface::getVol()

+{

+	int ret;

+	if(!intRetVoidDCOPCall("player","getVolume()",ret))return false;

+	return ret * 255 / 100;

+}

+

+int KviAmarokInterface::sampleRate()

+{

+	int ret;

+	if(!intRetVoidDCOPCall("player","sampleRate()",ret))return false;

+	return ret;

+}

+

+int KviAmarokInterface::length()

+{

+	int ret;

+	if(!intRetVoidDCOPCall("player","trackTotalTime()",ret))return false;

+	return ret * 1000;

+}

+

+int KviAmarokInterface::position()

+{

+	int ret;

+	if(!intRetVoidDCOPCall("player","trackCurrentTime()",ret))return false;

+	return ret * 1000;

+}

+

+bool KviAmarokInterface::getRepeat()

+{

+	bool ret;

+	if(!boolRetVoidDCOPCall("player","repeatTrackStatus()",ret))return false;

+	return ret;

+}

+

+bool KviAmarokInterface::getShuffle()

+{

+	bool ret;

+	if(!boolRetVoidDCOPCall("player","randomModeStatus()",ret))return false;

+	return ret;

+}

+

+bool KviAmarokInterface::setRepeat(bool &bVal)

+{

+	return voidRetBoolDCOPCall("player","enableRepeatTrack(bool)",bVal);

+}

+

+bool KviAmarokInterface::setShuffle(bool &bVal)

+{

+	return voidRetBoolDCOPCall("player","enableRandomMode(bool)",bVal);

+}

+

+KviMediaPlayerInterface::PlayerStatus KviAmarokInterface::status()

+{

+	int ret;

+	if(!intRetVoidDCOPCall("player","status()",ret))return KviMediaPlayerInterface::Unknown;

+	switch(ret)

+	{

+		case 0:

+			return KviMediaPlayerInterface::Stopped;

+		break;

+		case 1:

+			return KviMediaPlayerInterface::Paused;

+		break;

+		case 2:

+			return KviMediaPlayerInterface::Playing;

+		break;

+		default:

+			return KviMediaPlayerInterface::Unknown;

+		break;

+	}

+	return KviMediaPlayerInterface::Unknown;

+}

+

+QString KviAmarokInterface::mrl()

+{

+	QString ret;

+	if(!stringRetVoidDCOPCall("player","encodedURL()",ret))return false;

+	KURL url(ret);

+	return url.prettyURL();

+}

+

+int KviAmarokInterface::bitRate()

+{

+	QString ret;

+	if(!stringRetVoidDCOPCall("player","bitrate()",ret))return false;

+	int a = ret.toInt();

+	return a;

+}

+

+bool KviAmarokInterface::playMrl(const QString &mrl)

+{

+	QString title;

+	QByteArray data, replyData;

+	KviQCString replyType;

+	QDataStream arg(data,IO_WriteOnly);

+	arg << KURL(mrl);

+	if(!g_pApp->dcopClient()->call(m_szAppId,"playlist","playMedia(KURL)",data,replyType,replyData))

+		return false;

+	return true;

+}

+

+

+#endif //COMPILE_KDE_SUPPORT

diff --git a/src/modules/mediaplayer/mp_amarokinterface.h b/src/modules/mediaplayer/mp_amarokinterface.h
index fc4033c5f..9a7410e33 100644
--- a/src/modules/mediaplayer/mp_amarokinterface.h
+++ b/src/modules/mediaplayer/mp_amarokinterface.h
@@ -1,76 +1,76 @@
-#ifndef _MP_AMAROKINTERFACE_H_
-#define _MP_AMAROKINTERFACE_H_
-//=============================================================================
-//
-//   File : mp_amarokinterface.h
-//   Created on Sun 27 Mar 2005 16:55:09 by Szymon Stefanek
-//
-//   This file is part of the KVIrc IRC client distribution
-//   Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net>
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-
-#ifdef COMPILE_KDE3_SUPPORT
-
-	#include "kvi_dcophelper.h"
-	#include "mp_interface.h"
-	
-	class KviAmarokInterface : public KviMediaPlayerInterface, private KviDCOPHelper
-	{
-	public:
-		KviAmarokInterface();
-		~KviAmarokInterface();
-	public:
-		virtual int detect(bool bStart);
-		virtual bool prev();
-		virtual bool next();
-		virtual bool play();
-		virtual bool stop();
-		virtual bool pause();
-		virtual bool jumpTo(kvs_int_t &iPos);
-		virtual bool setVol(kvs_int_t &iVol);
-		virtual bool mute();
-		virtual int getVol();
-		virtual bool quit();
-		virtual QString nowPlaying();
-		virtual QString mrl();
-		virtual QString title();
-		virtual QString artist();
-		virtual QString genre();
-		virtual QString comment();
-		virtual QString year();
-		virtual QString album();
-		virtual int position();
-		virtual int length();
-		//virtual int bitRate(); unsupported
-		virtual int sampleRate();
-		virtual bool playMrl(const QString &mrl);
-		virtual KviMediaPlayerInterface::PlayerStatus status();
-		virtual bool getRepeat();
-		virtual bool getShuffle();
-		virtual bool setRepeat(bool &bVal);
-		virtual bool setShuffle(bool &bVal);
-	};
-	
-	MP_DECLARE_DESCRIPTOR(KviAmarokInterface)
-
-#endif //COMPILE_KDE_SUPPORT
-
-#endif //!_MP_AMAROKINTERFACE_H_
+#ifndef _MP_AMAROKINTERFACE_H_

+#define _MP_AMAROKINTERFACE_H_

+//=============================================================================

+//

+//   File : mp_amarokinterface.h

+//   Created on Sun 27 Mar 2005 16:55:09 by Szymon Stefanek

+//

+//   This file is part of the KVIrc IRC client distribution

+//   Copyright (C) 2005 Szymon Stefanek <pragma at kvirc dot net>

+//

+//   This program is FREE software. You can redistribute it and/or

+//   modify it under the terms of the GNU General Public License

+//   as published by the Free Software Foundation; either version 2

+//   of the License, or (at your opinion) any later version.

+//

+//   This program is distributed in the HOPE that it will be USEFUL,

+//   but WITHOUT ANY WARRANTY; without even the implied warranty of

+//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

+//   See the GNU General Public License for more details.

+//

+//   You should have received a copy of the GNU General Public License

+//   along with this program. If not, write to the Free Software Foundation,

+//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.

+//

+//=============================================================================

+

+#include "kvi_settings.h"

+

+

+#ifdef COMPILE_KDE3_SUPPORT

+

+	#include "kvi_dcophelper.h"

+	#include "mp_interface.h"

+	

+	class KviAmarokInterface : public KviMediaPlayerInterface, private KviDCOPHelper

+	{

+	public:

+		KviAmarokInterface();

+		~KviAmarokInterface();

+	public:

+		virtual int detect(bool bStart);

+		virtual bool prev();

+		virtual bool next();

+		virtual bool play();

+		virtual bool stop();

+		virtual bool pause();

+		virtual bool jumpTo(kvs_int_t &iPos);

+		virtual bool setVol(kvs_int_t &iVol);

+		virtual bool mute();

+		virtual int getVol();

+		virtual bool quit();

+		virtual QString nowPlaying();

+		virtual QString mrl();

+		virtual QString title();

+		virtual QString artist();

+		virtual QString genre();

+		virtual QString comment();

+		virtual QString year();

+		virtual QString album();

+		virtual int position();

+		virtual int length();

+		virtual int bitRate();

+		virtual int sampleRate();

+		virtual bool playMrl(const QString &mrl);

+		virtual KviMediaPlayerInterface::PlayerStatus status();

+		virtual bool getRepeat();

+		virtual bool getShuffle();

+		virtual bool setRepeat(bool &bVal);

+		virtual bool setShuffle(bool &bVal);

+	};

+	

+	MP_DECLARE_DESCRIPTOR(KviAmarokInterface)

+

+#endif //COMPILE_KDE_SUPPORT

+

+#endif //!_MP_AMAROKINTERFACE_H_

diff --git a/src/modules/objects/class_socket.cpp b/src/modules/objects/class_socket.cpp
index 978e9e7b2..9b6d8cd9c 100644
--- a/src/modules/objects/class_socket.cpp
+++ b/src/modules/objects/class_socket.cpp
@@ -600,9 +600,9 @@ bool  KviKvsObject_socket::functionConnect(KviKvsObjectFunctionCall *c)
 
 
 #ifdef COMPILE_IPV6_SUPPORT
-	if(kvi_isValidStringIp(m_szRemoteIp.toUtf8().data()) || kvi_isValidStringIp_V6(m_szRemoteIp.toUtf8().data()))
+	if(KviNetUtils::isValidStringIp(m_szRemoteIp) || KviNetUtils::isValidStringIp_V6(m_szRemoteIp))
 #else
-	if(kvi_isValidStringIp(m_szRemoteIp.toUtf8().data()))
+	if(KviNetUtils::isValidStringIp(m_szRemoteIp))
 #endif
 	{
 		debug ("ok connecting");
@@ -658,10 +658,10 @@ bool KviKvsObject_socket::functionListen(KviKvsObjectFunctionCall *c)
 	{
 
 		// Check the address type
-		if(kvi_isValidStringIp(m_szLocalIp.toUtf8().data()))bGotIp = true;
+		if(KviNetUtils::isValidStringIp(m_szLocalIp))bGotIp = true;
 		else {
 #ifdef COMPILE_IPV6_SUPPORT
-			if(kvi_isValidStringIp_V6(m_szLocalIp.toUtf8().data()))
+			if(KviNetUtils::isValidStringIp_V6(m_szLocalIp))
 			{
 				bGotIp = true;
 				m_bIPv6 = true;
@@ -803,12 +803,12 @@ void KviKvsObject_socket::incomingConnection(int)
 		if(m_bIPv6)
 		{
 			m_uSecondaryPort = ntohs(((struct sockaddr_in6 *)addr)->sin6_port);
-			if(!kvi_binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
+			if(!KviNetUtils::binaryIpToStringIp_V6(((struct sockaddr_in6 *)addr)->sin6_addr,m_szSecondaryIp))
 				m_szSecondaryIp = __tr("unknown");
 		} else {
 #endif
 			m_uSecondaryPort = ntohs(((struct sockaddr_in *)addr)->sin_port);
-			if(!kvi_binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
+			if(!KviNetUtils::binaryIpToStringIp(((struct sockaddr_in *)addr)->sin_addr,m_szSecondaryIp))
 				m_szSecondaryIp = __tr("unknown");
 #ifdef COMPILE_IPV6_SUPPORT
 		}
@@ -870,7 +870,7 @@ void KviKvsObject_socket::doConnect()
 	m_pDelayTimer = 0;
 
 
-	KviSockaddr sa(m_szRemoteIp.toUtf8().data(),m_uRemotePort,!kvi_isValidStringIp(m_szRemoteIp.toUtf8().data()),m_bUdp);
+	KviSockaddr sa(m_szRemoteIp.toUtf8().data(),m_uRemotePort,!KviNetUtils::isValidStringIp(m_szRemoteIp),m_bUdp);
 
 	if(!sa.socketAddress())
 	{
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 83fccd969..2b0f376ab 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -82,7 +82,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 
 	KviTalVBox * vbox = new KviTalVBox(this);
 	addWidgetToLayout(vbox,1,1,1,1);
-	
+
 	QToolButton * tb = new QToolButton(vbox);
 	tb->setIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PROXY))));
 	tb->setAutoRaise(true);
@@ -95,7 +95,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	tb->setAutoRaise(true);
 	connect(tb,SIGNAL(clicked()),this,SLOT(removeCurrent()));
 	mergeTip(tb,__tr2qs_ctx("Remove Proxy","options"));
-	
+
 	QFrame * lll = new QFrame(vbox);
 	vbox->setStretchFactor(lll,100);
 
@@ -248,22 +248,22 @@ void KviProxyOptionsWidget::saveLastItem()
 		m_pLastEditedItem->m_pProxyData->m_bIsIPv6 = false;
 #endif
 		m_pLastEditedItem->m_pProxyData->m_szIp = "";
-		KviStr tmpAddr = m_pIpEditor->address();
+		QString tmpAddr = m_pIpEditor->address();
 
 		if(!m_pIpEditor->hasEmptyFields())
 		{
 #ifdef COMPILE_IPV6_SUPPORT
 			if(m_pIPv6Check->isChecked())
 			{
-				if((!kvi_strEqualCI(tmpAddr.ptr(),"0:0:0:0:0:0:0:0")) &&
-					kvi_isValidStringIp_V6(tmpAddr.ptr()))
+				if((!KviQString::equalCI(tmpAddr,"0:0:0:0:0:0:0:0")) &&
+						KviNetUtils::isValidStringIp_V6(tmpAddr))
 				{
 					m_pLastEditedItem->m_pProxyData->m_szIp = tmpAddr;
 				}
 			} else {
 #endif
-				if((!kvi_strEqualCI(tmpAddr.ptr(),"0.0.0.0")) &&
-					kvi_isValidStringIp(tmpAddr.ptr()))
+				if((!KviQString::equalCI(tmpAddr,"0.0.0.0")) &&
+						KviNetUtils::isValidStringIp(tmpAddr))
 				{
 					m_pLastEditedItem->m_pProxyData->m_szIp = tmpAddr;
 				}
@@ -290,7 +290,7 @@ void KviProxyOptionsWidget::commit()
 	saveLastItem();
 	g_pProxyDataBase->clear();
 	KviProxyOptionsTreeWidgetItem * it;// = (KviProxyOptionsTreeWidgetItem *)m_pTreeWidget->topLevelItemCount();
-	
+
 	//while(it)
 	for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index b67853eda..88da148a9 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -931,25 +931,25 @@ void KviServerDetailsWidget::fillData(KviServer * s)
 
 	if(m_pIpEditor)
 	{
-		KviStr tmpAddr = m_pIpEditor->address();
+		QString tmpAddr = m_pIpEditor->address();
 
 		if(!m_pIpEditor->hasEmptyFields())
 		{
 #ifdef COMPILE_IPV6_SUPPORT
 			if(s->isIPv6())
 			{
-				if((!kvi_strEqualCI(tmpAddr.ptr(),"0:0:0:0:0:0:0:0")) && kvi_isValidStringIp_V6(tmpAddr.ptr()))
+				if((!KviQString::equalCI(tmpAddr,"0:0:0:0:0:0:0:0")) && KviNetUtils::isValidStringIp(tmpAddr))
 				{
-					s->setIp(tmpAddr.ptr());
+					s->setIp(tmpAddr);
 				} else {
 					s->setCacheIp(false);
 					s->setIp("");
 				}
 			} else {
 #endif
-				if((!kvi_strEqualCI(tmpAddr.ptr(),"0.0.0.0")) && kvi_isValidStringIp(tmpAddr.ptr()))
+				if((!KviQString::equalCI(tmpAddr,"0.0.0.0")) && KviNetUtils::isValidStringIp(tmpAddr))
 				{
-					s->setIp(tmpAddr.ptr());
+					s->setIp(tmpAddr);
 				} else {
 					s->setCacheIp(false);
 					s->setIp("");
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 3553e7941..b52774518 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -814,14 +814,14 @@ void KviRegisteredUsersDialog::importClicked()
 

 			if(img.isNull())debug("Ops.. readed a null image ?");

 

-			KviStr fName = u->name();

-			kvi_encodeFileName(fName);

+			QString fName = u->name();

+			KviFileUtils::adjustFilePath(fName);

 

 			QString fPath;

 			int rnm = 0 ;

 			do

 			{

-				g_pApp->getLocalKvircDirectory(fPath,KviApp::Avatars,fName.ptr());

+				g_pApp->getLocalKvircDirectory(fPath,KviApp::Avatars,fName);

 				fPath.append(QString("%1.png").arg(rnm));

 				rnm++;

 			} while(KviFileUtils::fileExists(fPath));

diff --git a/src/modules/rijndael/CMakeLists.txt b/src/modules/rijndael/CMakeLists.txt
index 9ac817f4d..4c5fe4366 100644
--- a/src/modules/rijndael/CMakeLists.txt
+++ b/src/modules/rijndael/CMakeLists.txt
@@ -15,7 +15,7 @@ SET(kvirijndael_SRCS
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
-QT4_WRAP_CPP(kvirijndael_MOC_SRCS ${kvirijndael_MOC_HDRS})
+QT4_WRAP_CPP(kvirijndael_MOC_SRCS ${kvirijndael_MOC_HDRS} "-DCOMPILE_CRYPT_SUPPORT")
 
 SET(kvi_module_name kvirijndael)
 INCLUDE(${CMAKE_SOURCE_DIR}/cmake/module.rules.txt)
diff --git a/src/modules/rijndael/ablowfish.h b/src/modules/rijndael/ablowfish.h
index ef8810035..5dc3ed133 100644
--- a/src/modules/rijndael/ablowfish.h
+++ b/src/modules/rijndael/ablowfish.h
@@ -75,7 +75,7 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_CRYPT_SUPPORT
+#if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
 
 
 //Block Structure
diff --git a/src/modules/rijndael/libkvirijndael.cpp b/src/modules/rijndael/libkvirijndael.cpp
index 9718653ad..32383b3dc 100644
--- a/src/modules/rijndael/libkvirijndael.cpp
+++ b/src/modules/rijndael/libkvirijndael.cpp
@@ -58,7 +58,7 @@
 
 
 
-#ifdef COMPILE_CRYPT_SUPPORT
+#if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
 	#include "kvi_memmove.h"
 	#include "kvi_malloc.h"
 	#include "kvi_pointerlist.h"
diff --git a/src/modules/rijndael/rijndael.h b/src/modules/rijndael/rijndael.h
index 4a5b9e506..63394d31f 100644
--- a/src/modules/rijndael/rijndael.h
+++ b/src/modules/rijndael/rijndael.h
@@ -81,7 +81,7 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_CRYPT_SUPPORT
+#if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
 
 #define _MAX_KEY_COLUMNS (256/32)
 #define _MAX_ROUNDS      14