code clean; small ports

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

36 files changed, 252 insertions, 614 deletions

diff --git a/TODO-Qt4 b/TODO-Qt4
index 564511837..b747bdd08 100644
--- a/TODO-Qt4
+++ b/TODO-Qt4
@@ -53,49 +53,14 @@ src/kvirc/kernel
 src/kvirc/ui
 	kvi_actiondrawer.cpp
 	kvi_actiondrawer.h
-	kvi_channel.cpp
-	kvi_channel.h
-	kvi_colorwin.cpp
-	kvi_colorwin.h
 	kvi_console.cpp
 	kvi_console.h
-	kvi_cryptcontroller.cpp
-	kvi_cryptcontroller.h
-	kvi_customtoolbar.cpp
-	kvi_customtoolbar.h
-	kvi_debugwindow.cpp
-	kvi_debugwindow.h
-	kvi_dynamictooltip.cpp
-	kvi_dynamictooltip.h
-	kvi_filedialog.cpp
-	kvi_filedialog.h
-	kvi_historywin.cpp
-	kvi_historywin.h
-	kvi_htmldialog.cpp
-	kvi_htmldialog.h
-	kvi_imagedialog.cpp
-	kvi_imagedialog.h
-	kvi_ipeditor.cpp
-	kvi_ipeditor.h
-	kvi_irctoolbar.cpp
-	kvi_irctoolbar.h
-	kvi_ircviewprivate.h
 	kvi_ircviewtools.cpp
-	kvi_ircviewtools.h
 	kvi_listview.cpp
 	kvi_listview.h
-	kvi_maskeditor.cpp
-	kvi_maskeditor.h
 	kvi_mdicaption.cpp
-	kvi_mdicaption.h
 	kvi_mdichild.cpp
-	kvi_mdichild.h
-	kvi_mdimanager.cpp
-	kvi_mdimanager.h
-	kvi_menubar.cpp
-	kvi_menubar.h
-	kvi_modeeditor.cpp
-	kvi_modeeditor.h
+
 	kvi_modew.cpp
 	kvi_modew.h
 	kvi_msgbox.cpp
diff --git a/src/kvirc/ui/kvi_colorwin.cpp b/src/kvirc/ui/kvi_colorwin.cpp
index 13d381454..27a64eebc 100644
--- a/src/kvirc/ui/kvi_colorwin.cpp
+++ b/src/kvirc/ui/kvi_colorwin.cpp
@@ -28,21 +28,15 @@
 #include "kvi_app.h"
 #include "kvi_options.h"
 
-
-#include <qnamespace.h>
-#include <qpainter.h>
-#include <qstring.h>
-#include <qevent.h>
-
+#include <QPainter>
+#include <QString>
+#include <QEvent>
+#include <QMouseEvent>
 
 KviColorWindow::KviColorWindow()
 :QWidget(0,"toplevel_color_window",Qt::WType_Popup)
 {
-#ifdef COMPILE_USE_QT4
 	setFocusPolicy(Qt::NoFocus);
-#else
-	setFocusPolicy(QWidget::NoFocus);
-#endif
 	setBackgroundMode(Qt::NoBackground);
 	setFixedSize(146,38);
 	m_pOwner = 0;
diff --git a/src/kvirc/ui/kvi_colorwin.h b/src/kvirc/ui/kvi_colorwin.h
index f879cec59..4f9a39cef 100644
--- a/src/kvirc/ui/kvi_colorwin.h
+++ b/src/kvirc/ui/kvi_colorwin.h
@@ -23,7 +23,7 @@
 //
 #include "kvi_settings.h"
 
-#include <qwidget.h>
+#include <QWidget>
 
 class KVIRC_API KviColorWindow : public QWidget
 {
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index ca3b0f5d9..89215b0e2 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -73,27 +73,25 @@
 #include "kvi_ircdatastreammonitor.h"
 #include "kvi_toolwindows_container.h"
 #include "kvi_msgbox.h"
-
-#ifdef COMPILE_SSL_SUPPORT
-	#include "kvi_sslmaster.h"
-#endif
-
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_eventtriggers.h"
-
-#include <qsplitter.h>
-#include <qtoolbar.h>
-#include <qtoolbutton.h>
-#include <qtimer.h>
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_popupmenu.h"
-#include <qmessagebox.h>
-#include <qstringlist.h>
 
-#ifdef COMPILE_USE_QT4
-	#include <q3mimefactory.h>
+#ifdef COMPILE_SSL_SUPPORT
+	#include "kvi_sslmaster.h"
 #endif
 
+#include <QSplitter>
+#include <QToolBar>
+#include <QToolButton>
+#include <QTimer>
+#include <QMessageBox>
+#include <QStringList>
+
+// FIXME: Qt4 #include <QMimeData>
+#include <q3mimefactory.h>
+
 #define __KVI_DEBUG__
 #include "kvi_debug.h"
 
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
index ef4cb5993..dda9e3f8f 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/kvi_console.h
@@ -30,12 +30,11 @@
 #include "kvi_ircsocket.h"
 #include "kvi_string.h"
 #include "kvi_irccontext.h"
-
 #include "kvi_pointerlist.h"
 
 #include <time.h>
-#include <qcombobox.h>
 
+#include <QComboBox>
 
 class QToolBar;
 class QToolButton;
diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp
index a6430d35e..cee72d369 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.cpp
+++ b/src/kvirc/ui/kvi_cryptcontroller.cpp
@@ -26,10 +26,8 @@
 
 
 #ifdef COMPILE_CRYPT_SUPPORT
-
 	#include "kvi_cryptcontroller.h"
 	#include "kvi_styled_controls.h"
-
 	#include "kvi_window.h"
 	#include "kvi_locale.h"
 	#include "kvi_out.h"
@@ -39,10 +37,10 @@
 	#include "kvi_malloc.h"
 	#include "kvi_memmove.h"
 	#include "kvi_toolwindows_container.h"
-
-	#include <qlayout.h>
 	#include "kvi_pointerhashtable.h"
-
+	
+	#include <QLayout>
+	
 	// kvi_app.cpp
 	extern KVIRC_API KviCryptEngineManager * g_pCryptEngineManager;
 	extern KVIRC_API KviModuleManager      * g_pModuleManager;
@@ -78,11 +76,7 @@
 
 		m_pWindow = wnd;
 
-#ifdef COMPILE_USE_QT4
 		setFocusPolicy(Qt::ClickFocus);
-#else
-		setFocusPolicy(QWidget::ClickFocus);
-#endif
 
 		QGridLayout *g = new QGridLayout(this,10,4,2,2);
 
@@ -106,11 +100,7 @@
 
 		m_pDescriptionLabel = new QLabel(this);
 		m_pDescriptionLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
-#ifdef COMPILE_USE_QT4
-		m_pDescriptionLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-#else
 		m_pDescriptionLabel->setAlignment(Qt::AlignTop | Qt::AlignLeft);
-#endif
 		g->addMultiCellWidget(m_pDescriptionLabel,3,3,1,3);
 
 		m_pAuthorLabel = new QLabel(this);
diff --git a/src/kvirc/ui/kvi_cryptcontroller.h b/src/kvirc/ui/kvi_cryptcontroller.h
index 2bb21f92d..c46c64671 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.h
+++ b/src/kvirc/ui/kvi_cryptcontroller.h
@@ -31,18 +31,17 @@
 // Qt4 moc bails out on this ??????
 
 #if defined(COMPILE_CRYPT_SUPPORT) || defined(Q_MOC_RUN)
-	#include <qwidget.h>
-	#include "kvi_tal_listbox.h"
-	#include <qpushbutton.h>
-	#include <qcheckbox.h>
-	#include <qlabel.h>
-	#include <qlineedit.h>
 	#include "kvi_styled_controls.h"
-	
 	#include "kvi_crypt.h"
 	#include "kvi_heapobject.h"
 	#include "kvi_toolwindows_container.h"
-	
+	#include "kvi_tal_listbox.h"
+
+	#include <QWidget>
+	#include <QPushButton>
+	#include <QCheckBox>
+	#include <QLabel>
+	#include <QLineEdit>
 	class KviWindow;
 
 	class KVIRC_API KviCryptSessionInfo : public KviHeapObject
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index d2387e353..94e432855 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -30,31 +30,21 @@
 #include "kvi_app.h"
 #include "kvi_actionmanager.h"
 #include "kvi_customtoolbardescriptor.h"
-
-#include <qcursor.h>
 #include "kvi_tal_popupmenu.h"
-#include <qlayout.h>
-#include <qpixmap.h>
-#include <qcursor.h>
-#include <qtoolbutton.h>
-#include <qpainter.h>
-#include <qstyle.h>
-
-#ifdef COMPILE_USE_QT4
-	#include <qevent.h>
-	#include <q3dragobject.h>
-
-	#define QDragObject Q3DragObject
-	#define QTextDrag Q3TextDrag
-	#define QIconDrag Q3IconDrag
-
-	#include <qstyleoption.h>
-#else
-	#include <qobjectlist.h>
-	#include <qdragobject.h>
-#endif
-
 
+#include <QCursor>
+#include <QLayout>
+#include <QPixmap>
+#include <QToolButton>
+#include <QPainter>
+#include <QStyle>
+#include <QEvent>
+#include <QStyleOption>
+#include <QDragEnterEvent>
+#include <QMimeData>
+#define QDragObject QMimeData
+#define QTextDrag QMimeData
+#define QIconDrag QMimeData
 
 KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,const char * name)
 : QWidget(pParent,name)
@@ -67,13 +57,9 @@ KviCustomToolBarSeparator::KviCustomToolBarSeparator(KviCustomToolBar *pParent,c
 
 QSize KviCustomToolBarSeparator::sizeHint() const
 {
-#ifdef COMPILE_USE_QT4
 	QStyleOption opt;
 	opt.initFrom(this);
 	int extent = style()->pixelMetric(QStyle::PM_ToolBarSeparatorExtent,&opt,this);
-#else
-	int extent = style().pixelMetric(QStyle::PM_DockWindowSeparatorExtent,this);
-#endif
 	if(m_pToolBar->orientation() == Qt::Horizontal)return QSize(extent,0);
 	else return QSize(0,extent);
 }
@@ -81,15 +67,9 @@ QSize KviCustomToolBarSeparator::sizeHint() const
 void KviCustomToolBarSeparator::paintEvent(QPaintEvent *)
 {
 	QPainter p(this);
-#ifdef COMPILE_USE_QT4
 	QStyleOption opt;
 	opt.initFrom(this);
 	style()->drawPrimitive(QStyle::PE_Q3DockWindowSeparator,&opt,&p,this);
-#else
-	QStyle::SFlags flags = QStyle::Style_Default;
-	if(m_pToolBar->orientation() == Qt::Horizontal)flags |= QStyle::Style_Horizontal;
-	style().drawPrimitive(QStyle::PE_DockWindowSeparator,&p,rect(),colorGroup(),flags);
-#endif
 }
 
 
@@ -170,45 +150,24 @@ void KviCustomToolBar::beginCustomize()
 	m_pFilteredChildren = new KviPointerHashTable<void *,bool>;
 	m_pFilteredChildren->setAutoDelete(true);
 	// filter the events for all the children
-#ifdef COMPILE_USE_QT4
 	QList<QObject*> l = children();
 	for(QList<QObject*>::Iterator it = l.begin();it != l.end();++it)
 	{
 		if((*it)->isWidgetType())
 			filterChild(*it);
 	}
-#else
-	const QObjectList * l = children();
-	QObjectListIterator it(*l);
-	while(QObject * o = it.current())
-	{
-		if(o->isWidgetType())
-			filterChild(o);
-		++it;
-	}
-#endif
 }
 
 void KviCustomToolBar::endCustomize()
 {
 	// stop filtering events
-#ifdef COMPILE_USE_QT4
 	QList<QObject*> l = children();
 	for(QList<QObject*>::Iterator it = l.begin();it != l.end();++it)
 	{
 		if((*it)->isWidgetType())
 			unfilterChild(*it);
 	}
-#else
-	const QObjectList * l = children();
-	QObjectListIterator it(*l);
-	while(QObject * o = it.current())
-	{
-		if(o->isWidgetType())
-			unfilterChild(o);
-		++it;
-	}
-#endif
+
 	// FIXME: We SHOULD MAKE SURE that the children are re-enabled...
 	// this could be done by calling setEnabled(isEnabled()) on each action ?
 	if(m_pFilteredChildren)
@@ -263,17 +222,17 @@ void KviCustomToolBar::dragEnterEvent(QDragEnterEvent *e)
 	if(!KviActionManager::customizingToolBars())return;
 	KviActionManager::instance()->setCurrentToolBar(this);
 	QString text;
-	if(QTextDrag::decode(e,text))
+	if(e->mimeData()->hasUrls())
 	{
 		if(!text.isEmpty())
 		{
 			KviAction * a = KviActionManager::instance()->getAction(text);
 			if(a)
 			{
-				e->accept(true);
+				e->acceptProposedAction();
 				int idx = dropIndexAt(mapFromGlobal(QCursor::pos()),0,0);
 				m_pDraggedChild = a->addToCustomToolBar(this);
-#ifdef COMPILE_USE_QT4
+
 				QWidget * pWidgetToMove = widgetAt(idx);
 				bool bDone = false;
 				QAction * a;
@@ -289,19 +248,15 @@ void KviCustomToolBar::dragEnterEvent(QDragEnterEvent *e)
 				if(!bDone)
 					a = addWidget(m_pDraggedChild);
 				a->setVisible(true);
-#else
-				boxLayout()->remove(m_pDraggedChild); // in case it was already added
-				boxLayout()->insertWidget(idx,m_pDraggedChild);
 #ifdef COMPILE_KDE_SUPPORT
 				// bleah ://///
 				insertWidget(-1,m_pDraggedChild->sizeHint().width(),m_pDraggedChild,idx);
 #endif
-#endif
 				QEvent ev(QEvent::LayoutHint);
 				QApplication::sendEvent(this,&ev);
-			} else e->accept(false);
-		} else e->accept(false);
-	} else e->accept(false);
+			} else e->ignore();
+		} else e->ignore();
+	} else e->ignore();
 }
 
 void KviCustomToolBar::dragMoveEvent(QDragMoveEvent *e)
@@ -325,7 +280,8 @@ void KviCustomToolBar::dropEvent(QDropEvent *e)
 {
 	if(!m_pDraggedChild)return;
 	m_pDraggedChild = 0;
-	e->accept();
+
+	if(e->mimeData()->hasUrls()) e->acceptProposedAction();
 	// nuthin :)
 }
 
@@ -334,11 +290,7 @@ int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excl
 	// find the widget at the current poisition
 	// treating exclude as if it was going to be removed
 	// find also the exclude index if needed
-#ifdef COMPILE_USE_QT4
 	QLayout * l = layout();
-#else
-	QBoxLayout * l = boxLayout();
-#endif
 	QLayoutItem * i = 0;
 	if(excludeIdx)*excludeIdx = -1;
 	int idx = 0;
@@ -451,7 +403,6 @@ int KviCustomToolBar::dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excl
 
 }
 
-#ifdef COMPILE_USE_QT4
 QWidget * KviCustomToolBar::widgetAt(int index)
 {
 	QLayout * l = layout();
@@ -468,16 +419,13 @@ QAction * KviCustomToolBar::actionForWidget(QWidget * pWidget)
 	return actionAt(pWidget->x() + 1,pWidget->y() + 1);
 }
 
-#endif
-
 void KviCustomToolBar::drag(QWidget * child,const QPoint &pnt)
 {
 	int me = -1;
 	int idx = dropIndexAt(pnt,child,&me);
 	debug("DROP INDEX IS %d, ME IS %d",idx,me);
-	if(idx == me)
-		return; // would move over itself
-#ifdef COMPILE_USE_QT4
+	if(idx == me) return; // would move over itself
+
 	QWidget * pWidgetToMove = widgetAt(idx > me ? idx-1 : idx);
 	debug("SEARCHING FOR WIDGET TO MOVE AT %d AND FOUND %x (ME=%x)",idx > me ? idx-1 : idx,pWidgetToMove,child);
 	if(pWidgetToMove == child)
@@ -504,14 +452,10 @@ void KviCustomToolBar::drag(QWidget * child,const QPoint &pnt)
 	if(!bDone)
 		a = addWidget(child);
 	a->setVisible(true);
-#else
-	boxLayout()->remove(child);
-	boxLayout()->insertWidget(idx,child);
 #ifdef COMPILE_KDE_SUPPORT
 	// bleah ://///
 	insertWidget(-1,child->width(),child,idx);
 #endif
-#endif
 	QEvent ev(QEvent::LayoutHint);
 	QApplication::sendEvent(this,&ev);
 }
@@ -601,56 +545,37 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e)
 				if(act)
 				{
 					QPixmap * pixie = act->bigIcon();
-#ifdef COMPILE_USE_QT4
 					if(pixie)
 					{
 						d->setPixmap(*pixie);
 						d->setHotSpot(QPoint(3,3));
 					}
-#else
-					if(pixie)d->setPixmap(*pixie,QPoint(3,3));
-#endif
 				}
 				//d->setPixmap(QPixmap::grabWidget(m_pMovedChild),QPoint(m_pMovedChild->width() / 2,m_pMovedChild->height() / 2));
 				// throw it somewhere else for now
 				if(m_pFilteredChildren)
 					unfilterChild(m_pMovedChild);
-#ifdef COMPILE_USE_QT4
+
 				QAction * pActionForMovedChild = actionForWidget(m_pMovedChild);
 				if(pActionForMovedChild)
 					pActionForMovedChild->setVisible(false);
 				m_pMovedChild->hide();
-#else
-				m_pMovedChild->hide();
-				m_pMovedChild->reparent(g_pFrame,QPoint(-1000,-1000),false);
-#endif
+
 				QEvent ev(QEvent::LayoutHint);
 				QApplication::sendEvent(this,&ev);
-#ifdef COMPILE_USE_QT4
 				if(!d->exec(Qt::MoveAction) != Qt::MoveAction)
-#else
-				if(!d->dragMove())
-#endif
 				{
 					// the user has probably failed to remove the action from the toolbar
 					// flash the trashcan in the customize toolbars dialog
 					KviActionManager::instance()->emitRemoveActionsHintRequest();
 					// will filter it as ChildInserted
-#ifndef COMPILE_USE_QT4
-					m_pMovedChild->reparent(this,QPoint(0,0),false);
-#endif
-#ifdef COMPILE_USE_QT4
 					QAction * pActionForMovedChild = actionForWidget(m_pMovedChild);
 					if(pActionForMovedChild)
 						pActionForMovedChild->setVisible(false);
-#else
-					boxLayout()->insertWidget(0,m_pMovedChild);
-					m_pMovedChild->show();
 #ifdef COMPILE_KDE_SUPPORT
 					// bleah ://///
 					insertWidget(-1,m_pMovedChild->width(),m_pMovedChild,0);
 #endif
-#endif
 					QEvent ev(QEvent::LayoutHint);
 					QApplication::sendEvent(this,&ev);
 				} else {
diff --git a/src/kvirc/ui/kvi_customtoolbar.h b/src/kvirc/ui/kvi_customtoolbar.h
index 7c880893e..897fec9b3 100644
--- a/src/kvirc/ui/kvi_customtoolbar.h
+++ b/src/kvirc/ui/kvi_customtoolbar.h
@@ -71,10 +71,8 @@ protected:
 	virtual void childEvent(QChildEvent *e);
 	virtual bool eventFilter(QObject *o,QEvent *e);
 	int dropIndexAt(const QPoint &pnt,QWidget * exclude,int * excludeIdx);
-#ifdef COMPILE_USE_QT4
 	QWidget * widgetAt(int index);
 	QAction * actionForWidget(QWidget * pWidget);
-#endif
 	void drag(QWidget * child,const QPoint &pnt);
 	void filterChild(QObject * o);
 	void unfilterChild(QObject * o);
@@ -86,6 +84,4 @@ protected slots:
 	void filteredChildDestroyed();
 };
 
-
-
 #endif //!_KVI_CUSTOMTOOLBAR_H_
diff --git a/src/kvirc/ui/kvi_debugwindow.cpp b/src/kvirc/ui/kvi_debugwindow.cpp
index 0b2e7f12d..66919c105 100644
--- a/src/kvirc/ui/kvi_debugwindow.cpp
+++ b/src/kvirc/ui/kvi_debugwindow.cpp
@@ -36,9 +36,9 @@
 #include "kvi_frame.h"
 #include "kvi_valuelist.h"
 
-#include <qpixmap.h>
-#include <qsplitter.h>
-#include <qtoolbutton.h>
+#include <QPixmap>
+#include <QSplitter>
+#include <QToolButton>
 
 KviDebugWindow * KviDebugWindow::m_pInstance = 0;
 
@@ -68,8 +68,6 @@ KviDebugWindow * KviDebugWindow::getInstance()
 	return m_pInstance;
 }
 
-
-
 void KviDebugWindow::getBaseLogFileName(QString &buffer)
 {
 	buffer = "debug";
@@ -129,4 +127,3 @@ QSize KviDebugWindow::sizeHint() const
 	QSize ret(m_pSplitter->sizeHint().width(),m_pIrcView->sizeHint().height() + m_pInput->heightHint());
 	return ret;
 }
-
diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/kvi_dynamictooltip.h
index daa91348e..80e909a5a 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.h
+++ b/src/kvirc/ui/kvi_dynamictooltip.h
@@ -25,7 +25,8 @@
 
 #include "kvi_settings.h"
 #include "kvi_tal_tooltip.h"
-#include <qobject.h>
+
+#include <QObject>
 
 class KviDynamicToolTip;
 
diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp
index f62de7697..62b2c2303 100644
--- a/src/kvirc/ui/kvi_filedialog.cpp
+++ b/src/kvirc/ui/kvi_filedialog.cpp
@@ -28,10 +28,10 @@
 #include "kvi_fileutils.h"
 #include "kvi_frame.h"
 #include "kvi_qstring.h"
-
-#include <qdir.h>
 #include "kvi_tal_tooltip.h"
-#include <qmessagebox.h>
+
+#include <QDir>
+#include <QMessageBox>
 #include <QFileDialog>
 
 extern KviMediaManager * g_pMediaManager;
diff --git a/src/kvirc/ui/kvi_filedialog.h b/src/kvirc/ui/kvi_filedialog.h
index 4631c1cc6..41911ed3d 100644
--- a/src/kvirc/ui/kvi_filedialog.h
+++ b/src/kvirc/ui/kvi_filedialog.h
@@ -28,11 +28,9 @@
 #endif
 #include "kvi_settings.h"
 #include "kvi_string.h"
-
-
 #include "kvi_tal_filedialog.h"
 
-#include <qstringlist.h>
+#include <QStringList>
 
 
 class KVIRC_API KviFileDialog : public KviTalFileDialog
diff --git a/src/kvirc/ui/kvi_historywin.cpp b/src/kvirc/ui/kvi_historywin.cpp
index e09a0888d..3d1f35ad1 100644
--- a/src/kvirc/ui/kvi_historywin.cpp
+++ b/src/kvirc/ui/kvi_historywin.cpp
@@ -31,29 +31,18 @@
 #include "kvi_input.h"
 #include "kvi_mirccntrl.h"
 
-#include <qnamespace.h>
-
-#ifdef COMPILE_USE_QT4
-	#include <qevent.h>
-#endif
+#include <QEvent>
+#include <QMouseEvent>
 
 #include <ctype.h>
 
 extern KviInputHistory * g_pInputHistory;
 
 KviHistoryWindow::KviHistoryWindow()
-#ifdef COMPILE_USE_QT4
 : KviTalListBox(0,Qt::Popup)
-#else
-: KviTalListBox(0,Qt::WType_Popup)
-#endif
 {
 	m_pOwner = 0;
-#ifdef COMPILE_USE_QT4
 	setHScrollBarMode(Q3ScrollView::AlwaysOff);
-#else
-	setHScrollBarMode(QScrollView::AlwaysOff);
-#endif
 	connect(this,SIGNAL(selected(const QString &)),this,SLOT(itemSelected(const QString &)));
 
 	m_iTimerId = -1;
diff --git a/src/kvirc/ui/kvi_htmldialog.cpp b/src/kvirc/ui/kvi_htmldialog.cpp
index 9d4578619..34bfe6399 100644
--- a/src/kvirc/ui/kvi_htmldialog.cpp
+++ b/src/kvirc/ui/kvi_htmldialog.cpp
@@ -27,10 +27,10 @@
 #include "kvi_locale.h"
 #include "kvi_tal_textedit.h"
 
-#include <qlabel.h>
-#include <qpushbutton.h>
-#include <qlayout.h>
-#include <qtextbrowser.h>
+#include <QLabel>
+#include <QPushButton>
+#include <QLayout>
+#include <QTextBrowser>
 
 KviHtmlDialog::KviHtmlDialog(QWidget * pParent,KviHtmlDialogData * pData)
 : QDialog(pParent)
@@ -151,5 +151,3 @@ int KviHtmlDialog::display(QWidget * pParent,KviHtmlDialogData * pData)
 	delete pDialog;
 	return pData->iSelectedButton;
 }
-
-
diff --git a/src/kvirc/ui/kvi_htmldialog.h b/src/kvirc/ui/kvi_htmldialog.h
index 6bb811a31..63eb2bb8d 100644
--- a/src/kvirc/ui/kvi_htmldialog.h
+++ b/src/kvirc/ui/kvi_htmldialog.h
@@ -27,9 +27,8 @@
 #include "kvi_qstring.h"

 #include "kvi_settings.h"

 

-

-#include <qpixmap.h>

-#include <qdialog.h>

+#include <QPixmap>

+#include <QDialog>

 

 class KviHtmlDialogData

 {

diff --git a/src/kvirc/ui/kvi_imagedialog.cpp b/src/kvirc/ui/kvi_imagedialog.cpp
index 9f0b52756..e110fffdc 100644
--- a/src/kvirc/ui/kvi_imagedialog.cpp
+++ b/src/kvirc/ui/kvi_imagedialog.cpp
@@ -22,25 +22,20 @@
 
 #define __KVIRC__
 #include "kvi_imagedialog.h"
-
-#include "kvi_locale.h"
-
-#include <qlayout.h>
-#include <qpushbutton.h>
-
-#include <qimage.h>
-#include <qfileinfo.h>
-#include <qdir.h>
-
-#include <qpainter.h>
-
 #include "kvi_fileutils.h"
-
+#include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 #include "kvi_options.h"
-
 #include "kvi_app.h"
 
+#include <QLayout>
+#include <QPushButton>
+#include <QPainter>
+#include <QImage>
+#include <QFileInfo>
+#include <QDir>
+
+
 int KviImageDialogItem::height(const KviTalListBox *lb) const
 {
 	return pixmap()->height() + 12 + lb->fontMetrics().lineSpacing();
@@ -281,11 +276,7 @@ void KviImageDialog::heartbeat()
 						QImage i(szPath);
 						if(i.isNull())continue;
 						QPixmap pix;
-#ifdef COMPILE_USE_QT4
 						if((i.width() > 80) || (i.height() > 80))pix = i.scaled(80,80,Qt::KeepAspectRatio);
-#else
-						if((i.width() > 80) || (i.height() > 80))pix = i.scale(80,80,QImage::ScaleMin);
-#endif
 						else pix = i;
 
 						QString tip = szFile;
diff --git a/src/kvirc/ui/kvi_imagedialog.h b/src/kvirc/ui/kvi_imagedialog.h
index 27737fb82..0c1bb4ac6 100644
--- a/src/kvirc/ui/kvi_imagedialog.h
+++ b/src/kvirc/ui/kvi_imagedialog.h
@@ -23,18 +23,15 @@
 //
 
 #include "kvi_settings.h"
-
-
-
-
-#include <qdialog.h>
-#include <qcombobox.h>
-#include "kvi_tal_listbox.h"
+#include "kvi_dynamictooltip.h"
 #include "kvi_valuelist.h"
-#include <qtimer.h>
-#include <qstringlist.h>
+#include "kvi_tal_listbox.h"
+
+#include <QDialog>
+#include <QComboBox>
+#include <QTimer>
+#include <QStringList>
 
-#include "kvi_dynamictooltip.h"
 
 class KviImageDialogItem : public KviTalListBoxPixmap
 {
diff --git a/src/kvirc/ui/kvi_ipeditor.cpp b/src/kvirc/ui/kvi_ipeditor.cpp
index bd75c1c45..b4f26825e 100644
--- a/src/kvirc/ui/kvi_ipeditor.cpp
+++ b/src/kvirc/ui/kvi_ipeditor.cpp
@@ -23,13 +23,14 @@
 #include "kvi_ipeditor.h"
 #include "kvi_qcstring.h"
 
-#include <qapplication.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-#include <qframe.h>
-#include <ctype.h>
-#include <qevent.h>
+#include <QApplication>
+#include <QLineEdit>
+#include <QLabel>
+#include <QFrame>
+#include <QEvent>
+#include <QKeyEvent>
 
+#include <ctype.h>
 
 // FIXME: #warning "THIS COULD GO INTO libkvioptions ?"
 
@@ -44,15 +45,8 @@ KviIpEditor::KviIpEditor(QWidget * parent,AddressType addrType,const QString &ip
 	}
 	m_pEdit[7] = 0;
 	setFrameStyle(QFrame::Sunken|QFrame::StyledPanel);
-
-#ifdef COMPILE_USE_QT4
 	setBackgroundRole(QPalette::Base);
-#else
-	setBackgroundMode(QWidget::PaletteBase);
-#endif
-
 	setAddressType(addrType);
-
 	setAddress(ipAddr);
 }
 
@@ -70,19 +64,11 @@ void KviIpEditor::setEnabled(bool bEnabled)
 		if(i<7)if(m_pLabel[i])
 		{
 			// Is this the right way ?
-#ifdef COMPILE_USE_QT4
 			m_pLabel[i]->setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background);
-#else
-			m_pLabel[i]->setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground);
-#endif
 			m_pLabel[i]->setEnabled(bEnabled);
 		}
 	}
-#ifdef COMPILE_USE_QT4
 	setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background);
-#else
-	setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground);
-#endif
 }
 
 void KviIpEditor::setAddressType(AddressType addrType)
@@ -123,7 +109,7 @@ void KviIpEditor::clear()
 bool KviIpEditor::setAddress(const QString &ipAddr)
 {
 	// FIXME We could check if the addres
-    //       is valid before effectively setting the fields
+	//       is valid before effectively setting the fields
 	clear();
 
 	KviQCString ip = ipAddr.ascii(); // ip addresses are digits & latin letters abcdef (IpV6)
@@ -219,11 +205,7 @@ void KviIpEditor::recreateChildren()
 			m_pLabel[i]->setText(bIpV4 ? "." : ":");
 			m_pLabel[i]->show();
 			// Is this the right way ? setBackgroundMode seems to not work well
-#ifdef COMPILE_USE_QT4
 			m_pLabel[i]->setBackgroundRole(isEnabled() ? QPalette::Base : QPalette::Background);
-#else
-			m_pLabel[i]->setBackgroundMode(isEnabled() ? QWidget::PaletteBase : QWidget::PaletteBackground);
-#endif
 		}
 	}
 	// Kill the unused widgets , if any
@@ -309,11 +291,7 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e)
 					{
 						if((c >= '0') && (c <= '9'))
 						{
-#if QT_VERSION >= 300
 							if(m_pEdit[edIdx]->hasSelectedText())m_pEdit[edIdx]->cut();
-#else
-							if(m_pEdit[edIdx]->hasMarkedText())m_pEdit[edIdx]->cut();
-#endif
 							cursorPos = m_pEdit[edIdx]->cursorPosition();
 							s = m_pEdit[edIdx]->text();
 							s.insert(cursorPos,c);
@@ -333,19 +311,11 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e)
 									return true;
 								}
 							}
-#if QT_VERSION >= 300
 							m_pEdit[edIdx]->cursorForward(false);
-#else
-							m_pEdit[edIdx]->cursorRight(false);
-#endif
 						} else {
 							if((c == '.') && (edIdx < edMax))
 							{
-#if QT_VERSION >= 300
 								if(!m_pEdit[edIdx]->hasSelectedText())
-#else
-								if(!m_pEdit[edIdx]->hasMarkedText())
-#endif
 								{
 									m_pEdit[++edIdx]->setFocus();
 									m_pEdit[edIdx]->selectAll();
@@ -355,11 +325,7 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e)
 					} else {
 						if(  ((c >= '0') && (c <= '9')) || ((c >= 'a') && (c <= 'f')) )
 						{
-#if QT_VERSION >= 300
 							if(m_pEdit[edIdx]->hasSelectedText())m_pEdit[edIdx]->cut();
-#else
-							if(m_pEdit[edIdx]->hasMarkedText())m_pEdit[edIdx]->cut();
-#endif
 							cursorPos = m_pEdit[edIdx]->cursorPosition();
 							s = m_pEdit[edIdx]->text();
 
@@ -384,21 +350,13 @@ bool KviIpEditor::eventFilter(QObject * o,QEvent *e)
 									m_pEdit[edIdx]->selectAll();
 									//m_pEdit[edIdx]->setCursorPosition(0);
 								} else {
-#if QT_VERSION >= 300
 									m_pEdit[edIdx]->cursorForward(false);
-#else
-									m_pEdit[edIdx]->cursorRight(false);
-#endif
 								}
 							}
 						} else {
 							if((c == ':') && (edIdx < edMax))
 							{
-#if QT_VERSION >= 300
 								if(!m_pEdit[edIdx]->hasSelectedText())
-#else
-								if(!m_pEdit[edIdx]->hasMarkedText())
-#endif
 								{
 									m_pEdit[++edIdx]->setFocus();
 									m_pEdit[edIdx]->selectAll();
diff --git a/src/kvirc/ui/kvi_ipeditor.h b/src/kvirc/ui/kvi_ipeditor.h
index 0279def97..9042ded7a 100644
--- a/src/kvirc/ui/kvi_ipeditor.h
+++ b/src/kvirc/ui/kvi_ipeditor.h
@@ -25,9 +25,9 @@
 
 #include "kvi_settings.h"
 
-#include <qwidget.h>
-#include <qstring.h>
-#include <qframe.h>
+#include <QWidget>
+#include <QString>
+#include <QFrame>
 
 class QLineEdit;
 class QLabel;
diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp
index 237707f28..9d041ca90 100644
--- a/src/kvirc/ui/kvi_irctoolbar.cpp
+++ b/src/kvirc/ui/kvi_irctoolbar.cpp
@@ -40,15 +40,13 @@
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_irccontext.h"
 #include "kvi_lagmeter.h"
-
-#include <qstyle.h>
-#include <qpainter.h>
 #include "kvi_tal_popupmenu.h"
-#include <qlayout.h>
 
-#ifdef COMPILE_USE_QT4
-	#include <qevent.h>
-#endif
+#include <QStyle>
+#include <QPainter>
+#include <QLayout>
+#include <QEvent>
+#include <QMouseEvent>
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	extern QPixmap * g_pShadedChildGlobalDesktopBackground;
@@ -68,12 +66,8 @@ KviToolBarGraphicalApplet::KviToolBarGraphicalApplet(QWidget * par,const char *
 	}
 
 	g_pToolBarGraphicalAppletList->append(this);
-#ifdef COMPILE_USE_QT4
-	setAutoFillBackground(false);
-#else
-	setBackgroundMode(QWidget::NoBackground);
-#endif
 
+	setAutoFillBackground(false);
 	setMouseTracking(true);
 	m_bResizeMode = false;
 
@@ -215,12 +209,8 @@ void KviToolBarGraphicalApplet::paintEvent(QPaintEvent *e)
 	pa.drawLine(1,height() - 1,width() - 1,height() - 1);
 	pa.drawLine(width() - 1,1,width() - 1,height());
 
-#ifdef COMPILE_USE_QT4
 	QPainter qt4SucksBecauseItNeedsAnAdditionalQPainter(this);
 	qt4SucksBecauseItNeedsAnAdditionalQPainter.drawPixmap(e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),*g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height());
-#else
-	bitBlt(this,e->rect().left(),e->rect().top(),g_pIccMemBuffer,e->rect().left(),e->rect().top(),e->rect().width(),e->rect().height(),Qt::CopyROP);
-#endif
 }
 
 void KviToolBarGraphicalApplet::drawContents(QPainter *)
diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h
index 0ea2dd657..e7f9a38c7 100644
--- a/src/kvirc/ui/kvi_irctoolbar.h
+++ b/src/kvirc/ui/kvi_irctoolbar.h
@@ -28,12 +28,12 @@
 #include "kvi_string.h"
 #include "kvi_toolbar.h"
 #include "kvi_console.h"
-
 #include "kvi_pointerlist.h"
-#include <qwidget.h>
-#include <qtoolbutton.h>
 #include "kvi_tal_widgetstack.h"
-#include <qlabel.h>
+
+#include <QWidget>
+#include <QToolButton>
+#include <QLabel>
 
 class KviTalPopupMenu;
 
@@ -87,9 +87,4 @@ protected slots:
 	void tipRequest(KviDynamicToolTip * tip,const QPoint &);
 };
 
-
-
-
-
-
 #endif //_KVI_IRCTOOLBAR_H_
diff --git a/src/kvirc/ui/kvi_ircviewprivate.h b/src/kvirc/ui/kvi_ircviewprivate.h
index 453b6272c..8cb07a349 100644
--- a/src/kvirc/ui/kvi_ircviewprivate.h
+++ b/src/kvirc/ui/kvi_ircviewprivate.h
@@ -25,7 +25,8 @@
 //=========================================================================================================
 
 #include "kvi_settings.h"
-#include <qstring.h>
+
+#include <QString>
 
 //=========================================================================================================
 // Internal data structures
diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp
index 9b7f7c8cc..e0e4a3afc 100644
--- a/src/kvirc/ui/kvi_ircviewtools.cpp
+++ b/src/kvirc/ui/kvi_ircviewtools.cpp
@@ -35,22 +35,21 @@
 #include "kvi_filedialog.h"
 #include "kvi_app.h"
 #include "kvi_memmove.h"
-
-#include <qtoolbutton.h>
-#include <qtabwidget.h>
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qcheckbox.h>
-#include <qpushbutton.h>
-#ifdef COMPILE_USE_QT4
-	#include <q3header.h>
-#else
-	#include <qheader.h>
-#endif
-#include <qlineedit.h>
-#include <qcursor.h>
 #include "kvi_accel.h"
-#include <qevent.h>
+
+#include <QToolButton>
+#include <QTabWidget>
+#include <QLayout>
+#include <QLabel>
+#include <QCheckBox>
+#include <QPushButton>
+#include <QLineEdit>
+#include <QCursor>
+#include <QEvent>
+#include <QMouseEvent>
+
+// FIXME: Qt4 #include <QHeaderView>
+#include <q3header.h>
 
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 //
@@ -277,12 +276,18 @@ void KviIrcViewToolWidget::filterSave()
 
 void KviIrcViewToolWidget::forceRepaint()
 {
-	#if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) 

-		m_pIrcView->repaint();

+	/*
+	#if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS)
+		m_pIrcView->repaint();
+	#else
+		m_pIrcView->paintEvent(0);
+	#endif
+	*/
+	#ifdef COMPILE_ON_WINDOWS
+		m_pIrcView->repaint();
 	#else
 		m_pIrcView->paintEvent(0);
 	#endif
-
 }
 
 void KviIrcViewToolWidget::setFindResult(const QString & text)
@@ -345,4 +350,3 @@ void KviIrcViewToolTip::maybeTip(const QPoint &pnt)
 {
 	m_pView->maybeTip(pnt);
 }
-
diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/kvi_ircviewtools.h
index e3f848728..f2cc5ad7d 100644
--- a/src/kvirc/ui/kvi_ircviewtools.h
+++ b/src/kvirc/ui/kvi_ircviewtools.h
@@ -25,18 +25,17 @@
 //=========================================================================================================
 
 #include "kvi_settings.h"
-
+#include "kvi_styled_controls.h"
 #include "kvi_tal_tooltip.h"
-#include <qframe.h>
 #include "kvi_tal_listview.h"
-#include <qstring.h>
+
+#include <QFrame>
+#include <QString>
 
 class QLabel;
-//class KviStyledCheckBox;
-#include "kvi_styled_controls.h"
 class QLineEdit;
-
 class KviIrcView;
+//class KviStyledCheckBox;
 
 class KviIrcViewToolTip : public KviTalToolTip
 {
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 8fdee497a..66ff69dc0 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -32,9 +32,9 @@
 #include "kvi_toolwindows_container.h"
 #include "kvi_channel.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
-#include <qvalidator.h> 
+#include <QLayout>
+#include <QLabel>
+#include <QValidator>
 
 KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry)
 :KviTalListViewItem(parent), m_Mask(*entry)
@@ -49,11 +49,8 @@ KviMaskItem::KviMaskItem(KviTalListView* parent,KviMaskEntry* entry)
 KviMaskItem::~KviMaskItem()
 {
 }
-#ifdef COMPILE_USE_QT4
+
 int KviMaskItem::compare ( KviTalListViewItem * i, int col, bool ascending ) const
-#else
-int KviMaskItem::compare ( QListViewItem * i, int col, bool ascending ) const
-#endif
 {
 	if(col==2)
 	{
@@ -140,11 +137,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 	w = w->parent();
 	}
 
-#ifdef COMPILE_USE_QT4
 	setFocusPolicy(Qt::ClickFocus);
-#else
-	setFocusPolicy(QWidget::ClickFocus);
-#endif
 
 	QGridLayout *g = new QGridLayout(this,4,2,2,2);
 
@@ -190,11 +183,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 	g->addMultiCellWidget(l,2,2,0,1);
 	
 	m_pMaskBox = new KviTalListView(this);
-#ifdef COMPILE_USE_QT4
 	m_pMaskBox->setFocusPolicy(Qt::ClickFocus);
-#else
-	m_pMaskBox->setFocusPolicy(QWidget::ClickFocus);
-#endif
 	m_pMaskBox->setFocusProxy(this);
 	m_pMaskBox->setFrameStyle(QFrame::StyledPanel|QFrame::Sunken);
 	m_pMaskBox->addColumn(__tr2qs("Mask"));
@@ -209,11 +198,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 
 	m_pRemoveMask  = new QPushButton(__tr2qs("Re&move"),this);
 	m_pRemoveMask->setEnabled(isEnabled);
-#ifdef COMPILE_USE_QT4
 	m_pRemoveMask->setFocusPolicy(Qt::ClickFocus);
-#else
-	m_pRemoveMask->setFocusPolicy(QWidget::ClickFocus);
-#endif
 	m_pRemoveMask->setFocusProxy(this);
 	g->addWidget(m_pRemoveMask,4,1);
 	connect(m_pRemoveMask,SIGNAL(clicked()),this,SLOT(removeClicked()));
@@ -221,11 +206,7 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 	
 	m_pAddButton = new QPushButton(__tr2qs("Add"),this);
 	m_pAddButton->setEnabled(isEnabled);
-#ifdef COMPILE_USE_QT4
 	m_pAddButton->setFocusPolicy(Qt::ClickFocus);
-#else
-	m_pAddButton->setFocusPolicy(QWidget::ClickFocus);
-#endif
 	m_pAddButton->setFocusProxy(this);
 	g->addWidget(m_pAddButton,4,0);
 	connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked()));
diff --git a/src/kvirc/ui/kvi_maskeditor.h b/src/kvirc/ui/kvi_maskeditor.h
index 32b710f5a..f549bf3f2 100644
--- a/src/kvirc/ui/kvi_maskeditor.h
+++ b/src/kvirc/ui/kvi_maskeditor.h
@@ -24,15 +24,15 @@
 //
 
 #include "kvi_settings.h"
-#include <qdialog.h> 
-#include <qlineedit.h> 
-#include <qwidget.h>
-#include "kvi_tal_listview.h"
-#include <qpushbutton.h>
 #include "kvi_pointerlist.h"
-
 #include "kvi_string.h"
 #include "kvi_toolwindows_container.h"
+#include "kvi_tal_listview.h"
+
+#include <QPushButton>
+#include <QDialog>
+#include <QLineEdit>
+#include <QWidget>
 
 class KviMaskEditor;
 class KviChannel;
@@ -51,11 +51,7 @@ public:
 	~KviMaskItem();
 	
 	KviMaskEntry* mask() { return &m_Mask; };
-#ifdef COMPILE_USE_QT4
 	virtual int compare ( KviTalListViewItem * i, int col, bool ascending ) const;
-#else
-	virtual int compare ( QListViewItem * i, int col, bool ascending ) const;
-#endif
 protected:
 	KviMaskEntry m_Mask;
 	
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index e166edc40..82f1f0b5e 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -35,25 +35,24 @@
 #include "kvi_iconmanager.h"
 #include "kvi_window.h"
 #include "kvi_mdicaption.h"
-
-#include <qcursor.h>
-#include <qnamespace.h>
-#include <qapplication.h>
-#include <qfontmetrics.h>
 #include "kvi_pointerlist.h"
-#include <qpixmap.h>
-#include <qstyle.h>
-#include <qpainter.h>
 #include "kvi_tal_popupmenu.h"
-#ifdef COMPILE_USE_QT4
-	#include <q3simplerichtext.h>
-	#define QSimpleRichText Q3SimpleRichText
-	#include <qstyleoption.h>
-#else
-	#include <qsimplerichtext.h>
-#endif
-#include <qdrawutil.h>
-#include <qevent.h>
+
+#include <QCursor>
+#include <QApplication>
+#include <QFontMetrics>
+#include <QPixmap>
+#include <QStyle>
+#include <QPainter>
+//#include <QDrawUtil>
+#include <QEvent>
+#include <QPaintEvent>
+#include <QStyleOption>
+
+#include <q3simplerichtext.h>
+#define QSimpleRichText Q3SimpleRichText
+
+
 
 KviMdiCaptionButton::KviMdiCaptionButton(const QPixmap &pix,QWidget * parent,const char * name)
 : QToolButton(parent,name)
@@ -67,43 +66,27 @@ KviMdiCaptionButton::~KviMdiCaptionButton()
 {
 }
 
-
-#ifdef COMPILE_USE_QT4
 void KviMdiCaptionButton::paintEvent(QPaintEvent *e)
 {
 	QPainter painter(this);
 	drawButton(&painter);
 }
-#endif
 
 void KviMdiCaptionButton::drawButton(QPainter *p)
 {
-#ifdef COMPILE_USE_QT4
 	QBrush b(parentWidget()->palette().window());
-#else
-	QBrush b(parentWidget()->colorGroup().background());
-#endif
 	
 	if(isDown())
 		qDrawShadePanel(p,0,0,width(),height(),colorGroup(),true,1,&b);
 	else
 		p->fillRect(0,0,width(),height(),b);
 
-#ifdef COMPILE_USE_QT4
 	int x = (width() - 16) / 2;
 	int y = (width() - 16) / 2;
 	p->drawPixmap(x,y,16,16,icon().pixmap(16,16),0,0,16,16);
-#else
-	drawButtonLabel(p);
-#endif
 }
 
 
-
-
-
-
-
 KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name)
 : QWidget(parent,name)
 {
@@ -120,9 +103,7 @@ KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name)
 	m_bMouseGrabbed = true;
 	m_bActive = false;
 	calcLineSpacing();
-#ifdef COMPILE_USE_QT4
 	setAutoFillBackground(false);
-#endif
 }
 
 KviMdiCaption::~KviMdiCaption()
@@ -172,11 +153,7 @@ void KviMdiCaption::mousePressEvent(QMouseEvent *e)
 {
 	m_bMouseGrabbed = true;
 	m_lastMousePos = QCursor::pos();
-#ifdef COMPILE_USE_QT4
 	setCursor(Qt::SizeAllCursor);
-#else
-	setCursor(QCursor::sizeAllCursor);
-#endif
 	((KviMdiChild *)parent())->activate(true);
 }
 
@@ -235,11 +212,7 @@ void KviMdiCaption::paintEvent(QPaintEvent * e)
 void KviMdiCaption::mouseReleaseEvent(QMouseEvent *)
 {
 	m_bMouseGrabbed = false;
-#ifdef COMPILE_USE_QT4
 	setCursor(Qt::arrowCursor);
-#else
-	setCursor(QCursor::arrowCursor);
-#endif
 //	releaseMouse();
 }
 
@@ -282,4 +255,3 @@ QSize KviMenuBarToolButton::sizeHint() const
 {
 	return QSize(20,20);
 }
-
diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h
index fcd642cee..376de08d7 100644
--- a/src/kvirc/ui/kvi_mdicaption.h
+++ b/src/kvirc/ui/kvi_mdicaption.h
@@ -25,15 +25,14 @@
 //=================================================================================================
 
 #include "kvi_settings.h"
-
-#include <qtoolbutton.h>
-#include <qlabel.h>
 #include "kvi_styled_controls.h"
 
+#include <QToolButton>
+#include <QLabel>
+
 class KviMdiManager;
 class KviMdiChild;
 
-
 class KVIRC_API KviMdiCaptionButton : public QToolButton
 {
 	Q_OBJECT
@@ -42,9 +41,7 @@ public:
 	~KviMdiCaptionButton();
 protected:
 	virtual void drawButton(QPainter * p);
-#ifdef COMPILE_USE_QT4
 	virtual void paintEvent(QPaintEvent *e);
-#endif
 };
 
 
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 7581844c6..b146e4658 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -34,27 +34,23 @@
 #include "kvi_iconmanager.h"
 #include "kvi_window.h"
 #include "kvi_mdicaption.h"
-
-#include <qcursor.h>
-#include <qnamespace.h>
-#include <qapplication.h>
-#include <qfontmetrics.h>
 #include "kvi_pointerlist.h"
-#include <qpixmap.h>
-#include <qstyle.h>
-#include <qpainter.h>
 #include "kvi_tal_popupmenu.h"
-#ifndef COMPILE_USE_QT4
-	#include <qobjectlist.h>
-#endif
-#include <qevent.h>
+
+#include <QCursor>
+#include <QApplication>
+#include <QFontMetrics>
+#include <QPixmap>
+#include <QStyle>
+#include <QPainter>
+//#include <qobjectlist.h>
+#include <QEvent>
+#include <QMouseEvent>
 
 #ifdef Q_OS_MACX
-#include "kvi_app.h"  //Needed for g_pApp
-#ifdef COMPILE_USE_QT4
+	#include "kvi_app.h"  //Needed for g_pApp
 	#include <QDesktopWidget>
 #endif
-#endif
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 	extern QPixmap * g_pShadedChildGlobalDesktopBackground;
@@ -92,10 +88,7 @@ KviMdiChild::KviMdiChild(KviMdiManager * par,const char * name)
 	setMouseTracking(true);
 	setMinimumSize(KVI_MDICHILD_MIN_WIDTH,KVI_MDICHILD_MIN_HEIGHT);
 
-#ifdef COMPILE_USE_QT4
 	setAutoFillBackground(true);
-#endif
-	
 }
 
 KviMdiChild::~KviMdiChild()
@@ -116,19 +109,11 @@ QRect KviMdiChild::restoredGeometry()
 
 }
 
-#ifdef COMPILE_USE_QT4
 void KviMdiChild::setBackgroundRole(QPalette::ColorRole)
 {
 	// hack
 	QFrame::setBackgroundRole(QPalette::Window);
 }
-#else
-void KviMdiChild::setBackgroundMode(QWidget::BackgroundMode)
-{
-	// hack
-	QFrame::setBackgroundMode(QWidget::PaletteBackground);
-}
-#endif
 
 void KviMdiChild::setIcon(const QPixmap &pix)
 {
@@ -539,8 +524,6 @@ void KviMdiChild::unsetClient()
 	setName("mdi_child");
 }
 
-
-
 void KviMdiChild::activate(bool bSetFocus)
 {
 	if(!m_pCaption->active())m_pCaption->setActive(true);
@@ -572,5 +555,3 @@ QSize KviMdiChild::sizeHint()
 	}
 	return QFrame::sizeHint();
 }
-
-
diff --git a/src/kvirc/ui/kvi_mdichild.h b/src/kvirc/ui/kvi_mdichild.h
index 6f1189792..16bda7ad2 100644
--- a/src/kvirc/ui/kvi_mdichild.h
+++ b/src/kvirc/ui/kvi_mdichild.h
@@ -27,10 +27,9 @@
 #include "kvi_settings.h"
 #include "kvi_string.h"
 
-#include <qframe.h>
-#include <qtoolbutton.h>
-#include <qlabel.h>
-
+#include <QFrame>
+#include <QToolButton>
+#include <QLabel>
 
 class KviMdiManager;
 class KviMdiChild;
@@ -38,8 +37,6 @@ class KviMdiCaption;
 
 class QCursor;
 
-
-
 class KVIRC_API KviMdiChild : public QFrame
 {
 	friend class KviMdiManager;
@@ -93,11 +90,7 @@ public slots:
 signals:
 	void systemPopupRequest(const QPoint & pnt);
 protected:
-#ifdef COMPILE_USE_QT4
 	virtual void setBackgroundRole(QPalette::ColorRole);
-#else
-	virtual void setBackgroundMode(QWidget::BackgroundMode bgmd);
-#endif
 	virtual void resizeEvent(QResizeEvent *e);
 	virtual void mousePressEvent(QMouseEvent *e);
 	virtual void mouseMoveEvent(QMouseEvent *e);
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 1d00dae5a..476117960 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -35,26 +35,22 @@
 #include "kvi_menubar.h"
 #include "kvi_mdicaption.h"
 #include "kvi_app.h"
-
 #include "kvi_tal_popupmenu.h"
-#include <qmenubar.h>
-#include <qlayout.h>
-#include <qpainter.h>
-#include <math.h>
-#include <qcursor.h>
-#include <qdrawutil.h>
-#include <qevent.h>
+#include "kvi_tal_hbox.h"
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_hbox.h"
-#endif
+#include <QMenuBar>
+#include <QLayout>
+#include <QPainter>
+#include <QCursor>
+#include <QEvent>
+#include <QMouseEvent>
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
-	#include <qpixmap.h>
+	#include <QPixmap>
 	extern QPixmap * g_pShadedParentGlobalDesktopBackground;
 #endif
 
-
+#include <math.h>
 
 
 KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name)
@@ -74,9 +70,7 @@ KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name)
 	m_pSdiCloseButton = 0;
 	m_pSdiRestoreButton = 0;
 	m_pSdiMinimizeButton = 0;
-#ifdef COMPILE_USE_QT4
 	m_pSdiControls = 0;
-#endif
 
 	m_pWindowPopup = new KviTalPopupMenu(this);
 	connect(m_pWindowPopup,SIGNAL(activated(int)),this,SLOT(menuActivated(int)));
@@ -84,22 +78,12 @@ KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name)
 	m_pTileMethodPopup = new KviTalPopupMenu(this);
 	connect(m_pTileMethodPopup,SIGNAL(activated(int)),this,SLOT(tileMethodMenuActivated(int)));
 
-#ifdef COMPILE_USE_QT4
 	viewport()->setAutoFillBackground(false);
-#else
-	viewport()->setBackgroundMode(QWidget::NoBackground);
-#endif
 	setStaticBackground(true);
 	resizeContents(width(),height());
 
-#ifdef COMPILE_USE_QT4
 	setFocusPolicy(Qt::NoFocus);
 	viewport()->setFocusPolicy(Qt::NoFocus);
-#else
-	setFocusPolicy(QWidget::NoFocus);
-	viewport()->setFocusPolicy(QWidget::NoFocus);
-#endif
-	
 	connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages()));
 }
 
@@ -514,14 +498,10 @@ void KviMdiManager::updateSDIMode()
 	{
 		m_pSdiIconButton = new KviMenuBarToolButton(b,*pix,"nonne");
 		connect(m_pSdiIconButton,SIGNAL(clicked()),this,SLOT(activeChildSystemPopup()));
-#ifdef COMPILE_USE_QT4
 		// This is an obscure, undocumented and internal function in QT4 QMenuBar
 		// I won't be surprised if this disappears....
 		b->setCornerWidget(m_pSdiIconButton,Qt::TopLeftCorner);
 		m_pSdiIconButton->show();
-#else
-		m_iSdiIconItemId = b->insertItem(m_pSdiIconButton,-1,0);
-#endif
 		connect(m_pSdiIconButton,SIGNAL(destroyed()),this,SLOT(sdiIconButtonDestroyed()));
 	} else {
 		m_pSdiIconButton->setPixmap(*pix);
@@ -557,37 +537,24 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC)
 	
 		QWidget * pButtonParent;
 	
-#ifdef COMPILE_USE_QT4
 		m_pSdiControls = new KviTalHBox(b);
 		m_pSdiControls->setMargin(0);
 		m_pSdiControls->setSpacing(2);
 		m_pSdiControls->setAutoFillBackground(false);
 		pButtonParent = m_pSdiControls;
-#else
-		pButtonParent = b;
-#endif
+
 		m_pSdiMinimizeButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),"btnminimize");
 		connect(m_pSdiMinimizeButton,SIGNAL(clicked()),this,SLOT(minimizeActiveChild()));
-#ifndef COMPILE_USE_QT4
-		m_iSdiMinimizeItemId = b->insertItem(m_pSdiMinimizeButton,-1,b->count());
-#endif
 		connect(m_pSdiMinimizeButton,SIGNAL(destroyed()),this,SLOT(sdiMinimizeButtonDestroyed()));
 
 		m_pSdiRestoreButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),"btnrestore");
 		connect(m_pSdiRestoreButton,SIGNAL(clicked()),this,SLOT(restoreActiveChild()));
-#ifndef COMPILE_USE_QT4
-		m_iSdiRestoreItemId = b->insertItem(m_pSdiRestoreButton,-1,b->count());
-#endif
 		connect(m_pSdiRestoreButton,SIGNAL(destroyed()),this,SLOT(sdiRestoreButtonDestroyed()));
 
 		m_pSdiCloseButton = new KviMenuBarToolButton(pButtonParent,*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),"btnclose");
 		connect(m_pSdiCloseButton,SIGNAL(clicked()),this,SLOT(closeActiveChild()));
-#ifndef COMPILE_USE_QT4
-		m_iSdiCloseItemId = b->insertItem(m_pSdiCloseButton,-1,b->count());
-#endif
 		connect(m_pSdiCloseButton,SIGNAL(destroyed()),this,SLOT(sdiCloseButtonDestroyed()));
 
-#ifdef COMPILE_USE_QT4
 		// This is an obscure, undocumented and internal function in QT4 QMenuBar
 		// I won't be surprised if this disappears....
 		b->setCornerWidget(m_pSdiControls,Qt::TopRightCorner);
@@ -595,11 +562,6 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC)
 		// but it doesn't work when the KviFrame is still hidden (at startup)
 		// We handle this BUG in showEvent()
 		m_pSdiControls->show();
-#else
-		m_pSdiRestoreButton->show();
-		m_pSdiMinimizeButton->show();
-		m_pSdiCloseButton->show();
-#endif
 		emit enteredSdiMode();
 		
 		setVScrollBarMode(KviTalScrollView::AlwaysOff);
@@ -610,7 +572,6 @@ void KviMdiManager::enterSDIMode(KviMdiChild *lpC)
 }
 void KviMdiManager::relayoutMenuButtons()
 {
-#ifdef COMPILE_USE_QT4
 	// force a re-layout of the menubar in Qt4 (see the note in enterSDIMode())
 	// by resetting the corner widget
 	if(m_pSdiControls)
@@ -620,9 +581,7 @@ void KviMdiManager::relayoutMenuButtons()
 	}
 	// also force an activation of the top MdiChild since it probably didn't get it yet
 	KviMdiChild * c = topChild();
-	if(c)
-		c->activate(false);
-#endif
+	if(c) c->activate(false);
 }
 
 
@@ -654,7 +613,6 @@ void KviMdiManager::leaveSDIMode()
 {
 	__range_valid(m_pSdiCloseButton);
 
-#ifdef COMPILE_USE_QT4
 	if(m_pSdiControls)
 	{
 		delete m_pSdiControls;
@@ -666,12 +624,6 @@ void KviMdiManager::leaveSDIMode()
 		delete m_pSdiIconButton;
 		m_pSdiIconButton = 0;
 	}
-#else
-	if(m_iSdiIconItemId != 0)m_pFrm->mainMenuBar()->removeItem(m_iSdiIconItemId);
-	if(m_iSdiCloseItemId != 0)m_pFrm->mainMenuBar()->removeItem(m_iSdiCloseItemId);
-	if(m_iSdiRestoreItemId != 0)m_pFrm->mainMenuBar()->removeItem(m_iSdiRestoreItemId);
-	if(m_iSdiMinimizeItemId != 0)m_pFrm->mainMenuBar()->removeItem(m_iSdiMinimizeItemId);
-#endif
 
 	setVScrollBarMode(KviTalScrollView::Auto);
 	setHScrollBarMode(KviTalScrollView::Auto);
@@ -729,7 +681,7 @@ void KviMdiManager::fillWindowPopup()
 	m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXVERTICAL)),(__tr2qs("Expand &Vertically")),this,SLOT(expandVertical()));
 	m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXHORIZONTAL)),(__tr2qs("Expand &Horizontally")),this,SLOT(expandHorizontal()));
 
-    m_pWindowPopup->insertSeparator();
+	m_pWindowPopup->insertSeparator();
 	m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),(__tr2qs("Mi&nimize All")),this,SLOT(minimizeAll()));
 //    m_pWindowPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RESTORE)),(__tr2qs("&Restore all")),this,SLOT(restoreAll()));
 //
@@ -910,7 +862,7 @@ void KviMdiManager::minimizeAll()
 {
 	KviPointerList<KviMdiChild> list(*m_pZ);
 	list.setAutoDelete(false);
-    m_pFrm->setActiveWindow((KviWindow*)m_pFrm->firstConsole());
+	m_pFrm->setActiveWindow((KviWindow*)m_pFrm->firstConsole());
 	while(!list.isEmpty())
 	{
 		KviMdiChild *lpC=list.first();
@@ -931,7 +883,7 @@ void KviMdiManager::restoreAll()
 	{
 		KviMdiChild *lpC=list.first();
 		if(lpC->state() != KviMdiChild::Normal && (!(lpC->plainCaption()).contains("CONSOLE") ))
-            lpC->restore();
+		lpC->restore();
 		list.removeFirst();
 	}
 	focusTopChild();
@@ -1122,5 +1074,3 @@ void KviMdiManager::tileAnodine()
 	if(lpTop)lpTop->setFocus();
 	updateContentsSize();
 }
-
-
diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h
index dba19b0ee..b2145e565 100644
--- a/src/kvirc/ui/kvi_mdimanager.h
+++ b/src/kvirc/ui/kvi_mdimanager.h
@@ -27,14 +27,13 @@
 
 #include "kvi_settings.h"
 #include "kvi_pointerlist.h"
-
-#include <qwidget.h>
-#include <qframe.h>
-#include <qpixmap.h>
-#include <qtoolbutton.h>
-
 #include "kvi_tal_scrollview.h"
 
+#include <QWidget>
+#include <QFrame>
+#include <QPixmap>
+#include <QToolButton>
+
 #define KVI_MDICHILD_BORDER 4
 #define KVI_MDICHILD_SPACING 2
 #define KVI_MDICHILD_MIN_WIDTH 100
@@ -46,9 +45,9 @@
 #else
 	class KviMdiChild;
 #endif
+
 //class KviMdiCaptionButton;
 class KviFrame;
-
 class KviTalPopupMenu;
 class KviTalHBox;
 class KviSdiButtonBox;
@@ -81,9 +80,7 @@ protected:
 	KviMenuBarToolButton     * m_pSdiCloseButton;
 	KviMenuBarToolButton     * m_pSdiIconButton;
 
-#ifdef COMPILE_USE_QT4
 	KviTalHBox               * m_pSdiControls;
-#endif
 	int                        m_iSdiIconItemId;
 	int                        m_iSdiRestoreItemId;
 	int                        m_iSdiMinimizeItemId;
@@ -111,7 +108,7 @@ public slots:
 	void expandVertical();
 	void expandHorizontal();
 	void minimizeAll();
-//    void restoreAll(); <-- this does nothing
+	// void restoreAll(); <-- this does nothing
 	void tile();
 	void toggleAutoTile();
 
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index a073f4d5a..09bdef1d2 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -89,25 +89,23 @@ KviMenuBar::KviMenuBar(KviFrame * par,const char * name)
 
 KviMenuBar::~KviMenuBar()
 {
-   if(m_pScriptItemList)delete m_pScriptItemList;
-   if(m_pDefaultItemId)kvi_free(m_pDefaultItemId);
+	if(m_pScriptItemList)delete m_pScriptItemList;
+	if(m_pDefaultItemId)kvi_free(m_pDefaultItemId);
 }
 
 void KviMenuBar::showEvent(QShowEvent *e)
 {
-#ifdef COMPILE_USE_QT4
-	debug("menubar show");
+	qDebug("menubar show");
 	// force a re-layout of the menubar in Qt4 (see the note in enterSDIMode())
 	// by resetting the corner widget
 	m_pFrm->mdiManager()->relayoutMenuButtons();
-#endif
 }
 
 void KviMenuBar::addDefaultItem(const QString &text,KviTalPopupMenu * pop)
 {
-   m_iNumDefaultItems++;
-   m_pDefaultItemId = (int *)kvi_realloc((void *)m_pDefaultItemId,sizeof(int) * m_iNumDefaultItems);
-   m_pDefaultItemId[m_iNumDefaultItems - 1] = insertItem(text,pop);
+	m_iNumDefaultItems++;
+	m_pDefaultItemId = (int *)kvi_realloc((void *)m_pDefaultItemId,sizeof(int) * m_iNumDefaultItems);
+	m_pDefaultItemId[m_iNumDefaultItems - 1] = insertItem(text,pop);
 }
 
 void KviMenuBar::setupHelpPopup()
@@ -322,10 +320,10 @@ void KviMenuBar::setupToolsPopup()
 
 void KviMenuBar::toolsPopupSelected(int id)
 {
-   KviTalPopupMenu * m = (KviTalPopupMenu *)sender();
-   if(!m)return;
-   int idext = m->itemParameter(id);
-   g_pModuleExtensionManager->allocateExtension("tool",idext,m_pFrm->firstConsole());
+	KviTalPopupMenu * m = (KviTalPopupMenu *)sender();
+	if(!m)return;
+	int idext = m->itemParameter(id);
+	g_pModuleExtensionManager->allocateExtension("tool",idext,m_pFrm->firstConsole());
 }
 
 
@@ -345,53 +343,53 @@ void KviMenuBar::setupToolbarsPopup()
 
 int KviMenuBar::getDefaultItemRealIndex(int iDefaultIndex)
 {
-   if(iDefaultIndex < 0)iDefaultIndex = 0;
-   if(iDefaultIndex >= m_iNumDefaultItems)
-      return indexOf(m_pDefaultItemId[m_iNumDefaultItems - 1]) + 1;
-   return indexOf(m_pDefaultItemId[iDefaultIndex]);
+	if(iDefaultIndex < 0)iDefaultIndex = 0;
+	if(iDefaultIndex >= m_iNumDefaultItems)
+		return indexOf(m_pDefaultItemId[m_iNumDefaultItems - 1]) + 1;
+	return indexOf(m_pDefaultItemId[iDefaultIndex]);
 }
 
 KviScriptMenuBarItem * KviMenuBar::findMenu(const QString &text)
 {
-   if(!m_pScriptItemList)return 0;
-   for(KviScriptMenuBarItem * i = m_pScriptItemList->first();i;i = m_pScriptItemList->next())
-   {
-      if(KviQString::equalCI(i->szText,text))return i;
-   }
-   return 0;
+	if(!m_pScriptItemList)return 0;
+	for(KviScriptMenuBarItem * i = m_pScriptItemList->first();i;i = m_pScriptItemList->next())
+	{
+		if(KviQString::equalCI(i->szText,text))return i;
+	}
+	return 0;
 }
 
 KviScriptMenuBarItem * KviMenuBar::findMenu(KviKvsPopupMenu * p)
 {
-   if(!m_pScriptItemList)return 0;
-   for(KviScriptMenuBarItem * i = m_pScriptItemList->first();i;i = m_pScriptItemList->next())
-   {
-      if(i->pPopup == p)return i;
-   }
-   return 0;
+	if(!m_pScriptItemList)return 0;
+	for(KviScriptMenuBarItem * i = m_pScriptItemList->first();i;i = m_pScriptItemList->next())
+	{
+		if(i->pPopup == p)return i;
+	}
+	return 0;
 }
 
 bool KviMenuBar::removeMenu(const QString &text)
 {
-   KviScriptMenuBarItem * i = findMenu(text);
-   if(i)
-   {
-      disconnect(i->pPopup,SIGNAL(destroyed()),this,SLOT(menuDestroyed()));
-      removeItem(i->id);
-      m_pScriptItemList->removeRef(i);
-      return true;
-   }
-   return false;
+	KviScriptMenuBarItem * i = findMenu(text);
+	if(i)
+	{
+		disconnect(i->pPopup,SIGNAL(destroyed()),this,SLOT(menuDestroyed()));
+		removeItem(i->id);
+		m_pScriptItemList->removeRef(i);
+		return true;
+	}
+	return false;
 }
 
 void KviMenuBar::menuDestroyed()
 {
-   KviScriptMenuBarItem * i = findMenu(((KviKvsPopupMenu *)sender()));
-   if(i)
-   {
-      removeItem(i->id);
-      m_pScriptItemList->removeRef(i);
-   }
+	KviScriptMenuBarItem * i = findMenu(((KviKvsPopupMenu *)sender()));
+	if(i)
+	{
+		removeItem(i->id);
+		m_pScriptItemList->removeRef(i);
+	}
 }
 
 void KviMenuBar::addMenu(const QString &text,KviKvsPopupMenu * p,int index)
diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp
index e6e654c17..e3bb57adb 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/kvi_modeeditor.cpp
@@ -33,8 +33,8 @@
 #include "kvi_toolwindows_container.h"
 #include "kvi_tal_scrollview.h"
 
-#include <qlayout.h>
-#include <qlabel.h>
+#include <QLayout>
+#include <QLabel>
 
 
 //////////////////////////////////////////////////////////////////////
@@ -68,19 +68,10 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 	
 	QGridLayout *pMasterLayout = new QGridLayout(this,2,1,2,2);
 
-#ifdef COMPILE_USE_QT4
 	setFocusPolicy(Qt::ClickFocus);
-#else
-	setFocusPolicy(QWidget::ClickFocus);
-#endif
 	
 	KviTalScrollView *pScrollView = new KviTalScrollView(this);
-#ifdef COMPILE_USE_QT4
 	pScrollView->viewport()->setBackgroundRole(QPalette::Background);
-#else
-	pScrollView->viewport()->setBackgroundMode(QWidget::PaletteBackground);
-#endif
-	
 	pMasterLayout->addWidget(pScrollView,0,0);
 
 	pMasterLayout->setRowStretch(1,1);
diff --git a/src/kvirc/ui/kvi_modeeditor.h b/src/kvirc/ui/kvi_modeeditor.h
index 49bc2f06c..6035fff72 100644
--- a/src/kvirc/ui/kvi_modeeditor.h
+++ b/src/kvirc/ui/kvi_modeeditor.h
@@ -24,18 +24,17 @@
 //
 
 #include "kvi_settings.h"
-
-#include <qwidget.h>
-#include <qpushbutton.h>
-#include <qcheckbox.h>
-#include <qlineedit.h>
-#include <qlabel.h>
-
 #include "kvi_string.h"
 #include "kvi_pointerlist.h"
 #include "kvi_styled_controls.h"
 #include "kvi_toolwindows_container.h"
 
+#include <QWidget>
+#include <QPushButton>
+#include <QCheckBox>
+#include <QLineEdit>
+#include <QLabel>
+
 class KviConsole;
 
 //////////////////////////////////////////////////////////////////////