Compile and run with Qt5.0. Also add a couple of KVS functions for byte order conversion.

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

48 files changed, 385 insertions, 118 deletions

diff --git a/src/kvilib/net/KviNetUtils.cpp b/src/kvilib/net/KviNetUtils.cpp
index f12cdbab7..150a914f6 100644
--- a/src/kvilib/net/KviNetUtils.cpp
+++ b/src/kvilib/net/KviNetUtils.cpp
@@ -475,11 +475,11 @@ namespace KviNetUtils
 		QStringList ipv4 = szAddr.split(".", QString::KeepEmptyParts, Qt::CaseInsensitive);
 		if (ipv4.count() == 4) {
 			int i = 0;
-			bool ok = TRUE;
+			bool ok = true;
 			while(ok && i < 4) {
 				uint byteValue = ipv4[i].toUInt(&ok);
 				if ( (byteValue > 255) && ok )
-					ok = FALSE;
+					ok = false;
 				if (ok)
 					iAddr = (iAddr << 8) + byteValue;
 				++i;
@@ -490,7 +490,7 @@ namespace KviNetUtils
 				return true;
 			}
 		}
-		return FALSE;
+		return false;
 #else //HAVE_INET_ATON
 		if(szStringIp.isEmpty())return false;
 		return (inet_aton(szStringIp.toUtf8().data(),address) != 0);
diff --git a/src/kvilib/system/KviByteOrder.h b/src/kvilib/system/KviByteOrder.h
index aedc53ef9..53d6df8d9 100644
--- a/src/kvilib/system/KviByteOrder.h
+++ b/src/kvilib/system/KviByteOrder.h
@@ -120,6 +120,68 @@ namespace KviByteOrder
 		return swap64(u);
 	}
 
+	inline kvi_u16_t localCpuToBigEndian16(kvi_u16_t u)
+	{
+		return u;
+	}
+	
+	inline kvi_u32_t localCpuToBigEndian32(kvi_u32_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u64_t localCpuToBigEndian64(kvi_u64_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u16_t bigEndianToLocalCpu16(kvi_u16_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u32_t bigEndianToLocalCpu32(kvi_u32_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u64_t bigEndianToLocalCpu64(kvi_u64_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u16_t localCpuToNetworkByteOrder16(kvi_u16_t u)
+	{
+		return u;
+	}
+	
+	inline kvi_u32_t localCpuToNetworkByteOrder32(kvi_u32_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u64_t localCpuToNetworkByteOrder64(kvi_u64_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u16_t networkByteOrderToLocalCpu16(kvi_u16_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u32_t networkByteOrderToLocalCpu32(kvi_u32_t u)
+	{
+		return u;
+	}
+
+	inline kvi_u64_t networkByteOrderToLocalCpu64(kvi_u64_t u)
+	{
+		return u;
+	}
+
+
+
 #else //!BIG_ENDIAN_MACHINE_BYTE_ORDER
 
 	// We ASSUME that the local cpu is little endian.. if it isn't.. well :)
@@ -155,6 +217,68 @@ namespace KviByteOrder
 		return u;
 	}
 
+	inline kvi_u16_t localCpuToBigEndian16(kvi_u16_t u)
+	{
+		return swap16(u);
+	}
+	
+	inline kvi_u32_t localCpuToBigEndian32(kvi_u32_t u)
+	{
+		return swap32(u);
+	}
+
+	inline kvi_u64_t localCpuToBigEndian64(kvi_u64_t u)
+	{
+		return swap64(u);
+	}
+
+	inline kvi_u16_t bigEndianToLocalCpu16(kvi_u16_t u)
+	{
+		return swap16(u);
+	}
+
+	inline kvi_u32_t bigEndianToLocalCpu32(kvi_u32_t u)
+	{
+		return swap32(u);
+	}
+
+	inline kvi_u64_t bigEndianToLocalCpu64(kvi_u64_t u)
+	{
+		return swap64(u);
+	}
+
+
+
+	inline kvi_u16_t localCpuToNetworkByteOrder16(kvi_u16_t u)
+	{
+		return swap16(u);
+	}
+	
+	inline kvi_u32_t localCpuToNetworkByteOrder32(kvi_u32_t u)
+	{
+		return swap32(u);
+	}
+
+	inline kvi_u64_t localCpuToNetworkByteOrder64(kvi_u64_t u)
+	{
+		return swap64(u);
+	}
+
+	inline kvi_u16_t networkByteOrderToLocalCpu16(kvi_u16_t u)
+	{
+		return swap16(u);
+	}
+
+	inline kvi_u32_t networkByteOrderToLocalCpu32(kvi_u32_t u)
+	{
+		return swap32(u);
+	}
+
+	inline kvi_u64_t networkByteOrderToLocalCpu64(kvi_u64_t u)
+	{
+		return swap64(u);
+	}
+
 #endif //!BIG_ENDIAN_MACHINE_BYTE_ORDER
 
 } // namespace KviByteOrder
diff --git a/src/kvirc/kernel/KviApplication.cpp b/src/kvirc/kernel/KviApplication.cpp
index 5483e40ca..06b1fc99e 100644
--- a/src/kvirc/kernel/KviApplication.cpp
+++ b/src/kvirc/kernel/KviApplication.cpp
@@ -126,7 +126,11 @@
 #endif
 
 #ifdef COMPILE_X11_SUPPORT
+#if (QT_VERSION < 0x050000)
 	#include <QX11Info>
+#else
+	// FIXME: Need a replacement for this
+#endif
 #endif
 
 /*
@@ -226,7 +230,7 @@ KviApplication::KviApplication(int &argc,char ** argv)
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 	m_bPortable = KviFileUtils::fileExists(g_pApp->applicationDirPath()+KVI_PATH_SEPARATOR_CHAR+"portable");
 	//workaround for #957
-	QApplication::setEffectEnabled(Qt::UI_FadeMenu, FALSE);
+	QApplication::setEffectEnabled(Qt::UI_FadeMenu, false);
 #endif
 
     //note: the early qApp->style() call leads to a crash on osx
@@ -732,8 +736,13 @@ bool KviApplication::supportsCompositing()
 	return true;
 #endif
 #ifdef COMPILE_X11_SUPPORT
+#if (QT_VERSION < 0x050000)
 	return QX11Info::isCompositingManagerRunning();
-#endif
+#else // QT_VERSION >= 0x050000
+	// FIXME: Need a replacement for this?
+	return false;
+#endif // QT_VERSION >= 0x050000
+#endif // COMPILE_X11_SUPPORT
 #ifdef COMPILE_ON_MAC
 	return true;
 #endif
diff --git a/src/kvirc/kernel/KviIpcSentinel.cpp b/src/kvirc/kernel/KviIpcSentinel.cpp
index 70880c5f1..ef047d6ce 100644
--- a/src/kvirc/kernel/KviIpcSentinel.cpp
+++ b/src/kvirc/kernel/KviIpcSentinel.cpp
@@ -48,7 +48,7 @@
 
 #else
 
-	#ifdef COMPILE_X11_SUPPORT
+	#if defined(COMPILE_X11_SUPPORT) && (QT_VERSION < 0x050000)
 		#include <X11/Xatom.h>
 		#include "KviXlib.h" // for XEvent
 
@@ -88,7 +88,7 @@
 			int format;
 			unsigned long nItems,after;
 			unsigned char * data = 0;
-			if(XGetWindowProperty(kvi_ipc_get_xdisplay(),win,kvi_atom_ipc_sentinel_window,0,32,FALSE,XA_STRING,
+			if(XGetWindowProperty(kvi_ipc_get_xdisplay(),win,kvi_atom_ipc_sentinel_window,0,32,false,XA_STRING,
 				&type,&format,&nItems,&after,&data) == Success)
 			{
 				if((type == XA_STRING) && (format == 8))
@@ -154,7 +154,7 @@
 			return true;
 		}
 #else
-	#ifdef COMPILE_X11_SUPPORT
+	#if defined(COMPILE_X11_SUPPORT) && (QT_VERSION < 0x050000)
 
 		kvi_ipcLoadAtoms();
 
@@ -198,7 +198,7 @@
 		setWindowTitle("kvirc4_ipc_sentinel");
 		setWindowFlags(Qt::FramelessWindowHint);
 #else
-	#ifdef COMPILE_X11_SUPPORT
+	#if defined(COMPILE_X11_SUPPORT) && (QT_VERSION < 0x050000)
 		kvi_ipcLoadAtoms();
 
 		XChangeProperty(kvi_ipc_get_xdisplay(),winId(),kvi_atom_ipc_sentinel_window,XA_STRING,8,
@@ -247,7 +247,7 @@
 	}
 
 #else
-	#ifdef COMPILE_X11_SUPPORT
+	#if defined(COMPILE_X11_SUPPORT) && (QT_VERSION < 0x050000)
 		bool KviIpcSentinel::x11Event(XEvent *e)
 		{
 			if(e->type == ClientMessage)
@@ -259,7 +259,7 @@
 					unsigned long nItems,after;
 					unsigned char * data = 0;
 					KviCString szData;
-					if(XGetWindowProperty(kvi_ipc_get_xdisplay(),winId(),kvi_atom_ipc_remote_command,0,1024,FALSE,XA_STRING,
+					if(XGetWindowProperty(kvi_ipc_get_xdisplay(),winId(),kvi_atom_ipc_remote_command,0,1024,false,XA_STRING,
 						&type,&format,&nItems,&after,&data) == Success)
 					{
 						if((type == XA_STRING) && (format == 8) && (nItems > 0) && data)
diff --git a/src/kvirc/kernel/KviIpcSentinel.h b/src/kvirc/kernel/KviIpcSentinel.h
index 6ae0a75ac..e997072b0 100644
--- a/src/kvirc/kernel/KviIpcSentinel.h
+++ b/src/kvirc/kernel/KviIpcSentinel.h
@@ -37,7 +37,7 @@
  #include <winsock2.h>
 	#include <windows.h>
 #else
-	#ifdef COMPILE_X11_SUPPORT
+	#if defined(COMPILE_X11_SUPPORT) && (QT_VERSION < 0x050000)
 		#include <qcoreevent.h>
 	#endif //!COMPILE_X11_SUPPORT
 #endif
@@ -57,7 +57,7 @@
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		virtual bool winEvent(MSG * msg, long * result);
 #else
-	#ifdef COMPILE_X11_SUPPORT
+	#if defined(COMPILE_X11_SUPPORT) && (QT_VERSION < 0x050000)
 		virtual bool x11Event(XEvent *e);
 	#endif //!COMPILE_X11_SUPPORT
 #endif
diff --git a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
index 39411e5ab..2a8509076 100644
--- a/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
+++ b/src/kvirc/kvs/KviKvsCoreSimpleCommands_af.cpp
@@ -40,6 +40,12 @@
 #include "KviKvsKernel.h"
 #include "KviKvsObjectController.h"
 
+#if (QT_VERSION >= 0x050000)
+	#ifndef COMPILE_NO_X_BELL
+		#define COMPILE_NO_X_BELL
+	#endif // QX11Info is not available with Qt5
+#endif
+
 #ifdef COMPILE_X11_SUPPORT
 	#ifndef COMPILE_NO_X_BELL
 		#include "KviXlib.h" // XBell : THIS SHOULD BE INCLUDED AS LAST!
@@ -347,7 +353,7 @@ namespace KviKvsCoreSimpleCommands
 
 #if defined(COMPILE_ON_WINDOWS) || defined(COMPILE_ON_MINGW)
 		Beep(pitch,duration);
-#elif defined(COMPILE_X11_SUPPORT)
+#elif defined(COMPILE_X11_SUPPORT) && (!defined(COMPILE_NO_X_BELL))
 		bool bSync   = (KVSCSC_pSwitches->find('s',"sync") != 0);
 
 		XKeyboardState st;
diff --git a/src/kvirc/kvs/KviKvsPopupMenu.cpp b/src/kvirc/kvs/KviKvsPopupMenu.cpp
index a14ff2697..49610be30 100644
--- a/src/kvirc/kvs/KviKvsPopupMenu.cpp
+++ b/src/kvirc/kvs/KviKvsPopupMenu.cpp
@@ -513,7 +513,7 @@ void KviKvsPopupMenuItemExtMenu::fill(KviKvsPopupMenu * pMenu,KviKvsPopupMenuTop
 
 KviKvsPopupMenuTopLevelData::KviKvsPopupMenuTopLevelData(KviKvsVariantList * pParameters,KviWindow * pWindow)
 {
-	m_pExtendedRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),TRUE);
+	m_pExtendedRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),true);
 	m_pParameters = pParameters;
 	m_pWindow = pWindow;
 	m_bTestMode = false;
diff --git a/src/kvirc/kvs/KviKvsProcessManager.cpp b/src/kvirc/kvs/KviKvsProcessManager.cpp
index fec5f1b82..bf553d627 100644
--- a/src/kvirc/kvs/KviKvsProcessManager.cpp
+++ b/src/kvirc/kvs/KviKvsProcessManager.cpp
@@ -37,7 +37,7 @@ KviKvsProcessAsyncOperation::KviKvsProcessAsyncOperation(KviKvsProcessDescriptor
 {
 	m_pData = d;
 	m_pProcess = 0;
-	m_pExtendedRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),TRUE);
+	m_pExtendedRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),true);
 	m_pPingTimer = 0;
 	m_pRunTimeTimer = 0;
 	m_bDeletePending = false;
diff --git a/src/kvirc/kvs/KviKvsRunTimeContext.h b/src/kvirc/kvs/KviKvsRunTimeContext.h
index e2c5d7e22..720117353 100644
--- a/src/kvirc/kvs/KviKvsRunTimeContext.h
+++ b/src/kvirc/kvs/KviKvsRunTimeContext.h
@@ -57,10 +57,10 @@ public:
 		m_pAliasSwitchList(0),
 		m_pThisObject(0),
 		m_pScriptFilePath(0),
-		m_bAutoDelete(FALSE),
+		m_bAutoDelete(false),
 		m_pPopupId(0)
 		{};
-	KviKvsExtendedRunTimeData(KviKvsHash * pExtScopeVariables,bool autoDelete=FALSE)
+	KviKvsExtendedRunTimeData(KviKvsHash * pExtScopeVariables,bool autoDelete = false)
 		: m_pExtendedScopeVariables(pExtScopeVariables),
 		m_pAliasSwitchList(0),
 		m_pThisObject(0),
@@ -68,7 +68,7 @@ public:
 		m_bAutoDelete(autoDelete),
 		m_pPopupId(0)
 		{};
-	KviKvsExtendedRunTimeData(KviKvsSwitchList * pAliasSwitchList,bool autoDelete=FALSE)
+	KviKvsExtendedRunTimeData(KviKvsSwitchList * pAliasSwitchList,bool autoDelete = false)
 		: m_pExtendedScopeVariables(0),
 		m_pAliasSwitchList(pAliasSwitchList),
 		m_pThisObject(0),
@@ -76,7 +76,7 @@ public:
 		m_bAutoDelete(autoDelete),
 		m_pPopupId(0)
 		{};
-	KviKvsExtendedRunTimeData(KviKvsObject * pThisObject,bool autoDelete=FALSE)
+	KviKvsExtendedRunTimeData(KviKvsObject * pThisObject,bool autoDelete = false)
 		: m_pExtendedScopeVariables(0),
 		m_pAliasSwitchList(0),
 		m_pThisObject(pThisObject),
@@ -84,7 +84,7 @@ public:
 		m_bAutoDelete(autoDelete),
 		m_pPopupId(0)
 		{};
-	KviKvsExtendedRunTimeData(QString * pScriptFilePath,bool autoDelete=FALSE)
+	KviKvsExtendedRunTimeData(QString * pScriptFilePath,bool autoDelete = false)
 		: m_pExtendedScopeVariables(0),
 		m_pAliasSwitchList(0),
 		m_pThisObject(0),
diff --git a/src/kvirc/kvs/KviKvsTimerManager.cpp b/src/kvirc/kvs/KviKvsTimerManager.cpp
index 7de626044..2983d854e 100644
--- a/src/kvirc/kvs/KviKvsTimerManager.cpp
+++ b/src/kvirc/kvs/KviKvsTimerManager.cpp
@@ -45,7 +45,7 @@ KviKvsTimer::KviKvsTimer(const QString &szName,Lifetime l,KviWindow * pWnd,int i
 	m_iId = iId;
 	m_pCallback = pCallback;
 	//m_pVariables = new KviKvsHash();
-	m_pRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),TRUE);
+	m_pRunTimeData = new KviKvsExtendedRunTimeData(new KviKvsHash(),true);
 	m_pParameterList = pParams;
 }
 
diff --git a/src/kvirc/kvs/KviKvsVariantList.h b/src/kvirc/kvs/KviKvsVariantList.h
index b140158ca..f5bc8685e 100644
--- a/src/kvirc/kvs/KviKvsVariantList.h
+++ b/src/kvirc/kvs/KviKvsVariantList.h
@@ -301,7 +301,7 @@ public:
 	* \param bAutoDelete Whether the list has to auto delete itself
 	* \return void
 	*/
-	void setAutoDelete(bool bAutoDelete); // this is TRUE by default
+	void setAutoDelete(bool bAutoDelete); // this is true by default
 
 	/**
 	* \brief Appends all elements in a single string delimited by spaces
diff --git a/src/kvirc/kvs/parser/KviKvsParserMacros.h b/src/kvirc/kvs/parser/KviKvsParserMacros.h
index c741fc9f9..2d7405b8a 100644
--- a/src/kvirc/kvs/parser/KviKvsParserMacros.h
+++ b/src/kvirc/kvs/parser/KviKvsParserMacros.h
@@ -41,7 +41,7 @@
 
 #define KVSP_setCurCharPointer(_ptr) m_ptr = _ptr
 
-#define KVSP_ASSERT(_x) if(!(_x))qDebug("WARNING : ASSERT FAILED: (%s) IS FALSE AT %s:%d",#_x,__FILE__,__LINE__);
+#define KVSP_ASSERT(_x) if(!(_x))qDebug("WARNING : ASSERT FAILED: (%s) IS false AT %s:%d",#_x,__FILE__,__LINE__);
 
 
 #endif //!_KVI_KVS_PARSER_MACROS_H_
diff --git a/src/kvirc/ui/KviInput.cpp b/src/kvirc/ui/KviInput.cpp
index 1a7280613..138cae60f 100644
--- a/src/kvirc/ui/KviInput.cpp
+++ b/src/kvirc/ui/KviInput.cpp
@@ -103,7 +103,7 @@ KviInput::KviInput(KviWindow * pPar, KviUserListView * pView)
 	m_pHistoryButton->setObjectName("historybutton");
 
 	m_pHistoryButton->setIconSize(QSize(22,22));
-	//m_pHistoryButton->setUpdatesEnabled(TRUE); ???
+	//m_pHistoryButton->setUpdatesEnabled(true); ???
 	QIcon is1;
 	if(KVI_OPTION_BOOL(KviOption_boolEnableInputHistory))//G&N mar 2005
 	{
diff --git a/src/kvirc/ui/KviInputEditor.cpp b/src/kvirc/ui/KviInputEditor.cpp
index 4b7092b50..6f5553b7f 100644
--- a/src/kvirc/ui/KviInputEditor.cpp
+++ b/src/kvirc/ui/KviInputEditor.cpp
@@ -425,7 +425,7 @@ void KviInputEditor::drawContents(QPainter * p)
 
 					if(iSubLen)
 					{
-						drawTextBlock(p,iTop,iBottom,iCurXPos,iTextBaseline,iSubStart,iSubLen,FALSE);
+						drawTextBlock(p,iTop,iBottom,iCurXPos,iTextBaseline,iSubStart,iSubLen,false);
 						iCurXPos += m_iBlockWidth;
 						m_iBlockWidth=0;
 					}
@@ -436,7 +436,7 @@ void KviInputEditor::drawContents(QPainter * p)
 
 					if(iSubLen)
 					{
-						drawTextBlock(p,iTop,iBottom,iCurXPos,iTextBaseline,iSubStart,iSubLen,TRUE);
+						drawTextBlock(p,iTop,iBottom,iCurXPos,iTextBaseline,iSubStart,iSubLen,true);
 						iCurXPos += m_iBlockWidth;
 						m_iBlockWidth=0;
 					}
@@ -445,7 +445,7 @@ void KviInputEditor::drawContents(QPainter * p)
 					{
 						iSubStart += iSubLen;
 						iSubLen = iBlockEnd-iSubStart;
-						drawTextBlock(p,iTop,iBottom,iCurXPos,iTextBaseline,iSubStart,iSubLen,FALSE);
+						drawTextBlock(p,iTop,iBottom,iCurXPos,iTextBaseline,iSubStart,iSubLen,false);
 					}
 				} else {
 					drawTextBlock(p,iTop,iBottom,iCurXPos,iTextBaseline,iCharIdx,m_iBlockLen);
diff --git a/src/kvirc/ui/KviSelectors.cpp b/src/kvirc/ui/KviSelectors.cpp
index 0f58692a7..0bf7d1bdc 100644
--- a/src/kvirc/ui/KviSelectors.cpp
+++ b/src/kvirc/ui/KviSelectors.cpp
@@ -871,7 +871,7 @@ KviChannelListSelector::KviChannelListSelector(QWidget * par,const QString & txt
 	}
 
 	m_pTreeWidget->setSelectionMode(QAbstractItemView::ExtendedSelection);
-	m_pTreeWidget->setAllColumnsShowFocus(TRUE);
+	m_pTreeWidget->setAllColumnsShowFocus(true);
 	connect(m_pTreeWidget,SIGNAL(itemSelectionChanged()),this,SLOT(itemSelectionChanged()));
 	setSpacing(4);
 	setStretchFactor(m_pTreeWidget,1);
@@ -930,7 +930,7 @@ void KviChannelListSelector::removeClicked()
 	{
 		lst.append((QTreeWidgetItem *)items.at(i));
 	}
-	lst.setAutoDelete(TRUE);
+	lst.setAutoDelete(true);
 	lst.clear();
 }
 
diff --git a/src/kvirc/ui/KviTopicWidget.cpp b/src/kvirc/ui/KviTopicWidget.cpp
index 6c2e0cbec..227a307d5 100644
--- a/src/kvirc/ui/KviTopicWidget.cpp
+++ b/src/kvirc/ui/KviTopicWidget.cpp
@@ -423,7 +423,7 @@ void KviTopicWidget::switchMode()
 	int iMaxLen=-1;
 	QObject * w = parent();
 	QString szModes;
-	bool bCanEdit = TRUE;
+	bool bCanEdit = true;
 	while(w)
 	{
 		if(w->inherits("KviChannelWindow"))
@@ -529,14 +529,14 @@ void KviTopicWidget::copy()
 bool KviTopicWidget::eventFilter(QObject *object,QEvent *e)
 {
 	if ( !e )
-		return TRUE;
+		return true;
 	if(object==m_pCompletionBox)
 	{
 		switch( e->type() ) {
 		case QEvent::MouseButtonPress:
 			if ( m_pCompletionBox->rect().contains( ((QMouseEvent*)e)->pos() ) ) {
 				complete();
-				return TRUE;
+				return true;
 			}
 			break;
 		case QEvent::MouseButtonRelease:
@@ -545,7 +545,7 @@ bool KviTopicWidget::eventFilter(QObject *object,QEvent *e)
 						((QMouseEvent*)e)->pos(), ((QMouseEvent*)e)->button(), ((QMouseEvent*)e)->buttons(), ((QMouseEvent*)e)->modifiers() ) ;
 				// will hide popup
 				QApplication::sendEvent( object, &tmp );
-				return TRUE;
+				return true;
 			} else {
 				if ( m_pCompletionBox->isVisible() )
 					popDownListBox();
@@ -561,7 +561,7 @@ bool KviTopicWidget::eventFilter(QObject *object,QEvent *e)
 			case Qt::Key_Escape:
 				if ( m_pCompletionBox->isVisible() ) {
 				popDownListBox();
-				return TRUE;
+				return true;
 				}
 				break;
 			default:
diff --git a/src/modules/chan/libkvichan.cpp b/src/modules/chan/libkvichan.cpp
index 3340e52d3..65d137d34 100644
--- a/src/modules/chan/libkvichan.cpp
+++ b/src/modules/chan/libkvichan.cpp
@@ -263,7 +263,7 @@ static bool chan_kvs_fnc_topicsetat(KviKvsModuleFunctionCall * c)
 	@short:
 		Returns the number of users on a channel
 	@syntax:
-		<intger> $chan.usercount
+		<integer> $chan.usercount
 		<integer> $chan.usercount(<window_id:string>)
 	@description:
 		The first form returns the number of users on the current channel (assuming that the current window
@@ -295,7 +295,7 @@ static bool chan_kvs_fnc_usercount(KviKvsModuleFunctionCall * c)
 		Returns the number of channel owner users on a channel
 	@syntax:
 		<integer> $chan.ownercount
-		<integer> $chan.ownercount(<window_id:integer>)
+		<integer> $chan.ownercount(<window_id:string>)
 	@description:
 		The first form returns the number of owners users on the current channel (assuming that the current window
 		is a channel at all). If the current window is not a channel, a warning is printed
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 1356c5f3c..90431a6b1 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -1228,8 +1228,8 @@
 			case QVariant::Bool:
 			{
 				QComboBox * b = new QComboBox(false,table()->viewport());
-				b->addAction("FALSE");
-				b->addAction("TRUE");
+				b->addAction("false");
+				b->addAction("true");
 				b->setCurrentItem(m_property.toBool() ? 1 : 0);
 				return b;
 			}
@@ -1335,7 +1335,7 @@
 					sz = m_property.toString();
 				break;
 				case QVariant::Bool:
-					sz = m_property.toBool() ? "TRUE" : "FALSE";
+					sz = m_property.toBool() ? "true" : "false";
 				break;
 				case QVariant::Font:
 					sz.setNum(m_property.toFont().pointSize());
diff --git a/src/modules/help/HelpWindow.cpp b/src/modules/help/HelpWindow.cpp
index 00b2255a1..563b7aa93 100644
--- a/src/modules/help/HelpWindow.cpp
+++ b/src/modules/help/HelpWindow.cpp
@@ -47,7 +47,7 @@ extern HelpIndex        * g_pDocIndex;
 extern KviPointerList<HelpWindow> * g_pHelpWindowList;
 extern KviPointerList<HelpWidget> * g_pHelpWidgetList;
 
-//bool g_bIndexingDone = FALSE;
+//bool g_bIndexingDone = false;
 HelpWindow::HelpWindow(const char * name)
 : KviWindow(KviWindow::Help,name)
 {
@@ -238,7 +238,7 @@ void HelpWindow::startSearch()
 		m_pResultBox->addItem( g_pDocIndex->getDocumentTitle( *it ) );
 
 	m_terms.clear();
-	bool isPhrase = FALSE;
+	bool isPhrase = false;
 	QString s = "";
 	for ( int i = 0; i < (int)buf.length(); ++i ) {
 		if ( buf[i] == '\"' ) {
diff --git a/src/modules/list/ListWindow.cpp b/src/modules/list/ListWindow.cpp
index 0bbaa3c99..44fdf0689 100644
--- a/src/modules/list/ListWindow.cpp
+++ b/src/modules/list/ListWindow.cpp
@@ -245,8 +245,8 @@ ListWindow::ListWindow(KviConsoleWindow * lpConsole)
 	columnLabels.append(__tr2qs("Topic"));
 	m_pTreeWidget->setColumnCount(3);
 	m_pTreeWidget->setHeaderLabels(columnLabels);
-	m_pTreeWidget->setAllColumnsShowFocus(TRUE);
-	m_pTreeWidget->setSortingEnabled(TRUE);
+	m_pTreeWidget->setAllColumnsShowFocus(true);
+	m_pTreeWidget->setSortingEnabled(true);
 	m_pTreeWidget->sortItems(0,Qt::AscendingOrder);
 	m_pTreeWidget->setUniformRowHeights(true);
 	
diff --git a/src/modules/mediaplayer/MpMprisInterface.cpp b/src/modules/mediaplayer/MpMprisInterface.cpp
index 14d090580..5f3a19bde 100644
--- a/src/modules/mediaplayer/MpMprisInterface.cpp
+++ b/src/modules/mediaplayer/MpMprisInterface.cpp
@@ -90,9 +90,9 @@ int MpMprisInterface::detect(bool)
 	if (reply.type() == QDBusMessage::ErrorMessage) { \
 		QDBusError err = reply; \
 		qDebug("Error: %s\n%s\n", qPrintable(err.name()), qPrintable(err.message())); \
-		return FALSE; \
+		return false; \
 	} \
-	return TRUE;
+	return true;
 
 bool MpMprisInterface::prev()
 {
@@ -342,7 +342,7 @@ int MpAudaciousInterface::getPlayListPos()
 bool MpAudaciousInterface::quit()
 {
 	if (MpMprisInterface::quit())
-		return TRUE;
+		return true;
 
 	/* compability with older versions */
 	MPRIS_SIMPLE_CALL("/Player", "Quit")
diff --git a/src/modules/mediaplayer/MpXmmsInterface.cpp b/src/modules/mediaplayer/MpXmmsInterface.cpp
index bab94cbc5..d2afabbfa 100644
--- a/src/modules/mediaplayer/MpXmmsInterface.cpp
+++ b/src/modules/mediaplayer/MpXmmsInterface.cpp
@@ -137,7 +137,7 @@ void * KviXmmsInterface::lookupSymbol(const char * szSymbolName)
 			return 0;
 		}
 	}
-	void * symptr =m_pPlayerLibrary->resolve(szSymbolName);
+	void * symptr = (void *)m_pPlayerLibrary->resolve(szSymbolName);
 	if(!symptr)
 	{
 		QString szTmp = QString(__tr2qs_ctx("Can't find symbol %1 in %2","mediaplayer")).arg(szSymbolName,m_szPlayerLibraryName);
diff --git a/src/modules/mediaplayer/winamp.cpp b/src/modules/mediaplayer/winamp.cpp
index eba45988e..41dca5aa1 100644
--- a/src/modules/mediaplayer/winamp.cpp
+++ b/src/modules/mediaplayer/winamp.cpp
@@ -66,7 +66,7 @@ winampGeneralPurposePlugin plugin =
 /*
 BOOL WINAPI _DllMainCRTStartup(HANDLE hInst, ULONG ul_reason_for_call, LPVOID lpReserved)
 {
-	return TRUE;
+	return true;
 }
 */
 
diff --git a/src/modules/my/Idle_x11.cpp b/src/modules/my/Idle_x11.cpp
index 9b4c4a062..cc82cf81e 100644
--- a/src/modules/my/Idle_x11.cpp
+++ b/src/modules/my/Idle_x11.cpp
@@ -30,7 +30,9 @@
 #else
 	#include <QApplication>
 	#include <QDesktopWidget>
+#if (QT_VERSION < 0x050000)
 	#include <QX11Info>
+#endif // QT_VERSION < 0x050000
 
 	#include <X11/Xlib.h>
 	#include <X11/Xutil.h>
@@ -78,17 +80,29 @@
 		old_handler = XSetErrorHandler(xerrhandler);
 
 		int event_base, error_base;
+#if (QT_VERSION < 0x050000)
 		if(XScreenSaverQueryExtension(QX11Info::display(), &event_base, &error_base)) {
 			d->ss_info = XScreenSaverAllocInfo();
 			return true;
 		}
+#else
+		// FIXME: Need a replacement for this?
+#endif
 		return false;
 	}
 
 	int IdlePlatform::secondsIdle() const
 	{
-		if(!d->ss_info) return 0;
-		if(!XScreenSaverQueryInfo(QX11Info::display(), QX11Info::appRootWindow(), d->ss_info)) return 0;
+		if(!d->ss_info)
+			return 0;
+#if (QT_VERSION < 0x050000)
+		if(!XScreenSaverQueryInfo(QX11Info::display(), QX11Info::appRootWindow(), d->ss_info))
+			return 0;
+#else
+		// FIXME: Need a replacement for this?
+		return 0;
+#endif
+
 		return d->ss_info->idle / 1000;
 	}
 #endif
diff --git a/src/modules/objects/KvsObject_groupBox.cpp b/src/modules/objects/KvsObject_groupBox.cpp
index ccc8a2d41..a6677d105 100644
--- a/src/modules/objects/KvsObject_groupBox.cpp
+++ b/src/modules/objects/KvsObject_groupBox.cpp
@@ -75,9 +75,9 @@ const int align_cod[] = {
 		!fn: $setFlat(<bflag:boolean>)
 		Sets whether the group box is painted flat. Valid Values are 1 or 0.
 		!fn: <boolean> $isFlat()
-		Returns 1 (TRUE) if the group box is painted flat; otherwise returns 0 (FALSE).
+		Returns 1 (true) if the group box is painted flat; otherwise returns 0 (false).
 		!fn: <boolean> $isCheckable()
-		Returns 1 (TRUE) if the group box has a checkbox in its title; otherwise returns 0 (FALSE).
+		Returns 1 (true) if the group box has a checkbox in its title; otherwise returns 0 (false).
 		!fn: $setCheckable(<bflag:boolean>)
 		Sets whether the group box has a checkbox in its title: Valid values are 1 or 0.
 		!fn: $setInsideMargin(<margin:uint>)
diff --git a/src/modules/objects/KvsObject_lcd.cpp b/src/modules/objects/KvsObject_lcd.cpp
index 3bc333bf1..3038a4b87 100644
--- a/src/modules/objects/KvsObject_lcd.cpp
+++ b/src/modules/objects/KvsObject_lcd.cpp
@@ -60,12 +60,12 @@
 		!fn: $setNumDigits(<number:integer>)
 		Sets the lcd number value.
 		!fn: <boolean> $checkOverflow()
-		Returns TRUE if num is too big to be displayed in its entirety;
-		otherwise returns FALSE.
+		Returns true if num is too big to be displayed in its entirety;
+		otherwise returns false.
 		!fn: $setSmallDecimalPoint(<bflag:boolean>)
 		Sets the the decimal point style, valid bool values are 1 or 0.
 		!fn: <boolean> $checkOverflow(<number:integer>)
-		Returns 1 (TRUE) if num is too big to be displayed in its entirety; otherwise returns 0 (FALSE).
+		Returns 1 (true) if num is too big to be displayed in its entirety; otherwise returns 0 (false).
 */
 
 KVSO_BEGIN_REGISTERCLASS(KvsObject_lcd,"lcdnumber","widget")
diff --git a/src/modules/objects/KvsObject_listWidget.cpp b/src/modules/objects/KvsObject_listWidget.cpp
index db5896e43..972f563a2 100644
--- a/src/modules/objects/KvsObject_listWidget.cpp
+++ b/src/modules/objects/KvsObject_listWidget.cpp
@@ -309,12 +309,12 @@ KVSO_CLASS_FUNCTION(listWidget,setFont)
 	for(int i=0;i<szListStyle.length();i++)
 	{
 		szStyle=szListStyle.at(i);
-		if(KviQString::equalCI(szStyle,"italic")) font.setItalic(TRUE);
-		else if(KviQString::equalCI(szStyle,"bold")) font.setBold(TRUE);
-		else if(KviQString::equalCI(szStyle,"underline"))font.setUnderline(TRUE);
-		else if(KviQString::equalCI(szStyle,"overline")) font.setOverline(TRUE);
-		else if(KviQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(TRUE);
-		else if(KviQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(TRUE);
+		if(KviQString::equalCI(szStyle,"italic")) font.setItalic(true);
+		else if(KviQString::equalCI(szStyle,"bold")) font.setBold(true);
+		else if(KviQString::equalCI(szStyle,"underline"))font.setUnderline(true);
+		else if(KviQString::equalCI(szStyle,"overline")) font.setOverline(true);
+		else if(KviQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(true);
+		else if(KviQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(true);
 		else c->warning(__tr2qs_ctx("Unknown style '%Q'","objects"),&szStyle);
 	}
 	pItem->setFont(font);
diff --git a/src/modules/objects/KvsObject_mainWindow.cpp b/src/modules/objects/KvsObject_mainWindow.cpp
index 2c4a557ec..8f9d62a45 100644
--- a/src/modules/objects/KvsObject_mainWindow.cpp
+++ b/src/modules/objects/KvsObject_mainWindow.cpp
@@ -93,7 +93,7 @@ KVSO_CLASS_FUNCTION(mainWindow,setCentralWidget)
 	if(!pObject->inheritsClass("widget"))
 	{
 		c->warning(__tr2qs_ctx("Widget object required","objects"));
-		return TRUE;
+		return true;
 	}
 	((KviTalMainWindow *)widget())->setCentralWidget(((QWidget  *)(pObject->object())));
 	return true;
diff --git a/src/modules/objects/KvsObject_multiLineEdit.cpp b/src/modules/objects/KvsObject_multiLineEdit.cpp
index 61837ab23..48dedf4fc 100644
--- a/src/modules/objects/KvsObject_multiLineEdit.cpp
+++ b/src/modules/objects/KvsObject_multiLineEdit.cpp
@@ -64,9 +64,9 @@
 		Sets the editor to be read-only if bReadOnly is 1 or
 		removes the read-only status is ReadOnly is 0
 		!fn: <boolean> $atBeginning()
-		Returns 1(TRUE) if the cursor is placed at the beginning of the text; otherwise returns 0(FALSE).
+		Returns 1(true) if the cursor is placed at the beginning of the text; otherwise returns 0(false).
 		!fn: <boolean> $atEnd()
-		Returns 1(TRUE) if the cursor is placed at the end of the text; otherwise returns 0(FALSE).
+		Returns 1(true) if the cursor is placed at the end of the text; otherwise returns 0(false).
 		!fn: $setWordWrap(<wrap_mode:string>)
 		Sets the word wrap mode to mode. Valid Values are:[br]
 		- NoWrap - Do not wrap the text.[br]
@@ -102,11 +102,11 @@
 		!fn: $setUnderline(<bUnderline:boolean>)
 		If the bool value is 1 sets the current format to underline; otherwise, if it's 0 sets the current format to no-underline.
 		!fn: <boolean> $italic()
-		Returns 1(TRUE) if the current format is italic; otherwise returns 0(FALSE).
+		Returns 1(true) if the current format is italic; otherwise returns 0(false).
 		!fn: <boolean> $bold()
-		Returns 1(TRUE) if the current format is bold; otherwise returns 0(FALSE).
+		Returns 1(true) if the current format is bold; otherwise returns 0(false).
 		!fn: <boolean> $underline()
-		Returns 1(TRUE) if the current format is underline; otherwise returns 0(FALSE).
+		Returns 1(true) if the current format is underline; otherwise returns 0(false).
 		!fn: $zoomIn(<zoom_range:integer>)
 		Zooms in on the text by making the base font size range points larger.
 		!fn: $zoomOut(<zoom_range:integer>)
@@ -120,7 +120,7 @@
 		!fn: $setUndoRedoEnabled(<bUndoRedo:boolean>)
 		Sets whether undo/redo is enabled to the bool value.
 		!fn: <boolean> $isUndoRedoEnabled()
-		Returns 1 (TRUE) if undo/redo is enabled; otherwise returns 0 (FALSE).
+		Returns 1 (true) if undo/redo is enabled; otherwise returns 0 (false).
 		!fn: <integer> $undoDepth()
 		Returns the depth of the undo history.
 		!fn: $setText(<txt:string>)
@@ -144,16 +144,16 @@
 		!fn: $loadFile(<path:string>)
 		Load the file specified in the <path>, also html files.
 		!fn: <boolean> $isUndoAvailable ()
-		Returns 1(TRUE) if undo is available; otherwise returns 0(FALSE).
+		Returns 1(true) if undo is available; otherwise returns 0(false).
 		!fn: <boolean> $isRedoAvailable ()
-		Returns 1(TRUE) if redo is available; otherwise returns 0(FALSE).
+		Returns 1(true) if redo is available; otherwise returns 0(false).
 		!fn: <integer> $lines()
 		Returns the number of lines in the multilineedit.
 		!fn: <integer> $lineOfChar(<paragraph:integer>,<index:integer>)
 		Returns the line number of the line in paragraph par in which the character at position index appears.[br]
 		If there is no such paragraph or no such character at the index position  -1 is returned.
 		!fn: $setModified(<bModified:boolean>)
-		Sets whether the document has been modified by the user. Valid Values are 1(TRUE) or 0(FALSE)
+		Sets whether the document has been modified by the user. Valid Values are 1(true) or 0(false)
 		!fn: $setAlignment(<alignment:string>)
 		Sets the alignment of the current paragraph to <alignment>. Valid values are:[br]
 		- Auto - Aligns according to the language.[b
diff --git a/src/modules/objects/KvsObject_painter.cpp b/src/modules/objects/KvsObject_painter.cpp
index 968e9434c..72124d318 100644
--- a/src/modules/objects/KvsObject_painter.cpp
+++ b/src/modules/objects/KvsObject_painter.cpp
@@ -772,12 +772,12 @@ KVSO_CLASS_FUNCTION(painter,setFont)
 	for(int i=0;i<szListStyle.length();i++)
 	{
 		szStyle=szListStyle.at(i);
-		if(KviQString::equalCI(szStyle,"italic")) font.setItalic(TRUE);
-		else if(KviQString::equalCI(szStyle,"bold")) font.setBold(TRUE);
-		else if(KviQString::equalCI(szStyle,"underline"))font.setUnderline(TRUE);
-		else if(KviQString::equalCI(szStyle,"overline")) font.setOverline(TRUE);
-		else if(KviQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(TRUE);
-		else if(KviQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(TRUE);
+		if(KviQString::equalCI(szStyle,"italic")) font.setItalic(true);
+		else if(KviQString::equalCI(szStyle,"bold")) font.setBold(true);
+		else if(KviQString::equalCI(szStyle,"underline"))font.setUnderline(true);
+		else if(KviQString::equalCI(szStyle,"overline")) font.setOverline(true);
+		else if(KviQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(true);
+		else if(KviQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(true);
 		else c->warning(__tr2qs_ctx("Unknown style '%Q'","objects"),&szStyle);
 	}
 	m_pPainter->setFont(font);
diff --git a/src/modules/objects/KvsObject_process.cpp b/src/modules/objects/KvsObject_process.cpp
index 369d197bb..4fd235ee7 100644
--- a/src/modules/objects/KvsObject_process.cpp
+++ b/src/modules/objects/KvsObject_process.cpp
@@ -143,7 +143,7 @@
 		!fn: <boolean> $isRunning()
 		Return 1 if the process is running, else return 0.
 		!fn: <boolean> $normalExit()
-		Returns TRUE if the process has exited normally; otherwise returns FALSE.
+		Returns true if the process has exited normally; otherwise returns false.
 		!fn: $readyReadStdoutEvent()
 		This function is invoched by the process when there are new datas.[br]
 		The default implementation emits the [classfnc]$readyReadStdout[/classfnc]() signal.
diff --git a/src/modules/objects/KvsObject_radioButton.cpp b/src/modules/objects/KvsObject_radioButton.cpp
index 2a847866c..7d614fa96 100644
--- a/src/modules/objects/KvsObject_radioButton.cpp
+++ b/src/modules/objects/KvsObject_radioButton.cpp
@@ -48,7 +48,7 @@
 		!fn: $settext(<text:string>)
 		Sets the text that will appear in the radiobutton.
 		!fn: <boolean> $isChecked()
-		Returns 1 (TRUE) if the radio button is checked; otherwise returns 0 (FALSE).
+		Returns 1 (true) if the radio button is checked; otherwise returns 0 (false).
 		!fn: $setChecked(<bChecked:boolean>)
 		Sets whether the radio button is checked to check.
 		!fn: $setPixmap(<image_id>)
diff --git a/src/modules/objects/KvsObject_tableWidget.cpp b/src/modules/objects/KvsObject_tableWidget.cpp
index 8b127e936..ddb7a6771 100644
--- a/src/modules/objects/KvsObject_tableWidget.cpp
+++ b/src/modules/objects/KvsObject_tableWidget.cpp
@@ -230,7 +230,7 @@ KVSO_BEGIN_REGISTERCLASS(KvsObject_tableWidget,"tablewidget","widget")
 	KVSO_REGISTER_HANDLER(KvsObject_tableWidget,"itemEnteredEvent",itemEnteredEvent);
 	KVSO_REGISTER_HANDLER(KvsObject_tableWidget,"cellActivatedEvent",cellActivatedEvent);
 	KVSO_REGISTER_HANDLER(KvsObject_tableWidget,"cellDoubleClickedEvent",cellDoubleClickedEvent);
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_tableWidget,"paintCellEvent")
+	KVSO_REGISTER_STANDARD_trueRETURN_HANDLER(KvsObject_tableWidget,"paintCellEvent")
 	KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(KvsObject_tableWidget,"sizeHintCellRequestEvent")
 
 
diff --git a/src/modules/objects/KvsObject_toolButton.cpp b/src/modules/objects/KvsObject_toolButton.cpp
index c2da8b6a6..eba314778 100644
--- a/src/modules/objects/KvsObject_toolButton.cpp
+++ b/src/modules/objects/KvsObject_toolButton.cpp
@@ -58,7 +58,7 @@
 		!fn:$usesTextLabel()
 		Return 1 if the setUsesTextLabel is enabled, otherwise return 0.
 		!fn:$setTextLabel(<text:String>,[tooltip:string])
-		Sets the label of this button to <text> and automatically sets it as a tool tip if <tip> is TRUE.
+		Sets the label of this button to <text> and automatically sets it as a tool tip if <tip> is true.
 		!fn:<string> $textLabel()
 		Returns the label of tthe button.
 		!fn:$setAutoRaise(<bAutoraise:boolean>)
diff --git a/src/modules/objects/KvsObject_treeWidgeteItem.cpp b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
index 0220c8810..7da3a2920 100644
--- a/src/modules/objects/KvsObject_treeWidgeteItem.cpp
+++ b/src/modules/objects/KvsObject_treeWidgeteItem.cpp
@@ -90,7 +90,7 @@ const char * const itemflags_tbl[] = {
 		Pixmap can be a Kvirc imageid, an image file or a [class]pixmap[/class] object.
 
 		!fn: $setItemEditable(<bEnabled:boolean>)
-		If bEnabled is TRUE (1), this item can be in-place editable by the user; otherwise it cannot be editable in-place.
+		If bEnabled is true (1), this item can be in-place editable by the user; otherwise it cannot be editable in-place.
 
 		!fn: $isItemEditable()
 		Returns $true if this item is editable and $false otherwise.
diff --git a/src/modules/objects/KvsObject_widget.cpp b/src/modules/objects/KvsObject_widget.cpp
index 0052ae0a2..5a07150d1 100644
--- a/src/modules/objects/KvsObject_widget.cpp
+++ b/src/modules/objects/KvsObject_widget.cpp
@@ -1752,12 +1752,12 @@ KVSO_CLASS_FUNCTION(widget,setFont)
 	for(int i=0;i<szListStyle.length();i++)
 	{
 		szStyle=szListStyle.at(i);
-		if(KviQString::equalCI(szStyle,"italic")) font.setItalic(TRUE);
-		else if(KviQString::equalCI(szStyle,"bold")) font.setBold(TRUE);
-		else if(KviQString::equalCI(szStyle,"underline"))font.setUnderline(TRUE);
-		else if(KviQString::equalCI(szStyle,"overline")) font.setOverline(TRUE);
-		else if(KviQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(TRUE);
-		else if(KviQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(TRUE);
+		if(KviQString::equalCI(szStyle,"italic")) font.setItalic(true);
+		else if(KviQString::equalCI(szStyle,"bold")) font.setBold(true);
+		else if(KviQString::equalCI(szStyle,"underline"))font.setUnderline(true);
+		else if(KviQString::equalCI(szStyle,"overline")) font.setOverline(true);
+		else if(KviQString::equalCI(szStyle,"strikeout"))font.setStrikeOut(true);
+		else if(KviQString::equalCI(szStyle,"fixedpitch")) font.setFixedPitch(true);
 		else c->warning(__tr2qs_ctx("Unknown style '%Q'","objects"),&szStyle);
 	}
 	widget()->setFont(font);
diff --git a/src/modules/objects/KvsObject_workspace.cpp b/src/modules/objects/KvsObject_workspace.cpp
index 377dce6c9..f46559936 100644
--- a/src/modules/objects/KvsObject_workspace.cpp
+++ b/src/modules/objects/KvsObject_workspace.cpp
@@ -58,7 +58,7 @@
 		!fn: <object> $activeWindow()
 		Returns the active window, or 0 if no window is active.
 		!fn: <boolean> $scrollBarsEnabled()
-		Returns TRUE if the workspace provides scrollbars; otherwise returns FALSE.
+		Returns true if the workspace provides scrollbars; otherwise returns false.
 		!fn: $setscrollBarsEnabled(<bEnabled:boolean>)
 		Sets whether the workspace provides scrollbars to enable. (bEnabled 1 or 0)
 		!fn: $cascade()
diff --git a/src/modules/objects/KvsObject_xmlreader.cpp b/src/modules/objects/KvsObject_xmlreader.cpp
index 0038f1c01..a52b3abdf 100644
--- a/src/modules/objects/KvsObject_xmlreader.cpp
+++ b/src/modules/objects/KvsObject_xmlreader.cpp
@@ -278,13 +278,13 @@ KVSO_BEGIN_REGISTERCLASS(KvsObject_xmlReader,"xmlreader","object")
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_xmlReader,lastError)
 	KVSO_REGISTER_HANDLER_BY_NAME(KvsObject_xmlReader,parse)
 
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onDocumentStart")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onDocumentEnd")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onElementStart")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onElementEnd")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onText")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onWarning")
-	KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(KvsObject_xmlReader,"onError")
+	KVSO_REGISTER_STANDARD_trueRETURN_HANDLER(KvsObject_xmlReader,"onDocumentStart")
+	KVSO_REGISTER_STANDARD_trueRETURN_HANDLER(KvsObject_xmlReader,"onDocumentEnd")
+	KVSO_REGISTER_STANDARD_trueRETURN_HANDLER(KvsObject_xmlReader,"onElementStart")
+	KVSO_REGISTER_STANDARD_trueRETURN_HANDLER(KvsObject_xmlReader,"onElementEnd")
+	KVSO_REGISTER_STANDARD_trueRETURN_HANDLER(KvsObject_xmlReader,"onText")
+	KVSO_REGISTER_STANDARD_trueRETURN_HANDLER(KvsObject_xmlReader,"onWarning")
+	KVSO_REGISTER_STANDARD_trueRETURN_HANDLER(KvsObject_xmlReader,"onError")
 KVSO_END_REGISTERCLASS(KvsObject_xmlReader)
 
 KVSO_BEGIN_CONSTRUCTOR(KvsObject_xmlReader,KviKvsObject)
diff --git a/src/modules/objects/object_macros.h b/src/modules/objects/object_macros.h
index b12ed3f3a..fe78b23e2 100644
--- a/src/modules/objects/object_macros.h
+++ b/src/modules/objects/object_macros.h
@@ -51,10 +51,10 @@ g_pKvs##__className##Class->registerFunctionHandler(#__szName,(KviKvsObjectFunct
 #define KVSO_REGISTER_STANDARD_NOTHINGRETURN_HANDLER(__className,__szName) \
 	g_pKvs##__className##Class->registerStandardNothingReturnFunctionHandler(__szName);
 
-#define KVSO_REGISTER_STANDARD_TRUERETURN_HANDLER(__className,__szName) \
+#define KVSO_REGISTER_STANDARD_trueRETURN_HANDLER(__className,__szName) \
 	g_pKvs##__className##Class->registerStandardTrueReturnFunctionHandler(__szName);
 
-#define KVSO_REGISTER_STANDARD_FALSERETURN_HANDLER(__className,__szName) \
+#define KVSO_REGISTER_STANDARD_falseRETURN_HANDLER(__className,__szName) \
 	g_pKvs##__className##Class->registerStandardFalseReturnFunctionHandler(__szName);
 
 #define KVSO_BEGIN_REGISTERCLASS(__className,__stringName,__baseClass) \
diff --git a/src/modules/options/libkvioptions.cpp b/src/modules/options/libkvioptions.cpp
index 61bd7f630..8205591f8 100644
--- a/src/modules/options/libkvioptions.cpp
+++ b/src/modules/options/libkvioptions.cpp
@@ -225,7 +225,7 @@ static bool options_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	// a trick for the dialog covering the splash screen before the time (this is prolly a WM or Qt bug)
 	if(g_pSplashScreen)
 	{
-		if(g_pSplashScreen->isVisible()) // another bug: this ALWAYS RETURNS TRUE, even if the splash was hidden by a mouse click...
+		if(g_pSplashScreen->isVisible()) // another bug: this ALWAYS RETURNS true, even if the splash was hidden by a mouse click...
 		{
 			QObject::connect(g_pSplashScreen,SIGNAL(destroyed()),wc,SLOT(show()));
 			return true;
diff --git a/src/modules/perlcore/ppport.h b/src/modules/perlcore/ppport.h
index e0f8de2bf..df6e9806f 100644
--- a/src/modules/perlcore/ppport.h
+++ b/src/modules/perlcore/ppport.h
@@ -192,7 +192,7 @@ __DATA__
 #endif /* PERL_REVISION != 5 */
 
 #ifndef ERRSV
-#	define ERRSV perl_get_sv("@",FALSE)
+#	define ERRSV perl_get_sv("@",false)
 #endif
 
 #if (PERL_VERSION < 4) || ((PERL_VERSION == 4) && (PERL_SUBVERSION <= 5))
@@ -376,7 +376,7 @@ SV *sv;
      		start_subparse(0),
 #  else
      /* 5.003_23  onwards */
-     		start_subparse(FALSE, 0),
+     		start_subparse(false, 0),
 #  endif
 #endif
 
@@ -426,11 +426,11 @@ SV *sv;
 #if (PERL_VERSION < 4 || (PERL_VERSION == 4 && PERL_SUBVERSION < 68 ))
 /* Fetches the SV that keeps the per-interpreter data. */
 #define dMY_CXT_SV \
-	SV *my_cxt_sv = perl_get_sv(MY_CXT_KEY, FALSE)
+	SV *my_cxt_sv = perl_get_sv(MY_CXT_KEY, false)
 #else /* >= perl5.004_68 */
 #define dMY_CXT_SV \
 	SV *my_cxt_sv = *hv_fetch(PL_modglobal, MY_CXT_KEY,		\
-				  sizeof(MY_CXT_KEY)-1, TRUE)
+				  sizeof(MY_CXT_KEY)-1, true)
 #endif /* < perl5.004_68 */
 
 /* This declaration should be used within all functions that use the
diff --git a/src/modules/reguser/RegisteredUsersDialog.cpp b/src/modules/reguser/RegisteredUsersDialog.cpp
index 3cb51126e..f8f072bd8 100644
--- a/src/modules/reguser/RegisteredUsersDialog.cpp
+++ b/src/modules/reguser/RegisteredUsersDialog.cpp
@@ -89,7 +89,7 @@ KviRegisteredUsersListView::KviRegisteredUsersListView(QWidget * par)
 
 	setSelectionBehavior(QAbstractItemView::SelectRows);
 	setSelectionMode(QAbstractItemView::ExtendedSelection);
-	setRootIsDecorated(TRUE);
+	setRootIsDecorated(true);
 	setSortingEnabled(true);
 
 	setToolTip(__tr2qs_ctx("<center>This is the list of registered users. " \
@@ -513,7 +513,7 @@ void RegisteredUsersDialog::fillList()
 	{
 		RegisteredUsersGroupItem* pCur = new RegisteredUsersGroupItem(m_pListView,g);
 		groupItems.insert(g->name(),pCur);
-		pCur->setExpanded(TRUE);
+		pCur->setExpanded(true);
 	}
 
 	KviPointerHashTable<QString,KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
diff --git a/src/modules/reguser/RegistrationWizard.cpp b/src/modules/reguser/RegistrationWizard.cpp
index dc092dff2..9588ed05c 100644
--- a/src/modules/reguser/RegistrationWizard.cpp
+++ b/src/modules/reguser/RegistrationWizard.cpp
@@ -77,7 +77,7 @@ RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUse
 	setWindowTitle(__tr2qs_ctx("User Registration Wizard - KVIrc","register"));
 	setWindowIcon(*(g_pIconManager->getSmallIcon(KviIconManager::Linux)));
 
-	setSizeGripEnabled( TRUE );
+	setSizeGripEnabled( true );
 
 	m_pPage1 = new QWidget(this);
 	m_pPage1Layout = new QGridLayout(m_pPage1);
diff --git a/src/modules/setup/SetupWizard.cpp b/src/modules/setup/SetupWizard.cpp
index e9017a24a..9aa3447d1 100644
--- a/src/modules/setup/SetupWizard.cpp
+++ b/src/modules/setup/SetupWizard.cpp
@@ -299,7 +299,7 @@ SetupWizard::SetupWizard()
 #endif
 	// Pragma: Unused, takes only space.
 	//m_pDirRestore = new QRadioButton(__tr2qs("Restore from backup archive"),m_pDirButtonGroup);
-	//m_pDirRestore->setEnabled(FALSE);
+	//m_pDirRestore->setEnabled(false);
 
 	//l = new QLabel(m_pDirectory->m_pVBox,"<b> </b>");
 
@@ -526,7 +526,7 @@ SetupWizard::SetupWizard()
 	{
 		KviConfigurationFile cfg(szTmp,KviConfigurationFile::Read);
 		cfg.setGroup("Setup");
-		if(cfg.readBoolEntry("hideServerList",FALSE))
+		if(cfg.readBoolEntry("hideServerList",false))
 		{
 			//setPageEnabled(m_pServers,false);
 			//setFinishEnabled(m_pIdentity,true);
@@ -1075,12 +1075,12 @@ void SetupWizard::accept()
 
 			if(m_pServersSpecifyManually->isOn())
 			{
-				KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = FALSE;
+				KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = false;
 				szHost = m_szServerHost;
 				uPort=m_uServerPort;
 			} else if(m_pServersOpenIrcUrl->isOn())
 			{
-				KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = FALSE;
+				KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = false;
 				szUrl=m_szServerUrl;
 			}
 			*/
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index bc8e7b1fb..7bbfbdd75 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -112,14 +112,14 @@ KVIMODULEEXPORTFUNC void setup_finish()
 			pParams->append(szUrl);
 			KviKvsScript::run("openurl $0",g_pActiveWindow,pParams);
 			delete pParams;
-			KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = TRUE;
+			KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = true;
 		} else if(!szHost.isEmpty()) {
 			KviKvsVariantList * pParams = new KviKvsVariantList();
 			pParams->append(szHost);
 			pParams->append((kvs_int_t)uPort);
 			KviKvsScript::run("server $0 $1",g_pActiveWindow,pParams);
 			delete pParams;
-			KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = TRUE;
+			KVI_OPTION_BOOL(KviOption_boolShowServersConnectDialogOnStart) = true;
 		}
 	}
 }
diff --git a/src/modules/snd/libkvisnd.cpp b/src/modules/snd/libkvisnd.cpp
index 8df5d325e..0fad1f912 100644
--- a/src/modules/snd/libkvisnd.cpp
+++ b/src/modules/snd/libkvisnd.cpp
@@ -754,7 +754,7 @@ static bool snd_kvs_cmd_mute(KviKvsModuleCommandCall * c)
 {
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETERS_END(c)
-	g_pSoundPlayer->setMuted(TRUE);
+	g_pSoundPlayer->setMuted(true);
 	return true;
 }
 
@@ -776,7 +776,7 @@ static bool snd_kvs_cmd_unmute(KviKvsModuleCommandCall * c)
 {
 	KVSM_PARAMETERS_BEGIN(c)
 	KVSM_PARAMETERS_END(c)
-	g_pSoundPlayer->setMuted(FALSE);
+	g_pSoundPlayer->setMuted(false);
 	return true;
 }
 
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index b11755554..a4869dca0 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -34,6 +34,7 @@
 #include "KviEnvironment.h"
 #include "KviOsInfo.h"
 #include "KviModuleManager.h"
+#include "KviByteOrder.h"
 
 #include <QClipboard>
 #include <QByteArray>
@@ -804,6 +805,117 @@ static bool system_kvs_cmd_runcmd(KviKvsModuleCommandCall *c)
 	return c->error(__tr2qs("Failed to start the terminal program"));
 }
 
+/*
+	@doc: system.ntohi
+	@type:
+		function
+	@title:
+		$system.ntohi
+	@short:
+		Convert an integer from network to host byte order.
+	@syntax:
+		<integer> $system.ntohi(<value:integer>)
+		<integer> $system.ntohi(<value:integer>,<bytecount:integer>)
+	@description:
+		Converts the integer value in network byte order
+		to it's host byte order counterpart.
+		Since the conversion is carried at binary rappresentation
+		level you must specify the number of bytes you want
+		the binary rappresentation to have. Valid values are
+		1 (no conversion), 2 (short), 4 (32 bit int) and 8 (64 bit int).
+		If omitted, bytecount is assumed to be 4.
+*/
+static bool system_kvs_fnc_ntohi(KviKvsModuleFunctionCall * c)
+{
+	kvs_int_t iValue;
+	kvs_uint_t uBytes;
+
+	KVSM_PARAMETERS_BEGIN(c)
+		KVSM_PARAMETER("value",KVS_PT_INT,0,iValue)
+		KVSM_PARAMETER("bytecount",KVS_PT_UINT,KVS_PF_OPTIONAL,uBytes)
+	KVSM_PARAMETERS_END(c)
+
+	switch(uBytes)
+	{
+		case 0:
+			c->returnValue()->setInteger((kvs_int_t)KviByteOrder::networkByteOrderToLocalCpu32((kvi_u32_t)iValue));
+		break;
+		case 1:
+			c->returnValue()->setInteger((kvs_int_t)((kvi_u8_t)iValue));
+		break;
+		case 2:
+			c->returnValue()->setInteger((kvs_int_t)KviByteOrder::networkByteOrderToLocalCpu16((kvi_u16_t)iValue));
+		break;
+		case 4:
+			c->returnValue()->setInteger((kvs_int_t)KviByteOrder::networkByteOrderToLocalCpu32((kvi_u32_t)iValue));
+		break;
+		case 8:
+			c->returnValue()->setInteger((kvs_int_t)KviByteOrder::networkByteOrderToLocalCpu64((kvi_u64_t)iValue));
+		break;
+		default:
+			return c->error(__tr2qs("Bad bytecount specification: 1, 2, 4 and 8 are allowed"));
+		break;
+	}
+
+	return true;
+}
+
+
+/*
+	@doc: system.htoni
+	@type:
+		function
+	@title:
+		$system.htoni
+	@short:
+		Convert an integer from host to network byte order.
+	@syntax:
+		<integer> $system.htoni(<value:integer>)
+		<integer> $system.htoni(<value:integer>,<bytecount:integer>)
+	@description:
+		Converts the integer value in host byte order
+		to it's network byte order counterpart.
+		Since the conversion is carried at binary rappresentation
+		level you must specify the number of bytes you want
+		the binary rappresentation to have. Valid values are
+		1 (no conversion), 2 (short), 4 (32 bit int) and 8 (64 bit int).
+		If omitted, bytecount is assumed to be 4.
+*/
+static bool system_kvs_fnc_htoni(KviKvsModuleFunctionCall * c)
+{
+	kvs_int_t iValue;
+	kvs_uint_t uBytes;
+
+	KVSM_PARAMETERS_BEGIN(c)
+		KVSM_PARAMETER("value",KVS_PT_INT,0,iValue)
+		KVSM_PARAMETER("bytecount",KVS_PT_UINT,KVS_PF_OPTIONAL,uBytes)
+	KVSM_PARAMETERS_END(c)
+
+	switch(uBytes)
+	{
+		case 0:
+			c->returnValue()->setInteger((kvs_int_t)KviByteOrder::localCpuToNetworkByteOrder32((kvi_u32_t)iValue));
+		break;
+		case 1:
+			c->returnValue()->setInteger((kvs_int_t)((kvi_u8_t)iValue));
+		break;
+		case 2:
+			c->returnValue()->setInteger((kvs_int_t)KviByteOrder::localCpuToNetworkByteOrder16((kvi_u16_t)iValue));
+		break;
+		case 4:
+			c->returnValue()->setInteger((kvs_int_t)KviByteOrder::localCpuToNetworkByteOrder32((kvi_u32_t)iValue));
+		break;
+		case 8:
+			c->returnValue()->setInteger((kvs_int_t)KviByteOrder::localCpuToNetworkByteOrder64((kvi_u64_t)iValue));
+		break;
+		default:
+			return c->error(__tr2qs("Bad bytecount specification: 1, 2, 4 and 8 are allowed"));
+		break;
+	}
+
+	return true;
+}
+
 static bool system_module_init(KviModule * m)
 {
 	KVSM_REGISTER_FUNCTION(m,"ostype",system_kvs_fnc_ostype);
@@ -815,6 +927,8 @@ static bool system_module_init(KviModule * m)
 	KVSM_REGISTER_FUNCTION(m,"getenv",system_kvs_fnc_getenv);
 	KVSM_REGISTER_FUNCTION(m,"hostname",system_kvs_fnc_hostname);
 	KVSM_REGISTER_FUNCTION(m,"dbus",system_kvs_fnc_dbus);
+	KVSM_REGISTER_FUNCTION(m,"htoni",system_kvs_fnc_htoni);
+	KVSM_REGISTER_FUNCTION(m,"ntohi",system_kvs_fnc_ntohi);
 	KVSM_REGISTER_FUNCTION(m,"clipboard",system_kvs_fnc_clipboard);
 	KVSM_REGISTER_FUNCTION(m,"selection",system_kvs_fnc_selection);
 	KVSM_REGISTER_FUNCTION(m,"checkModule",system_kvs_fnc_checkModule);
diff --git a/src/modules/torrent/KTorrentDbusInterface.cpp b/src/modules/torrent/KTorrentDbusInterface.cpp
index d28b1f95b..ae9d46553 100644
--- a/src/modules/torrent/KTorrentDbusInterface.cpp
+++ b/src/modules/torrent/KTorrentDbusInterface.cpp
@@ -49,7 +49,7 @@
 
 // 		QTimer *timer = new QTimer(this);
 // 		connect(timer, SIGNAL(timeout()), this, SLOT(slotTimer()));
-// 		timer->start(250, FALSE);
+// 		timer->start(250, false);
 
 		// make sure we have a list of files,
 		// otherwise functions dealing would
@@ -96,9 +96,9 @@
 	if (reply.type() == QDBusMessage::ErrorMessage) { \
 		QDBusError err = reply; \
 		qDebug("Error: %s\n%s\n", qPrintable(err.name()), qPrintable(err.message())); \
-		return FALSE; \
+		return false; \
 	} \
-	return TRUE;
+	return true;
 
 	bool KTorrentDbusInterface::startAll()
 	{