ported KviTalHBox and KviTalVBox to Qt4;

removed some qt3 include files and cleaned a bit the code around;
moved config dir to ~/.config/KVIrc according to LSB 2.0 standards;
changed codename to 'Insomnia';


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

25 files changed, 578 insertions, 972 deletions

diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am
index 90d4b97e3..543fa68e7 100644
--- a/src/kvilib/build/Makefile.am
+++ b/src/kvilib/build/Makefile.am
@@ -183,22 +183,15 @@ headers_HEADERS = \
 	../tal/kvi_tal_filedialog.h \
 	../tal/kvi_tal_filedialog_kde.h \
 	../tal/kvi_tal_filedialog_qt.h \
-	../tal/kvi_tal_filedialog_qt4.h \
 	../tal/kvi_tal_grid.h \
-	../tal/kvi_tal_grid_qt3.h \
-	../tal/kvi_tal_grid_qt4.h \
 	../tal/kvi_tal_groupbox.h \
 	../tal/kvi_tal_groupbox_qt3.h \
 	../tal/kvi_tal_groupbox_qt4.h \
 	../tal/kvi_tal_hbox.h \
-	../tal/kvi_tal_hbox_qt3.h \
-	../tal/kvi_tal_hbox_qt4.h \
 	../tal/kvi_tal_iconview.h \
 	../tal/kvi_tal_iconview_qt3.h \
 	../tal/kvi_tal_iconview_qt4.h \
 	../tal/kvi_tal_listbox.h \
-	../tal/kvi_tal_listbox_qt3.h \
-	../tal/kvi_tal_listbox_qt4.h \
 	../tal/kvi_tal_listview.h \
 	../tal/kvi_tal_listview_qt3.h \
 	../tal/kvi_tal_listview_qt4.h \
@@ -224,8 +217,6 @@ headers_HEADERS = \
 	../tal/kvi_tal_toolbardocktype.h \
 	../tal/kvi_tal_tooltip.h \
 	../tal/kvi_tal_vbox.h \
-	../tal/kvi_tal_vbox_qt3.h \
-	../tal/kvi_tal_vbox_qt4.h \
 	../tal/kvi_tal_widgetstack.h \
 	../tal/kvi_tal_widgetstack_qt3.h \
 	../tal/kvi_tal_widgetstack_qt4.h \
@@ -276,21 +267,16 @@ headers_HEADERS = \
 ../tal/kvi_tal_menubar.cpp: ../tal/kvi_tal_menubar_qt.moc
 ../tal/kvi_tal_filedialog.cpp: ../tal/kvi_tal_filedialog_kde.moc
 ../tal/kvi_tal_filedialog.cpp: ../tal/kvi_tal_filedialog_qt.moc
-../tal/kvi_tal_filedialog.cpp: ../tal/kvi_tal_filedialog_qt4.moc
-../tal/kvi_tal_grid.cpp: ../tal/kvi_tal_grid_qt3.moc
-../tal/kvi_tal_grid.cpp: ../tal/kvi_tal_grid_qt4.moc
+../tal/kvi_tal_grid.cpp: ../tal/kvi_tal_grid.moc
 ../tal/kvi_tal_groupbox.cpp: ../tal/kvi_tal_groupbox_qt3.moc
 ../tal/kvi_tal_groupbox.cpp: ../tal/kvi_tal_groupbox_qt4.moc
-../tal/kvi_tal_hbox.cpp: ../tal/kvi_tal_hbox_qt3.moc
-../tal/kvi_tal_hbox.cpp: ../tal/kvi_tal_hbox_qt4.moc
-../tal/kvi_tal_vbox.cpp: ../tal/kvi_tal_vbox_qt3.moc
-../tal/kvi_tal_vbox.cpp: ../tal/kvi_tal_vbox_qt4.moc
+../tal/kvi_tal_hbox.cpp: ../tal/kvi_tal_hbox.moc
+../tal/kvi_tal_vbox.cpp: ../tal/kvi_tal_vbox.moc
 ../tal/kvi_tal_popupmenu.cpp: ../tal/kvi_tal_popupmenu_qt3.moc
 ../tal/kvi_tal_popupmenu.cpp: ../tal/kvi_tal_popupmenu_qt4.moc
 ../tal/kvi_tal_listview.cpp: ../tal/kvi_tal_listview_qt3.moc
 ../tal/kvi_tal_listview.cpp: ../tal/kvi_tal_listview_qt4.moc
-../tal/kvi_tal_listbox.cpp: ../tal/kvi_tal_listbox_qt3.moc
-../tal/kvi_tal_listbox.cpp: ../tal/kvi_tal_listbox_qt4.moc
+../tal/kvi_tal_listbox.cpp: ../tal/kvi_tal_listbox.moc
 ../tal/kvi_tal_iconview.cpp: ../tal/kvi_tal_iconview_qt3.moc
 ../tal/kvi_tal_iconview.cpp: ../tal/kvi_tal_iconview_qt4.moc
 ../tal/kvi_tal_scrollview.cpp: ../tal/kvi_tal_scrollview.moc
diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index 67f917005..ff6375078 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -96,7 +96,7 @@
 #define KVI_BUILD_DATE BUILD_DATE
 #define KVI_BUILD_FLAGS BUILD_FLAGS
 
-#define KVI_RELEASE_NAME "Virgo"
+#define KVI_RELEASE_NAME "Insomnia"
 
 // We want _GNU_SOURCE features
 #ifndef _GNU_SOURCE
diff --git a/src/kvilib/tal/kvi_tal_filedialog.cpp b/src/kvilib/tal/kvi_tal_filedialog.cpp
index 8d15c27aa..305af0990 100644
--- a/src/kvilib/tal/kvi_tal_filedialog.cpp
+++ b/src/kvilib/tal/kvi_tal_filedialog.cpp
@@ -27,9 +27,58 @@
 
 #include "kvi_tal_filedialog.h"
 
-#ifdef COMPILE_USE_QT4
+#ifdef COMPILE_KDE_SUPPORT
+	
+	KviTalFileDialog::KviTalFileDialog(const QString &dirName,const QString &filter,QWidget *parent,const char *name,bool modal)
+	: KFileDialog(dirName,filter,parent,name,modal)
+	{
+		clearWFlags(WDestructiveClose);
+	}
+
+	KviTalFileDialog::~KviTalFileDialog()
+	{
+	}
+	
+	void KviTalFileDialog::setFileMode(FileMode m)
+	{
+		switch(m)
+		{
+			case AnyFile:
+				setMode(KFile::File | KFile::LocalOnly);
+				setOperationMode(Saving);
+			break;
+			case ExistingFile:
+				setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly);
+				setOperationMode(Opening);
+			break;
+			case ExistingFiles:
+				setMode(KFile::Files | KFile::ExistingOnly | KFile::LocalOnly);
+				setOperationMode(Opening);
+			break;
+			case Directory:
+				setMode(KFile::Directory);
+			break;
+			case DirectoryOnly:
+				setMode(KFile::Directory);
+			break;
+			default:
+				setMode(KFile::File | KFile::LocalOnly);
+				setOperationMode(Saving);
+			break;
+		}
+	}
+	
+	void KviTalFileDialog::setDirectory(const QString &szDirectory)
+	{
+		setURL(szDirectory);
+	}
 
-	#include <qdir.h>
+
+	#include "kvi_tal_filedialog_kde.moc"
+
+#else
+
+	#include <QDir>
 
 	KviTalFileDialog::KviTalFileDialog(const QString &dirName,const QString &filter,QWidget *parent,const char *name,bool modal)
 	: QFileDialog(parent,"",dirName,filter)
@@ -72,105 +121,6 @@
 	}
 
 
-	#include "kvi_tal_filedialog_qt4.moc"
-
-#else
+	#include "kvi_tal_filedialog_qt.moc"
 
-	#ifdef COMPILE_KDE_SUPPORT
-	
-		KviTalFileDialog::KviTalFileDialog(const QString &dirName,const QString &filter,QWidget *parent,const char *name,bool modal)
-		: KFileDialog(dirName,filter,parent,name,modal)
-		{
-			clearWFlags(WDestructiveClose);
-		}
-	
-		KviTalFileDialog::~KviTalFileDialog()
-		{
-		}
-		
-		void KviTalFileDialog::setFileMode(FileMode m)
-		{
-			switch(m)
-			{
-				case AnyFile:
-					setMode(KFile::File | KFile::LocalOnly);
-					setOperationMode(Saving);
-				break;
-				case ExistingFile:
-					setMode(KFile::File | KFile::ExistingOnly | KFile::LocalOnly);
-					setOperationMode(Opening);
-				break;
-				case ExistingFiles:
-					setMode(KFile::Files | KFile::ExistingOnly | KFile::LocalOnly);
-					setOperationMode(Opening);
-				break;
-				case Directory:
-					setMode(KFile::Directory);
-				break;
-				case DirectoryOnly:
-					setMode(KFile::Directory);
-				break;
-				default:
-					setMode(KFile::File | KFile::LocalOnly);
-					setOperationMode(Saving);
-				break;
-			}
-		}
-		
-		void KviTalFileDialog::setDirectory(const QString &szDirectory)
-		{
-			setURL(szDirectory);
-		}
-	
-	
-		#include "kvi_tal_filedialog_kde.moc"
-	
-	#else
-	
-		#include <qdir.h>
-	
-		KviTalFileDialog::KviTalFileDialog(const QString &dirName,const QString &filter,QWidget *parent,const char *name,bool modal)
-		: QFileDialog(dirName,filter,parent,name,modal)
-		{
-			clearWFlags(WDestructiveClose);
-		}
-	
-		KviTalFileDialog::~KviTalFileDialog()
-		{
-		}
-	
-		void KviTalFileDialog::setFileMode(FileMode m)
-		{
-			switch(m)
-			{
-				case AnyFile:
-					setMode(QFileDialog::AnyFile);
-				break;
-				case ExistingFile:
-					setMode(QFileDialog::ExistingFile);
-				break;
-				case ExistingFiles:
-					setMode(QFileDialog::ExistingFiles);
-				break;
-				case Directory:
-					setMode(QFileDialog::Directory);
-				break;
-				case DirectoryOnly:
-					setMode(QFileDialog::DirectoryOnly);
-				break;
-				default:
-					setMode(QFileDialog::AnyFile);
-				break;
-			}
-		}
-		
-		void KviTalFileDialog::setDirectory(const QString &szDirectory)
-		{
-			setDir(QDir(szDirectory));
-		}
-	
-	
-		#include "kvi_tal_filedialog_qt.moc"
-	
-	#endif
 #endif
diff --git a/src/kvilib/tal/kvi_tal_filedialog.h b/src/kvilib/tal/kvi_tal_filedialog.h
index 4de6b6f90..d6bb3dc2c 100644
--- a/src/kvilib/tal/kvi_tal_filedialog.h
+++ b/src/kvilib/tal/kvi_tal_filedialog.h
@@ -27,14 +27,10 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_filedialog_qt4.h"
+#ifdef COMPILE_KDE_SUPPORT
+	#include "kvi_tal_filedialog_kde.h"
 #else
-	#ifdef COMPILE_KDE_SUPPORT
-		#include "kvi_tal_filedialog_kde.h"
-	#else
-		#include "kvi_tal_filedialog_qt.h"
-	#endif
+	#include "kvi_tal_filedialog_qt.h"
 #endif
 
 #endif // _KVI_TAL_FILEDIALOG_H_
diff --git a/src/kvilib/tal/kvi_tal_filedialog_kde.h b/src/kvilib/tal/kvi_tal_filedialog_kde.h
index 4670215a3..464768162 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_kde.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_kde.h
@@ -24,7 +24,7 @@
 //
 
 #include <kfiledialog.h>
-#include <qfiledialog.h>
+#include <QFileDialog>
 
 class KVILIB_API KviTalFileDialog : public KFileDialog
 {
diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt.h b/src/kvilib/tal/kvi_tal_filedialog_qt.h
index 931cd1206..4e57258b0 100644
--- a/src/kvilib/tal/kvi_tal_filedialog_qt.h
+++ b/src/kvilib/tal/kvi_tal_filedialog_qt.h
@@ -1,12 +1,13 @@
 #ifndef _KVI_TAL_FILEDIALOG_QT_H_
 #define _KVI_TAL_FILEDIALOG_QT_H_
 
+//=============================================================================
 //
-//   File : kvi_tal_filedialog_qt.h
-//   Creation date : Thu Aug 11 2003 04:43:58 by Szymon Stefanek
+//   File : kvi_tal_filedialog_qt4.h
+//   Creation date : Fri 19 Jan 2007 02:17:12 by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2003 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -22,8 +23,9 @@
 //   along with this program. If not, write to the Free Software Foundation,
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
+//=============================================================================
 
-#include <qfiledialog.h>
+#include <QFileDialog>
 
 class KVILIB_API KviTalFileDialog : public QFileDialog
 {
@@ -38,7 +40,7 @@ public:
 	void setDirectory(const QString &szDirectory);
 
 	static QString getExistingDirectoryPath(const QString &dir = QString::null,const QString &caption = QString::null,QWidget *parent = 0)
-		{ return getExistingDirectory(dir,parent,0 /* name */,caption); };
+		{ return getExistingDirectory(parent,caption,dir); };
 };
 
 #endif // _KVI_TAL_FILEDIALOG_QT_H_
diff --git a/src/kvilib/tal/kvi_tal_filedialog_qt4.h b/src/kvilib/tal/kvi_tal_filedialog_qt4.h
deleted file mode 100644
index 7407cfec4..000000000
--- a/src/kvilib/tal/kvi_tal_filedialog_qt4.h
+++ /dev/null
@@ -1,46 +0,0 @@
-#ifndef _KVI_TAL_FILEDIALOG_QT4_H_
-#define _KVI_TAL_FILEDIALOG_QT4_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_filedialog_qt4.h
-//   Creation date : Fri 19 Jan 2007 02:17:12 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include <qfiledialog.h>
-
-class KVILIB_API KviTalFileDialog : public QFileDialog
-{
-	Q_OBJECT
-public:
-	KviTalFileDialog(const QString &dirName,const QString &filter = QString::null,QWidget *parent = 0,const char *name = 0,bool modal = FALSE);
-	~KviTalFileDialog();
-public:
-	enum FileMode { AnyFile, ExistingFile, ExistingFiles, Directory, DirectoryOnly };
-
-	void setFileMode(FileMode m);
-	void setDirectory(const QString &szDirectory);
-
-	static QString getExistingDirectoryPath(const QString &dir = QString::null,const QString &caption = QString::null,QWidget *parent = 0)
-		{ return getExistingDirectory(parent,caption,dir); };
-};
-
-#endif // _KVI_TAL_FILEDIALOG_QT_H_
diff --git a/src/kvilib/tal/kvi_tal_grid.cpp b/src/kvilib/tal/kvi_tal_grid.cpp
index a72b06384..74b7bf986 100644
--- a/src/kvilib/tal/kvi_tal_grid.cpp
+++ b/src/kvilib/tal/kvi_tal_grid.cpp
@@ -25,10 +25,4 @@
 #define __KVILIB__
 #include "kvi_tal_grid.h"
 
-
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_grid_qt4.moc"
-#else
-	#include "kvi_tal_grid_qt3.moc"
-#endif
-
+#include "kvi_tal_grid.moc"
diff --git a/src/kvilib/tal/kvi_tal_grid.h b/src/kvilib/tal/kvi_tal_grid.h
index d0794b996..20fd95f4b 100644
--- a/src/kvilib/tal/kvi_tal_grid.h
+++ b/src/kvilib/tal/kvi_tal_grid.h
@@ -27,10 +27,16 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_grid_qt4.h"
-#else
-	#include "kvi_tal_grid_qt3.h"
-#endif
+#include <q3grid.h>
+/* FIXME: #include <Q3Grid> */
+
+class KVILIB_API KviTalGrid : public Q3Grid
+{
+	Q_OBJECT
+public:
+	KviTalGrid(int n,Qt::Orientation orient,QWidget * pParent = 0)
+	: Q3Grid(n,orient,pParent) {};
+	~KviTalGrid() {};
+};
 
 #endif // _KVI_TAL_GRID_H_
diff --git a/src/kvilib/tal/kvi_tal_grid_qt3.h b/src/kvilib/tal/kvi_tal_grid_qt3.h
deleted file mode 100644
index b6163a280..000000000
--- a/src/kvilib/tal/kvi_tal_grid_qt3.h
+++ /dev/null
@@ -1,39 +0,0 @@
-#ifndef _KVI_TAL_GRID_QT3_H_
-#define _KVI_TAL_GRID_QT3_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_grid_qt3.h
-//   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include <qgrid.h>
-
-class KVILIB_API KviTalGrid : public QGrid
-{
-	Q_OBJECT
-public:
-	KviTalGrid(int n,Qt::Orientation orient,QWidget * pParent = 0)
-	: QGrid(n,orient,pParent) {};
-	~KviTalGrid() {};
-};
-
-#endif // _KVI_TAL_GRID_QT3_H_
diff --git a/src/kvilib/tal/kvi_tal_grid_qt4.h b/src/kvilib/tal/kvi_tal_grid_qt4.h
deleted file mode 100644
index c0c6938d0..000000000
--- a/src/kvilib/tal/kvi_tal_grid_qt4.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _KVI_TAL_GRID_QT4_H_
-#define _KVI_TAL_GRID_QT4_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_grid_qt4.h
-//   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-#include <q3grid.h>
-
-class KVILIB_API KviTalGrid : public Q3Grid
-{
-	Q_OBJECT
-public:
-	KviTalGrid(int n,Qt::Orientation orient,QWidget * pParent = 0)
-	: Q3Grid(n,orient,pParent) {};
-	~KviTalGrid() {};
-};
-
-#endif // _KVI_TAL_GRID_QT4_H_
diff --git a/src/kvilib/tal/kvi_tal_hbox.cpp b/src/kvilib/tal/kvi_tal_hbox.cpp
index 749664498..bbb419cbf 100644
--- a/src/kvilib/tal/kvi_tal_hbox.cpp
+++ b/src/kvilib/tal/kvi_tal_hbox.cpp
@@ -25,8 +25,46 @@
 #define __KVILIB__
 #include "kvi_tal_hbox.h"
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_hbox_qt4.moc"
-#else
-	#include "kvi_tal_hbox_qt3.moc"
-#endif
+#include <QChildEvent>
+
+KviTalHBox::KviTalHBox(QWidget * pParent,char* name)
+: QWidget(pParent)
+{
+	this->setObjectName(name);
+
+	m_pLayout = new QHBoxLayout();
+	this->setLayout(m_pLayout);
+}
+
+void KviTalHBox::childEvent(QChildEvent * e)
+{
+	if(!e->child()->isWidgetType()) return;
+	if(e->child()->parent() != this) return;
+
+	switch(e->type())
+	{
+		case QEvent::ChildAdded:
+			m_pLayout->addWidget((QWidget *)(e->child()));
+			break;
+		case QEvent::ChildRemoved:
+			m_pLayout->removeWidget((QWidget *)(e->child()));
+			break;
+	}
+}
+
+void KviTalHBox::setStretchFactor(QWidget * child,int stretch)
+{
+	m_pLayout->setStretchFactor(child,stretch);
+}
+
+void KviTalHBox::setSpacing(int spacing)
+{
+	m_pLayout->setSpacing(spacing);
+}
+
+void KviTalHBox::setMargin(int margin)
+{
+	m_pLayout->setContentsMargins(margin,margin,margin,margin);
+}
+
+#include "kvi_tal_hbox.moc"
diff --git a/src/kvilib/tal/kvi_tal_hbox.h b/src/kvilib/tal/kvi_tal_hbox.h
index 1122ea3d1..fded12a6e 100644
--- a/src/kvilib/tal/kvi_tal_hbox.h
+++ b/src/kvilib/tal/kvi_tal_hbox.h
@@ -27,10 +27,22 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_hbox_qt4.h"
-#else
-	#include "kvi_tal_hbox_qt3.h"
-#endif
+#include <QWidget>
+#include <QHBoxLayout>
+
+class KVILIB_API KviTalHBox : public QWidget
+{
+	Q_OBJECT
+public:
+	KviTalHBox(QWidget * pParent,char* name=0);
+	virtual ~KviTalHBox() {};
+	void setStretchFactor(QWidget * child,int stretch);
+	void setSpacing(int spacing);
+	void setMargin(int margin);
+protected:
+	virtual void childEvent(QChildEvent * e);
+private:
+	QHBoxLayout * m_pLayout;
+};
 
 #endif // _KVI_TAL_HBOX_H_
diff --git a/src/kvilib/tal/kvi_tal_hbox_qt3.h b/src/kvilib/tal/kvi_tal_hbox_qt3.h
deleted file mode 100644
index 2749143db..000000000
--- a/src/kvilib/tal/kvi_tal_hbox_qt3.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _KVI_TAL_HBOX_QT3_H_
-#define _KVI_TAL_HBOX_QT3_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_hbox_qt3.h
-//   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-#include <qhbox.h>
-
-class KVILIB_API KviTalHBox : public QHBox
-{
-	Q_OBJECT
-public:
-	KviTalHBox(QWidget * pParent)
-	: QHBox(pParent) {};
-	virtual ~KviTalHBox() {};
-};
-
-#endif // _KVI_TAL_HBOX_QT3_H_
diff --git a/src/kvilib/tal/kvi_tal_hbox_qt4.h b/src/kvilib/tal/kvi_tal_hbox_qt4.h
deleted file mode 100644
index e58dbd20b..000000000
--- a/src/kvilib/tal/kvi_tal_hbox_qt4.h
+++ /dev/null
@@ -1,41 +0,0 @@
-#ifndef _KVI_TAL_HBOX_QT4_H_
-#define _KVI_TAL_HBOX_QT4_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_hbox_qt4.h
-//   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-#include <q3hbox.h>
-
-class KVILIB_API KviTalHBox : public Q3HBox
-{
-	Q_OBJECT
-public:
-	KviTalHBox(QWidget * pParent,char* name=0)
-	: Q3HBox(pParent,name) {};
-	virtual ~KviTalHBox() {};
-};
-
-#endif // _KVI_TAL_HBOX_QT4_H_
diff --git a/src/kvilib/tal/kvi_tal_listbox.cpp b/src/kvilib/tal/kvi_tal_listbox.cpp
index 76eaa4dc7..58df1d22a 100644
--- a/src/kvilib/tal/kvi_tal_listbox.cpp
+++ b/src/kvilib/tal/kvi_tal_listbox.cpp
@@ -25,489 +25,241 @@
 #define __KVILIB__
 #include "kvi_tal_listbox.h"
 
-#ifdef COMPILE_USE_QT4
-	#include <qpainter.h>
-	#include <qstyle.h>
-	#include <qapplication.h>
-	
-	KviTalListBox::KviTalListBox(QWidget * pParent,Qt::WFlags f)
-	: Q3ListBox(pParent,0,f)
-	{
-		connect(this,SIGNAL(highlighted(Q3ListBoxItem *)),this,SLOT(redirect_highlighted(Q3ListBoxItem *)));
-		connect(this,SIGNAL(selected(Q3ListBoxItem *)),this,SLOT(redirect_selected(Q3ListBoxItem *)));
-		connect(this,SIGNAL(selectionChanged(Q3ListBoxItem *)),this,SLOT(redirect_selectionChanged(Q3ListBoxItem *)));
-		connect(this,SIGNAL(currentChanged(Q3ListBoxItem *)),this,SLOT(redirect_currentChanged(Q3ListBoxItem *)));
-		connect(this,SIGNAL(clicked(Q3ListBoxItem *)),this,SLOT(redirect_clicked(Q3ListBoxItem *)));
-		connect(this,SIGNAL(clicked(Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_clicked(Q3ListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(pressed(Q3ListBoxItem *)),this,SLOT(redirect_pressed(Q3ListBoxItem *)));
-		connect(this,SIGNAL(pressed(Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_pressed(Q3ListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(doubleClicked(Q3ListBoxItem *)),this,SLOT(redirect_doubleClicked(Q3ListBoxItem *)));
-		connect(this,SIGNAL(returnPressed(Q3ListBoxItem *)),this,SLOT(redirect_returnPressed(Q3ListBoxItem *)));
-		connect(this,SIGNAL(rightButtonClicked(Q3ListBoxItem *, const QPoint &)),this,SLOT(redirect_rightButtonClicked(Q3ListBoxItem *, const QPoint &)));
-		connect(this,SIGNAL(rightButtonPressed(Q3ListBoxItem *, const QPoint &)),this,SLOT(redirect_rightButtonPressed(Q3ListBoxItem *, const QPoint &)));
-		connect(this,SIGNAL(mouseButtonPressed(int,Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_mouseButtonPressed(int,Q3ListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(mouseButtonClicked(int,Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_mouseButtonClicked(int,Q3ListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(contextMenuRequested(Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_contextMenuRequested(Q3ListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(onItem(Q3ListBoxItem *)),this,SLOT(redirect_onItem(Q3ListBoxItem *)));
-	}
+#include <QPainter>
+#include <QStyle>
+#include <QApplication>
 
-	void KviTalListBox::redirect_highlighted(Q3ListBoxItem *item)
-	{
-		emit highlighted((KviTalListBoxItem *)item);
-	}
+KviTalListBox::KviTalListBox(QWidget * pParent,Qt::WFlags f)
+: Q3ListBox(pParent,0,f)
+{
+	connect(this,SIGNAL(highlighted(Q3ListBoxItem *)),this,SLOT(redirect_highlighted(Q3ListBoxItem *)));
+	connect(this,SIGNAL(selected(Q3ListBoxItem *)),this,SLOT(redirect_selected(Q3ListBoxItem *)));
+	connect(this,SIGNAL(selectionChanged(Q3ListBoxItem *)),this,SLOT(redirect_selectionChanged(Q3ListBoxItem *)));
+	connect(this,SIGNAL(currentChanged(Q3ListBoxItem *)),this,SLOT(redirect_currentChanged(Q3ListBoxItem *)));
+	connect(this,SIGNAL(clicked(Q3ListBoxItem *)),this,SLOT(redirect_clicked(Q3ListBoxItem *)));
+	connect(this,SIGNAL(clicked(Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_clicked(Q3ListBoxItem *,const QPoint &)));
+	connect(this,SIGNAL(pressed(Q3ListBoxItem *)),this,SLOT(redirect_pressed(Q3ListBoxItem *)));
+	connect(this,SIGNAL(pressed(Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_pressed(Q3ListBoxItem *,const QPoint &)));
+	connect(this,SIGNAL(doubleClicked(Q3ListBoxItem *)),this,SLOT(redirect_doubleClicked(Q3ListBoxItem *)));
+	connect(this,SIGNAL(returnPressed(Q3ListBoxItem *)),this,SLOT(redirect_returnPressed(Q3ListBoxItem *)));
+	connect(this,SIGNAL(rightButtonClicked(Q3ListBoxItem *, const QPoint &)),this,SLOT(redirect_rightButtonClicked(Q3ListBoxItem *, const QPoint &)));
+	connect(this,SIGNAL(rightButtonPressed(Q3ListBoxItem *, const QPoint &)),this,SLOT(redirect_rightButtonPressed(Q3ListBoxItem *, const QPoint &)));
+	connect(this,SIGNAL(mouseButtonPressed(int,Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_mouseButtonPressed(int,Q3ListBoxItem *,const QPoint &)));
+	connect(this,SIGNAL(mouseButtonClicked(int,Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_mouseButtonClicked(int,Q3ListBoxItem *,const QPoint &)));
+	connect(this,SIGNAL(contextMenuRequested(Q3ListBoxItem *,const QPoint &)),this,SLOT(redirect_contextMenuRequested(Q3ListBoxItem *,const QPoint &)));
+	connect(this,SIGNAL(onItem(Q3ListBoxItem *)),this,SLOT(redirect_onItem(Q3ListBoxItem *)));
+}
 
-	void KviTalListBox::redirect_selected(Q3ListBoxItem *item)
-	{
-		emit selected((KviTalListBoxItem *)item);
-	}
+void KviTalListBox::redirect_highlighted(Q3ListBoxItem *item)
+{
+	emit highlighted((KviTalListBoxItem *)item);
+}
 
-	void KviTalListBox::redirect_selectionChanged(Q3ListBoxItem * item)
-	{
-		emit selectionChanged((KviTalListBoxItem *)item);
-	}
+void KviTalListBox::redirect_selected(Q3ListBoxItem *item)
+{
+	emit selected((KviTalListBoxItem *)item);
+}
 
-	void KviTalListBox::redirect_currentChanged(Q3ListBoxItem * item)
-	{
-		emit currentChanged((KviTalListBoxItem *)item);
-	}
-
-	void KviTalListBox::redirect_clicked(Q3ListBoxItem * item)
-	{
-		emit clicked((KviTalListBoxItem *)item);
-	}
-
-	void KviTalListBox::redirect_clicked(Q3ListBoxItem * item,const QPoint & pnt)
-	{
-		emit clicked((KviTalListBoxItem *)item,pnt);
-	}
+void KviTalListBox::redirect_selectionChanged(Q3ListBoxItem * item)
+{
+	emit selectionChanged((KviTalListBoxItem *)item);
+}
 
-	void KviTalListBox::redirect_pressed(Q3ListBoxItem * item)
-	{
-		emit pressed((KviTalListBoxItem *)item);
-	}
+void KviTalListBox::redirect_currentChanged(Q3ListBoxItem * item)
+{
+	emit currentChanged((KviTalListBoxItem *)item);
+}
 
-	void KviTalListBox::redirect_pressed(Q3ListBoxItem * item,const QPoint & pnt)
-	{
-		emit pressed((KviTalListBoxItem *)item,pnt);
-	}
+void KviTalListBox::redirect_clicked(Q3ListBoxItem * item)
+{
+	emit clicked((KviTalListBoxItem *)item);
+}
 
-	void KviTalListBox::redirect_doubleClicked(Q3ListBoxItem * item)
-	{
-		emit doubleClicked((KviTalListBoxItem *)item);
-	}
+void KviTalListBox::redirect_clicked(Q3ListBoxItem * item,const QPoint & pnt)
+{
+	emit clicked((KviTalListBoxItem *)item,pnt);
+}
 
-	void KviTalListBox::redirect_returnPressed(Q3ListBoxItem * item)
-	{
-		emit returnPressed((KviTalListBoxItem *)item);
-	}
+void KviTalListBox::redirect_pressed(Q3ListBoxItem * item)
+{
+	emit pressed((KviTalListBoxItem *)item);
+}
 
-	void KviTalListBox::redirect_rightButtonClicked(Q3ListBoxItem * item, const QPoint &pnt)
-	{
-		emit rightButtonClicked((KviTalListBoxItem *)item,pnt);
-	}
+void KviTalListBox::redirect_pressed(Q3ListBoxItem * item,const QPoint & pnt)
+{
+	emit pressed((KviTalListBoxItem *)item,pnt);
+}
 
-	void KviTalListBox::redirect_rightButtonPressed(Q3ListBoxItem * item, const QPoint &pnt)
-	{
-		emit rightButtonPressed((KviTalListBoxItem *)item,pnt);
-	}
+void KviTalListBox::redirect_doubleClicked(Q3ListBoxItem * item)
+{
+	emit doubleClicked((KviTalListBoxItem *)item);
+}
 
-	void KviTalListBox::redirect_mouseButtonPressed(int button,Q3ListBoxItem * item,const QPoint & pos)
-	{
-		emit mouseButtonPressed(button,(KviTalListBoxItem *)item,pos);
-	}
+void KviTalListBox::redirect_returnPressed(Q3ListBoxItem * item)
+{
+	emit returnPressed((KviTalListBoxItem *)item);
+}
 
-	void KviTalListBox::redirect_mouseButtonClicked(int button,Q3ListBoxItem * item,const QPoint & pos)
-	{
-		emit mouseButtonClicked(button,(KviTalListBoxItem *)item,pos);
-	}
+void KviTalListBox::redirect_rightButtonClicked(Q3ListBoxItem * item, const QPoint &pnt)
+{
+	emit rightButtonClicked((KviTalListBoxItem *)item,pnt);
+}
 
-	void KviTalListBox::redirect_contextMenuRequested(Q3ListBoxItem * item,const QPoint & pos)
-	{
-		emit contextMenuRequested((KviTalListBoxItem *)item,pos);
-	}
+void KviTalListBox::redirect_rightButtonPressed(Q3ListBoxItem * item, const QPoint &pnt)
+{
+	emit rightButtonPressed((KviTalListBoxItem *)item,pnt);
+}
 
-	void KviTalListBox::redirect_onItem(Q3ListBoxItem * i)
-	{
-		emit onItem((KviTalListBoxItem *)i);
-	}
+void KviTalListBox::redirect_mouseButtonPressed(int button,Q3ListBoxItem * item,const QPoint & pos)
+{
+	emit mouseButtonPressed(button,(KviTalListBoxItem *)item,pos);
+}
 
-	KviTalListBoxText::KviTalListBoxText(KviTalListBox *listbox, const QString &text)
-	    :KviTalListBoxItem(listbox)
-	{
-	    setText(text);
-	}
+void KviTalListBox::redirect_mouseButtonClicked(int button,Q3ListBoxItem * item,const QPoint & pos)
+{
+	emit mouseButtonClicked(button,(KviTalListBoxItem *)item,pos);
+}
 
-	KviTalListBoxText::KviTalListBoxText(const QString &text)
-	    :KviTalListBoxItem()
-	{
-	    setText(text);
-	}
-	
-	KviTalListBoxText::KviTalListBoxText(KviTalListBox* listbox, const QString &text, KviTalListBoxItem *after)
-	    : KviTalListBoxItem(listbox, after)
-	{
-	    setText(text);
-	}
-	
-	KviTalListBoxText::~KviTalListBoxText()
-	{
-	}
-	
-	void KviTalListBoxText::paint(QPainter *painter)
-	{
-	    int itemHeight = height(listBox());
-	    QFontMetrics fm = painter->fontMetrics();
-	    int yPos = ((itemHeight - fm.height()) / 2) + fm.ascent();
-	    painter->drawText(3, yPos, text());
-	}
-	
-	int KviTalListBoxText::height(const KviTalListBox* lb) const
-	{
-	    int h = lb ? lb->fontMetrics().lineSpacing() + 2 : 0;
-	    return qMax(h, QApplication::globalStrut().height());
-	}
-	
-	int KviTalListBoxText::width(const KviTalListBox* lb) const
-	{
-	    int w = lb ? lb->fontMetrics().width(text()) + 6 : 0;
-	    return qMax(w, QApplication::globalStrut().width());
-	}
-	
-	int KviTalListBoxText::rtti() const
-	{
-	    return RTTI;
-	}
-	
-	KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &pixmap)
-	    : KviTalListBoxItem(listbox)
-	{
-	    pm = pixmap;
-	}
-	
-	KviTalListBoxPixmap::KviTalListBoxPixmap(const QPixmap &pixmap)
-	    : KviTalListBoxItem()
-	{
-	    pm = pixmap;
-	}
-	
-	KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &pixmap, KviTalListBoxItem *after)
-	    : KviTalListBoxItem(listbox, after)
-	{
-	    pm = pixmap;
-	}
-	
-	KviTalListBoxPixmap::~KviTalListBoxPixmap()
-	{
-	}
+void KviTalListBox::redirect_contextMenuRequested(Q3ListBoxItem * item,const QPoint & pos)
+{
+	emit contextMenuRequested((KviTalListBoxItem *)item,pos);
+}
 
-	KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &pix, const QString& text)
-	    : KviTalListBoxItem(listbox)
-	{
-	    pm = pix;
-	    setText(text);
-	}
-	
-	KviTalListBoxPixmap::KviTalListBoxPixmap(const QPixmap & pix, const QString& text)
-	    : KviTalListBoxItem()
-	{
-	    pm = pix;
-	    setText(text);
-	}
-	
-	KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap & pix, const QString& text,
-	                                KviTalListBoxItem *after)
-	    : KviTalListBoxItem(listbox, after)
-	{
-	    pm = pix;
-	    setText(text);
-	}
-	
-	void KviTalListBoxPixmap::paint(QPainter *painter)
-	{
-	    int itemHeight = height(listBox());
-	    int yPos;
-	
-	    const QPixmap *pm = pixmap();
-	    if (pm && ! pm->isNull()) {
-	        yPos = (itemHeight - pm->height()) / 2;
-	        painter->drawPixmap(3, yPos, *pm);
-	    }
-	
-	    if (!text().isEmpty()) {
-	        QFontMetrics fm = painter->fontMetrics();
-	        yPos = ((itemHeight - fm.height()) / 2) + fm.ascent();
-	        painter->drawText(pm->width() + 5, yPos, text());
-	    }
-	}
-	
-	int KviTalListBoxPixmap::height(const KviTalListBox* lb) const
-	{
-	    int h;
-	    if (text().isEmpty())
-	        h = pm.height();
-	    else
-	        h = qMax(pm.height(), lb->fontMetrics().lineSpacing() + 2);
-	    return qMax(h, QApplication::globalStrut().height());
-	}
-	
-	int KviTalListBoxPixmap::width(const KviTalListBox* lb) const
-	{
-	    if (text().isEmpty())
-	        return qMax(pm.width() + 6, QApplication::globalStrut().width());
-	    return qMax(pm.width() + lb->fontMetrics().width(text()) + 6,
-	            QApplication::globalStrut().width());
-	}
-	
-	int KviTalListBoxPixmap::rtti() const
-	{
-	    return RTTI;
-	}
-	
+void KviTalListBox::redirect_onItem(Q3ListBoxItem * i)
+{
+	emit onItem((KviTalListBoxItem *)i);
+}
 
-	#include "kvi_tal_listbox_qt4.moc"
-#else
-	#include <qpainter.h>
-	#include <qstyle.h>
-	#include <qapplication.h>
+KviTalListBoxText::KviTalListBoxText(KviTalListBox *listbox, const QString &text)
+:KviTalListBoxItem(listbox)
+{
+	setText(text);
+}
 
+KviTalListBoxText::KviTalListBoxText(const QString &text)
+:KviTalListBoxItem()
+{
+	setText(text);
+}
 
-	KviTalListBox::KviTalListBox(QWidget * pParent,Qt::WFlags f)
-	: QListBox(pParent,0,f)
-	{
-		connect(this,SIGNAL(highlighted(QListBoxItem *)),this,SLOT(redirect_highlighted(QListBoxItem *)));
-		connect(this,SIGNAL(selected(QListBoxItem *)),this,SLOT(redirect_selected(QListBoxItem *)));
-		connect(this,SIGNAL(selectionChanged(QListBoxItem *)),this,SLOT(redirect_selectionChanged(QListBoxItem *)));
-		connect(this,SIGNAL(currentChanged(QListBoxItem *)),this,SLOT(redirect_currentChanged(QListBoxItem *)));
-		connect(this,SIGNAL(clicked(QListBoxItem *)),this,SLOT(redirect_clicked(QListBoxItem *)));
-		connect(this,SIGNAL(clicked(QListBoxItem *,const QPoint &)),this,SLOT(redirect_clicked(QListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(pressed(QListBoxItem *)),this,SLOT(redirect_pressed(QListBoxItem *)));
-		connect(this,SIGNAL(pressed(QListBoxItem *,const QPoint &)),this,SLOT(redirect_pressed(QListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(doubleClicked(QListBoxItem *)),this,SLOT(redirect_doubleClicked(QListBoxItem *)));
-		connect(this,SIGNAL(returnPressed(QListBoxItem *)),this,SLOT(redirect_returnPressed(QListBoxItem *)));
-		connect(this,SIGNAL(rightButtonClicked(QListBoxItem *, const QPoint &)),this,SLOT(redirect_rightButtonClicked(QListBoxItem *, const QPoint &)));
-		connect(this,SIGNAL(rightButtonPressed(QListBoxItem *, const QPoint &)),this,SLOT(redirect_rightButtonPressed(QListBoxItem *, const QPoint &)));
-		connect(this,SIGNAL(mouseButtonPressed(int,QListBoxItem *,const QPoint &)),this,SLOT(redirect_mouseButtonPressed(int,QListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(mouseButtonClicked(int,QListBoxItem *,const QPoint &)),this,SLOT(redirect_mouseButtonClicked(int,QListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(contextMenuRequested(QListBoxItem *,const QPoint &)),this,SLOT(redirect_contextMenuRequested(QListBoxItem *,const QPoint &)));
-		connect(this,SIGNAL(onItem(QListBoxItem *)),this,SLOT(redirect_onItem(QListBoxItem *)));
-	}
+KviTalListBoxText::KviTalListBoxText(KviTalListBox* listbox, const QString &text, KviTalListBoxItem *after)
+: KviTalListBoxItem(listbox, after)
+{
+	setText(text);
+}
 
-	void KviTalListBox::redirect_highlighted(QListBoxItem *item)
-	{
-		emit highlighted((KviTalListBoxItem *)item);
-	}
+KviTalListBoxText::~KviTalListBoxText()
+{
+}
 
-	void KviTalListBox::redirect_selected(QListBoxItem *item)
-	{
-		emit selected((KviTalListBoxItem *)item);
-	}
+void KviTalListBoxText::paint(QPainter *painter)
+{
+	int itemHeight = height(listBox());
+	QFontMetrics fm = painter->fontMetrics();
+	int yPos = ((itemHeight - fm.height()) / 2) + fm.ascent();
+	painter->drawText(3, yPos, text());
+}
 
-	void KviTalListBox::redirect_selectionChanged(QListBoxItem * item)
-	{
-		emit selectionChanged((KviTalListBoxItem *)item);
-	}
+int KviTalListBoxText::height(const KviTalListBox* lb) const
+{
+	int h = lb ? lb->fontMetrics().lineSpacing() + 2 : 0;
+	return qMax(h, QApplication::globalStrut().height());
+}
 
-	void KviTalListBox::redirect_currentChanged(QListBoxItem * item)
-	{
-		emit currentChanged((KviTalListBoxItem *)item);
-	}
+int KviTalListBoxText::width(const KviTalListBox* lb) const
+{
+	int w = lb ? lb->fontMetrics().width(text()) + 6 : 0;
+	return qMax(w, QApplication::globalStrut().width());
+}
 
-	void KviTalListBox::redirect_clicked(QListBoxItem * item)
-	{
-		emit clicked((KviTalListBoxItem *)item);
-	}
+int KviTalListBoxText::rtti() const
+{
+	return RTTI;
+}
 
-	void KviTalListBox::redirect_clicked(QListBoxItem * item,const QPoint & pnt)
-	{
-		emit clicked((KviTalListBoxItem *)item,pnt);
-	}
+KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &pixmap)
+: KviTalListBoxItem(listbox)
+{
+	pm = pixmap;
+}
 
-	void KviTalListBox::redirect_pressed(QListBoxItem * item)
-	{
-		emit pressed((KviTalListBoxItem *)item);
-	}
+KviTalListBoxPixmap::KviTalListBoxPixmap(const QPixmap &pixmap)
+: KviTalListBoxItem()
+{
+	pm = pixmap;
+}
 
-	void KviTalListBox::redirect_pressed(QListBoxItem * item,const QPoint & pnt)
-	{
-		emit pressed((KviTalListBoxItem *)item,pnt);
-	}
+KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &pixmap, KviTalListBoxItem *after)
+: KviTalListBoxItem(listbox, after)
+{
+	pm = pixmap;
+}
 
-	void KviTalListBox::redirect_doubleClicked(QListBoxItem * item)
-	{
-		emit doubleClicked((KviTalListBoxItem *)item);
-	}
+KviTalListBoxPixmap::~KviTalListBoxPixmap()
+{
+}
 
-	void KviTalListBox::redirect_returnPressed(QListBoxItem * item)
-	{
-		emit returnPressed((KviTalListBoxItem *)item);
-	}
+KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &pix, const QString& text)
+: KviTalListBoxItem(listbox)
+{
+	pm = pix;
+	setText(text);
+}
 
-	void KviTalListBox::redirect_rightButtonClicked(QListBoxItem * item, const QPoint &pnt)
-	{
-		emit rightButtonClicked((KviTalListBoxItem *)item,pnt);
-	}
+KviTalListBoxPixmap::KviTalListBoxPixmap(const QPixmap & pix, const QString& text)
+: KviTalListBoxItem()
+{
+	pm = pix;
+	setText(text);
+}
 
-	void KviTalListBox::redirect_rightButtonPressed(QListBoxItem * item, const QPoint &pnt)
-	{
-		emit rightButtonPressed((KviTalListBoxItem *)item,pnt);
-	}
+KviTalListBoxPixmap::KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap & pix, const QString& text,KviTalListBoxItem *after)
+: KviTalListBoxItem(listbox, after)
+{
+	pm = pix;
+	setText(text);
+}
 
-	void KviTalListBox::redirect_mouseButtonPressed(int button,QListBoxItem * item,const QPoint & pos)
-	{
-		emit mouseButtonPressed(button,(KviTalListBoxItem *)item,pos);
-	}
+void KviTalListBoxPixmap::paint(QPainter *painter)
+{
+	int itemHeight = height(listBox());
+	int yPos;
 
-	void KviTalListBox::redirect_mouseButtonClicked(int button,QListBoxItem * item,const QPoint & pos)
-	{
-		emit mouseButtonClicked(button,(KviTalListBoxItem *)item,pos);
+	const QPixmap *pm = pixmap();
+	if (pm && ! pm->isNull()) {
+	yPos = (itemHeight - pm->height()) / 2;
+	painter->drawPixmap(3, yPos, *pm);
 	}
 
-	void KviTalListBox::redirect_contextMenuRequested(QListBoxItem * item,const QPoint & pos)
-	{
-		emit contextMenuRequested((KviTalListBoxItem *)item,pos);
+	if (!text().isEmpty()) {
+	QFontMetrics fm = painter->fontMetrics();
+	yPos = ((itemHeight - fm.height()) / 2) + fm.ascent();
+	painter->drawText(pm->width() + 5, yPos, text());
 	}
+}
 
-	void KviTalListBox::redirect_onItem(QListBoxItem * i)
-	{
-		emit onItem((KviTalListBoxItem *)i);
-	}
+int KviTalListBoxPixmap::height(const KviTalListBox* lb) const
+{
+	int h;
+	if (text().isEmpty())
+	h = pm.height();
+	else
+	h = qMax(pm.height(), lb->fontMetrics().lineSpacing() + 2);
+	return qMax(h, QApplication::globalStrut().height());
+}
 
-	KviTalListBoxText::KviTalListBoxText( KviTalListBox *listbox, const QString &text )
-	    :KviTalListBoxItem( listbox )
-	{
-	    setText( text );
-	}
-	
-	KviTalListBoxText::KviTalListBoxText( const QString &text )
-	    :KviTalListBoxItem()
-	{
-	    setText( text );
-	}
-	
-	KviTalListBoxText::KviTalListBoxText( KviTalListBox* listbox, const QString &text, KviTalListBoxItem *after )
-	    : KviTalListBoxItem( listbox, after )
-	{
-	    setText( text );
-	}
-	
-	KviTalListBoxText::~KviTalListBoxText()
-	{
-	}
-	
-	void KviTalListBoxText::paint( QPainter *painter )
-	{
-	    int itemHeight = height( listBox() );
-	    QFontMetrics fm = painter->fontMetrics();
-	    int yPos = ( ( itemHeight - fm.height() ) / 2 ) + fm.ascent();
-	    painter->drawText( 3, yPos, text() );
-	}
-	
-	int KviTalListBoxText::height( const KviTalListBox* lb ) const
-	{
-	    int h = lb ? lb->fontMetrics().lineSpacing() + 2 : 0;
-	    return QMAX( h, QApplication::globalStrut().height() );
-	}
-	
-	int KviTalListBoxText::width( const KviTalListBox* lb ) const
-	{
-	    int w = lb ? lb->fontMetrics().width( text() ) + 6 : 0;
-	    return QMAX( w, QApplication::globalStrut().width() );
-	}
-	
-	int KviTalListBoxText::RTTI = 1;
-	
-	int KviTalListBoxText::rtti() const
-	{
-	    return RTTI;
-	}
+int KviTalListBoxPixmap::width(const KviTalListBox* lb) const
+{
+	if (text().isEmpty())
+	return qMax(pm.width() + 6, QApplication::globalStrut().width());
+	return qMax(pm.width() + lb->fontMetrics().width(text()) + 6,
+		QApplication::globalStrut().width());
+}
 
-	KviTalListBoxPixmap::KviTalListBoxPixmap( KviTalListBox* listbox, const QPixmap &pixmap )
-	    : KviTalListBoxItem( listbox )
-	{
-	    pm = pixmap;
-	}
-	
-	KviTalListBoxPixmap::KviTalListBoxPixmap( const QPixmap &pixmap )
-	    : KviTalListBoxItem()
-	{
-	    pm = pixmap;
-	}
-	
-	KviTalListBoxPixmap::KviTalListBoxPixmap( KviTalListBox* listbox, const QPixmap &pixmap, KviTalListBoxItem *after )
-	    : KviTalListBoxItem( listbox, after )
-	{
-	    pm = pixmap;
-	}
-	
-	KviTalListBoxPixmap::~KviTalListBoxPixmap()
-	{
-	}
-	
-	KviTalListBoxPixmap::KviTalListBoxPixmap( KviTalListBox* listbox, const QPixmap &pix, const QString& text)
-	    : KviTalListBoxItem( listbox )
-	{
-	    pm = pix;
-	    setText( text );
-	}
+int KviTalListBoxPixmap::rtti() const
+{
+	return RTTI;
+}
 
-	KviTalListBoxPixmap::KviTalListBoxPixmap( const QPixmap & pix, const QString& text)
-	    : KviTalListBoxItem()
-	{
-	    pm = pix;
-	    setText( text );
-	}
-	
-	KviTalListBoxPixmap::KviTalListBoxPixmap( KviTalListBox* listbox, const QPixmap & pix, const QString& text,
-					KviTalListBoxItem *after )
-	    : KviTalListBoxItem( listbox, after )
-	{
-	    pm = pix;
-	    setText( text );
-	}
-	
-	void KviTalListBoxPixmap::paint( QPainter *painter )
-	{
-	    int itemHeight = height( listBox() );
-	    int yPos;
-	
-	    const QPixmap *pm = pixmap();
-	    if ( pm && ! pm->isNull() ) {
-		yPos = ( itemHeight - pm->height() ) / 2;
-		painter->drawPixmap( 3, yPos, *pm);
-	    }
-	
-	    if ( !text().isEmpty() ) {
-		QFontMetrics fm = painter->fontMetrics();
-		yPos = ( ( itemHeight - fm.height() ) / 2 ) + fm.ascent();
-		painter->drawText( pm->width() + 5, yPos, text() );
-	    }
-	}
-	
-	int KviTalListBoxPixmap::height( const KviTalListBox* lb ) const
-	{
-	    int h;
-	    if ( text().isEmpty() )
-		h = pm.height();
-	    else
-		h = QMAX( pm.height(), lb->fontMetrics().lineSpacing() + 2 );
-	    return QMAX( h, QApplication::globalStrut().height() );
-	}
-	
-	int KviTalListBoxPixmap::width( const KviTalListBox* lb ) const
-	{
-	    if ( text().isEmpty() )
-		return QMAX( pm.width() + 6, QApplication::globalStrut().width() );
-	    return QMAX( pm.width() + lb->fontMetrics().width( text() ) + 6,
-		    QApplication::globalStrut().width() );
-	}
-	
-	int KviTalListBoxPixmap::RTTI = 2;
-	
-	int KviTalListBoxPixmap::rtti() const
-	{
-	    return RTTI;
-	}
-	
-	#include "kvi_tal_listbox_qt3.moc"
-#endif
 
+#include "kvi_tal_listbox.moc"
diff --git a/src/kvilib/tal/kvi_tal_listbox.h b/src/kvilib/tal/kvi_tal_listbox.h
index 89c4af14c..912784c81 100644
--- a/src/kvilib/tal/kvi_tal_listbox.h
+++ b/src/kvilib/tal/kvi_tal_listbox.h
@@ -41,10 +41,122 @@
 // present in qt 3.3.6 AND in qt 4.1.2.
 //
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_listbox_qt4.h"
-#else
-	#include "kvi_tal_listbox_qt3.h"
-#endif
+#include <q3listbox.h>
+
+class KviTalListBoxItem;
+
+
+class KVILIB_API KviTalListBox : public Q3ListBox
+{
+	Q_OBJECT
+public:
+	KviTalListBox(QWidget * pParent,Qt::WFlags f = 0);
+	virtual ~KviTalListBox() {};
+public:
+	KviTalListBoxItem * firstItem() const { return (KviTalListBoxItem *)Q3ListBox::firstItem(); };
+	KviTalListBoxItem * selectedItem() const { return (KviTalListBoxItem *)Q3ListBox::selectedItem(); };
+	KviTalListBoxItem * item(int iIndex) const { return (KviTalListBoxItem *)Q3ListBox::item(iIndex); };
+signals:
+	void highlighted(KviTalListBoxItem *);
+	void selected(KviTalListBoxItem *);
+	void selectionChanged(KviTalListBoxItem * item);
+	void currentChanged(KviTalListBoxItem * item);
+	void clicked(KviTalListBoxItem * item);
+	void clicked(KviTalListBoxItem * item,const QPoint & pnt);
+	void pressed(KviTalListBoxItem * item);
+	void pressed(KviTalListBoxItem * item,const QPoint & pnt);
+	void doubleClicked(KviTalListBoxItem * item);
+	void returnPressed(KviTalListBoxItem * item);
+	void rightButtonClicked(KviTalListBoxItem *, const QPoint &);
+	void rightButtonPressed(KviTalListBoxItem *, const QPoint &);
+	void mouseButtonPressed(int button,KviTalListBoxItem * item,const QPoint & pos);
+	void mouseButtonClicked(int button,KviTalListBoxItem * item,const QPoint & pos);
+	void contextMenuRequested(KviTalListBoxItem * item,const QPoint & pos);
+	void onItem(KviTalListBoxItem * i);
+protected slots:
+	void redirect_highlighted(Q3ListBoxItem *);
+	void redirect_selected(Q3ListBoxItem *);
+	void redirect_selectionChanged(Q3ListBoxItem * item);
+	void redirect_currentChanged(Q3ListBoxItem * item);
+	void redirect_clicked(Q3ListBoxItem * item);
+	void redirect_clicked(Q3ListBoxItem * item,const QPoint & pnt);
+	void redirect_pressed(Q3ListBoxItem * item);
+	void redirect_pressed(Q3ListBoxItem * item,const QPoint & pnt);
+	void redirect_doubleClicked(Q3ListBoxItem * item);
+	void redirect_returnPressed(Q3ListBoxItem *);
+	void redirect_rightButtonClicked(Q3ListBoxItem *, const QPoint &);
+	void redirect_rightButtonPressed(Q3ListBoxItem *, const QPoint &);
+	void redirect_mouseButtonPressed(int button,Q3ListBoxItem * item,const QPoint & pos);
+	void redirect_mouseButtonClicked(int button,Q3ListBoxItem * item,const QPoint & pos);
+	void redirect_contextMenuRequested(Q3ListBoxItem * item,const QPoint & pos);
+	void redirect_onItem(Q3ListBoxItem * i);
+};
+
+class KVILIB_API KviTalListBoxItem : public Q3ListBoxItem
+{
+public:
+	KviTalListBoxItem()
+	: Q3ListBoxItem() {};
+	KviTalListBoxItem(KviTalListBox * pParent)
+	: Q3ListBoxItem(pParent) {};
+	KviTalListBoxItem(KviTalListBox * pParent,KviTalListBoxItem * pAfter)
+	: Q3ListBoxItem(pParent,pAfter) {};
+	virtual ~KviTalListBoxItem() {};
+public:
+	KviTalListBoxItem * next() const { return (KviTalListBoxItem *)Q3ListBoxItem::next(); };
+	KviTalListBoxItem * prev() const { return (KviTalListBoxItem *)Q3ListBoxItem::prev(); };
+	KviTalListBox * listBox() const { return (KviTalListBox *)Q3ListBoxItem::listBox(); };
+	virtual int height(const KviTalListBox *) const { return 0; };
+	int height(const Q3ListBox *lb) const { return height((KviTalListBox *)lb); };
+	virtual int width(const KviTalListBox *) const { return 0; };
+	int width(const Q3ListBox *lb) const { return width((KviTalListBox *)lb); };
+};
+
+
+class KVILIB_API KviTalListBoxText : public KviTalListBoxItem
+{
+public:
+	KviTalListBoxText(KviTalListBox* listbox, const QString & text=QString());
+	KviTalListBoxText(const QString & text=QString());
+	KviTalListBoxText(KviTalListBox* listbox, const QString & text, KviTalListBoxItem *after);
+	~KviTalListBoxText();
+	
+	int         height(const KviTalListBox *) const;
+	int         width(const KviTalListBox *)  const;
+	
+	int rtti() const;
+	enum { RTTI = 1 };
+protected:
+	virtual void  paint(QPainter *);
+private:
+	Q_DISABLE_COPY(KviTalListBoxText)
+};
+
+
+class KVILIB_API KviTalListBoxPixmap : public KviTalListBoxItem
+{
+public:
+	KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &);
+	KviTalListBoxPixmap(const QPixmap &);
+	KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap & pix, KviTalListBoxItem *after);
+	KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap &, const QString&);
+	KviTalListBoxPixmap(const QPixmap &, const QString&);
+	KviTalListBoxPixmap(KviTalListBox* listbox, const QPixmap & pix, const QString&, KviTalListBoxItem *after);
+	~KviTalListBoxPixmap();
+	
+	const QPixmap *pixmap() const { return &pm; }
+	
+	int         height(const KviTalListBox *) const;
+	int         width(const KviTalListBox *)  const;
+	
+	int rtti() const;
+	enum { RTTI = 2 };
+protected:
+	virtual void paint(QPainter *);
+private:
+	Q_DISABLE_COPY(KviTalListBoxPixmap)
+	
+	QPixmap pm;
+};
 
 #endif // _KVI_TAL_LISTBOX_H_
diff --git a/src/kvilib/tal/kvi_tal_vbox.cpp b/src/kvilib/tal/kvi_tal_vbox.cpp
index 6ac47d2f6..7e135570d 100644
--- a/src/kvilib/tal/kvi_tal_vbox.cpp
+++ b/src/kvilib/tal/kvi_tal_vbox.cpp
@@ -25,9 +25,46 @@
 #define __KVILIB__
 #include "kvi_tal_vbox.h"
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_vbox_qt4.moc"
-#else
-	#include "kvi_tal_vbox_qt3.moc"
-#endif
+#include <QChildEvent>
 
+KviTalVBox::KviTalVBox(QWidget * pParent,char* name)
+: QWidget(pParent)
+{
+	this->setObjectName(name);
+
+	m_pLayout = new QVBoxLayout();
+	this->setLayout(m_pLayout);
+}
+
+void KviTalVBox::childEvent(QChildEvent * e)
+{
+	if(!e->child()->isWidgetType()) return;
+	if(e->child()->parent() != this) return;
+
+	switch(e->type())
+	{
+		case QEvent::ChildAdded:
+			m_pLayout->addWidget((QWidget *)(e->child()));
+			break;
+		case QEvent::ChildRemoved:
+			m_pLayout->removeWidget((QWidget *)(e->child()));
+			break;
+	}
+}
+
+void KviTalVBox::setStretchFactor(QWidget * child,int stretch)
+{
+	m_pLayout->setStretchFactor(child,stretch);
+}
+
+void KviTalVBox::setSpacing(int spacing)
+{
+	m_pLayout->setSpacing(spacing);
+}
+
+void KviTalVBox::setMargin(int margin)
+{
+	m_pLayout->setContentsMargins(margin,margin,margin,margin);
+}
+
+#include "kvi_tal_vbox.moc"
diff --git a/src/kvilib/tal/kvi_tal_vbox.h b/src/kvilib/tal/kvi_tal_vbox.h
index ee35a98d7..8ed46b8c3 100644
--- a/src/kvilib/tal/kvi_tal_vbox.h
+++ b/src/kvilib/tal/kvi_tal_vbox.h
@@ -27,10 +27,22 @@
 
 #include "kvi_settings.h"
 
-#ifdef COMPILE_USE_QT4
-	#include "kvi_tal_vbox_qt4.h"
-#else
-	#include "kvi_tal_vbox_qt3.h"
-#endif
+#include <QWidget>
+#include <QVBoxLayout>
+
+class KVILIB_API KviTalVBox : public QWidget
+{
+	Q_OBJECT
+public:
+	KviTalVBox(QWidget * pParent,char* name=0);
+	virtual ~KviTalVBox() {};
+	void setStretchFactor(QWidget * child,int stretch);
+	void setSpacing(int spacing);
+	void setMargin(int margin);
+protected:
+	virtual void childEvent(QChildEvent * e);
+private:
+	QVBoxLayout * m_pLayout;
+};
 
 #endif // _KVI_TAL_VBOX_H_
diff --git a/src/kvilib/tal/kvi_tal_vbox_qt3.h b/src/kvilib/tal/kvi_tal_vbox_qt3.h
deleted file mode 100644
index 1bd01bb2e..000000000
--- a/src/kvilib/tal/kvi_tal_vbox_qt3.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _KVI_TAL_VBOX_QT3_H_
-#define _KVI_TAL_VBOX_QT3_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_vbox_qt3.h
-//   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-#include <qvbox.h>
-
-class KVILIB_API KviTalVBox : public QVBox
-{
-	Q_OBJECT
-public:
-	KviTalVBox(QWidget * pParent)
-	: QVBox(pParent) {};
-	virtual ~KviTalVBox() {};
-};
-
-
-#endif // _KVI_TAL_VBOX_QT3_H_
diff --git a/src/kvilib/tal/kvi_tal_vbox_qt4.h b/src/kvilib/tal/kvi_tal_vbox_qt4.h
deleted file mode 100644
index 661b25eed..000000000
--- a/src/kvilib/tal/kvi_tal_vbox_qt4.h
+++ /dev/null
@@ -1,42 +0,0 @@
-#ifndef _KVI_TAL_VBOX_QT4_H_
-#define _KVI_TAL_VBOX_QT4_H_
-
-//=============================================================================
-//
-//   File : kvi_tal_vbox_qt4.h
-//   Creation date : Mon Jan 22 2007 11:25:08 by Szymon Stefanek
-//
-//   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2007 Szymon Stefanek (pragma at kvirc dot net)
-//
-//   This program is FREE software. You can redistribute it and/or
-//   modify it under the terms of the GNU General Public License
-//   as published by the Free Software Foundation; either version 2
-//   of the License, or (at your opinion) any later version.
-//
-//   This program is distributed in the HOPE that it will be USEFUL,
-//   but WITHOUT ANY WARRANTY; without even the implied warranty of
-//   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
-//   See the GNU General Public License for more details.
-//
-//   You should have received a copy of the GNU General Public License
-//   along with this program. If not, write to the Free Software Foundation,
-//   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-//
-//=============================================================================
-
-#include "kvi_settings.h"
-
-#include <q3vbox.h>
-
-class KVILIB_API KviTalVBox : public Q3VBox
-{
-	Q_OBJECT
-public:
-	KviTalVBox(QWidget * pParent)
-	: Q3VBox(pParent) {};
-	virtual ~KviTalVBox() {};
-};
-
-
-#endif // _KVI_TAL_VBOX_QT4_H_
diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h
index 0fd4031be..0e13ab214 100644
--- a/src/kvirc/ui/kvi_input.h
+++ b/src/kvirc/ui/kvi_input.h
@@ -26,14 +26,16 @@
 //=============================================================================
 
 #include "kvi_settings.h"
+#include "kvi_pointerlist.h"
+#include "kvi_string.h"
 
+#include "kvi_tal_hbox.h"
 
 #include <qwidget.h>
-#include "kvi_tal_hbox.h"
 #include <qpixmap.h>
-#include "kvi_pointerlist.h"
+#include <QFrame>
+
 
-#include "kvi_string.h"
 
 //#include <qdialog.h>
 #include <qtoolbutton.h>
diff --git a/src/modules/setup/libkvisetup.cpp b/src/modules/setup/libkvisetup.cpp
index 701daf62a..49d629eb3 100644
--- a/src/modules/setup/libkvisetup.cpp
+++ b/src/modules/setup/libkvisetup.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Oct  6 02:08:24 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2004 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -22,13 +22,9 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
-
 #include "setupwizard.h"
 
-#include <qstring.h>
-#include <qfile.h>
-
+#include "kvi_module.h"
 #include "kvi_options.h"
 #include "kvi_defaults.h"
 #include "kvi_app.h"
@@ -38,6 +34,10 @@
 #include "kvi_theme.h"
 #include "kvi_ircserverdb.h"
 
+#include <QString>
+#include <QFile>
+
+
 // this will be choosen during the setup process
 QString g_szChoosenIncomingDirectory;
 //int g_iThemeToApply = THEME_APPLY_NONE;
@@ -148,8 +148,8 @@ static bool setup_module_can_unload(KviModule *m)
 
 KVIRC_MODULE(
 	"Setup wizard",
-	"1.0.0",
-	"Szymon Stefanek <pragma at kvirc dot net>" ,
+	"4.0.0",
+	"Szymon Stefanek <pragma at kvirc dot net>",
 	"First-time-run setup wizard",
 	setup_module_init ,
 	setup_module_can_unload,
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index e22bc91f5..379351158 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -4,7 +4,7 @@
 //   Creation date : Sat Oct  6 02:06:53 2001 GMT by Szymon Stefanek
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 2001-2004 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 2001-2008 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -38,13 +38,15 @@ bool g_bFoundMirc;
 #include "kvi_config.h"
 
 #include <kvi_tal_textedit.h>
-#include <qmessagebox.h>
-#include <qdir.h>
-#include <qpushbutton.h>
-#include <qvalidator.h>
-#include <qtextcodec.h>
-#include <qlayout.h>
-#include "kvi_tal_hbox.h" 
+#include "kvi_tal_hbox.h"
+
+#include <QMessageBox>
+#include <QDir>
+#include <QPushButton>
+#include <QValidator>
+#include <QTextCodec>
+#include <QLayout>
+#include <QDesktopWidget>
 
 #ifdef COMPILE_ON_WINDOWS
 	#include <windows.h>
@@ -55,9 +57,6 @@ bool g_bFoundMirc;
 	#include <unistd.h>  // for symlink()
 #endif
 
-#ifdef COMPILE_USE_QT4
-	#include <QDesktopWidget>
-#endif
 
 // libkvisetup.cpp
 extern QString g_szChoosenIncomingDirectory;
@@ -72,7 +71,7 @@ extern QString szMircIni;
 #ifdef COMPILE_ON_WINDOWS
 	#define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME "KVIrc4"
 #else
-	#define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME ".kvirc4"
+	#define KVI_LOCAL_KVIRC_SUBDIRECTORY_NAME ".config/KVIrc"
 #endif
 
 KviSetupPage::KviSetupPage(KviSetupWizard * w)
@@ -125,9 +124,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
 	l->setBackgroundColor(QColor(48,48,48));
 
 	m_pTextLabel = new QLabel(m_pVBox);
-#ifdef COMPILE_USE_QT4
 	m_pTextLabel->setWordWrap(true);
-#endif
 	m_pTextLabel->setAlignment(Qt::AlignJustify | Qt::AlignTop);
 	m_pVBox->setStretchFactor(m_pTextLabel,1);
 }
@@ -184,13 +181,13 @@ KviSetupWizard::KviSetupWizard()
 #ifndef COMPILE_ON_WINDOWS //it have been already shown by installer
 	KviSetupPage * m_pLicense = new KviSetupPage(this);
 	m_pLicense->m_pTextLabel->setText(__tr2qs( \
-			"<p>All of the files in this distribution are covered by the GPL. " \
-			"In human terms this can be read as follows:<br>" \
-			"<ul>" \
-			"<li><b>KVIrc is free</b>, use it, have fun! <b>:)</b></li>" \
-			"<li>If you use <b>any</b> part of KVIrc in your own project, you <b>must</b> release that project under the same license.</li>" \
-			"</ul></p>" \
-			"<p>The \"legalese\" version of the license is shown in the box below.</p>"));
+		"<p>All of the files in this distribution are covered by the GPL. " \
+		"In human terms this can be read as follows:<br>" \
+		"<ul>" \
+		"<li><b>KVIrc is free</b>, use it, have fun! <b>:)</b></li>" \
+		"<li>If you use <b>any</b> part of KVIrc in your own project, you <b>must</b> release that project under the same license.</li>" \
+		"</ul></p>" \
+		"<p>The \"legalese\" version of the license is shown in the box below.</p>"));
 
 	KviTalTextEdit * ed = new KviTalTextEdit(m_pLicense->m_pVBox);
 	ed->setReadOnly(true);
@@ -201,8 +198,8 @@ KviSetupWizard::KviSetupWizard()
 	if(!KviFileUtils::loadFile(szLicensePath,szLicense))
 	{
 		szLicense = __tr("Oops... can't find the license file.\n" \
-						"It MUST be included in the distribution...\n" \
-						"Please report to <pragma at kvirc dot net>");
+			"It MUST be included in the distribution...\n" \
+			"Please report to <pragma at kvirc dot net>");
 	}
 	ed->setText(szLicense);
 	
@@ -488,13 +485,13 @@ KviSetupWizard::KviSetupWizard()
 	m_pDesktopIntegration = new KviSetupPage(this);
 
 	szText  = __tr2qs( \
-				"<p>" \
-					"Here you can choose how much KVIrc will integrate with " \
-					"your system." \
-					"<br><br>" \
-					"The default settings are fine for most users so if " \
-					"you're in doubt just click \"<b>Next</b>\" and go to the next screen." \
-				"</p>");
+		"<p>" \
+			"Here you can choose how much KVIrc will integrate with " \
+			"your system." \
+			"<br><br>" \
+			"The default settings are fine for most users so if " \
+			"you're in doubt just click \"<b>Next</b>\" and go to the next screen." \
+		"</p>");
 
 	m_pDesktopIntegration->m_pTextLabel->setText(szText);
 
@@ -646,7 +643,7 @@ KviSetupWizard::KviSetupWizard()
 	}
 	free(buffer);
 
-#endif
+#endif // COMPILE_ON:WINDOWS
 
 	//setMinimumSize(630,450);
 }
@@ -722,6 +719,7 @@ void KviSetupWizard::newDirClicked()
 	if(m_pDataPathEdit->text().isEmpty() || m_pIncomingPathEdit->text().isEmpty()) setNextEnabled(m_pDirectory,false);
 	else setNextEnabled(m_pDirectory,true);
 }
+
 void KviSetupWizard::chooseOldDataPath()
 {
 	QString szBuffer = KviTalFileDialog::getExistingDirectoryPath(m_pDataPathEdit->text(),__tr2qs("Choose an Old Configuration Folder - KVIrc Setup"),0);
@@ -789,19 +787,19 @@ void KviSetupWizard::makeLink()
 	// otherwise there would be 150 lines for a stupid symlink!)
 
 	HKEY hCU;
-    DWORD lpType;
-    ULONG ulSize = MAX_PATH;
+	DWORD lpType;
+	ULONG ulSize = MAX_PATH;
 	char szLink[MAX_PATH];
 
 	// Dig in the registry looking up the Desktop path
-    if(RegOpenKeyEx(HKEY_CURRENT_USER,
+	if(RegOpenKeyEx(HKEY_CURRENT_USER,
 		"Software\\Microsoft\\Windows\\CurrentVersion\\Explorer\\Shell Folders", 
 		0,KEY_QUERY_VALUE,&hCU) == ERROR_SUCCESS)
 	{
 		RegQueryValueEx(hCU,"Desktop",NULL,&lpType,
-        (unsigned char *)&szLink,&ulSize);
+		(unsigned char *)&szLink,&ulSize);
 		RegCloseKey(hCU);
-    }
+	}
 
 	// Build our paths
 	QString szLinkTarget = szLink;
@@ -816,8 +814,8 @@ void KviSetupWizard::makeLink()
 	// Fiddle with an obscure shell interface
 	IShellLink* psl;
 
-    // Get a pointer to the IShellLink interface: this is kinda ugly :)
-    if(CoCreateInstance(CLSID_ShellLink,NULL,CLSCTX_INPROC_SERVER,
+	// Get a pointer to the IShellLink interface: this is kinda ugly :)
+	if(CoCreateInstance(CLSID_ShellLink,NULL,CLSCTX_INPROC_SERVER,
 				IID_IShellLink,(void **)&psl) == S_OK)
 	{
 		// just for fun , lookup another shell interface
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index 39e9ad81f..04e86f1cc 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -24,28 +24,30 @@
 //
 //=============================================================================
 
+#include "kvi_settings.h"
+#include "kvi_string.h"
+#include "kvi_selectors.h"
 
 #include <kvi_tal_wizard.h>
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_groupbox.h"
-#include <qlabel.h>
-#include <qpixmap.h>
-#include <qlineedit.h>
-#ifdef COMPILE_USE_QT4
-#include <q3buttongroup.h>
+
+#include <QLabel>
+#include <QPixmap>
+#include <QLineEdit>
+#include <QRadioButton>
+#include <QComboBox>
+#include <QCheckBox>
+/*
+#include <Q3ButtonGroup>
 #define KviTalVButtonGroup Q3VButtonGroup
-#else
- #include <qvbuttongroup.h>
-#define KviTalVButtonGroup QVButtonGroup
-#endif
-#include <qradiobutton.h>
-#include <qcombobox.h>
-#include <qcheckbox.h>
+*/
+/* FIXME: Qt4 */
+#include <QGroupBox>
+#define KviTalVButtonGroup QGroupBox
+
 
-#include "kvi_settings.h"
-#include "kvi_string.h"
-#include "kvi_selectors.h"
 
 class KviSetupWizard;
 
@@ -59,7 +61,6 @@ public:
 	KviTalVBox * m_pVBox;
 	QLabel * m_pPixmapLabel;
 	QLabel * m_pTextLabel;
-   
 };