More Qt 4.x port

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@246 17fca916-40b9-46aa-a4ea-0a15b648b75c
author: Szymon Tomasz Stefanek 2007-01-23 22:24:31 +0000
committer: Szymon Tomasz Stefanek 2007-01-23 22:24:31 +0000
commit: daf9b531b3b8b058dc07b2e818876ece1943cb76 (patch)
tree: e605c2b2a174ca3ddca4f35bae9d8c66e9497dac
parent: not important fix (diff)
download: KVIrc-daf9b531b3b8b058dc07b2e818876ece1943cb76.tar.gz
KVIrc-daf9b531b3b8b058dc07b2e818876ece1943cb76.tar.bz2
KVIrc-daf9b531b3b8b058dc07b2e818876ece1943cb76.zip
184 files changed, 1588 insertions, 897 deletions
diff --git a/admin/acinclude.m4.in b/admin/acinclude.m4.in
index 9423c0a52..c8ef476b4 100644
--- a/admin/acinclude.m4.in
+++ b/admin/acinclude.m4.in
@@ -2358,6 +2358,7 @@ AC_DEFUN([AC_SS_FINAL_CONFIG],
 	else
 		AC_DEFINE([COMPILE_USE_QT4], 1, [define if you want to compile the Qt 4.x support])
 		SS_INCDIRS="$SS_QT4_INCDIRECTORIES -I$SS_X_INCDIR"
+		SS_CPPFLAGS="$SS_CPPFLAGS -DQT3_SUPPORT"
 	fi
 
 	if test -n "$SS_X_INCDIR"; then
diff --git a/src/kvi_configstatus.h b/src/kvi_configstatus.h
index 7f3799081..5e37dc7ac 100644
--- a/src/kvi_configstatus.h
+++ b/src/kvi_configstatus.h
@@ -8,7 +8,7 @@
 /* #undef BIG_ENDIAN_MACHINE_BYTE_ORDER */
 
 /* this is the build date (configure date rather) */
-#define BUILD_DATE "Mon Jan 22 04:28:49 UTC 2007"
+#define BUILD_DATE "Tue Jan 23 02:28:16 UTC 2007"
 
 /* these are the build flags */
 #define BUILD_FLAGS "x86_64-cefgikopsAGTZ"
diff --git a/src/kvilib/build/Makefile.am b/src/kvilib/build/Makefile.am
index 7b96a1901..36132f4c0 100644
--- a/src/kvilib/build/Makefile.am
+++ b/src/kvilib/build/Makefile.am
@@ -80,9 +80,15 @@ libkvilib_la_SOURCES = \
 	../system/kvi_time.cpp \
 	../tal/kvi_tal_application.cpp \
 	../tal/kvi_tal_filedialog.cpp \
+	../tal/kvi_tal_grid.cpp \
+	../tal/kvi_tal_hbox.cpp \
 	../tal/kvi_tal_mainwindow.cpp \
 	../tal/kvi_tal_menubar.cpp \
-	../tal/kvi_tal_toolbar.cpp
+	../tal/kvi_tal_popupmenu.cpp \
+	../tal/kvi_tal_toolbar.cpp \
+	../tal/kvi_tal_tooltip.cpp \
+	../tal/kvi_tal_vbox.cpp \
+	../tal/kvi_tal_widgetstack.cpp
 
 #
 # Command useful to find out all the headers
@@ -105,6 +111,7 @@ headers_HEADERS = \
 	../core/kvi_dict.h \
 	../core/kvi_error.h \
 	../core/kvi_heapobject.h \
+	../core/kvi_intdict.h \
 	../core/kvi_inttypes.h \
 	../core/kvi_list.h \
 	../core/kvi_malloc.h \
@@ -168,18 +175,33 @@ headers_HEADERS = \
 	../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_hbox.h \
+	../tal/kvi_tal_hbox_qt3.h \
+	../tal/kvi_tal_hbox_qt4.h \
 	../tal/kvi_tal_mainwindow.h \
 	../tal/kvi_tal_mainwindow_kde.h \
 	../tal/kvi_tal_mainwindow_qt.h \
 	../tal/kvi_tal_menubar.h \
 	../tal/kvi_tal_menubar_kde.h \
 	../tal/kvi_tal_menubar_qt.h \
+	../tal/kvi_tal_popupmenu.h \
+	../tal/kvi_tal_popupmenu_qt3.h \
+	../tal/kvi_tal_popupmenu_qt4.h \
 	../tal/kvi_tal_toolbar.h \
 	../tal/kvi_tal_toolbar_kde.h \
 	../tal/kvi_tal_toolbar_qt.h \
-	../tal/kvi_tal_toolbardocktype.h
-
-
+	../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 \
+	../tal/kvi_tal_windowstate.h
 
 
 ../ext/moc_%.cpp: ../ext/%.h
@@ -223,6 +245,16 @@ headers_HEADERS = \
 ../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_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_widgetstack.cpp: ../tal/kvi_tal_widgetstack_qt3.moc
+../tal/kvi_tal_widgetstack.cpp: ../tal/kvi_tal_widgetstack_qt4.moc
+../tal/kvi_tal_popupmenu.cpp: ../tal/kvi_tal_popupmenu_qt3.moc
+../tal/kvi_tal_popupmenu.cpp: ../tal/kvi_tal_popupmenu_qt4.moc
 
 
 #
diff --git a/src/kvilib/config/kvi_settings.h b/src/kvilib/config/kvi_settings.h
index 7f6d10d19..47d4b0f11 100644
--- a/src/kvilib/config/kvi_settings.h
+++ b/src/kvilib/config/kvi_settings.h
@@ -136,4 +136,5 @@
 	#define debug qDebug
 #endif
 
+
 #endif //_KVI_SETTINGS_H_
diff --git a/src/kvilib/core/kvi_intdict.h b/src/kvilib/core/kvi_intdict.h
new file mode 100644
index 000000000..191077147
--- /dev/null
+++ b/src/kvilib/core/kvi_intdict.h
@@ -0,0 +1,39 @@
+#ifndef _KVI_INTDICT_H_
+#define _KVI_INTDICT_H_
+//=================================================================================================
+//
+//   File : kvi_intdict.h
+//   Creation date : Mon Jan 15 2007 04:53 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"
+
+#if COMPILE_USE_QT4
+	#include <q3intdict.h>
+	#define KviIntDict Q3IntDict
+	#define KviIntDictIterator Q3IntDictIterator
+#else
+	#include <qintdict.h>
+	#define KviIntDict QIntDict
+	#define KviIntDictIterator QIntDictIterator
+#endif
+
+#endif //_KVI_INTDICT_H_
diff --git a/src/kvilib/irc/kvi_avatarcache.cpp b/src/kvilib/irc/kvi_avatarcache.cpp
index 53c526d62..d72e1acdf 100644
--- a/src/kvilib/irc/kvi_avatarcache.cpp
+++ b/src/kvilib/irc/kvi_avatarcache.cpp
@@ -118,7 +118,7 @@ const QString & KviAvatarCache::lookup(const KviIrcMask &mask,const QString &szN
 	szKey.append(szNetwork);
 
 	KviAvatarCacheEntry * e = m_pAvatarDict->find(szKey);
-	if(!e)return QString::null;
+	if(!e)return KviQString::empty;
 	e->tLastAccess = kvi_unixTime();
 	return e->szIdString;
 }
diff --git a/src/kvilib/system/kvi_locale.cpp b/src/kvilib/system/kvi_locale.cpp
index d3b443d0f..a8134f66a 100644
--- a/src/kvilib/system/kvi_locale.cpp
+++ b/src/kvilib/system/kvi_locale.cpp
@@ -785,7 +785,8 @@ namespace KviLocale
 		QString szLocDir = szLocaleDir;
 		KviQString::ensureLastCharIs(szLocDir,KVI_PATH_SEPARATOR_CHAR);
 
-		szBuffer = szLocDir+name+"_"+szLocale.ptr()+".mo";
+		KviQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
+
 		if(KviFileUtils::fileExists(szBuffer))return true;
 
 		if(szLocale.findFirstIdx('.') != -1)
@@ -793,7 +794,8 @@ namespace KviLocale
 			// things like en_GB.utf8
 			// kill them
 			szLocale.cutFromFirst('.');
-			szBuffer = szLocDir+name+"_"+szLocale.ptr()+".mo";
+
+			KviQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
 			if(KviFileUtils::fileExists(szBuffer))return true;
 		}
 
@@ -802,7 +804,7 @@ namespace KviLocale
 			// things like @euro ?
 			// kill them
 			szLocale.cutFromFirst('@');
-			szBuffer = szLocDir+name+"_"+szLocale.ptr()+".mo";
+			KviQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
 			if(KviFileUtils::fileExists(szBuffer))return true;
 		}
 
@@ -811,13 +813,13 @@ namespace KviLocale
 			// things like en_GB
 			// kill them
 			szLocale.cutFromFirst('_');
-			szBuffer = szLocDir+name+"_"+szLocale.ptr()+".mo";
+			KviQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
 			if(KviFileUtils::fileExists(szBuffer))return true;
 		}
 
 		// try the lower case version too
 		szLocale.toLower();
-		szBuffer = szLocDir+name+"_"+szLocale.ptr()+".mo";
+		KviQString::sprintf(szBuffer,"%Q%Q_%s.mo",&szLocDir,&name,szLocale.ptr());
 		if(KviFileUtils::fileExists(szBuffer))return true;
 
 		return false;
diff --git a/src/kvilib/tal/kvi_tal_grid.cpp b/src/kvilib/tal/kvi_tal_grid.cpp
new file mode 100644
index 000000000..a72b06384
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_grid.cpp
@@ -0,0 +1,34 @@
+//=============================================================================
+//
+//   File : kvi_tal_grid.cpp
+//   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.
+//
+//=============================================================================
+
+#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
+
diff --git a/src/kvilib/tal/kvi_tal_grid.h b/src/kvilib/tal/kvi_tal_grid.h
new file mode 100644
index 000000000..d0794b996
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_grid.h
@@ -0,0 +1,36 @@
+#ifndef _KVI_TAL_GRID_H_
+#define _KVI_TAL_GRID_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_grid.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"
+
+#ifdef COMPILE_USE_QT4
+	#include "kvi_tal_grid_qt4.h"
+#else
+	#include "kvi_tal_grid_qt3.h"
+#endif
+
+#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
new file mode 100644
index 000000000..b6163a280
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_grid_qt3.h
@@ -0,0 +1,39 @@
+#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
new file mode 100644
index 000000000..c0c6938d0
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_grid_qt4.h
@@ -0,0 +1,41 @@
+#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
new file mode 100644
index 000000000..749664498
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_hbox.cpp
@@ -0,0 +1,32 @@
+//=============================================================================
+//
+//   File : kvi_tal_hbox.cpp
+//   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.
+//
+//=============================================================================
+
+#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
diff --git a/src/kvilib/tal/kvi_tal_hbox.h b/src/kvilib/tal/kvi_tal_hbox.h
new file mode 100644
index 000000000..1122ea3d1
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_hbox.h
@@ -0,0 +1,36 @@
+#ifndef _KVI_TAL_HBOX_H_
+#define _KVI_TAL_HBOX_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_hbox.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"
+
+#ifdef COMPILE_USE_QT4
+	#include "kvi_tal_hbox_qt4.h"
+#else
+	#include "kvi_tal_hbox_qt3.h"
+#endif
+
+#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
new file mode 100644
index 000000000..2749143db
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_hbox_qt3.h
@@ -0,0 +1,41 @@
+#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
new file mode 100644
index 000000000..c89e8016b
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_hbox_qt4.h
@@ -0,0 +1,41 @@
+#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)
+	: Q3HBox(pParent) {};
+	virtual ~KviTalHBox() {};
+};
+
+#endif // _KVI_TAL_HBOX_QT4_H_
diff --git a/src/kvilib/tal/kvi_tal_popupmenu.cpp b/src/kvilib/tal/kvi_tal_popupmenu.cpp
new file mode 100644
index 000000000..fcc57edcc
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_popupmenu.cpp
@@ -0,0 +1,33 @@
+//=============================================================================
+//
+//   File : kvi_tal_popupmenu.cpp
+//   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.
+//
+//=============================================================================
+
+#define __KVILIB__
+#include "kvi_tal_popupmenu.h"
+
+#ifdef COMPILE_USE_QT4
+	#include "kvi_tal_popupmenu_qt4.moc"
+#else
+	#include "kvi_tal_popupmenu_qt3.moc"
+#endif
+
diff --git a/src/kvilib/tal/kvi_tal_popupmenu.h b/src/kvilib/tal/kvi_tal_popupmenu.h
new file mode 100644
index 000000000..6aa1c1a58
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_popupmenu.h
@@ -0,0 +1,36 @@
+#ifndef _KVI_TAL_POPUPMENU_H_
+#define _KVI_TAL_POPUPMENU_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_popupmenu.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"
+
+#ifdef COMPILE_USE_QT4
+	#include "kvi_tal_popupmenu_qt4.h"
+#else
+	#include "kvi_tal_popupmenu_qt3.h"
+#endif
+
+#endif // _KVI_TAL_POPUPMENU_H_
diff --git a/src/kvilib/tal/kvi_tal_popupmenu_qt3.h b/src/kvilib/tal/kvi_tal_popupmenu_qt3.h
new file mode 100644
index 000000000..f29e601d5
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_popupmenu_qt3.h
@@ -0,0 +1,42 @@
+#ifndef _KVI_TAL_POPUPMENU_QT3_H_
+#define _KVI_TAL_POPUPMENU_QT3_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_popupmenu.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 "kvi_qstring.h"
+
+#include <qpopupmenu.h>
+
+class KVILIB_API KviTalPopupMenu : public QPopupMenu
+{
+	Q_OBJECT
+public:
+	KviTalPopupMenu(QWidget * pParent=0,const QString &szName = KviQString::empty)
+	: QPopupMenu(pParent,KviQString::toUtf8(szName).data()) {};
+	virtual ~KviTalPopupMenu() {};
+};
+
+#endif // _KVI_TAL_POPUPMENU_QT3_H_
diff --git a/src/kvilib/tal/kvi_tal_popupmenu_qt4.h b/src/kvilib/tal/kvi_tal_popupmenu_qt4.h
new file mode 100644
index 000000000..51f3b8f96
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_popupmenu_qt4.h
@@ -0,0 +1,45 @@
+#ifndef _KVI_TAL_POPUPMENU_QT4_H_
+#define _KVI_TAL_POPUPMENU_QT4_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_popupmenu_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 "kvi_qstring.h"
+
+#include <q3popupmenu.h>
+
+class KVILIB_API KviTalPopupMenu : public Q3PopupMenu
+{
+	Q_OBJECT
+public:
+	KviTalPopupMenu(QWidget * pParent=0,const QString &szName = KviQString::empty)
+	: Q3PopupMenu(pParent)
+	{
+		setName(szName);
+	};
+	virtual ~KviTalPopupMenu() {};
+};
+
+#endif // _KVI_TAL_POPUPMENU_QT4_H_
diff --git a/src/kvilib/tal/kvi_tal_tooltip.cpp b/src/kvilib/tal/kvi_tal_tooltip.cpp
new file mode 100644
index 000000000..6592383b3
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_tooltip.cpp
@@ -0,0 +1,60 @@
+//=============================================================================
+//
+//   File : kvi_tal_tooltip.cpp
+//   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.
+//
+//=============================================================================
+
+#define __KVILIB__
+#include "kvi_tal_tooltip.h"
+
+KviTalToolTip::KviTalToolTip(QWidget * pParent)
+#ifndef COMPILE_USE_QT4
+: QToolTip(pParent)
+#endif
+{
+	// FIXME: With QT4 will need a helper that intercepts
+	// the widget QHelpEvent thingies...
+	// Will also need a deleting parent I guess...
+}
+
+KviTalToolTip::~KviTalToolTip()
+{
+}
+
+#ifdef COMPILE_USE_QT4
+void KviTalToolTip::add(QWidget * widget,const QString & text)
+{
+	QToolTip::add(widget,text);
+}
+
+
+void KviTalToolTip::tip(const QRect & rect,const QString & text)
+{
+	QToolTip::showText(rect.topLeft(),text);
+}
+#endif
+
+void KviTalToolTip::maybeTip(const QPoint & p)
+{
+	// does nothing here.. and in Qt 4.x will even fail to work
+}
+
+
diff --git a/src/kvilib/tal/kvi_tal_tooltip.h b/src/kvilib/tal/kvi_tal_tooltip.h
new file mode 100644
index 000000000..5e10dca19
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_tooltip.h
@@ -0,0 +1,50 @@
+#ifndef _KVI_TAL_TOOLTIP_H_
+#define _KVI_TAL_TOOLTIP_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_tooltip.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 <qtooltip.h>
+
+#ifdef COMPILE_USE_QT4
+class KVILIB_API KviTalToolTip
+#else
+class KVILIB_API KviTalToolTip : public QToolTip
+#endif
+{
+public:
+	KviTalToolTip(QWidget * pParent);
+	virtual ~KviTalToolTip();
+public:
+#ifdef COMPILE_USE_QT4
+	static void add(QWidget * widget,const QString & text);
+	virtual void tip(const QRect & rect,const QString & text);
+#endif
+protected:
+	virtual void maybeTip(const QPoint & p);
+};
+
+#endif // _KVI_TAL_TOOLTIP_H_
diff --git a/src/kvilib/tal/kvi_tal_vbox.cpp b/src/kvilib/tal/kvi_tal_vbox.cpp
new file mode 100644
index 000000000..6ac47d2f6
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_vbox.cpp
@@ -0,0 +1,33 @@
+//=============================================================================
+//
+//   File : kvi_tal_vbox.cpp
+//   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.
+//
+//=============================================================================
+
+#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
+
diff --git a/src/kvilib/tal/kvi_tal_vbox.h b/src/kvilib/tal/kvi_tal_vbox.h
new file mode 100644
index 000000000..ee35a98d7
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_vbox.h
@@ -0,0 +1,36 @@
+#ifndef _KVI_TAL_VBOX_H_
+#define _KVI_TAL_VBOX_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_vbox.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"
+
+#ifdef COMPILE_USE_QT4
+	#include "kvi_tal_vbox_qt4.h"
+#else
+	#include "kvi_tal_vbox_qt3.h"
+#endif
+
+#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
new file mode 100644
index 000000000..1bd01bb2e
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_vbox_qt3.h
@@ -0,0 +1,42 @@
+#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
new file mode 100644
index 000000000..661b25eed
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_vbox_qt4.h
@@ -0,0 +1,42 @@
+#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/kvilib/tal/kvi_tal_widgetstack.cpp b/src/kvilib/tal/kvi_tal_widgetstack.cpp
new file mode 100644
index 000000000..8fc4ee62e
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_widgetstack.cpp
@@ -0,0 +1,33 @@
+//=============================================================================
+//
+//   File : kvi_tal_widgetstack.cpp
+//   Creation date : Mon Jan 22 2007 11:17: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.
+//
+//=============================================================================
+
+#define __KVILIB__
+#include "kvi_tal_widgetstack.h"
+
+#ifdef COMPILE_USE_QT4
+	#include "kvi_tal_widgetstack_qt4.moc"
+#else
+	#include "kvi_tal_widgetstack_qt3.moc"
+#endif
+
diff --git a/src/kvilib/tal/kvi_tal_widgetstack.h b/src/kvilib/tal/kvi_tal_widgetstack.h
new file mode 100644
index 000000000..792982020
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_widgetstack.h
@@ -0,0 +1,36 @@
+#ifndef _KVI_TAL_WIDGETSTACK_H_
+#define _KVI_TAL_WIDGETSTACK_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_widgetstack.h
+//   Creation date : Mon Jan 22 2007 11:17: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"
+
+#ifdef COMPILE_USE_QT4
+	#include "kvi_tal_widgetstack_qt4.h"
+#else
+	#include "kvi_tal_widgetstack_qt3.h"
+#endif
+
+#endif // _KVI_TAL_WIDGETSTACK_H_
diff --git a/src/kvilib/tal/kvi_tal_widgetstack_qt3.h b/src/kvilib/tal/kvi_tal_widgetstack_qt3.h
new file mode 100644
index 000000000..82d9fdfe9
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_widgetstack_qt3.h
@@ -0,0 +1,42 @@
+#ifndef _KVI_TAL_WIDGETSTACK_QT3_H_
+#define _KVI_TAL_WIDGETSTACK_QT3_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_widgetstack_qt3.h
+//   Creation date : Mon Jan 22 2007 11:17: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 <qwidgetstack.h>
+
+
+class KviTalWidgetStack : public QWidgetStack
+{
+	Q_OBJECT
+public:
+	KviTalWidgetStack(QWidget * pParent)
+	: QWidgetStack(pParent) {};
+	virtual ~KviTalWidgetStack() {};
+};
+
+#endif // _KVI_TAL_WIDGETSTACK_QT3_H_
diff --git a/src/kvilib/tal/kvi_tal_widgetstack_qt4.h b/src/kvilib/tal/kvi_tal_widgetstack_qt4.h
new file mode 100644
index 000000000..1e58ef370
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_widgetstack_qt4.h
@@ -0,0 +1,41 @@
+#ifndef _KVI_TAL_WIDGETSTACK_QT4_H_
+#define _KVI_TAL_WIDGETSTACK_QT4_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_widgetstack_qt4.h
+//   Creation date : Mon Jan 22 2007 11:17: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 <qstackedwidget.h>
+
+class KviTalWidgetStack : public QStackedWidget
+{
+	Q_OBJECT
+public:
+	KviTalWidgetStack(QWidget * pParent)
+	: QStackedWidget(pParent) {};
+	virtual ~KviTalWidgetStack() {};
+};
+
+#endif // _KVI_TAL_WIDGETSTACK_QT4_H_
diff --git a/src/kvilib/tal/kvi_tal_windowstate.h b/src/kvilib/tal/kvi_tal_windowstate.h
new file mode 100644
index 000000000..cff64b224
--- /dev/null
+++ b/src/kvilib/tal/kvi_tal_windowstate.h
@@ -0,0 +1,42 @@
+#ifndef _KVI_TAL_WINDOWSTATE_H_
+#define _KVI_TAL_WINDOWSTATE_H_
+
+//=============================================================================
+//
+//   File : kvi_tal_windowstate.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"
+
+#ifdef COMPILE_USE_QT4
+	#define QT_WINDOWSTATE_FLAGS Qt::WindowState
+	
+	#define QT_WINDOWSTATE_MAXIMIZED Qt::WindowMaximized
+	#define QT_WINDOWSTATE_MINIMIZED Qt::WindowMinimized
+#else
+	#define QT_WINDOWSTATE_FLAGS Qt::WidgetState
+
+	#define QT_WINDOWSTATE_MAXIMIZED Qt::WState_Maximized
+	#define QT_WINDOWSTATE_MINIMIZED Qt::WState_Minimized
+#endif
+
+#endif // _KVI_TAL_WINDOWSTATE_H_
diff --git a/src/kvirc/build/Makefile.am b/src/kvirc/build/Makefile.am
index 751f0c175..69308d2f0 100644
--- a/src/kvirc/build/Makefile.am
+++ b/src/kvirc/build/Makefile.am
@@ -53,8 +53,7 @@ nodist_kvirc_SOURCES = ../kernel/moc_kvi_action.cpp \
 ../ui/moc_kvi_statusbar.cpp \
 ../ui/moc_kvi_statusbarapplet.cpp \
 ../ui/moc_kvi_toolwindows_container.cpp \
-../ui/moc_kvi_listview.cpp \
-../ui/moc_kvi_xmladdonloader.cpp 
+../ui/moc_kvi_listview.cpp
 
 kvirc_SOURCES = ../kernel/kvi_action.cpp \
 ../kernel/kvi_actionmanager.cpp \
@@ -232,6 +231,7 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \
 ../ui/kvi_irctoolbar.cpp \
 ../ui/kvi_ircview.cpp \
 ../ui/kvi_ircviewtools.cpp \
+../ui/kvi_listview.cpp \
 ../ui/kvi_maskeditor.cpp \
 ../ui/kvi_mdicaption.cpp \
 ../ui/kvi_mdichild.cpp \
@@ -256,9 +256,7 @@ kvirc_SOURCES = ../kernel/kvi_action.cpp \
 ../ui/kvi_styled_controls.cpp \
 ../ui/kvi_userlistview.cpp \
 ../ui/kvi_window.cpp \
-../ui/kvi_toolwindows_container.cpp \
-../ui/kvi_xmladdonloader.cpp \
-../ui/kvi_listview.cpp
+../ui/kvi_toolwindows_container.cpp
 
 #
 # Command useful to find out all the headers
@@ -434,6 +432,7 @@ headers_HEADERS = ../kernel/kvi_action.h \
 ../ui/kvi_ircview.h \
 ../ui/kvi_ircviewprivate.h \
 ../ui/kvi_ircviewtools.h \
+../ui/kvi_listview.h \
 ../ui/kvi_maskeditor.h \
 ../ui/kvi_mdicaption.h \
 ../ui/kvi_mdichild.h \
@@ -454,9 +453,7 @@ headers_HEADERS = ../kernel/kvi_action.h \
 ../ui/kvi_window.h \
 ../ui/kvi_modew.h \
 ../ui/kvi_styled_controls.h \
-../ui/kvi_toolwindows_container.h \
-../ui/kvi_listview.h \
-../ui/kvi_xmladdonloader.h
+../ui/kvi_toolwindows_container.h
 
 %.moc: %.h
 	$(SS_QT_MOC) $< -o $@
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index e2e584929..be307a668 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -38,7 +38,7 @@
 #include "kvi_styled_controls.h"
 
 #include <qtoolbutton.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
 
 KviAction::~KviAction()
@@ -374,7 +374,7 @@ void KviAction::activeContextStateChanged()
 	}
 }
 
-bool KviAction::addToPopupMenu(QPopupMenu *pMenu)
+bool KviAction::addToPopupMenu(KviTalPopupMenu *pMenu)
 {
 	if(!setupDone())setup();
 	QPixmap * p = smallIcon();
diff --git a/src/kvirc/kernel/kvi_action.h b/src/kvirc/kernel/kvi_action.h
index 83276ce6b..a0e6962b7 100644
--- a/src/kvirc/kernel/kvi_action.h
+++ b/src/kvirc/kernel/kvi_action.h
@@ -37,7 +37,7 @@
 // Known categories are: general (or empty), irc, script
 //
 
-class QPopupMenu;
+class KviTalPopupMenu;
 class QWidget;
 class KviCustomToolBar;
 class QPixmap;
@@ -128,7 +128,7 @@ public:
 	virtual void setEnabled(bool bEnabled);
 	virtual QPixmap * smallIcon();
 	virtual QPixmap * bigIcon();
-	virtual bool addToPopupMenu(QPopupMenu *pMenu);
+	virtual bool addToPopupMenu(KviTalPopupMenu *pMenu);
 	virtual QWidget * addToCustomToolBar(KviCustomToolBar *pParentToolBar);
 	void suicide() { delete this; };
 protected:
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index c912a744c..edf49fdf5 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -84,7 +84,7 @@
 #include "kvi_kvs_eventtriggers.h"
 #include "kvi_sourcesdate.h"
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qsplitter.h>
 #include <qstringlist.h>
 #include "kvi_asciidict.h"
@@ -111,7 +111,7 @@ KVIRC_API KviProxyDataBase             * g_pProxyDataBase          = 0;
 
 KVIRC_API KviColorWindow               * g_pColorWindow               = 0;
 KVIRC_API KviTextIconWindow            * g_pTextIconWindow            = 0;
-KVIRC_API QPopupMenu                   * g_pInputPopup                = 0;
+KVIRC_API KviTalPopupMenu                   * g_pInputPopup                = 0;
 KVIRC_API QStringList                  * g_pRecentTopicList           = 0;
 //KVIRC_API QStringList                  * g_pBookmarkList              = 0;
 KVIRC_API KviAsciiDict<KviWindow>        * g_pGlobalWindowDict          = 0;
@@ -426,7 +426,7 @@ void KviApp::setup()
 	g_pGarbageCollector = new KviGarbageCollector();
 
 	// and the input popup
-	g_pInputPopup = new QPopupMenu();
+	g_pInputPopup = new KviTalPopupMenu();
 
 	// create the server parser
 	g_pServerParser = new KviServerParser();
@@ -1888,7 +1888,7 @@ void KviApp::addRecentServer(const QString& server)
 	merge_to_stringlist_option(server,KviOption_stringlistRecentServers,KVI_MAX_RECENT_SERVERS);
 }
 
-void KviApp::fillRecentServersPopup(QPopupMenu * m)
+void KviApp::fillRecentServersPopup(KviTalPopupMenu * m)
 {
 // FIXME: #warning "MAYBE DISABLE THE SERVERS THAT WE ARE ALREADY CONNECTED TO ?"
 	m->clear();
@@ -1898,7 +1898,7 @@ void KviApp::fillRecentServersPopup(QPopupMenu * m)
 	}
 }
 
-void KviApp::fillRecentNicknamesPopup(QPopupMenu * m,KviConsole * pConsole)
+void KviApp::fillRecentNicknamesPopup(KviTalPopupMenu * m,KviConsole * pConsole)
 {
 	m->clear();
 	int id;
@@ -1918,7 +1918,7 @@ void KviApp::fillRecentNicknamesPopup(QPopupMenu * m,KviConsole * pConsole)
 	}
 }
 
-void KviApp::fillRecentChannelsPopup(QPopupMenu * m,KviConsole * pConsole)
+void KviApp::fillRecentChannelsPopup(KviTalPopupMenu * m,KviConsole * pConsole)
 {
 	m->clear();
 	int id;
diff --git a/src/kvirc/kernel/kvi_app.h b/src/kvirc/kernel/kvi_app.h
index 3051f87e3..aafadb900 100644
--- a/src/kvirc/kernel/kvi_app.h
+++ b/src/kvirc/kernel/kvi_app.h
@@ -48,7 +48,7 @@
 	class KviIpcSentinel;
 #endif // !COMPILE_NO_IPC
 
-class QPopupMenu;
+class KviTalPopupMenu;
 class QPixmap;
 class QListBox;
 class QTextCodec;
@@ -266,9 +266,9 @@ public:
 	QStringList* getRecentChannels(const QString& net);
 	
 	void addRecentServer(const QString& server);
-	void fillRecentServersPopup(QPopupMenu * m);
-	void fillRecentNicknamesPopup(QPopupMenu * m,KviConsole * pConsole);
-	void fillRecentChannelsPopup(QPopupMenu * m,KviConsole * pConsole);
+	void fillRecentServersPopup(KviTalPopupMenu * m);
+	void fillRecentNicknamesPopup(KviTalPopupMenu * m,KviConsole * pConsole);
+	void fillRecentChannelsPopup(KviTalPopupMenu * m,KviConsole * pConsole);
 	
 	void autoConnectToServers();
 	
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 9b385be45..00df7007c 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -46,7 +46,7 @@
 
 #include "kvi_kvs_script.h"
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qobject.h>
 
 
@@ -464,7 +464,7 @@ void KviIrcContextDisplayAction::setup()
 	connect(g_pFrame,SIGNAL(activeConnectionLagChanged()),this,SLOT(activeContextStateChanged()));
 }
 
-bool KviIrcContextDisplayAction::addToPopupMenu(QPopupMenu *p)
+bool KviIrcContextDisplayAction::addToPopupMenu(KviTalPopupMenu *p)
 {
 	if(!setupDone())setup();
 	KviIrcContextDisplay * w = new KviIrcContextDisplay(p,"kvirc.irccontextdisplay");
@@ -520,7 +520,7 @@ KviSeparatorAction::KviSeparatorAction(QObject * pParent)
 }
 
 
-bool KviSeparatorAction::addToPopupMenu(QPopupMenu *p)
+bool KviSeparatorAction::addToPopupMenu(KviTalPopupMenu *p)
 {
 	if(!setupDone())setup();
 	p->insertSeparator();
@@ -627,7 +627,7 @@ void KviConnectAction::activate()
 	if(c)c->connectOrDisconnect();
 }
 
-bool KviConnectAction::addToPopupMenu(QPopupMenu *p)
+bool KviConnectAction::addToPopupMenu(KviTalPopupMenu *p)
 {
 	if(!setupDone())setup();
 	KviIrcContext * c = g_pFrame->activeContext();
@@ -722,7 +722,7 @@ void KviSubmenuAction::setup()
 	KviKvsAction::setup();
 	if(!m_pPopup)
 	{
-		m_pPopup = new QPopupMenu();
+		m_pPopup = new KviTalPopupMenu();
 		connect(m_pPopup,SIGNAL(aboutToShow()),this,SLOT(popupAboutToShow()));
 		connect(m_pPopup,SIGNAL(activated(int)),this,SLOT(popupActivated(int)));
 	}
@@ -736,7 +736,7 @@ void KviSubmenuAction::popupActivated(int)
 {
 }
 
-bool KviSubmenuAction::addToPopupMenu(QPopupMenu *p)
+bool KviSubmenuAction::addToPopupMenu(KviTalPopupMenu *p)
 {
 	if(!setupDone())setup();
 	int id = p->insertItem(*(smallIcon()),visibleName(),m_pPopup);
@@ -1049,7 +1049,7 @@ void KviGoAwayAction::setup()
 	connect(g_pFrame,SIGNAL(activeConnectionAwayStateChanged()),this,SLOT(activeContextStateChanged()));
 }
 
-bool KviGoAwayAction::addToPopupMenu(QPopupMenu *p)
+bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p)
 {
 	if(!setupDone())setup();
 	KviIrcContext * c = g_pFrame->activeContext();
diff --git a/src/kvirc/kernel/kvi_coreactions.h b/src/kvirc/kernel/kvi_coreactions.h
index 96c2643e6..a178c1be5 100644
--- a/src/kvirc/kernel/kvi_coreactions.h
+++ b/src/kvirc/kernel/kvi_coreactions.h
@@ -41,7 +41,7 @@ protected:
 	QString m_szAbortConnectionString;
 	QString m_szDisconnectString;
 public:
-	virtual bool addToPopupMenu(QPopupMenu *p);
+	virtual bool addToPopupMenu(KviTalPopupMenu *p);
 	virtual QWidget * addToCustomToolBar(KviCustomToolBar *t);
 protected:
 	virtual void setup();
@@ -57,11 +57,11 @@ class KviSeparatorAction : public KviAction
 public:
 	KviSeparatorAction(QObject * pParent);
 public:
-	virtual bool addToPopupMenu(QPopupMenu *p);
+	virtual bool addToPopupMenu(KviTalPopupMenu *p);
 	virtual QWidget * addToCustomToolBar(KviCustomToolBar *t);
 };
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviSubmenuAction : public KviKvsAction
 {
@@ -78,11 +78,11 @@ public:
 		unsigned int uFlags = 0);
 	~KviSubmenuAction();
 protected:
-	QPopupMenu * m_pPopup;
+	KviTalPopupMenu * m_pPopup;
 protected:
 	virtual void setup();
 public:
-	virtual bool addToPopupMenu(QPopupMenu *p);
+	virtual bool addToPopupMenu(KviTalPopupMenu *p);
 	virtual QWidget * addToCustomToolBar(KviCustomToolBar *t);
 protected slots:
 	virtual void popupAboutToShow();
@@ -158,7 +158,7 @@ class KviIrcContextDisplayAction : public KviAction
 public:
 	KviIrcContextDisplayAction(QObject * pParent);
 public:
-	virtual bool addToPopupMenu(QPopupMenu *p);
+	virtual bool addToPopupMenu(KviTalPopupMenu *p);
 	virtual QWidget * addToCustomToolBar(KviCustomToolBar *t);
 	virtual void activeContextStateChanged();
 	virtual void activeContextChanged();
@@ -176,7 +176,7 @@ protected:
 	QString m_szAwayString;
 	QString m_szBackString;
 public:
-	virtual bool addToPopupMenu(QPopupMenu *p);
+	virtual bool addToPopupMenu(KviTalPopupMenu *p);
 	virtual QWidget * addToCustomToolBar(KviCustomToolBar *t);
 protected:
 	virtual void setup();
diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
index 17ba83470..61c77cd81 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
@@ -29,7 +29,7 @@
 #include "kvi_app.h"
 
 #include <qlistview.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
 static KviFileTransferManager * g_pFileTransferManager = 0;
 
diff --git a/src/kvirc/kernel/kvi_filetransfer.h b/src/kvirc/kernel/kvi_filetransfer.h
index efefe1f8e..8323d40dd 100644
--- a/src/kvirc/kernel/kvi_filetransfer.h
+++ b/src/kvirc/kernel/kvi_filetransfer.h
@@ -33,7 +33,7 @@
 
 class KviFileTransfer;
 class KviWindow;
-class QPopupMenu;
+class KviTalPopupMenu;
 
 // This is for the external extension
 #define KVI_FILE_TRANSFER_WINDOW_EXTENSION_NAME "File transfer extension"
@@ -108,7 +108,7 @@ public:
 	virtual QString localFileName();
 	virtual QString retryCommand();
 	virtual int displayHeight(int iLineSpacing);
-	virtual void fillContextPopup(QPopupMenu * m,int column) = 0;
+	virtual void fillContextPopup(KviTalPopupMenu * m,int column) = 0;
 	virtual void die() = 0;
 };
 
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index a67c17898..e3cd5684c 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -410,7 +410,7 @@ bool KviIconWidget::eventFilter(QObject * o,QEvent *e)
 			int iVal = szName.toInt(&bOk);
 			if(bOk)emit selected(iVal);
 
-			if(parentWidget() && isVisible() && parentWidget()->inherits("QPopupMenu"))
+			if(parentWidget() && isVisible() && parentWidget()->inherits("KviTalPopupMenu"))
 			{
 				parentWidget()->close();
 				return true;
diff --git a/src/kvirc/kernel/kvi_ircurl.cpp b/src/kvirc/kernel/kvi_ircurl.cpp
index 062db9fa3..37e55f8ba 100644
--- a/src/kvirc/kernel/kvi_ircurl.cpp
+++ b/src/kvirc/kernel/kvi_ircurl.cpp
@@ -35,8 +35,6 @@
 #include "kvi_console.h"
 #include "kvi_frame.h"
 
-#include <qptrlist.h>
-
 #define _KVI_IRCURL_CPP_
 #include "kvi_ircurl.h"
 
@@ -360,4 +358,4 @@ int KviIrcUrl::run(const QString& text,int contextSpec,KviConsole* pConsole)
 	}
 	//!invalid proto
 	return parts.iError;
-}
-\ No newline at end of file
+}
diff --git a/src/kvirc/kernel/kvi_ircurl.h b/src/kvirc/kernel/kvi_ircurl.h
index fc993f6ca..b0c568607 100644
--- a/src/kvirc/kernel/kvi_ircurl.h
+++ b/src/kvirc/kernel/kvi_ircurl.h
@@ -74,4 +74,5 @@ namespace KviIrcUrl
 	extern KVIRC_API void join(QString &url, KviIrcServer* server);
 	extern KVIRC_API void makeJoinCmd(const QStringList& chans, QString& szJoinCommand);
 }
+
 #endif // _KVI_IRCURL_H_
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
index 240953748..69f0ac5c7 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
@@ -43,7 +43,7 @@
 #include "kvi_locale.h"
 
 #include <qregexp.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 
 namespace KviKvsCoreCallbackCommands
 {
@@ -455,11 +455,11 @@ namespace KviKvsCoreCallbackCommands
 			pButton->show();
 		}
 
-		QToolTip::remove(pButton);
+		KviTalToolTip::remove(pButton);
 		if(!szLabel.isEmpty())
 		{
 			pButton->setButtonText(szLabel);
-			QToolTip::add(pButton,szLabel);
+			KviTalToolTip::add(pButton,szLabel);
 		}
 
 		pButton->setButtonCode(new KviKvsScript(*KVSCCC_pCallback));
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index 34612a3d7..8973b6db0 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -48,7 +48,7 @@
 	#include <unistd.h>   // for usleep();
 #endif
 
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 
 // kvi_app.cpp
 extern KviAsciiDict<KviWindow> * g_pGlobalWindowDict;
@@ -416,8 +416,8 @@ namespace KviKvsCoreSimpleCommands
 		switch(o.unicode())
 		{
 			case 't':
-				QToolTip::remove(pButton);
-				QToolTip::add(pButton,tbPar);
+				KviTalToolTip::remove(pButton);
+				KviTalToolTip::add(pButton,tbPar);
 				pButton->setButtonText(tbPar);
 			break;
 			case 'i':
diff --git a/src/kvirc/kvs/kvi_kvs_object.h b/src/kvirc/kvs/kvi_kvs_object.h
index 2ecf3a474..cd2e63ff6 100644
--- a/src/kvirc/kvs/kvi_kvs_object.h
+++ b/src/kvirc/kvs/kvi_kvs_object.h
@@ -33,7 +33,6 @@
 #include "kvi_kvs_types.h"
 
 #include <qobject.h>
-#include <qintdict.h>
 
 
 class KviKvsObjectFunctionCall;
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 32c244046..f654115e8 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -525,7 +525,7 @@ KviKvsPopupMenuTopLevelData::~KviKvsPopupMenuTopLevelData()
 
 
 KviKvsPopupMenu::KviKvsPopupMenu(const QString &szName)
-:QPopupMenu(0,szName)
+:KviTalPopupMenu(0,szName)
 {
 	m_szName = szName;
 	m_pItemList = new KviPtrList<KviKvsPopupMenuItem>;
@@ -721,7 +721,7 @@ void KviKvsPopupMenu::doPopup(const QPoint & pnt,KviWindow * wnd,KviKvsVariantLi
 	clearMenuContents();
 	m_pTempTopLevelData = new KviKvsPopupMenuTopLevelData(pParams,wnd);
 	m_pTempTopLevelData->setTestMode(bTestMode);
-	QPopupMenu::popup(pnt);
+	KviTalPopupMenu::popup(pnt);
 }
 
 void KviKvsPopupMenu::clearMenuContents()
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.h b/src/kvirc/kvs/kvi_kvs_popupmenu.h
index 351d3e19a..a2b13cf5f 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.h
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.h
@@ -32,7 +32,7 @@
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_runtimecontext.h"
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qlabel.h>
 #include <qpixmap.h>
 
@@ -235,7 +235,7 @@ public:
 
 
 
-class KVIRC_API KviKvsPopupMenu : public QPopupMenu
+class KVIRC_API KviKvsPopupMenu : public KviTalPopupMenu
 {
 	friend class KviKvsPopupMenuItemMenu;
 	friend class KviKvsPopupManager;
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.cpp b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
index 9c491cb0b..bd22258ae 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.cpp
+++ b/src/kvirc/kvs/kvi_kvs_switchlist.cpp
@@ -28,24 +28,19 @@
 
 KviKvsSwitchList::KviKvsSwitchList()
 {
-#ifdef COMPILE_NEW_KVS
 	m_pShortSwitchDict = 0;
 	m_pLongSwitchDict = 0;
-#endif
 }
 
 	
 KviKvsSwitchList::~KviKvsSwitchList()
 {
-#ifdef COMPILE_NEW_KVS
 	if(m_pShortSwitchDict)delete m_pShortSwitchDict;
 	if(m_pLongSwitchDict)delete m_pLongSwitchDict;
-#endif
 }
 
 void KviKvsSwitchList::clear()
 {
-#ifdef COMPILE_NEW_KVS
 	if(m_pShortSwitchDict)
 	{
 		delete m_pShortSwitchDict;
@@ -56,30 +51,25 @@ void KviKvsSwitchList::clear()
 		delete m_pLongSwitchDict;
 		m_pLongSwitchDict = 0;
 	}
-#endif
 }
 
 void KviKvsSwitchList::addShort(unsigned short uShortKey,KviKvsVariant * pVariant)
 {
-#ifdef COMPILE_NEW_KVS
 	if(!m_pShortSwitchDict)
 	{
-		m_pShortSwitchDict = new QIntDict<KviKvsVariant>(11);
+		m_pShortSwitchDict = new KviIntDict<KviKvsVariant>(11);
 		m_pShortSwitchDict->setAutoDelete(true);
 	}
 	m_pShortSwitchDict->replace(uShortKey,pVariant);
-#endif
 }
 
 void KviKvsSwitchList::addLong(const QString &szLongKey,KviKvsVariant * pVariant)
 {
-#ifdef COMPILE_NEW_KVS
 	if(!m_pLongSwitchDict)
 	{
 		m_pLongSwitchDict = new KviDict<KviKvsVariant>(11);
 		m_pLongSwitchDict->setAutoDelete(true);
 	}
 	m_pLongSwitchDict->replace(szLongKey,pVariant);
-#endif
 }
 
diff --git a/src/kvirc/kvs/kvi_kvs_switchlist.h b/src/kvirc/kvs/kvi_kvs_switchlist.h
index 868e47718..ff6529039 100644
--- a/src/kvirc/kvs/kvi_kvs_switchlist.h
+++ b/src/kvirc/kvs/kvi_kvs_switchlist.h
@@ -28,7 +28,7 @@
 #include "kvi_qstring.h"
 #include "kvi_kvs_variant.h"
 
-#include <qintdict.h>
+#include "kvi_intdict.h"
 #include "kvi_dict.h"
 
 class KVIRC_API KviKvsSwitchList
@@ -37,7 +37,7 @@ public:
 	KviKvsSwitchList();
 	~KviKvsSwitchList();
 protected:
-	QIntDict<KviKvsVariant> * m_pShortSwitchDict;
+	KviIntDict<KviKvsVariant> * m_pShortSwitchDict;
 	KviDict<KviKvsVariant>    * m_pLongSwitchDict;
 public:
 	void clear();
diff --git a/src/kvirc/kvs/kvi_kvs_variant.h b/src/kvirc/kvs/kvi_kvs_variant.h
index 018c8f211..f8f3ddeb0 100644
--- a/src/kvirc/kvs/kvi_kvs_variant.h
+++ b/src/kvirc/kvs/kvi_kvs_variant.h
@@ -163,7 +163,7 @@ public:
 
 	kvs_int_t integer() const { return m_pData ? m_pData->m_u.iInteger : 0; };
 	kvs_real_t real() const { return m_pData ? *(m_pData->m_u.pReal) : 0.0; };
-	const QString & string() const { return m_pData ? *(m_pData->m_u.pString) : QString::null; };
+	const QString & string() const { return m_pData ? *(m_pData->m_u.pString) : KviQString::empty; };
 	KviKvsArray * array() const { return m_pData ? m_pData->m_u.pArray : 0; };
 	KviKvsHash * hash() const { return m_pData ? m_pData->m_u.pHash : 0; };
 	bool boolean() const { return m_pData ? m_pData->m_u.bBoolean : false; };
diff --git a/src/kvirc/sparser/kvi_sp_ctcp.cpp b/src/kvirc/sparser/kvi_sp_ctcp.cpp
index 61583895f..021d50b56 100644
--- a/src/kvirc/sparser/kvi_sp_ctcp.cpp
+++ b/src/kvirc/sparser/kvi_sp_ctcp.cpp
@@ -465,7 +465,7 @@ void KviServerParser::encodeCtcpParameter(const char * parametr,QString &resultB
 	// This one encodes a single ctcp parameter with the simplest
 	// subset of rules and places it in the supplied buffer
 	//
-	QCString buffer;
+	KviQCString buffer;
 	register const char* param=parametr;
 	if(!param)
 	{
@@ -581,7 +581,7 @@ const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviStr &buff
 }
 
 
-const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,QCString &buffer)
+const char * KviServerParser::decodeCtcpEscape(const char * msg_ptr,KviQCString &buffer)
 {
 	//
 	// This one decodes an octal sequence
@@ -730,7 +730,7 @@ const char * KviServerParser::extractCtcpParameter(const char * p_msg_ptr,QStrin
 	// based CTCP message.
 	//
     
-	QCString buffer;
+	KviQCString buffer;
 	register const char* msg_ptr=p_msg_ptr;
 	int bInString = 0;
 	if(!msg_ptr) return 0;
@@ -934,7 +934,7 @@ bool KviServerParser::checkCtcpFlood(KviCtcpMessage *msg)
 
 void KviServerParser::replyCtcp(KviCtcpMessage *msg,const char * data)
 {
-	QCString szNick = msg->msg->connection()->encodeText(msg->pSource->nick());
+	KviQCString szNick = msg->msg->connection()->encodeText(msg->pSource->nick());
 	msg->msg->connection()->sendFmtData("NOTICE %s :%c%s %s%c",
 		szNick.data(),0x01,msg->msg->connection()->encodeText(msg->szTag).data(),msg->msg->connection()->encodeText(data).data(),0x01);
 }
diff --git a/src/kvirc/sparser/kvi_sparser.h b/src/kvirc/sparser/kvi_sparser.h
index de4eecf02..d4281084e 100644
--- a/src/kvirc/sparser/kvi_sparser.h
+++ b/src/kvirc/sparser/kvi_sparser.h
@@ -34,6 +34,7 @@
 #include "kvi_list.h"
 
 #include "kvi_qstring.h"
+#include "kvi_qcstring.h"
 #include "kvi_console.h"
 
 #include "kvi_ircmessage.h"
@@ -253,7 +254,7 @@ public:
 	static void encodeCtcpParameter(const char * param,KviStr &buffer,bool bSpaceBreaks = true);
 	static void encodeCtcpParameter(const char * param,QString &buffer,bool bSpaceBreaks = true);
 	static const char * decodeCtcpEscape(const char * msg_ptr,KviStr &buffer);
-	static const char * decodeCtcpEscape(const char * msg_ptr,QCString &buffer);
+	static const char * decodeCtcpEscape(const char * msg_ptr,KviQCString &buffer);
 	static const char * extractCtcpParameter(const char * msg_ptr,KviStr &buffer,bool bSpaceBreaks = true);
 	static const char * extractCtcpParameter(const char * msg_ptr,QString &buffer,bool bSpaceBreaks = true);
 };
diff --git a/src/kvirc/ui/kvi_channel.cpp b/src/kvirc/ui/kvi_channel.cpp
index cc5bf7b50..14767dad4 100644
--- a/src/kvirc/ui/kvi_channel.cpp
+++ b/src/kvirc/ui/kvi_channel.cpp
@@ -70,15 +70,14 @@
 #include <time.h>
 
 #include <qsplitter.h>
-#include <qhbox.h>
 #include <qtoolbutton.h>
 #include <qlabel.h>
-#include <qvaluelist.h>
+
 #include <qpalette.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include "kvi_dict.h"
 #include <qmessagebox.h>
-#include <qwidgetstack.h> 
+#include "kvi_tal_widgetstack.h" 
 
 #ifndef AVERAGE_CHANNEL_USERS
 	#define AVERAGE_CHANNEL_USERS 101
@@ -106,20 +105,20 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
 	m_pActionHistory->setAutoDelete(true);
 	m_uActionHistoryHotActionCount = 0;
 
-	m_pTmpHighLighted      = new QStrList();
+	m_pTmpHighLighted      = new KviAsciiDict<QString>();
 	m_pTmpHighLighted->setAutoDelete(true);
 
 	// Register ourselves
 	connection()->registerChannel(this);
 	// And create the widgets layout
 	// Button box
-	m_pButtonBox = new QHBox(this,"button_box");
+	m_pButtonBox = new KviTalHBox(this);
 	
 	m_pTopSplitter = new QSplitter(QSplitter::Horizontal,m_pButtonBox,"top_splitter");
 
 	m_pButtonBox->setStretchFactor(m_pTopSplitter,1);
 	
-	m_pButtonContainer = new QHBox(m_pButtonBox);
+	m_pButtonContainer = new KviTalHBox(m_pButtonBox);
 	
 	// Topic widget on the left
 	m_pTopicWidget = new KviTopicWidget(m_pTopSplitter,"topic_widget");
@@ -128,7 +127,7 @@ KviChannel::KviChannel(KviFrame * lpFrm,KviConsole * lpConsole,const char * name
 		this,SLOT(topicSelected(const QString &)));
 	// mode label follows the topic widget
 	m_pModeWidget = new KviModeWidget(m_pTopSplitter,this,"mode_");
-	QToolTip::add(m_pModeWidget,__tr2qs("Channel mode"));
+	KviTalToolTip::add(m_pModeWidget,__tr2qs("Channel mode"));
 
 	createTextEncodingButton(m_pButtonContainer);
 
@@ -302,7 +301,7 @@ void KviChannel::saveProperties(KviConfig *cfg)
 void KviChannel::loadProperties(KviConfig *cfg)
 {
 	int w = width();
-	QValueList<int> def;
+	KviValueList<int> def;
 	def.append((w * 75) / 100);
 	def.append((w * 15) / 100);
 	def.append((w * 10) / 100);
@@ -574,18 +573,14 @@ void KviChannel::setChannelLimit(const char * limit)
 
 void KviChannel::addHighlightedUser(const char * nick)
 {
-    if(!m_pUserListView->findEntry(nick))return;
-    else
-    {
-        if(m_pTmpHighLighted->find(nick) != -1)return;
-        else m_pTmpHighLighted->append(nick);
-    }
+	if(!m_pUserListView->findEntry(nick))return;
+	else
+   		m_pTmpHighLighted->replace(nick,new QString());
 }
 
 void KviChannel::removeHighlightedUser(const char * nick)
 {
-    if(m_pTmpHighLighted->find(nick) == -1)return;
-    else m_pTmpHighLighted->remove(nick);
+	m_pTmpHighLighted->remove(nick);
 }
 
 void KviChannel::getChannelModeString(QString &buffer)
@@ -1486,8 +1481,8 @@ void KviChannel::updateModeLabel()
 	}
 
 	m_pModeWidget->refreshModes();
-	QToolTip::remove(m_pModeWidget);
-	QToolTip::add(m_pModeWidget,tip);
+	KviTalToolTip::remove(m_pModeWidget);
+	KviTalToolTip::add(m_pModeWidget,tip);
 }
 
 /*
diff --git a/src/kvirc/ui/kvi_channel.h b/src/kvirc/ui/kvi_channel.h
index 3d116bfbb..cec29ee84 100644
--- a/src/kvirc/ui/kvi_channel.h
+++ b/src/kvirc/ui/kvi_channel.h
@@ -26,6 +26,7 @@
 
 #include "kvi_settings.h"
 
+
 #include "kvi_console.h"
 #include "kvi_window.h"
 #include "kvi_string.h"
@@ -34,8 +35,8 @@
 #include "kvi_userlistview.h"
 #include "kvi_time.h"
 #include "kvi_modew.h"
+#include "kvi_valuelist.h"
 
-#include <qstrlist.h>
 #include <qdatetime.h>
 #include "kvi_asciidict.h"
 #include <qstringlist.h>
@@ -46,6 +47,8 @@ class QToolButton;
 class KviTopicWidget;
 class KviIrcMask;
 class KviThemedLabel;
+class KviTalHBox;
+
 #ifdef COMPILE_ON_WINDOWS
 	// windows compiler wants this instead of the forward decl
 	#include "kvi_maskeditor.h"
@@ -136,19 +139,19 @@ protected:
 	KviPixmap                             m_privateBackground;
 	QDateTime                             m_joinTime;
 	QString                               m_szNameWithUserFlag;
-	QStrList                            * m_pTmpHighLighted;
+	KviAsciiDict<QString>               * m_pTmpHighLighted;
 	unsigned int                          m_uActionHistoryHotActionCount;
 	KviPtrList<KviChannelAction>        * m_pActionHistory;
 	kvi_time_t                            m_tLastReceivedWhoReply;
-	QValueList<int> 		      m_VertSplitterSizesList;
-	QHBox				    * m_pButtonContainer;
+	KviValueList<int>                     m_VertSplitterSizesList;
+	KviTalHBox                          * m_pButtonContainer;
 protected:
 	bool eventFilter(QObject *, QEvent *);
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
 	virtual void resizeEvent(QResizeEvent *e);
 	virtual void closeEvent(QCloseEvent *e);
-//	virtual void fillContextPopup(QPopupMenu * p);
+//	virtual void fillContextPopup(KviTalPopupMenu * p);
 	virtual void getConfigGroupName(QString &buf);
 	virtual void saveProperties(KviConfig * cfg);
 	virtual void loadProperties(KviConfig * cfg);
@@ -282,7 +285,7 @@ public:
 
     void addHighlightedUser(const char * nick);
     void removeHighlightedUser(const char * nick);
-    int isHighlightedUser(const char * nick) { return (m_pTmpHighLighted->find(nick) == -1 ? 0 : 1); };
+    bool isHighlightedUser(const char * nick) { return m_pTmpHighLighted->find(nick); };
     KviIrcView * messageView() const { return m_pMessageView; };
 	virtual void lostUserFocus();
 	virtual void getTaskBarTipText(QString &buffer);
diff --git a/src/kvirc/ui/kvi_console.cpp b/src/kvirc/ui/kvi_console.cpp
index 368e4b558..ed8563670 100644
--- a/src/kvirc/ui/kvi_console.cpp
+++ b/src/kvirc/ui/kvi_console.cpp
@@ -85,8 +85,8 @@
 #include <qtoolbar.h>
 #include <qtoolbutton.h>
 #include <qtimer.h>
-#include <qhbox.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_hbox.h"
+#include "kvi_tal_popupmenu.h"
 #include <qmessagebox.h>
 #include <qstringlist.h>
 
@@ -117,7 +117,7 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags)
 		m_iFlags |= KVI_CONSOLE_FLAG_FIRSTINAPP;
 	}
 
-	m_pButtonBox = new QHBox(this,"button_box");
+	m_pButtonBox = new KviTalHBox(this);
 	m_pButtonBox->setSpacing(5);
 	new QLabel(__tr2qs("Address:"),m_pButtonBox,"url_label");
 	m_pAddressEdit = new QComboBox(m_pButtonBox,"url_editor");
@@ -130,7 +130,7 @@ KviConsole::KviConsole(KviFrame * lpFrm,int iFlags)
 	m_pAddressEdit->setInsertionPolicy(QComboBox::NoInsertion);
 	m_pAddressEdit->setMinimumHeight(24); //icon is 16px, + margins
 	m_pButtonBox->setStretchFactor(m_pAddressEdit,1);
-	QToolTip::add(m_pAddressEdit,__tr2qs("Current IRC URI"));
+	KviTalToolTip::add(m_pAddressEdit,__tr2qs("Current IRC URI"));
 	connect(m_pAddressEdit,SIGNAL(activated(const QString & )),this,SLOT(ircUriChanged(const QString & )));
 	connect(g_pApp,SIGNAL(recentUrlsChanged()),this,SLOT(recentUrlsChanged()));
 
@@ -245,7 +245,7 @@ void KviConsole::triggerCreationEvents()
 }
 
 
-void KviConsole::fillContextPopup(QPopupMenu * p)
+void KviConsole::fillContextPopup(KviTalPopupMenu * p)
 {
 	int id;
 	int cc = 0;
diff --git a/src/kvirc/ui/kvi_console.h b/src/kvirc/ui/kvi_console.h
index 435981ed9..804d0c24e 100644
--- a/src/kvirc/ui/kvi_console.h
+++ b/src/kvirc/ui/kvi_console.h
@@ -100,7 +100,7 @@ protected:
 	virtual void getBaseLogFileName(KviStr &buffer);
 	virtual void getBaseLogFileName(QString &buffer);
 	virtual void getTaskBarTipText(QString &buffer);
-	virtual void fillContextPopup(QPopupMenu * p);
+	virtual void fillContextPopup(KviTalPopupMenu * p);
 	virtual QSize sizeHint() const;
 	virtual void applyOptions();
 	virtual void triggerCreationEvents();
diff --git a/src/kvirc/ui/kvi_cryptcontroller.cpp b/src/kvirc/ui/kvi_cryptcontroller.cpp
index fc3323586..bf86a5091 100644
--- a/src/kvirc/ui/kvi_cryptcontroller.cpp
+++ b/src/kvirc/ui/kvi_cryptcontroller.cpp
@@ -66,7 +66,7 @@
 
 
 	KviCryptController::KviCryptController(QWidget * par,KviWindowToolPageButton* button,const char * name,KviWindow * wnd,KviCryptSessionInfo * cur)
-	: KviWindowToolWidget(par,button,name)
+	: KviWindowToolWidget(par,button)
 	{
 // FIXME: #warning "Load the available modules here"
 
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.cpp b/src/kvirc/ui/kvi_ctcppagedialog.cpp
index 1ffb44933..fb8a21c2c 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.cpp
+++ b/src/kvirc/ui/kvi_ctcppagedialog.cpp
@@ -42,7 +42,7 @@ KviCtcpPageDialog::KviCtcpPageDialog()
 		  WStyle_StaysOnTop | WStyle_Tool | WType_Dialog | WType_TopLevel)
 {
 	QGridLayout * g = new QGridLayout(this,4,1,6,0);
-	m_pWidgetStack = new QWidgetStack(this);
+	m_pWidgetStack = new KviTalWidgetStack(this);
 	g->addWidget(m_pWidgetStack,0,0);
 	m_pTabBar = new QTabBar(this);
 	m_pTabBar->setShape(QTabBar::TriangularBelow);
diff --git a/src/kvirc/ui/kvi_ctcppagedialog.h b/src/kvirc/ui/kvi_ctcppagedialog.h
index 40cff8dbe..35ebdd5db 100644
--- a/src/kvirc/ui/kvi_ctcppagedialog.h
+++ b/src/kvirc/ui/kvi_ctcppagedialog.h
@@ -26,7 +26,7 @@
 
 #include "kvi_string.h"
 
-#include <qwidgetstack.h>
+#include "kvi_tal_widgetstack.h"
 #include <qtabbar.h>
 #include <qwidget.h>
 #include <qpushbutton.h>
@@ -38,7 +38,7 @@ public:
 	KviCtcpPageDialog();
 	~KviCtcpPageDialog();
 protected:
-	QWidgetStack * m_pWidgetStack;
+	KviTalWidgetStack * m_pWidgetStack;
 	QTabBar      * m_pTabBar;
 	QPushButton  * m_pCloseButton;
 public:
diff --git a/src/kvirc/ui/kvi_customtoolbar.cpp b/src/kvirc/ui/kvi_customtoolbar.cpp
index 2a6ea513a..9262b8ee6 100644
--- a/src/kvirc/ui/kvi_customtoolbar.cpp
+++ b/src/kvirc/ui/kvi_customtoolbar.cpp
@@ -32,7 +32,7 @@
 #include "kvi_customtoolbardescriptor.h"
 
 #include <qcursor.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qlayout.h>
 #include <qdragobject.h>
 #include <qpixmap.h>
@@ -518,7 +518,7 @@ bool KviCustomToolBar::eventFilter(QObject *o,QEvent *e)
 			if(o->isWidgetType())
 			{
 				if(!(
-					o->inherits("QPopupMenu") ||
+					o->inherits("KviTalPopupMenu") ||
 					o->inherits("QToolBarHandle") ||
 					o->inherits("QDockWindowHandle") ||
 					o->inherits("QDockWindowResizeHandle") ||
diff --git a/src/kvirc/ui/kvi_dynamictooltip.cpp b/src/kvirc/ui/kvi_dynamictooltip.cpp
index 3c40522a6..42a386a9a 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.cpp
+++ b/src/kvirc/ui/kvi_dynamictooltip.cpp
@@ -23,7 +23,7 @@
 #include "kvi_dynamictooltip.h"
 
 KviDynamicToolTipHelper::KviDynamicToolTipHelper(QWidget * parent,KviDynamicToolTip * parToolTip)
-: QToolTip(parent)
+: KviTalToolTip(parent)
 {
 	m_pParentToolTip = parToolTip;
 }
diff --git a/src/kvirc/ui/kvi_dynamictooltip.h b/src/kvirc/ui/kvi_dynamictooltip.h
index 5dc8c6ed9..daa91348e 100644
--- a/src/kvirc/ui/kvi_dynamictooltip.h
+++ b/src/kvirc/ui/kvi_dynamictooltip.h
@@ -24,12 +24,12 @@
 //
 
 #include "kvi_settings.h"
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qobject.h>
 
 class KviDynamicToolTip;
 
-class KVIRC_API KviDynamicToolTipHelper : public QToolTip
+class KVIRC_API KviDynamicToolTipHelper : public KviTalToolTip
 {
 	friend class KviDynamicToolTip;
 protected:
diff --git a/src/kvirc/ui/kvi_filedialog.cpp b/src/kvirc/ui/kvi_filedialog.cpp
index 4f6f77e37..631fcf82e 100644
--- a/src/kvirc/ui/kvi_filedialog.cpp
+++ b/src/kvirc/ui/kvi_filedialog.cpp
@@ -30,7 +30,7 @@
 #include "kvi_qstring.h"
 
 #include <qdir.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qmessagebox.h>
 
 extern KviMediaManager * g_pMediaManager;
diff --git a/src/kvirc/ui/kvi_frame.cpp b/src/kvirc/ui/kvi_frame.cpp
index 5fb823c9b..972188bc9 100644
--- a/src/kvirc/ui/kvi_frame.cpp
+++ b/src/kvirc/ui/kvi_frame.cpp
@@ -55,6 +55,7 @@
 #include "kvi_actionmanager.h"
 #include "kvi_defaults.h"
 #include "kvi_ircview.h"
+#include "kvi_tal_popupmenu.h"
 
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_eventtriggers.h"
@@ -1020,7 +1021,7 @@ void KviFrame::toggleStatusBar()
 	}
 }
 
-void KviFrame::fillToolBarsPopup(QPopupMenu * p)
+void KviFrame::fillToolBarsPopup(KviTalPopupMenu * p)
 {
 	p->clear();
 
@@ -1091,8 +1092,8 @@ void KviFrame::toolbarsPopupSelected(int id)
 {
 	const QObject * o = sender();
 	if(!o)return;
-	if(!o->inherits("QPopupMenu"))return;
-	const QPopupMenu * p = (const QPopupMenu *)o;
+	if(!o->inherits("KviTalPopupMenu"))return;
+	const KviTalPopupMenu * p = (const KviTalPopupMenu *)o;
 	int idext = p->itemParameter(id);
 	
 	KviCustomToolBarDescriptor * dd = KviCustomToolBarManager::instance()->findDescriptorByInternalId(idext);
diff --git a/src/kvirc/ui/kvi_frame.h b/src/kvirc/ui/kvi_frame.h
index 07e3e1511..d05dd90d0 100644
--- a/src/kvirc/ui/kvi_frame.h
+++ b/src/kvirc/ui/kvi_frame.h
@@ -50,6 +50,7 @@ class KviMexToolBar;
 class KviIrcContext;
 class KviIrcConnection;
 class KviStatusBar;
+class KviTalPopupMenu;
 
 #ifdef COMPILE_ON_WINDOWS
 	// MSCV has problems with KviPtrList<KviWindow> otherwise
@@ -60,12 +61,12 @@ class KviStatusBar;
 // this should be probably moved out of here
 class KVIRC_API KviDockExtension
 {
-public:
-	KviDockExtension():m_uStoredWindowState(Qt::WState_Maximized){};
-	virtual ~KviDockExtension(){};
 protected:
 	unsigned int m_uStoredWindowState;
 public:
+	KviDockExtension() : m_uStoredWindowState(0){};
+	virtual ~KviDockExtension(){};
+public:
 	void setPrevWindowState(unsigned int state) { m_uStoredWindowState = state; };
 	unsigned int getPrevWindowState() { return m_uStoredWindowState; };
 	
@@ -164,7 +165,7 @@ public:
 	KviMexToolBar * moduleExtensionToolBar(int extensionId);
 	// Helper to fill the toolbars popup
 	// it is used by KviToolBar and KviMenuBar
-	void fillToolBarsPopup(QPopupMenu * p);
+	void fillToolBarsPopup(KviTalPopupMenu * p);
 	int registerAccelerator(const QString &szKeySequence,QObject * recv,const char * slot);
 	void unregisterAccelerator(int id);
 
diff --git a/src/kvirc/ui/kvi_input.cpp b/src/kvirc/ui/kvi_input.cpp
index 2ae3f9e38..0cf46032c 100644
--- a/src/kvirc/ui/kvi_input.cpp
+++ b/src/kvirc/ui/kvi_input.cpp
@@ -58,7 +58,7 @@
 #include <ctype.h>
 #include <stdlib.h>
 #include <qfiledialog.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qpainter.h>
 #include <qclipboard.h>
 #include <qdragobject.h>
@@ -67,7 +67,7 @@
 #include <qapplication.h>
 #include <qclipboard.h>
 #include <qmessagebox.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qlayout.h> 
 #include <qstyle.h>
 
@@ -94,7 +94,7 @@
 extern KviColorWindow    * g_pColorWindow;
 extern KviTextIconWindow * g_pTextIconWindow;
 extern KviHistoryWindow  * g_pHistoryWindow;
-extern QPopupMenu        * g_pInputPopup;
+extern KviTalPopupMenu        * g_pInputPopup;
 
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -208,7 +208,7 @@ KviInputEditor::KviInputEditor(QWidget * par,KviWindow *wnd,KviUserListView * vi
 	setFrameShadow( Plain );
 	recalcFontMetrics();
 	
-	m_pIconMenu = new QPopupMenu();
+	m_pIconMenu = new KviTalPopupMenu();
 	connect(m_pIconMenu,SIGNAL(activated(int)),this,SLOT(iconPopupActivated(int)));
 
 	setCursor( IbeamCursor );
@@ -2207,7 +2207,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	
 	connect(m_pHideToolsButton,SIGNAL(clicked()),this,SLOT(toggleToolButtons()));
 	
-	m_pButtonContainer=new QHBox(this,"input_buttons_box");
+	m_pButtonContainer=new KviTalHBox(this);
 	
 	m_pHistoryButton = new KviStyledToolButton(m_pButtonContainer,"historybutton");
 	m_pHistoryButton->setUsesBigPixmap(false);
@@ -2217,14 +2217,14 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	{
 		is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),QIconSet::Small);
 		m_pHistoryButton->setIconSet(is1);
-		QToolTip::add(m_pHistoryButton,__tr2qs("Show History<br>&lt;Ctrl+PageUp&gt;"));
+		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br>&lt;Ctrl+PageUp&gt;"));
 		connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked()));
 	}
 	else
 	{
 		is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)),QIconSet::Small);
 		m_pHistoryButton->setIconSet(is1);
-		QToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
+		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
 	}
 
 	m_pIconButton = new KviStyledToolButton(m_pButtonContainer,"iconbutton");
@@ -2232,7 +2232,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	QIconSet is3;
 	is3.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_BIGGRIN)),QIconSet::Small);
 	m_pIconButton->setIconSet(is3);
-	QToolTip::add(m_pIconButton,__tr2qs("Show Icons Popup<br>&lt;Ctrl+I&gt;<br>See also /help texticons"));
+	KviTalToolTip::add(m_pIconButton,__tr2qs("Show Icons Popup<br>&lt;Ctrl+I&gt;<br>See also /help texticons"));
 
 	connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked()));
 
@@ -2244,7 +2244,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYSMILE)),QIconSet::Small,QIconSet::Normal,QIconSet::On);
 	is0.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SAYKVS)),QIconSet::Small,QIconSet::Normal,QIconSet::Off);
 	m_pCommandlineModeButton->setIconSet(is0);
-	QToolTip::add(m_pCommandlineModeButton,__tr2qs("User friendly commandline mode<br>See also /help commandline"));
+	KviTalToolTip::add(m_pCommandlineModeButton,__tr2qs("User friendly commandline mode<br>See also /help commandline"));
 	if(KVI_OPTION_BOOL(KviOption_boolCommandlineInUserFriendlyModeByDefault))
 		m_pCommandlineModeButton->setOn(true);
 
@@ -2256,7 +2256,7 @@ KviInput::KviInput(KviWindow *par,KviUserListView * view)
 	is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIconSet::Small,QIconSet::Normal,QIconSet::On);
 	is2.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TERMINAL)),QIconSet::Small,QIconSet::Normal,QIconSet::Off);
 	m_pMultiEditorButton->setIconSet(is2);
-	QToolTip::add(m_pMultiEditorButton,__tr2qs("Multi-line Editor<br>&lt;Alt+Backspace&gt;"));
+	KviTalToolTip::add(m_pMultiEditorButton,__tr2qs("Multi-line Editor<br>&lt;Alt+Backspace&gt;"));
 
 	connect(m_pMultiEditorButton,SIGNAL(toggled(bool)),this,SLOT(multilineEditorButtonToggled(bool)));
 	
@@ -2481,7 +2481,7 @@ void KviInput::applyOptions()
 		QIconSet is1;
 		is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUITSPLIT)),QIconSet::Small);
 		m_pHistoryButton->setIconSet(is1);
-		QToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
+		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Input History Disabled"));
 		m_pHistoryButton->disconnect(SIGNAL(clicked()));
 	}
 
@@ -2490,7 +2490,7 @@ void KviInput::applyOptions()
 		QIconSet is1;
 		is1.setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)),QIconSet::Small);
 		m_pHistoryButton->setIconSet(is1);
-		QToolTip::add(m_pHistoryButton,__tr2qs("Show History<br>&lt;Ctrl+PageUp&gt;"));
+		KviTalToolTip::add(m_pHistoryButton,__tr2qs("Show History<br>&lt;Ctrl+PageUp&gt;"));
 		connect(m_pHistoryButton,SIGNAL(clicked()),this,SLOT(historyButtonClicked()));
 	}
 
diff --git a/src/kvirc/ui/kvi_input.h b/src/kvirc/ui/kvi_input.h
index b9afcbe92..9e761c6a7 100644
--- a/src/kvirc/ui/kvi_input.h
+++ b/src/kvirc/ui/kvi_input.h
@@ -29,7 +29,7 @@
 
 
 #include <qwidget.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qpixmap.h>
 #include "kvi_list.h"
 
@@ -41,7 +41,7 @@
 class KviUserListView;
 class KviWindow;
 class KviInput;
-class QHBox;
+class KviTalHBox;
 
 // Default maximum buffer size.
 #define KVI_INPUT_MAX_BUFFER_SIZE 400
@@ -135,7 +135,7 @@ protected:
 	KviStr                   m_szAltKeyCode;
 	KviWindow              * m_pKviWindow;
 	QWidget                * m_pInputParent;
-	QPopupMenu             * m_pIconMenu;
+	KviTalPopupMenu             * m_pIconMenu;
 	bool			 m_bReadOnly;
 public:
 	int  heightHint() const;
@@ -218,7 +218,7 @@ public:
 	KviWindow       * m_pWindow;
 	KviInputEditor  * m_pInputEditor;
 	KviScriptEditor * m_pMultiLineEditor;
-	QHBox		* m_pButtonContainer;
+	KviTalHBox		* m_pButtonContainer;
 	QToolButton     * m_pMultiEditorButton;
 	QToolButton     * m_pHistoryButton;
 	QToolButton     * m_pIconButton;
diff --git a/src/kvirc/ui/kvi_irctoolbar.cpp b/src/kvirc/ui/kvi_irctoolbar.cpp
index f971d1d9c..a309ed57a 100644
--- a/src/kvirc/ui/kvi_irctoolbar.cpp
+++ b/src/kvirc/ui/kvi_irctoolbar.cpp
@@ -43,7 +43,7 @@
 
 #include <qstyle.h>
 #include <qpainter.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qlayout.h>
 
 
diff --git a/src/kvirc/ui/kvi_irctoolbar.h b/src/kvirc/ui/kvi_irctoolbar.h
index a74430db3..67c97d59b 100644
--- a/src/kvirc/ui/kvi_irctoolbar.h
+++ b/src/kvirc/ui/kvi_irctoolbar.h
@@ -32,10 +32,10 @@
 #include "kvi_list.h"
 #include <qwidget.h>
 #include <qtoolbutton.h>
-#include <qwidgetstack.h>
+#include "kvi_tal_widgetstack.h"
 #include <qlabel.h>
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
 
 //
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index 7343353a7..d2dd58362 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -113,7 +113,7 @@
 #include <qtoolbutton.h>
 #include <qfontmetrics.h> // needed
 #include <qapplication.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qmessagebox.h>
 #include <qtextcodec.h>
 #include <qdatetime.h>
@@ -358,7 +358,7 @@ KviIrcView::KviIrcView(QWidget *parent,KviFrame *pFrm,KviWindow *pWnd)
 #else
 	m_pToolsButton->setOnIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_POPUPMENU)));
 #endif
-	QToolTip::add(m_pToolsButton,__tr2qs("Search tools"));
+	KviTalToolTip::add(m_pToolsButton,__tr2qs("Search tools"));
 	m_pToolsButton->setFocusProxy(this);
 
 	connect(m_pToolsButton,SIGNAL(clicked()),this,SLOT(showToolsPopup()));
@@ -3775,7 +3775,7 @@ QSize KviIrcView::sizeHint() const
 void KviIrcView::showToolsPopup()
 {
 	if(!m_pToolsPopup)
-		m_pToolsPopup = new QPopupMenu(this);
+		m_pToolsPopup = new KviTalPopupMenu(this);
 
 	m_pToolsPopup->clear();
 
diff --git a/src/kvirc/ui/kvi_ircview.h b/src/kvirc/ui/kvi_ircview.h
index b8fcf7583..6a4566a1a 100644
--- a/src/kvirc/ui/kvi_ircview.h
+++ b/src/kvirc/ui/kvi_ircview.h
@@ -36,7 +36,7 @@ class QLineEdit;
 class QFile;
 class QToolButton;
 class QFontMetrics;
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviWindow;
 class KviFrame;
@@ -84,7 +84,7 @@ private:
 	QPixmap                   * m_pPrivateBackgroundPixmap;
 	QScrollBar                * m_pScrollBar;
 	QToolButton               * m_pToolsButton;
-	QPopupMenu                * m_pToolsPopup;
+	KviTalPopupMenu                * m_pToolsPopup;
 
 	KviIrcViewToolWidget      * m_pToolWidget;
 
diff --git a/src/kvirc/ui/kvi_ircviewtools.cpp b/src/kvirc/ui/kvi_ircviewtools.cpp
index 01dcf9656..8fe2c62db 100644
--- a/src/kvirc/ui/kvi_ircviewtools.cpp
+++ b/src/kvirc/ui/kvi_ircviewtools.cpp
@@ -314,7 +314,7 @@ void KviIrcViewToolWidget::mouseMoveEvent(QMouseEvent *)
 ///////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 KviIrcViewToolTip::KviIrcViewToolTip(KviIrcView * pView)
-: QToolTip(pView,0)
+: KviTalToolTip(pView)
 {
 	m_pView = pView;
 }
diff --git a/src/kvirc/ui/kvi_ircviewtools.h b/src/kvirc/ui/kvi_ircviewtools.h
index a1cbfa67b..57b29b4b0 100644
--- a/src/kvirc/ui/kvi_ircviewtools.h
+++ b/src/kvirc/ui/kvi_ircviewtools.h
@@ -26,7 +26,7 @@
 
 #include "kvi_settings.h"
 
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qframe.h>
 #include <qlistview.h>
 #include <qstring.h>
@@ -37,7 +37,7 @@ class QLineEdit;
 
 class KviIrcView;
 
-class KviIrcViewToolTip : public QToolTip
+class KviIrcViewToolTip : public KviTalToolTip
 {
 public:
 	KviIrcViewToolTip(KviIrcView * pView);
diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index e227660c7..e553458e4 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -121,7 +121,7 @@ void KviMaskInputDialog::accept()
 }
 
 KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPtrList<KviMaskEntry> * maskList,char flag,const char * nam)
-: KviWindowToolWidget(par,button,nam)
+: KviWindowToolWidget(par,button)
 {
 	bool isEnabled=1;
 	
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index 4268b3733..ce553ae22 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -44,7 +44,7 @@
 #include <qpixmap.h>
 #include <qstyle.h>
 #include <qpainter.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qsimplerichtext.h>
 #include <qdrawutil.h>
 
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 355bbb724..ce147d112 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -41,7 +41,7 @@
 #include <qpixmap.h>
 #include <qstyle.h>
 #include <qpainter.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qobjectlist.h>
 
 #ifdef Q_OS_MACX
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index c7c68bccd..6c690ac8f 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -36,7 +36,7 @@
 #include "kvi_mdicaption.h"
 #include "kvi_app.h"
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qmenubar.h>
 #include <qlayout.h>
 #include <qpainter.h>
@@ -71,10 +71,10 @@ KviMdiManager::KviMdiManager(QWidget * parent,KviFrame * pFrm,const char * name)
 	m_pSdiRestoreButton = 0;
 	m_pSdiMinimizeButton = 0;
 
-	m_pWindowPopup = new QPopupMenu(this);
+	m_pWindowPopup = new KviTalPopupMenu(this);
 	connect(m_pWindowPopup,SIGNAL(activated(int)),this,SLOT(menuActivated(int)));
 	connect(m_pWindowPopup,SIGNAL(aboutToShow()),this,SLOT(fillWindowPopup()));
-	m_pTileMethodPopup = new QPopupMenu(this);
+	m_pTileMethodPopup = new KviTalPopupMenu(this);
 	connect(m_pTileMethodPopup,SIGNAL(activated(int)),this,SLOT(tileMethodMenuActivated(int)));
 
 	viewport()->setBackgroundMode(QWidget::NoBackground);
diff --git a/src/kvirc/ui/kvi_mdimanager.h b/src/kvirc/ui/kvi_mdimanager.h
index 1532e9fb0..7133eb621 100644
--- a/src/kvirc/ui/kvi_mdimanager.h
+++ b/src/kvirc/ui/kvi_mdimanager.h
@@ -48,7 +48,7 @@
 //class KviMdiCaptionButton;
 class KviFrame;
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviSdiButtonBox;
 class KviMenuBarToolButton;
@@ -67,7 +67,7 @@ public:
 	void manageChild(KviMdiChild * lpC,bool bCascade = true,QRect * setGeom = 0);
 	void setTopChild(KviMdiChild *lpC,bool bSetFocus);
 	void showAndActivate(KviMdiChild * lpC);
-	QPopupMenu * windowPopup(){ return m_pWindowPopup; };
+	KviTalPopupMenu * windowPopup(){ return m_pWindowPopup; };
 	void focusTopChild();
 	void destroyChild(KviMdiChild *lpC,bool bFocusTopChild = true);
 	int getVisibleChildCount();
@@ -85,8 +85,8 @@ protected:
 	int                        m_iSdiMinimizeItemId;
 	int                        m_iSdiCloseItemId;
 
-	QPopupMenu               * m_pWindowPopup;
-	QPopupMenu               * m_pTileMethodPopup;
+	KviTalPopupMenu               * m_pWindowPopup;
+	KviTalPopupMenu               * m_pTileMethodPopup;
 	KviFrame                 * m_pFrm;
 protected:
 	void updateContentsSize();
diff --git a/src/kvirc/ui/kvi_menubar.cpp b/src/kvirc/ui/kvi_menubar.cpp
index 5e3891679..8383f0af4 100644
--- a/src/kvirc/ui/kvi_menubar.cpp
+++ b/src/kvirc/ui/kvi_menubar.cpp
@@ -40,7 +40,7 @@
 #include "kvi_coreactionnames.h"
 #include "kvi_kvs_script.h"
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
 KviMenuBar::KviMenuBar(KviFrame * par,const char * name)
       : KviTalMenuBar(par,name)
@@ -50,7 +50,7 @@ KviMenuBar::KviMenuBar(KviFrame * par,const char * name)
 	m_iNumDefaultItems = 0;
 	m_pDefaultItemId = 0;
 	
-	QPopupMenu * pop = new QPopupMenu(this,"KVIrc");
+	KviTalPopupMenu * pop = new KviTalPopupMenu(this,"KVIrc");
 	connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupMainPopup()));
 #ifndef Q_OS_MACX
 	addDefaultItem("&KVIrc",pop);
@@ -58,31 +58,31 @@ KviMenuBar::KviMenuBar(KviFrame * par,const char * name)
 	// Qt/Mac creates already a "KVirc" menu item on its own, and we don't like double entries ;-)
 	addDefaultItem("&IRC",pop);
 #endif //Q_OS_MACX
-	m_pRecentServersPopup = new QPopupMenu(this,"recentservers");
+	m_pRecentServersPopup = new KviTalPopupMenu(this,"recentservers");
 	connect(m_pRecentServersPopup,SIGNAL(aboutToShow()),this,SLOT(setupRecentServersPopup()));
 	connect(m_pRecentServersPopup,SIGNAL(activated(int)),this,SLOT(newConnectionToServer(int)));
 
 	m_pScriptItemList = 0;
 
-	pop = new QPopupMenu(this,"scripting");
+	pop = new KviTalPopupMenu(this,"scripting");
 	connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupScriptingPopup()));
 	addDefaultItem(__tr2qs("Scri&pting"),pop);
 
-	pop = new QPopupMenu(this,"tools");
+	pop = new KviTalPopupMenu(this,"tools");
 	connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupToolsPopup()));
 	connect(pop,SIGNAL(activated(int)),this,SLOT(toolsPopupSelected(int)));
 	addDefaultItem(__tr2qs("&Tools"),pop);
 
-	m_pToolbarsPopup = new QPopupMenu(this,"toolbars");
+	m_pToolbarsPopup = new KviTalPopupMenu(this,"toolbars");
 	connect(m_pToolbarsPopup,SIGNAL(aboutToShow()),this,SLOT(setupToolbarsPopup()));
 
-	pop = new QPopupMenu(this,"settings");
+	pop = new KviTalPopupMenu(this,"settings");
 	connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupSettingsPopup()));
 	addDefaultItem(__tr2qs("&Settings"),pop);
 
 	addDefaultItem(__tr2qs("&Window"),par->mdiManager()->windowPopup());
 
-	pop = new QPopupMenu(this,"help");
+	pop = new KviTalPopupMenu(this,"help");
 	connect(pop,SIGNAL(aboutToShow()),this,SLOT(setupHelpPopup()));
 	addDefaultItem(__tr2qs("&Help"),pop);
 }
@@ -93,7 +93,7 @@ KviMenuBar::~KviMenuBar()
    if(m_pDefaultItemId)kvi_free(m_pDefaultItemId);
 }
 
-void KviMenuBar::addDefaultItem(const QString &text,QPopupMenu * pop)
+void KviMenuBar::addDefaultItem(const QString &text,KviTalPopupMenu * pop)
 {
    m_iNumDefaultItems++;
    m_pDefaultItemId = (int *)kvi_realloc((void *)m_pDefaultItemId,sizeof(int) * m_iNumDefaultItems);
@@ -102,7 +102,7 @@ void KviMenuBar::addDefaultItem(const QString &text,QPopupMenu * pop)
 
 void KviMenuBar::setupHelpPopup()
 {
-	QPopupMenu * help = (QPopupMenu *)sender();
+	KviTalPopupMenu * help = (KviTalPopupMenu *)sender();
 	help->clear();
 
 	// FIXME: Convert these to actions!
@@ -161,7 +161,7 @@ void KviMenuBar::setupSettingsPopup()
 {
 	// FIXME: Move everything to actions!
 
-	QPopupMenu * opt = (QPopupMenu *)sender();
+	KviTalPopupMenu * opt = (KviTalPopupMenu *)sender();
 	opt->clear();
 	
 	opt->insertItem(__tr2qs("Toolbars"),m_pToolbarsPopup);
@@ -186,7 +186,7 @@ void KviMenuBar::setupSettingsPopup()
 
 void KviMenuBar::setupScriptingPopup()
 {
-	QPopupMenu * script = (QPopupMenu *)sender();
+	KviTalPopupMenu * script = (KviTalPopupMenu *)sender();
 	script->clear();
 
 	ACTION_POPUP_ITEM(KVI_COREACTION_ACTIONEDITOR,script)
@@ -205,7 +205,7 @@ void KviMenuBar::setupScriptingPopup()
 
 void KviMenuBar::setupMainPopup()
 {
-	QPopupMenu * main = (QPopupMenu *)sender();
+	KviTalPopupMenu * main = (KviTalPopupMenu *)sender();
 	main->clear();
 
 	ACTION_POPUP_ITEM(KVI_COREACTION_NEWIRCCONTEXT,main)
@@ -239,7 +239,7 @@ void KviMenuBar::setupMainPopup()
 
 void KviMenuBar::setupRecentServersPopup()
 {
-	QPopupMenu * m = (QPopupMenu *)sender();
+	KviTalPopupMenu * m = (KviTalPopupMenu *)sender();
 	g_pApp->fillRecentServersPopup(m);
 	m->insertSeparator();
 	m->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)),__tr2qs("&Other..."));
@@ -266,7 +266,7 @@ void KviMenuBar::newConnectionToServer(int id)
 
 void KviMenuBar::setupToolsPopup()
 {
-	QPopupMenu * m = (QPopupMenu *)sender();
+	KviTalPopupMenu * m = (KviTalPopupMenu *)sender();
 	if(!m)return;
 
 	m->clear();
@@ -312,7 +312,7 @@ void KviMenuBar::setupToolsPopup()
 
 void KviMenuBar::toolsPopupSelected(int id)
 {
-   QPopupMenu * m = (QPopupMenu *)sender();
+   KviTalPopupMenu * m = (KviTalPopupMenu *)sender();
    if(!m)return;
    int idext = m->itemParameter(id);
    g_pModuleExtensionManager->allocateExtension("tool",idext,m_pFrm->firstConsole());
diff --git a/src/kvirc/ui/kvi_menubar.h b/src/kvirc/ui/kvi_menubar.h
index 81153e7b1..a81ad3b3f 100644
--- a/src/kvirc/ui/kvi_menubar.h
+++ b/src/kvirc/ui/kvi_menubar.h
@@ -33,7 +33,7 @@
 #include "kvi_list.h"
 
 class KviFrame;
-class QPopupMenu;
+class KviTalPopupMenu;
 class KviKvsPopupMenu;
 
 typedef struct _KviScriptMenuBarItem
@@ -52,8 +52,8 @@ public:
 	KviMenuBar(KviFrame * par,const char * name);
 	~KviMenuBar();
 protected:
-	QPopupMenu                       * m_pToolbarsPopup;
-	QPopupMenu                       * m_pRecentServersPopup;
+	KviTalPopupMenu                       * m_pToolbarsPopup;
+	KviTalPopupMenu                       * m_pRecentServersPopup;
 	KviFrame                         * m_pFrm;
 	KviPtrList<KviScriptMenuBarItem> * m_pScriptItemList;
 	int                                m_iNumDefaultItems;
@@ -61,7 +61,7 @@ protected:
 protected:
 	KviScriptMenuBarItem * findMenu(const QString &text);
 	KviScriptMenuBarItem * findMenu(KviKvsPopupMenu * p);
-	void addDefaultItem(const QString &text,QPopupMenu * pop);
+	void addDefaultItem(const QString &text,KviTalPopupMenu * pop);
 public:
 	int getDefaultItemRealIndex(int iDefaultIndex);
 	void 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 96ee54fed..9775f9dfe 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/kvi_modeeditor.cpp
@@ -47,7 +47,7 @@
 // FIXME: This widget should use a QScrollView!
 
 KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const char * nam,KviConsole * c,const char * mode,const char * key,const char * limit)
-: KviWindowToolWidget(par,button,nam)
+: KviWindowToolWidget(par,button)
 {
 	m_szMode = mode;
 	m_szKey = key;
diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp
index 05e016bbe..ac37fdb89 100755
--- a/src/kvirc/ui/kvi_modew.cpp
+++ b/src/kvirc/ui/kvi_modew.cpp
@@ -30,7 +30,7 @@
 
 #include <qframe.h>
 #include <qlineedit.h>
-#include <qhbox.h> 
+#include "kvi_tal_hbox.h" 
 
 KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name)
 :QFrame(par,name)
diff --git a/src/kvirc/ui/kvi_modew.h b/src/kvirc/ui/kvi_modew.h
index f33436d87..6e52bbdc2 100755
--- a/src/kvirc/ui/kvi_modew.h
+++ b/src/kvirc/ui/kvi_modew.h
@@ -29,7 +29,7 @@
 
 #include <qframe.h>
 #include <qlineedit.h>
-#include <qhbox.h> 
+#include "kvi_tal_hbox.h" 
 
 class KVIRC_API KviModeWidget : public QFrame 
 {
diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index dd22872ad..d1107679c 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -33,7 +33,7 @@
 
 #include "kvi_app.h"
 
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 
 #define KVI_OPTIONSWIDGET_GRIDLAYOUT_BORDER 4
 #define KVI_OPTIONSWIDGET_GRIDLAYOUT_SPACE 6
@@ -73,15 +73,15 @@ void KviOptionsWidget::mergeTip(QWidget * w,const QString &tip)
 	static QString begin = "<table width=\"100%\" align=\"center\"><tr><td bgcolor=\"#fefef0\">";
 	static QString mid = "</td></tr><tr><td>";
 	static QString end = "</td></tr></table>";
-	QString s = QToolTip::textFor(w);
-	if(s.isEmpty())QToolTip::add(w,tip);
+	QString s = KviTalToolTip::textFor(w);
+	if(s.isEmpty())KviTalToolTip::add(w,tip);
 	else {
 		QString tmp = begin;
 		tmp += tip;
 		tmp += mid;
 		tmp += s;
 		tmp += end;
-		QToolTip::add(w,tmp);
+		KviTalToolTip::add(w,tmp);
 	}
 }
 
@@ -141,7 +141,7 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(int x1,int y1,int
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 
 	return d;
 }
@@ -154,7 +154,7 @@ KviDirectorySelector * KviOptionsWidget::addDirectorySelector(QWidget * pParent,
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 
 	return d;
 }
@@ -186,7 +186,7 @@ KviFileSelector * KviOptionsWidget::addFileSelector(int x1,int y1,int x2,int y2,
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 
 	return d;
 }
@@ -199,7 +199,7 @@ KviFileSelector * KviOptionsWidget::addFileSelector(QWidget * pParent,const QStr
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 
 	return d;
 }
@@ -230,7 +230,7 @@ KviSoundSelector * KviOptionsWidget::addSoundSelector(int x1,int y1,int x2,int y
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 
 	return d;
 }
@@ -243,7 +243,7 @@ KviSoundSelector * KviOptionsWidget::addSoundSelector(QWidget * pParent,const QS
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 
 	return d;
 }
@@ -273,7 +273,7 @@ KviBoolSelector * KviOptionsWidget::addBoolSelector(int x1,int y1,int x2,int y2,
 	QString tmp = m_szBasicTipStart;
 	tmp += g_boolOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -284,7 +284,7 @@ KviBoolSelector * KviOptionsWidget::addBoolSelector(QWidget * pParent,const QStr
 	QString tmp = m_szBasicTipStart;
 	tmp += g_boolOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -306,7 +306,7 @@ KviPixmapSelector * KviOptionsWidget::addPixmapSelector(int x1,int y1,int x2,int
 	QString tmp = m_szBasicTipStart;
 	tmp += g_pixmapOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -341,7 +341,7 @@ KviUIntSelector * KviOptionsWidget::addUIntSelector(int x1,int y1,int x2,int y2,
 	QString tmp = m_szBasicTipStart;
 	tmp += g_uintOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -354,7 +354,7 @@ KviUIntSelector * KviOptionsWidget::addUIntSelector(QWidget * pParent,const QStr
 	QString tmp = m_szBasicTipStart;
 	tmp += g_uintOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -395,7 +395,7 @@ KviStringSelector * KviOptionsWidget::addStringSelector(int x1,int y1,int x2,int
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -406,7 +406,7 @@ KviStringSelector * KviOptionsWidget::addStringSelector(QWidget * pParent,const
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -435,7 +435,7 @@ KviPasswordSelector * KviOptionsWidget::addPasswordSelector(int x1,int y1,int x2
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -446,7 +446,7 @@ KviPasswordSelector * KviOptionsWidget::addPasswordSelector(QWidget * pParent,co
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -468,7 +468,7 @@ KviStringListSelector * KviOptionsWidget::addStringListSelector(int x1,int y1,in
 	QString tmp = m_szBasicTipStart;
 	tmp += g_stringlistOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -497,7 +497,7 @@ KviColorSelector * KviOptionsWidget::addColorSelector(int x1,int y1,int x2,int y
 	QString tmp = m_szBasicTipStart;
 	tmp += g_colorOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -508,7 +508,7 @@ KviColorSelector * KviOptionsWidget::addColorSelector(QWidget * pParent,const QS
 	QString tmp = m_szBasicTipStart;
 	tmp += g_colorOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -538,7 +538,7 @@ KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(int x1,int
 	QString tmp = m_szBasicTipStart;
 	tmp += g_uintOptionsTable[optForeId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -550,7 +550,7 @@ KviMircTextColorSelector * KviOptionsWidget::addMircTextColorSelector(QWidget *
 	QString tmp = m_szBasicTipStart;
 	tmp += g_uintOptionsTable[optForeId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -580,7 +580,7 @@ KviFontSelector * KviOptionsWidget::addFontSelector(int x1,int y1,int x2,int y2,
 	QString tmp = m_szBasicTipStart;
 	tmp += g_fontOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
@@ -591,7 +591,7 @@ KviFontSelector * KviOptionsWidget::addFontSelector(QWidget * pParent,const QStr
 	QString tmp = m_szBasicTipStart;
 	tmp += g_fontOptionsTable[optId].name;
 	tmp += m_szBasicTipEnd;
-	QToolTip::add(d,tmp);
+	KviTalToolTip::add(d,tmp);
 	return d;
 }
 
diff --git a/src/kvirc/ui/kvi_query.cpp b/src/kvirc/ui/kvi_query.cpp
index 650a74a7c..8b49addd1 100644
--- a/src/kvirc/ui/kvi_query.cpp
+++ b/src/kvirc/ui/kvi_query.cpp
@@ -56,7 +56,7 @@
 
 #include <qpixmap.h>
 #include <qsplitter.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qtoolbutton.h>
 #include <qdragobject.h>
 #include <qgrid.h> 
@@ -69,18 +69,18 @@ KviQuery::KviQuery(KviFrame * lpFrm,KviConsole * lpConsole,const QString &nick)
 	connection()->registerQuery(this);
 
 	//m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter");
-	m_pButtonBox = new QHBox(this,"button_box");
+	m_pButtonBox = new KviTalHBox(this);
 	m_pLabel = new KviThemedLabel(m_pButtonBox,"query_label");
 	m_pLabel->setAutoHeight(1);
 	updateLabelText();
 	m_pButtonBox->setStretchFactor(m_pLabel,1);
 
 	// The button box on the right
-	//QHBox * box = new QHBox(m_pTopSplitter,"button_box");
+	//KviTalHBox * box = new KviTalHBox(m_pTopSplitter,"button_box");
 	if(KVI_OPTION_BOOL(KviOption_boolShowExtendedInfoInQueryLabel))
-		m_pButtonGrid= new QGrid(2,Qt::Vertical,m_pButtonBox);
+		m_pButtonGrid= new KviTalGrid(2,Qt::Vertical,m_pButtonBox);
 	else
-		m_pButtonGrid= new QGrid(1,Qt::Vertical,m_pButtonBox);
+		m_pButtonGrid= new KviTalGrid(1,Qt::Vertical,m_pButtonBox);
 
 
 	createTextEncodingButton(m_pButtonGrid);
@@ -126,7 +126,7 @@ void KviQuery::updateLabelText()
 	if(szText!=m_pLabel->text())
 	{
 		m_pLabel->setText(szText);
-		QToolTip::add(m_pLabel,getInfoLabelTipText());
+		KviTalToolTip::add(m_pLabel,getInfoLabelTipText());
 	}
 }
 
diff --git a/src/kvirc/ui/kvi_query.h b/src/kvirc/ui/kvi_query.h
index 863e1a3c0..d167ac710 100644
--- a/src/kvirc/ui/kvi_query.h
+++ b/src/kvirc/ui/kvi_query.h
@@ -32,7 +32,7 @@
 #include "kvi_themedlabel.h"
 
 #include "kvi_asciidict.h"
-#include <qgrid.h> 
+#include "kvi_tal_grid.h"
 
 class KviConsole;
 class KviConfig;
@@ -51,8 +51,8 @@ protected:
 	KviUserListView                     * m_pUserListView;
 	KviWindowToolPageButton             * m_pListViewButton;
 	int                                   m_iFlags;
-	KviThemedLabel 			    * m_pLabel;
-	QGrid			 	    * m_pButtonGrid;
+	KviThemedLabel                      * m_pLabel;
+	KviTalGrid                          * m_pButtonGrid;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index 93981d756..289729473 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -39,7 +39,7 @@
 #include <qcolordialog.h>
 #include <qpalette.h>
 #include <qfontdialog.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
 KviBoolSelector::KviBoolSelector(QWidget * par,const QString & txt,bool *pOption,bool bEnabled)
 : KviStyledCheckBox(txt,par), KviSelectorInterface()
@@ -61,7 +61,7 @@ void KviBoolSelector::commit()
 
 KviUIntSelector::KviUIntSelector(QWidget * par,const QString & txt,unsigned int *pOption,
 	unsigned int uLowBound,unsigned int uHighBound,unsigned int uDefault,bool bEnabled,bool bShortInt)
-: QHBox(par) , KviSelectorInterface()
+: KviTalHBox(par) , KviSelectorInterface()
 {
 	m_pLabel = new QLabel(txt,this);
 	//m_pLineEdit = new QLineEdit(this);
@@ -118,7 +118,7 @@ void KviUIntSelector::commit()
 
 void KviUIntSelector::setEnabled(bool bEnabled)
 {
-	QHBox::setEnabled(bEnabled);
+	KviTalHBox::setEnabled(bEnabled);
 	m_pLabel->setEnabled(bEnabled);
 	m_pSpinBox->setEnabled(bEnabled);
 }
@@ -126,7 +126,7 @@ void KviUIntSelector::setEnabled(bool bEnabled)
 
 
 KviStringSelector::KviStringSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled)
-: QHBox(par) , KviSelectorInterface()
+: KviTalHBox(par) , KviSelectorInterface()
 {
 	m_pLabel = new QLabel(txt,this);
 	m_pLineEdit = new QLineEdit(this);
@@ -154,7 +154,7 @@ void KviStringSelector::commit()
 
 void KviStringSelector::setEnabled(bool bEnabled)
 {
-	QHBox::setEnabled(bEnabled);
+	KviTalHBox::setEnabled(bEnabled);
 	m_pLineEdit->setEnabled(bEnabled);
 	m_pLabel->setEnabled(bEnabled);
 }
@@ -301,7 +301,7 @@ void KviPixmapSelector::setEnabled(bool bEnabled)
 
 // FIXME: #warning "Option for DIR_MUST_EXISTS...(this widget could be turned into a file selector too)"
 KviFileSelector::KviFileSelector(QWidget * par,const QString & txt,QString * pOption,bool bEnabled,unsigned int uFlags,const QString &szFilter)
-: QHBox(par), KviSelectorInterface()
+: KviTalHBox(par), KviSelectorInterface()
 {
 	m_uFlags = uFlags;
 	m_szFilter = szFilter;
@@ -328,7 +328,7 @@ void KviFileSelector::commit()
 
 void KviFileSelector::setEnabled(bool bEnabled)
 {
-	QHBox::setEnabled(bEnabled);
+	KviTalHBox::setEnabled(bEnabled);
 	m_pLineEdit->setEnabled(bEnabled);
 	m_pLabel->setEnabled(bEnabled);
 	m_pButton->setEnabled(bEnabled);
@@ -390,14 +390,14 @@ void KviDirectorySelector::select()
 
 
 KviStringListSelector::KviStringListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled)
-: QVBox(par), KviSelectorInterface()
+: KviTalVBox(par), KviSelectorInterface()
 {
 	m_pLabel = new QLabel(txt,this);
 	m_pListBox = new QListBox(this);
 	m_pLineEdit = new QLineEdit(this);
 	connect(m_pLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &)));
 	connect(m_pLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked()));
-	QHBox * hBox = new QHBox(this);
+	KviTalHBox * hBox = new KviTalHBox(this);
 	m_pAddButton = new QPushButton(__tr2qs("A&dd"),hBox);
 	connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked()));
 	m_pRemoveButton = new QPushButton(__tr2qs("Re&move"),hBox);
@@ -438,7 +438,7 @@ void KviStringListSelector::textChanged(const QString &str)
 
 void KviStringListSelector::setEnabled(bool bEnabled)
 {
-	QVBox::setEnabled(bEnabled);
+	KviTalVBox::setEnabled(bEnabled);
 	m_pLineEdit->setEnabled(bEnabled);
 	m_pLabel->setEnabled(bEnabled);
 	QString txt = m_pLineEdit->text();
@@ -489,7 +489,7 @@ void KviStringListSelector::removeClicked()
 
 
 KviColorSelector::KviColorSelector(QWidget * par,const QString & txt,QColor * pOption,bool bEnabled)
-: QHBox(par), KviSelectorInterface()
+: KviTalHBox(par), KviSelectorInterface()
 {
 	m_pLabel = new QLabel(txt,this);
 
@@ -536,14 +536,14 @@ void KviColorSelector::commit()
 
 void KviColorSelector::setEnabled(bool bEnabled)
 {
-	QHBox::setEnabled(bEnabled);
+	KviTalHBox::setEnabled(bEnabled);
 	m_pLabel->setEnabled(bEnabled);
 	m_pButton->setEnabled(bEnabled);
 }
 
 
 KviFontSelector::KviFontSelector(QWidget * par,const QString & txt,QFont * pOption,bool bEnabled)
-: QHBox(par), KviSelectorInterface()
+: KviTalHBox(par), KviSelectorInterface()
 {
 	m_pLabel = new QLabel(txt,this);
 
@@ -581,7 +581,7 @@ void KviFontSelector::commit()
 
 void KviFontSelector::setEnabled(bool bEnabled)
 {
-	QHBox::setEnabled(bEnabled);
+	KviTalHBox::setEnabled(bEnabled);
 	m_pLabel->setEnabled(bEnabled);
 	m_pButton->setEnabled(bEnabled);
 }
@@ -591,7 +591,7 @@ void KviFontSelector::setEnabled(bool bEnabled)
 
 
 KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString &txt,unsigned int * uFore,unsigned int * uBack,bool bEnabled)
-: QHBox(par), KviSelectorInterface()
+: KviTalHBox(par), KviSelectorInterface()
 {
 	m_pLabel = new QLabel(txt,this);
 
@@ -612,9 +612,9 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString &
 
 	setEnabled(bEnabled);
 	
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 	
-	m_pForePopup = new QPopupMenu(this);
+	m_pForePopup = new KviTalPopupMenu(this);
 	connect(m_pForePopup,SIGNAL(activated(int)),this,SLOT(foreSelected(int)));
 	int i;
 	for(i=0;i<KVI_MIRCCOLOR_MAX_FOREGROUND;i++)
@@ -626,7 +626,7 @@ KviMircTextColorSelector::KviMircTextColorSelector(QWidget * par,const QString &
 	}
 	m_pContextPopup->insertItem(__tr2qs("Foreground"),m_pForePopup);
 
-	m_pBackPopup = new QPopupMenu(this);
+	m_pBackPopup = new KviTalPopupMenu(this);
 	connect(m_pBackPopup,SIGNAL(activated(int)),this,SLOT(backSelected(int)));
 	i = m_pBackPopup->insertItem(__tr2qs("Transparent"));
 	m_pBackPopup->setItemParameter(i,KVI_TRANSPARENT);
@@ -652,7 +652,7 @@ void KviMircTextColorSelector::commit()
 
 void KviMircTextColorSelector::setEnabled(bool bEnabled)
 {
-	QHBox::setEnabled(bEnabled);
+	KviTalHBox::setEnabled(bEnabled);
 	m_pLabel->setEnabled(bEnabled);
 	m_pButton->setEnabled(bEnabled);
 }
@@ -729,14 +729,14 @@ KviChanListViewItem::KviChanListViewItem(QListView* pList,QString szChan,QString
 }
 
 KviCahnnelListSelector::KviCahnnelListSelector(QWidget * par,const QString & txt,QStringList * pOption,bool bEnabled)
-: QVBox(par), KviSelectorInterface()
+: KviTalVBox(par), KviSelectorInterface()
 {
 	m_pLabel = new QLabel(txt,this);
 	m_pListView = new QListView(this);
 	m_pListView->addColumn(__tr2qs("Channel name"));
 	m_pListView->addColumn(__tr2qs("Channel password"));
 	
-	QHBox* pEditsHBox = new QHBox(this);
+	KviTalHBox* pEditsHBox = new KviTalHBox(this);
 	
 	m_pChanLineEdit = new QLineEdit(pEditsHBox);
 	connect(m_pChanLineEdit,SIGNAL(textChanged(const QString &)),this,SLOT(textChanged(const QString &)));
@@ -748,7 +748,7 @@ KviCahnnelListSelector::KviCahnnelListSelector(QWidget * par,const QString & txt
 	connect(m_pPassLineEdit,SIGNAL(returnPressed()),this,SLOT(addClicked()));
 	
 	
-	QHBox * hBox = new QHBox(this);
+	KviTalHBox * hBox = new KviTalHBox(this);
 	m_pAddButton = new QPushButton(__tr2qs("A&dd"),hBox);
 	connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked()));
 	m_pRemoveButton = new QPushButton(__tr2qs("Re&move"),hBox);
diff --git a/src/kvirc/ui/kvi_selectors.h b/src/kvirc/ui/kvi_selectors.h
index d0fb3cedf..1f8e9483c 100644
--- a/src/kvirc/ui/kvi_selectors.h
+++ b/src/kvirc/ui/kvi_selectors.h
@@ -29,8 +29,8 @@
 #include "kvi_settings.h"
 
 #include <qcheckbox.h>
-#include <qhbox.h>
-#include <qvbox.h>
+#include "kvi_tal_hbox.h"
+#include "kvi_tal_vbox.h"
 #include <qlineedit.h>
 #include <qlabel.h>
 #include <qscrollview.h>
@@ -91,7 +91,7 @@ public slots:
 	void setNotEnabled(bool bNotEnabled);
 };
 
-class KVIRC_API KviStringSelector : public QHBox, public KviSelectorInterface
+class KVIRC_API KviStringSelector : public KviTalHBox, public KviSelectorInterface
 {
 	Q_OBJECT
 public:
@@ -154,7 +154,7 @@ protected slots:
 	void choosePixmap();
 };
 
-class KVIRC_API KviUIntSelector : public QHBox, public KviSelectorInterface
+class KVIRC_API KviUIntSelector : public KviTalHBox, public KviSelectorInterface
 {
 	Q_OBJECT
 public:
@@ -177,7 +177,7 @@ public:
 };
 
 
-class KVIRC_API KviFileSelector : public QHBox, public KviSelectorInterface
+class KVIRC_API KviFileSelector : public KviTalHBox, public KviSelectorInterface
 {
 	Q_OBJECT
 public:
@@ -218,7 +218,7 @@ protected:
 };
 
 
-class KVIRC_API KviColorSelector : public QHBox, public KviSelectorInterface
+class KVIRC_API KviColorSelector : public KviTalHBox, public KviSelectorInterface
 {
 	Q_OBJECT
 public:
@@ -240,7 +240,7 @@ private slots:
 	void changeClicked();
 };
 
-class KVIRC_API KviFontSelector : public QHBox, public KviSelectorInterface
+class KVIRC_API KviFontSelector : public KviTalHBox, public KviSelectorInterface
 {
 	Q_OBJECT
 public:
@@ -259,7 +259,7 @@ private slots:
 	void changeClicked();
 };
 
-class KVIRC_API KviStringListSelector : public QVBox, public KviSelectorInterface
+class KVIRC_API KviStringListSelector : public KviTalVBox, public KviSelectorInterface
 {
 	Q_OBJECT
 public:
@@ -282,9 +282,9 @@ private slots:
 	void removeClicked();
 };
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
-class KVIRC_API KviMircTextColorSelector : public QHBox, public KviSelectorInterface
+class KVIRC_API KviMircTextColorSelector : public KviTalHBox, public KviSelectorInterface
 {
 	Q_OBJECT
 public:
@@ -297,9 +297,9 @@ private:
 	unsigned int * m_pUBack;
 	unsigned int m_uFore;
 	unsigned int m_uBack;
-	QPopupMenu * m_pContextPopup;
-	QPopupMenu * m_pForePopup;
-	QPopupMenu * m_pBackPopup;
+	KviTalPopupMenu * m_pContextPopup;
+	KviTalPopupMenu * m_pForePopup;
+	KviTalPopupMenu * m_pBackPopup;
 public:
 	virtual void commit();
 	virtual void setEnabled(bool bEnabled);
@@ -337,7 +337,7 @@ public:
 	const QString& pass() { return m_szPass; }
 };
 
-class KVIRC_API KviCahnnelListSelector : public QVBox, public KviSelectorInterface
+class KVIRC_API KviCahnnelListSelector : public KviTalVBox, public KviSelectorInterface
 {
 	Q_OBJECT
 public:
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index 66d799ad4..4d243adeb 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -46,7 +46,7 @@
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qcursor.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qpixmap.h>
 
 // This class COULD be derived also from KStatusBar but in fact
@@ -306,11 +306,11 @@ void KviStatusBar::tipRequest(KviDynamicToolTip *pTip,const QPoint &pnt)
 	pTip->tip(r,szTip);
 }
 
-QPopupMenu * KviStatusBar::contextPopup()
+KviTalPopupMenu * KviStatusBar::contextPopup()
 {
 	if(!m_pContextPopup)
 	{
-		m_pContextPopup = new QPopupMenu(this);
+		m_pContextPopup = new KviTalPopupMenu(this);
 		connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(contextPopupAboutToShow()));
 	}
 	m_pClickedApplet = appletAt(QCursor::pos());
@@ -343,7 +343,7 @@ void KviStatusBar::contextPopupAboutToShow()
 
 	if(!m_pAppletsPopup)
 	{
-		m_pAppletsPopup = new QPopupMenu(this);
+		m_pAppletsPopup = new KviTalPopupMenu(this);
 		connect(m_pAppletsPopup,SIGNAL(aboutToShow()),this,SLOT(appletsPopupAboutToShow()));
 		connect(m_pAppletsPopup,SIGNAL(activated(int)),this,SLOT(appletsPopupActivated(int)));
 	}
diff --git a/src/kvirc/ui/kvi_statusbar.h b/src/kvirc/ui/kvi_statusbar.h
index 54ba0fd7c..85c71955d 100644
--- a/src/kvirc/ui/kvi_statusbar.h
+++ b/src/kvirc/ui/kvi_statusbar.h
@@ -36,7 +36,7 @@ class KviFrame;
 
 class QTimer;
 class QLabel;
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KVIRC_API KviStatusBarMessage : public KviHeapObject
 {
@@ -75,8 +75,8 @@ protected:
 	QLabel                                   * m_pMessageLabel;
 	KviPtrList<KviStatusBarApplet>           * m_pAppletList;
 	KviDict<KviStatusBarAppletDescriptor>      * m_pAppletDescriptors;
-	QPopupMenu                               * m_pContextPopup;
-	QPopupMenu                               * m_pAppletsPopup;
+	KviTalPopupMenu                               * m_pContextPopup;
+	KviTalPopupMenu                               * m_pAppletsPopup;
 	KviStatusBarApplet                       * m_pClickedApplet;
 	int                                        m_iLastMinimumHeight;
 	bool                                       m_bStopLayoutOnAddRemove;
@@ -107,7 +107,7 @@ public:
 	// pnt is global!
 	KviStatusBarApplet * appletAt(const QPoint &pnt,bool bBestMatch = false);
 
-	QPopupMenu * contextPopup();
+	KviTalPopupMenu * contextPopup();
 	// takes the ownership of pMsg
 	void queueMessage(KviStatusBarMessage * pMsg);
 	// called by KviFrame
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp
index 400479dea..9b0ed29c4 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/kvi_statusbarapplet.cpp
@@ -45,7 +45,7 @@
 #include <qlayout.h>
 #include <qtimer.h>
 #include <qcursor.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qpixmap.h>
 
 // This class COULD be derived also from KStatusBar but in fact
@@ -189,7 +189,7 @@ void KviStatusBarAwayIndicator::toggleContext()
 	m_bAwayOnAllContexts = !m_bAwayOnAllContexts;
 }
 
-void KviStatusBarAwayIndicator::fillContextPopup(QPopupMenu *p)
+void KviStatusBarAwayIndicator::fillContextPopup(KviTalPopupMenu *p)
 {
 	int id = p->insertItem(__tr2qs("Apply to all IRC Contexts"),this,SLOT(toggleContext()));
 	p->setItemChecked(id,m_bAwayOnAllContexts);	
@@ -417,7 +417,7 @@ void KviStatusBarClock::timerEvent(QTimerEvent *)
 	setText(tmp);
 }
 
-void KviStatusBarClock::fillContextPopup(QPopupMenu * p)
+void KviStatusBarClock::fillContextPopup(KviTalPopupMenu * p)
 {
 	int id = p->insertItem("UTC",this,SLOT(toggleUtc()));
 	p->setItemChecked(id,m_bUtc);
@@ -498,7 +498,7 @@ void KviStatusBarConnectionTimer::toggleTotal()
 	m_bTotal = !m_bTotal;
 }
 
-void KviStatusBarConnectionTimer::fillContextPopup(QPopupMenu *p)
+void KviStatusBarConnectionTimer::fillContextPopup(KviTalPopupMenu *p)
 {
 	int id = p->insertItem(__tr2qs("Show total connection time"),this,SLOT(toggleTotal()));
 	p->setItemChecked(id,m_bTotal);	
diff --git a/src/kvirc/ui/kvi_statusbarapplet.h b/src/kvirc/ui/kvi_statusbarapplet.h
index e84db315e..9affc6cd5 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.h
+++ b/src/kvirc/ui/kvi_statusbarapplet.h
@@ -37,7 +37,7 @@
 
 class QTimer;
 class QLabel;
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviConfig;
 class KviFrame;
@@ -99,7 +99,7 @@ public:
 	bool isSelected(){ return m_bSelected; };
 protected:
 	virtual void paintEvent(QPaintEvent *e);
-	virtual void fillContextPopup(QPopupMenu *p){};
+	virtual void fillContextPopup(KviTalPopupMenu *p){};
 	virtual void loadState(const char * prefix,KviConfig *cfg){};
 	virtual void saveState(const char * prefix,KviConfig *cfg){};
 	virtual QString tipText(const QPoint &);
@@ -118,7 +118,7 @@ protected:
 public:
 	static void selfRegister(KviStatusBar * pBar);
 protected:
-	virtual void fillContextPopup(QPopupMenu * p);
+	virtual void fillContextPopup(KviTalPopupMenu * p);
 	virtual void timerEvent(QTimerEvent * e);
 	virtual void loadState(const char * prefix,KviConfig *cfg);
 	virtual void saveState(const char * prefix,KviConfig *cfg);
@@ -136,7 +136,7 @@ protected:
 	bool m_bTotal;
 protected:
 	virtual void timerEvent(QTimerEvent * e);
-	virtual void fillContextPopup(QPopupMenu *p);
+	virtual void fillContextPopup(KviTalPopupMenu *p);
 	virtual void loadState(const char * prefix,KviConfig *cfg);
 	virtual void saveState(const char * prefix,KviConfig *cfg);
 public:
@@ -168,7 +168,7 @@ protected:
 protected:
 	virtual void mouseDoubleClickEvent(QMouseEvent *e);
 	virtual QString tipText(const QPoint &);
-	virtual void fillContextPopup(QPopupMenu *p);
+	virtual void fillContextPopup(KviTalPopupMenu *p);
 	virtual void loadState(const char * prefix,KviConfig *cfg);
 	virtual void saveState(const char * prefix,KviConfig *cfg);
 protected slots:
diff --git a/src/kvirc/ui/kvi_taskbar.cpp b/src/kvirc/ui/kvi_taskbar.cpp
index b76425b28..92f590452 100644
--- a/src/kvirc/ui/kvi_taskbar.cpp
+++ b/src/kvirc/ui/kvi_taskbar.cpp
@@ -53,7 +53,7 @@
 #include <qpixmap.h>
 #include <qheader.h>
 #include <qimage.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
 
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
@@ -411,7 +411,7 @@ void KviTaskBarButton::highlight(int iLevel)
 //
 /*
 KviTaskBarToolTip::KviTaskBarToolTip(KviTaskBarButton * b)
-: QToolTip(b,0)
+: KviTalToolTip(b,0)
 {
 	m_pTaskBarButton = b;
 }
@@ -1070,7 +1070,7 @@ void KviTreeTaskBarListView::contentsMousePressEvent(QMouseEvent *e)
 	} else {
 		if(e->button() & RightButton)
 		{
-			QPopupMenu* pPopup=new QPopupMenu();
+			KviTalPopupMenu* pPopup=new KviTalPopupMenu();
 			pPopup->insertItem(__tr2qs("Sort"),this,SLOT(sort()));
 			pPopup->insertItem(__tr2qs("Reverse Sort"),this,SLOT(reverseSort()));
 			pPopup->popup(QCursor::pos());
diff --git a/src/kvirc/ui/kvi_taskbar.h b/src/kvirc/ui/kvi_taskbar.h
index 812836df4..0c9966bea 100644
--- a/src/kvirc/ui/kvi_taskbar.h
+++ b/src/kvirc/ui/kvi_taskbar.h
@@ -30,7 +30,7 @@
 
 #include "kvi_list.h"
 #include <qframe.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qlistview.h>
 #include <qpushbutton.h>
 
diff --git a/src/kvirc/ui/kvi_toolbar.cpp b/src/kvirc/ui/kvi_toolbar.cpp
index 48f639dba..ce10d3e5d 100644
--- a/src/kvirc/ui/kvi_toolbar.cpp
+++ b/src/kvirc/ui/kvi_toolbar.cpp
@@ -30,12 +30,12 @@
 #include "kvi_app.h"
 
 #include <qcursor.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
-static QPopupMenu * g_pToolBarContextPopup = 0;
-static QPopupMenu * g_pToolBarWindowsPopup = 0;
-static QPopupMenu * g_pToolBarIconSizesPopup = 0;
-static QPopupMenu * g_pToolBarPositionsPopup = 0;
+static KviTalPopupMenu * g_pToolBarContextPopup = 0;
+static KviTalPopupMenu * g_pToolBarWindowsPopup = 0;
+static KviTalPopupMenu * g_pToolBarIconSizesPopup = 0;
+static KviTalPopupMenu * g_pToolBarPositionsPopup = 0;
 
 
 KviToolBar::KviToolBar(const QString &label,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam)
@@ -64,10 +64,10 @@ void KviToolBar::mousePressEvent(QMouseEvent *e)
 		return;
 	}
 	
-	if(!g_pToolBarContextPopup)g_pToolBarContextPopup = new QPopupMenu();
-	if(!g_pToolBarIconSizesPopup)g_pToolBarIconSizesPopup = new QPopupMenu();
-	if(!g_pToolBarPositionsPopup)g_pToolBarPositionsPopup = new QPopupMenu();
-	if(!g_pToolBarWindowsPopup)g_pToolBarWindowsPopup = new QPopupMenu();
+	if(!g_pToolBarContextPopup)g_pToolBarContextPopup = new KviTalPopupMenu();
+	if(!g_pToolBarIconSizesPopup)g_pToolBarIconSizesPopup = new KviTalPopupMenu();
+	if(!g_pToolBarPositionsPopup)g_pToolBarPositionsPopup = new KviTalPopupMenu();
+	if(!g_pToolBarWindowsPopup)g_pToolBarWindowsPopup = new KviTalPopupMenu();
 
 	g_pToolBarContextPopup->clear();
 	g_pToolBarIconSizesPopup->clear();
diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp
index c185ffda6..4c1fdd511 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.cpp
+++ b/src/kvirc/ui/kvi_toolwindows_container.cpp
@@ -1,12 +1,11 @@
 #define __KVIRC__
 
 
-#include <qwidgetstack.h> 
 #include <qlayout.h> 
 #include <qtoolbutton.h> 
 #include <qobjectcleanuphandler.h> 
 #include <qpushbutton.h> 
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include <qpainter.h>
 #include <qapplication.h>
 
@@ -14,73 +13,8 @@
 #include "kvi_iconmanager.h"
 
 
-KviToolWindowsContainer::KviToolWindowsContainer( QWidget * parent, const char * name, WFlags f )
-:QFrame(parent,name,f)
-{
-	new QHBoxLayout(this);
-	m_pStack=new QWidgetStack(this);
-	layout()->add(m_pStack);
-	m_pCurrentPage=0;
-	m_pButtonContainer=new QVBox(this);
-	m_pButtonContainer->setFixedWidth(24);
-	//m_pButtonContainer->setSizePolicy(QSizePolicy(QSizePolicy::Ignored,QSizePolicy::Ignored));
-	layout()->add(m_pButtonContainer);
-	
-	setMinimumWidth(24);
-}
-
-KviToolWindowsContainer::~KviToolWindowsContainer()
-{
-	
-}
-
-void KviToolWindowsContainer::unregisterWidget(KviWindowToolWidget* page)
-{
-	if(m_pStack->id(page)!=-1)
-		m_pStack->removeWidget(page);
-	if(page==m_pCurrentPage)
-	{
-		m_ObjectHandler.remove(page);
-		m_pCurrentPage=0;
-//		m_pStack->hide();
-//		resizeEvent(0);
-	}
-	if(!m_pStack->visibleWidget())
-	{
-//		m_pStack->setFixedWidth(0);
-		resize( m_pButtonContainer->size() );
-//		debug("%s %s %i %i",__FILE__,__FUNCTION__,__LINE__,width());
-	}
-}
-
-void KviToolWindowsContainer::registerWidget(KviWindowToolWidget* page)
-{
-	if(page!=m_pCurrentPage && page!=0)
-	{
-		if(!m_ObjectHandler.isEmpty())
-		{
-//			debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
-			if(m_pCurrentPage->autoDelete())
-			{
-//				debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
-				delete m_pCurrentPage;
-			} else {
-//				debug("%s %s %i",__FILE__,__FUNCTION__,__LINE__);
-				m_pCurrentPage->hide();
-			}
-		} else {
-			//m_pStack->setFixedWidth(0);
-		}
-		m_pCurrentPage=page;
-		m_ObjectHandler.add(page);
-		m_pStack->addWidget(m_pCurrentPage);
-		m_pStack->raiseWidget(m_pCurrentPage);
-	}
-}
-
-
-KviWindowToolWidget::KviWindowToolWidget(QWidget * parent, KviWindowToolPageButton* button, const char * name, WFlags f )
-:QWidget(parent,name,f)
+KviWindowToolWidget::KviWindowToolWidget(QWidget * parent, KviWindowToolPageButton* button/*, const char * name, WFlags f*/ )
+:QWidget(parent/*,name,f*/)
 {
 //	m_pContainer=parent;
 	m_pButton=button;
diff --git a/src/kvirc/ui/kvi_toolwindows_container.h b/src/kvirc/ui/kvi_toolwindows_container.h
index 1d68275d5..40eac4f9b 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.h
+++ b/src/kvirc/ui/kvi_toolwindows_container.h
@@ -1,11 +1,12 @@
 #ifndef _KVI_TOOLWINDOWS_CONTAINER_H_
 #define _KVI_TOOLWINDOWS_CONTAINER_H_
 
-#include <qwidgetstack.h> 
+#include "kvi_tal_widgetstack.h"
+#include "kvi_tal_vbox.h"
+
 #include <qtoolbutton.h> 
 #include <qobjectcleanuphandler.h> 
 #include <qpushbutton.h> 
-#include <qvbox.h> 
 
 #include "kvi_heapobject.h"
 #include "kvi_styled_controls.h"
@@ -15,33 +16,16 @@ class KviWindowToolPageButton;
 
 // FIXME: these classes are probably useless now... no ?
 
-class KVIRC_API KviToolWindowsContainer : public QFrame
-{
-	Q_OBJECT
-public:
-	KviToolWindowsContainer( QWidget * parent = 0, const char * name = 0, WFlags f = 0 );
-	~KviToolWindowsContainer();
-	
-	void registerWidget(KviWindowToolWidget* page);
-	void unregisterWidget(KviWindowToolWidget* page);
-	
-	QWidget* buttonContainer() { return m_pButtonContainer; };
-	
-protected:
-	QWidgetStack		*m_pStack;
-	KviWindowToolWidget	*m_pCurrentPage;
-	QVBox			*m_pButtonContainer;
-	QObjectCleanupHandler    m_ObjectHandler;
-protected:
-	QWidgetStack* widgetContainer() { return m_pStack; };
-};
+//    Pragma: KviWindowToolPageButton is actually used in kvi_window.h and others (need to fix the name and move
+//            it to its own file.
+
 
 
 class KVIRC_API KviWindowToolWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	KviWindowToolWidget( QWidget * parent,KviWindowToolPageButton* button, const char * name = 0, WFlags f = 0 );
+	KviWindowToolWidget( QWidget * parent,KviWindowToolPageButton* button/*, const char * name = 0, WFlags f = 0 */);
 	~KviWindowToolWidget();
 	
 	void setAutoDelete(bool b) { m_bAutoDelete=b; };
@@ -61,6 +45,9 @@ protected:
 	
 };
 
+
+
+
 class KVIRC_API KviWindowToolPageButton : public KviStyledToolButton
 {
 	Q_OBJECT
diff --git a/src/kvirc/ui/kvi_topicw.cpp b/src/kvirc/ui/kvi_topicw.cpp
index 5497ce060..0d7134165 100644
--- a/src/kvirc/ui/kvi_topicw.cpp
+++ b/src/kvirc/ui/kvi_topicw.cpp
@@ -48,12 +48,12 @@ static int g_iInputFontCharWidth[256];
 
 #include <qpainter.h>
 #include <qfontmetrics.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qlineedit.h>
 #include <qlistbox.h>
 #include <qregexp.h>
 #include <qclipboard.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
 // FIXME: #warning "The combo should disappear when it looses focus!...(how to do it ?)"
 
@@ -114,9 +114,9 @@ void KviTopicWidget::popDownListBox()
 
 void KviTopicWidget::reset()
 {
-	QToolTip::remove(this);
+	KviTalToolTip::remove(this);
 	m_szTopic = __tr2qs("Unknown");
-	QToolTip::add(this,__tr2qs("No topic message has been received from the server yet"));
+	KviTalToolTip::add(this,__tr2qs("No topic message has been received from the server yet"));
 	m_szSetAt = "";
 	m_szSetBy = "";
 	update();
@@ -464,7 +464,7 @@ void KviTopicWidget::setTopicSetAt(const QString & setAt)
 
 void KviTopicWidget::updateToolTip()
 {
-	QToolTip::remove(this);
+	KviTalToolTip::remove(this);
 
 	QString txt = "<html>" \
 			"<body>" \
@@ -521,7 +521,7 @@ void KviTopicWidget::updateToolTip()
 		"</body>" \
 	"<html>";
 
-	QToolTip::add(this,txt);
+	KviTalToolTip::add(this,txt);
 }
 
 QSize KviTopicWidget::sizeHint() const
@@ -567,7 +567,7 @@ void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *)
 		m_pHistory = new QPushButton(this);
 		m_pHistory->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TIME)));
 		m_pHistory->setGeometry(width() - (height() << 2)+height(),0,height(),height());
-		QToolTip::add(m_pHistory,__tr2qs("History"));
+		KviTalToolTip::add(m_pHistory,__tr2qs("History"));
 		m_pHistory->show();
 		connect(m_pHistory,SIGNAL(clicked()),this,SLOT(historyClicked()));
 		
@@ -576,13 +576,13 @@ void KviTopicWidget::mouseDoubleClickEvent(QMouseEvent *)
 		m_pAccept->setGeometry(width() - (height() << 1),0,height(),height());
 		m_pAccept->setEnabled(bCanEdit);
 		m_pAccept->show();
-		QToolTip::add(m_pAccept,__tr2qs("Commit Changes"));
+		KviTalToolTip::add(m_pAccept,__tr2qs("Commit Changes"));
 		connect(m_pAccept,SIGNAL(clicked()),this,SLOT(acceptClicked()));
 		
 		m_pDiscard = new QPushButton(this);
 		m_pDiscard->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 		m_pDiscard->setGeometry(width() - height(),0,height(),height());
-		QToolTip::add(m_pDiscard,__tr2qs("Discard Changes"));
+		KviTalToolTip::add(m_pDiscard,__tr2qs("Discard Changes"));
 		m_pDiscard->show();
 		connect(m_pDiscard,SIGNAL(clicked()),this,SLOT(discardClicked()));
 		
@@ -597,7 +597,7 @@ void KviTopicWidget::mousePressEvent(QMouseEvent * e)
 	if(!(e->button() & RightButton))return;
 	if(!m_pContextPopup)
 	{
-		m_pContextPopup = new QPopupMenu(this);
+		m_pContextPopup = new KviTalPopupMenu(this);
 		connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(contextPopupAboutToShow()));
 	}
 	m_pContextPopup->popup(mapToGlobal(e->pos()));
diff --git a/src/kvirc/ui/kvi_topicw.h b/src/kvirc/ui/kvi_topicw.h
index 373244f27..8aa92cd43 100644
--- a/src/kvirc/ui/kvi_topicw.h
+++ b/src/kvirc/ui/kvi_topicw.h
@@ -37,7 +37,7 @@
 
 class QComboBox;
 class KviChannel;
-class QPopupMenu;
+class KviTalPopupMenu;
 class KviIrcConnection;
 class QListBox;
 
@@ -68,7 +68,7 @@ private:
 	QPushButton * m_pAccept;
 	QPushButton * m_pDiscard;
 	QPushButton * m_pHistory;
-	QPopupMenu  * m_pContextPopup;
+	KviTalPopupMenu  * m_pContextPopup;
 	QChar getSubstituteChar(unsigned short control_code);
 	int xCursorPostionCalculation(int xInd);
 	KviInputEditor* m_pInput;
diff --git a/src/kvirc/ui/kvi_userlistview.cpp b/src/kvirc/ui/kvi_userlistview.cpp
index 004bb6b70..501677b0d 100644
--- a/src/kvirc/ui/kvi_userlistview.cpp
+++ b/src/kvirc/ui/kvi_userlistview.cpp
@@ -74,7 +74,7 @@ extern QPixmap * g_pUserChanStatePixmap;
 // FIXME: #warning "We want to be able to navigate the list with the keyboard!"
 
 KviUserListToolTip::KviUserListToolTip(KviUserListView * v,KviUserListViewArea * a)
-: QToolTip(a,0)
+: KviTalToolTip(a)
 {
 	m_pListView = v;
 }
@@ -186,7 +186,7 @@ void KviUserListEntry::recalcSize()
 
 
 KviUserListView::KviUserListView(QWidget * parent,KviWindowToolPageButton* button,KviIrcUserDataBase * db,KviWindow * pWnd,int dictSize,const QString & label_text,const char * name)
-: KviWindowToolWidget(parent,button,name)
+: KviWindowToolWidget(parent,button)
 {
 	setAutoDelete(0);
 	m_pKviWindow  = pWnd;
@@ -194,7 +194,7 @@ KviUserListView::KviUserListView(QWidget * parent,KviWindowToolPageButton* butto
 	m_pEntryDict->setAutoDelete(true);
 
 	m_pUsersLabel = new QLabel(this,"userslabel");
-	QToolTip::add(m_pUsersLabel,label_text);
+	KviTalToolTip::add(m_pUsersLabel,label_text);
 
 	m_pViewArea   = new KviUserListViewArea(this);
 	m_pToolTip    = new KviUserListToolTip(this,m_pViewArea);
diff --git a/src/kvirc/ui/kvi_userlistview.h b/src/kvirc/ui/kvi_userlistview.h
index 6ccc06ec5..02467edf0 100644
--- a/src/kvirc/ui/kvi_userlistview.h
+++ b/src/kvirc/ui/kvi_userlistview.h
@@ -33,7 +33,7 @@
 #include "kvi_time.h"
 
 #include <time.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qwidget.h>
 #include "kvi_list.h"
 #include "kvi_dict.h"
@@ -55,7 +55,7 @@ class KviWindow;
 #define KVI_USERLISTVIEW_GRIDTYPE_MAXIMUM 3
 #define KVI_USERLISTVIEW_GRIDTYPE_DEFAULT 0
 
-class KVIRC_API KviUserListToolTip : public QToolTip
+class KVIRC_API KviUserListToolTip : public KviTalToolTip
 {
 public:
 	KviUserListToolTip(KviUserListView *v,KviUserListViewArea * a);
diff --git a/src/kvirc/ui/kvi_window.cpp b/src/kvirc/ui/kvi_window.cpp
index 41cf97fac..28561c6b9 100644
--- a/src/kvirc/ui/kvi_window.cpp
+++ b/src/kvirc/ui/kvi_window.cpp
@@ -54,7 +54,7 @@
 #include "kvi_kvs_script.h"
 
 #include <qpixmap.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
 #include <qtimer.h>
 #include <qsplitter.h>
@@ -71,7 +71,7 @@
 #include <qvariant.h>
 #include <qaccel.h>
 #include <qtoolbutton.h>
-#include <qtooltip.h>
+#include "kvi_tal_tooltip.h"
 #include <qmessagebox.h>
 
 #ifdef COMPILE_CRYPT_SUPPORT
@@ -90,11 +90,11 @@
 
 KVIRC_API KviWindow * g_pActiveWindow = 0;
 
-static QPopupMenu * g_pMdiWindowSystemMainPopup = 0;
-static QPopupMenu * g_pMdiWindowSystemTextEncodingPopup = 0;
-static QPopupMenu * g_pMdiWindowSystemTextEncodingPopupStandard = 0;
-static QPopupMenu * g_pMdiWindowSystemTextEncodingPopupSmart = 0;
-static QPopupMenu * g_pMdiWindowSystemTextEncodingPopupSmartUtf8 = 0;
+static KviTalPopupMenu * g_pMdiWindowSystemMainPopup = 0;
+static KviTalPopupMenu * g_pMdiWindowSystemTextEncodingPopup = 0;
+static KviTalPopupMenu * g_pMdiWindowSystemTextEncodingPopupStandard = 0;
+static KviTalPopupMenu * g_pMdiWindowSystemTextEncodingPopupSmart = 0;
+static KviTalPopupMenu * g_pMdiWindowSystemTextEncodingPopupSmartUtf8 = 0;
 
 unsigned long int g_uUniqueWindowId = 1;
 
@@ -336,9 +336,9 @@ QTextCodec * KviWindow::defaultTextCodec()
 	return KviApp::defaultTextCodec();
 }
 
-QCString KviWindow::encodeText(const QString &szText)
+KviQCString KviWindow::encodeText(const QString &szText)
 {
-	if(!m_pTextCodec)return QCString(szText.utf8().data());
+	if(!m_pTextCodec)return KviQString::toUtf8(szText);
 	return m_pTextCodec->fromUnicode(szText);
 }
 
@@ -429,7 +429,7 @@ QToolButton * KviWindow::createToolButton(QWidget * par,const char * nam,int pix
 	b->setOffIconSet(*(g_pIconManager->getSmallIcon(pixoff)));
 #endif
 
-	QToolTip::add
+	KviTalToolTip::add
 		(b,tooltip);
 	b->setOn(bOn);
 	return b;
@@ -699,14 +699,14 @@ void KviWindow::updateCaption()
 void KviWindow::createSystemTextEncodingPopup()
 {
 	if(!g_pMdiWindowSystemTextEncodingPopup)
-		g_pMdiWindowSystemTextEncodingPopup = new QPopupMenu();
+		g_pMdiWindowSystemTextEncodingPopup = new KviTalPopupMenu();
 	else
 	{
 		g_pMdiWindowSystemTextEncodingPopup->clear();
 	}
 	
 	if(!g_pMdiWindowSystemTextEncodingPopupStandard)
-		g_pMdiWindowSystemTextEncodingPopupStandard = new QPopupMenu();
+		g_pMdiWindowSystemTextEncodingPopupStandard = new KviTalPopupMenu();
 	else
 	{
 		g_pMdiWindowSystemTextEncodingPopupStandard->clear();
@@ -714,7 +714,7 @@ void KviWindow::createSystemTextEncodingPopup()
 	}
 
 	if(!g_pMdiWindowSystemTextEncodingPopupSmart)
-		g_pMdiWindowSystemTextEncodingPopupSmart = new QPopupMenu();
+		g_pMdiWindowSystemTextEncodingPopupSmart = new KviTalPopupMenu();
 	else
 	{
 		g_pMdiWindowSystemTextEncodingPopupSmart->clear();
@@ -722,7 +722,7 @@ void KviWindow::createSystemTextEncodingPopup()
 	}
 
 	if(!g_pMdiWindowSystemTextEncodingPopupSmartUtf8)
-		g_pMdiWindowSystemTextEncodingPopupSmartUtf8 = new QPopupMenu();
+		g_pMdiWindowSystemTextEncodingPopupSmartUtf8 = new KviTalPopupMenu();
 	else
 	{
 		g_pMdiWindowSystemTextEncodingPopupSmartUtf8->clear();
@@ -751,7 +751,7 @@ void KviWindow::createSystemTextEncodingPopup()
 	while(d->szName)
 	{
 		KviQString::sprintf(tmp,"%s (%s)",d->szName,d->szDescription);
-		QPopupMenu * ppp = d->bSmart ? (d->bSendUtf8 ? g_pMdiWindowSystemTextEncodingPopupSmartUtf8 : g_pMdiWindowSystemTextEncodingPopupSmart) : g_pMdiWindowSystemTextEncodingPopupStandard;
+		KviTalPopupMenu * ppp = d->bSmart ? (d->bSendUtf8 ? g_pMdiWindowSystemTextEncodingPopupSmartUtf8 : g_pMdiWindowSystemTextEncodingPopupSmart) : g_pMdiWindowSystemTextEncodingPopupStandard;
 		id = ppp->insertItem(tmp);
 		if(KviQString::equalCI(m_szTextEncoding,d->szName))
 			ppp->setItemChecked(id,true);
@@ -768,7 +768,7 @@ void KviWindow::createSystemTextEncodingPopup()
 void KviWindow::systemPopupRequest(const QPoint &pnt)
 {
 	if(!g_pMdiWindowSystemMainPopup)
-		g_pMdiWindowSystemMainPopup = new QPopupMenu();
+		g_pMdiWindowSystemMainPopup = new KviTalPopupMenu();
 	else
 	{
 		g_pMdiWindowSystemMainPopup->clear();
@@ -868,7 +868,7 @@ void KviWindow::contextPopup()
 	systemPopupRequest(QCursor::pos());
 }
 
-void KviWindow::fillContextPopup(QPopupMenu *)
+void KviWindow::fillContextPopup(KviTalPopupMenu *)
 {
 	// nothing here
 }
diff --git a/src/kvirc/ui/kvi_window.h b/src/kvirc/ui/kvi_window.h
index 50a1dcc4e..821bd9cd7 100644
--- a/src/kvirc/ui/kvi_window.h
+++ b/src/kvirc/ui/kvi_window.h
@@ -26,6 +26,7 @@
 
 #include "kvi_string.h"
 #include "kvi_qstring.h"
+#include "kvi_qcstring.h"
 #include "kvi_settings.h"
 
 #ifdef COMPILE_ON_WINDOWS
@@ -47,14 +48,17 @@ class KviIrcContext;
 class KviIrcConnection;
 class KviWindowToolPageButton;
 
-class QPopupMenu;
+class KviTalPopupMenu;
 class QPixmap;
 class QSplitter;
-class QHBox;
+class KviTalHBox;
 class QAccel;
 class QToolButton;
 class QTextCodec;
-class QWidgetStack;
+class KviTalWidgetStack;
+
+#include "kvi_tal_hbox.h"
+#include "kvi_tal_widgetstack.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	class KviCryptController;
@@ -152,7 +156,7 @@ protected: // almost private: don't touch :D
 	KviIrcView                          * m_pIrcView;
 	KviInput                            * m_pInput;
 	QSplitter                           * m_pSplitter;
-	QHBox                               * m_pButtonBox;
+	KviTalHBox                               * m_pButtonBox;
 	unsigned long int                     m_uId;
 	QString                               m_szTextEncoding;
 #ifdef COMPILE_CRYPT_SUPPORT
@@ -216,9 +220,9 @@ public:
 	KviInput * input(){ return m_pInput; };
 
 	// The target of this window: empty when it makes no sense :D
-	virtual const QString & target(){ return QString::null; };
+	virtual const QString & target(){ return KviQString::empty; };
 	// The local nickname bound to this window: might be empty when a local nickname makes no sense
-	virtual const QString & localNick(){ return QString::null; };
+	virtual const QString & localNick(){ return KviQString::empty; };
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	KviCryptSessionInfo * cryptSessionInfo(){ return m_pCryptSessionInfo; };
@@ -241,7 +245,7 @@ public:
 	// this must return a default text codec suitable for this window
 	virtual QTextCodec * defaultTextCodec();
 	// encode the text from szSource by using m_uTextEncoding
-	QCString encodeText(const QString &szText);
+	KviQCString encodeText(const QString &szText);
 	QString decodeText(const char * szText);
 
 	void contextPopup();
@@ -258,7 +262,7 @@ public:
 	void delayedClose(); // close that jumps out of the current event loop
 
 	// Interesting overridables:
-	virtual void fillContextPopup(QPopupMenu * p);
+	virtual void fillContextPopup(KviTalPopupMenu * p);
 	virtual void getConfigGroupName(QString &buf);
 //	virtual void getBaseLogFileName(KviStr &buffer);
 	virtual void getBaseLogFileName(QString &buffer);
diff --git a/src/kvirc/ui/kvi_xmladdonloader.cpp b/src/kvirc/ui/kvi_xmladdonloader.cpp
deleted file mode 100644
index 9a64f8813..000000000
--- a/src/kvirc/ui/kvi_xmladdonloader.cpp
+++ /dev/null
@@ -1,149 +0,0 @@
-///////////////////////////////////////////////////////////////////////////////
-//
-//   File : kvi_xmladdonloader.cpp
-//   Creation date : 25  Jul 2006 GMT by Alexey Uzhva
-//
-//   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2006 Alexey Uzhva
-//
-//   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.
-//
-///////////////////////////////////////////////////////////////////////////////
-
-/*
-#define __KVIRC__
-
-#include "kvi_locale.h"
-#include "kvi_xmladdonloader.h"
-#include "kvi_iconmanager.h"
-#include "kvi_app.h"
-
-#include <qlayout.h>
-#include <qtextcodec.h>
-#include <qpushbutton.h>
-#include <qfile.h>
-#include <zlib.h>
-
-// FIXME: Shouldn't this go to the addon management module ? (smaller executable)
-
-KviXmlAddonLoaderItem::KviXmlAddonLoaderItem ( QDomElement *pElement,QCheckListItem * parent )
-:QCheckListItem(parent,QString::null,CheckBoxController),m_pElement(pElement)
-{
-	setText(0,m_pElement->attribute("Name"));
-	setText(1,m_pElement->attribute("Version"));
-	setState(On);
-}
-
-KviXmlAddonLoaderItem::~KviXmlAddonLoaderItem()
-{
-	delete m_pElement;
-}
-
-KviXmlAddonLoader::KviXmlAddonLoader ( QString szAddonFilename,QWidget * parent, const char * name, bool modal, WFlags f )
-:QDialog(parent,name,modal,f)
-{
-	m_pDocument=0;
-	m_szFilename=szAddonFilename;
-	QGridLayout *pLayout = new QGridLayout(this,2,3);
-	
-	m_pListView = new QListView(this);
-	m_pListView->addColumn(__tr2qs("Name"));
-	m_pListView->addColumn(__tr2qs("Version"));
-	pLayout->addMultiCellWidget(m_pListView,0,0,0,2);
-	
-	QPushButton *pButton;
-	
-	pButton = new QPushButton(__tr2qs("Install"),this);
-	connect(pButton,SIGNAL(clicked()),this,SLOT(accept()));
-	pButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));
-	pLayout->addWidget(pButton,1,1);
-	
-	pButton = new QPushButton(__tr2qs("Cancel"),this);
-	connect(pButton,SIGNAL(clicked()),this,SLOT(reject()));
-	pLayout->addWidget(pButton,1,2);
-	pButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
-	
-	pLayout->setRowStretch(0,1);
-	pLayout->setColStretch(0,1);
-	
-	fillListView();
-}
-
-KviXmlAddonLoader::~KviXmlAddonLoader()
-{
-	if(m_pDocument) delete m_pDocument;
-}
-
-void KviXmlAddonLoader::accept()
-{
-	QListViewItemIterator it( m_pListView, QListViewItemIterator::Checked );
-	while ( it.current() ) {
-		g_pApp->loadXmlTheme( ( (KviXmlAddonLoaderItem*)(it.current()) )->element() );
-		++it;
-	}
-	QDialog::accept();
-}
-
-void KviXmlAddonLoader::reject()
-{
-	QDialog::reject();
-}
-
-void KviXmlAddonLoader::fillListView()
-{
-	m_pListView->clear();
-	
-	KviAsciiDict<QCheckListItem> dict;
-	
-	if(m_pDocument) delete m_pDocument;
-	m_pDocument = new QDomDocument();
-
-	QCString data;
-	gzFile file=gzopen(QTextCodec::codecForLocale()->fromUnicode(m_szFilename).data(),"rb");
-	if(file)
-	{
-		char buff[1025];
-		int len;
-		len=gzread(file,buff,1024);
-		while(len>0)
-		{
-			buff[len]=0;
-			data.append(buff);
-			len=gzread(file,buff,1024);
-		}
-		gzclose(file);
-	}
-
-	if ( !m_pDocument->setContent( data ) ) {
-		return;
-	}
-	
-	QCheckListItem *pParent;
-	for( QDomNode n = m_pDocument->documentElement().firstChild(); !n.isNull(); n = n.nextSibling() )
-	{
-		if(n.nodeName()=="Theme" && n.isElement())
-		{
-			pParent=dict["theme"];
-			if(!pParent) {
-				pParent = new QCheckListItem(m_pListView,__tr2qs("Themes"));
-				pParent->setOpen(TRUE);
-				dict.replace("theme",pParent);
-			}
-			new KviXmlAddonLoaderItem(new QDomElement(n.toElement()),pParent);
-		}
-	}
-}
-
-*/
diff --git a/src/kvirc/ui/kvi_xmladdonloader.h b/src/kvirc/ui/kvi_xmladdonloader.h
deleted file mode 100644
index 04a5ad0fa..000000000
--- a/src/kvirc/ui/kvi_xmladdonloader.h
+++ /dev/null
@@ -1,63 +0,0 @@
-#ifndef _KVI_XML_ADDON_LOADER_H_
-#define _KVI_XML_ADDON_LOADER_H_
-
-///////////////////////////////////////////////////////////////////////////////
-//
-//   File : kvi_xmladdonloader.h
-//   Creation date : 25  Jul 2006 GMT by Alexey Uzhva
-//
-//   This toolbar is part of the KVirc irc client distribution
-//   Copyright (C) 2006 Alexey Uzhva
-//
-//   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_heapobject.h"
-#include <qdialog.h>
-#include <qlistview.h> 
-#include <qdom.h>
-
-class KVIRC_API KviXmlAddonLoaderItem: public QCheckListItem {
-
-public:
-	KviXmlAddonLoaderItem ( QDomElement *pElement,QCheckListItem * parent );
-	~KviXmlAddonLoaderItem();
-	
-	QDomElement * element() { return m_pElement; };
-protected:
-	QDomElement *m_pElement;
-};
-
-
-class KVIRC_API KviXmlAddonLoader: public QDialog {
-	Q_OBJECT
-public:
-	KviXmlAddonLoader ( QString szAddonFilename,QWidget * parent = 0, const char * name = 0, bool modal = FALSE, WFlags f = 0 );
-	~KviXmlAddonLoader();
-protected:
-	QString		 m_szFilename;
-	QListView	*m_pListView;
-	QDomDocument    *m_pDocument;
-protected slots:
-	virtual void accept();
-	virtual void reject();
-protected:
-	void fillListView();
-};
-*/
-
-#endif //!_KVI_XML_ADDON_LOADER_H_
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 5bd001497..f76bf5df9 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -44,7 +44,7 @@
 
 #include <qsplitter.h>
 #include <qlayout.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qdir.h>
@@ -657,7 +657,7 @@ KviActionEditor::KviActionEditor(QWidget * par)
 	l->addWidget(m_pSplitter,0,0);
 	
 	
-	QVBox * box = new QVBox(m_pSplitter);
+	KviTalVBox * box = new KviTalVBox(m_pSplitter);
 	m_pListView = new KviActionEditorListView(box);
 	//m_pListView->setMultiSelection(false);
 	m_pListView->setShowSortIndicator(true);
diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 337324cc7..826acef1d 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -42,7 +42,7 @@
 
 #include <qsplitter.h>
 #include <qlayout.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include <qtooltip.h>
 #include <qpushbutton.h>
 #include <qdir.h>
@@ -213,15 +213,15 @@ KviAliasEditor::KviAliasEditor(QWidget * par)
 
 	l->addWidget(m_pSplitter,0,0);
 	
-	QVBox * box = new QVBox(m_pSplitter);
+	KviTalVBox * box = new KviTalVBox(m_pSplitter);
 	m_pListView = new QListView(box);
 	m_pListView->addColumn(__tr2qs("Alias"));
 	m_pListView->setSelectionMode(QListView::Extended);
 	m_pListView->setShowSortIndicator(true);
 	m_pListView->setRootIsDecorated(true);
 
-	box = new QVBox(m_pSplitter);
-	QHBox * hbox = new QHBox(box);
+	box = new KviTalVBox(m_pSplitter);
+	KviTalHBox * hbox = new KviTalHBox(box);
 	m_pNameLabel = new QLabel(__tr2qs("No item selected"),hbox);
 	m_pRenameButton = new QPushButton(__tr2qs("Rename"),hbox);
 	m_pRenameButton->setEnabled(false);
@@ -233,7 +233,7 @@ KviAliasEditor::KviAliasEditor(QWidget * par)
 	connect(m_pEditor,SIGNAL(find(const QString &)),this,SLOT(slotFindWord(const QString &)));
 	connect(m_pEditor,SIGNAL(replaceAll(const QString &,const QString &)),this,SLOT(slotReplaceAll(const QString &,const QString &)));
 
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 
 	oneTimeSetup();
 
diff --git a/src/modules/aliaseditor/aliaseditor.h b/src/modules/aliaseditor/aliaseditor.h
index f4e62bc1d..4b4e54d37 100644
--- a/src/modules/aliaseditor/aliaseditor.h
+++ b/src/modules/aliaseditor/aliaseditor.h
@@ -32,7 +32,7 @@
 #include <qwidget.h>
 #include <qlistview.h>
 #include <qlineedit.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qstringlist.h>
 #include <qpushbutton.h>
 #include <qlabel.h>
@@ -114,7 +114,7 @@ public:
 	KviAliasEditorListViewItem * m_pLastEditedItem;
 	KviAliasEditorListViewItem * m_pLastClickedItem;
 	//KviAliasListViewItem * m_pLastEditedItem;
-	QPopupMenu                 * m_pContextPopup;
+	KviTalPopupMenu                 * m_pContextPopup;
 	QSplitter                  * m_pSplitter;
 	QString						m_szDir;
 public:
diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index cd274dc34..d3d4a9892 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -50,7 +50,7 @@
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qlabel.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qlayout.h>
 
 static KviPtrList<KviAsyncAvatarSelectionDialog> * g_pAvatarSelectionDialogList = 0;
@@ -89,7 +89,7 @@ KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(QWidget * par,const
 	QPushButton * b = new QPushButton(__tr2qs("&Browse..."),this);
 	connect(b,SIGNAL(clicked()),this,SLOT(chooseFileClicked()));
 	g->addWidget(b,1,2);
-	QHBox * h = new QHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2);
+	KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2);
 	b = new QPushButton(__tr2qs("&OK"),h);
 	b->setMinimumWidth(80);
 	b->setDefault(true);
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 2a80ff0d0..c420bb6ed 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -107,7 +107,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
 	g->addWidget(cancelButton,3,1);
 
 /*
-	QHBox * hb = new QHBox(this);
+	KviTalHBox * hb = new KviTalHBox(this);
 	hb->setSpacing(4);
 	
 	QPushButton * namesButton = new QPushButton("/names", hb);
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index c94475a14..075c13f40 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -39,7 +39,7 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #include <qtoolbutton.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
 extern KviPtrList<KviCodeTesterWindow> * g_pCodeTesterWindowList;
 
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index 47f36becd..e8ba76cb5 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -33,6 +33,7 @@
 #include "kvi_string.h"
 
 #include "kvi_locale.h"
+#include "kvi_tal_popupmenu.h"
 
 #include <math.h>
 
@@ -1552,10 +1553,10 @@ KviCanvasWidget::KviCanvasWidget(QWidget * par)
 
 	connect(m_pPropertiesWidget,SIGNAL(propertyChanged(const QString &,const QVariant &)),m_pCanvasView,SLOT(propertyChanged(const QString &,const QVariant &)));
 
-	QPopupMenu * add = new QPopupMenu(m_pMenuBar);
-	QPopupMenu * shapes = new QPopupMenu(add);
-	QPopupMenu * polygons = new QPopupMenu(add);
-	QPopupMenu * items = new QPopupMenu(add);
+	KviTalPopupMenu * add = new KviTalPopupMenu(m_pMenuBar);
+	KviTalPopupMenu * shapes = new KviTalPopupMenu(add);
+	KviTalPopupMenu * polygons = new KviTalPopupMenu(add);
+	KviTalPopupMenu * items = new KviTalPopupMenu(add);
 	shapes->insertItem(__tr2qs_ctx("&Line","dcc"),m_pCanvasView,SLOT(insertLine()));
 	shapes->insertItem(__tr2qs_ctx("&Rectangle","dcc"),m_pCanvasView,SLOT(insertRectangle()));
 	shapes->insertItem(__tr2qs_ctx("&Ellipse","dcc"),m_pCanvasView,SLOT(insertEllipse()));
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 608859677..8700640b3 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -64,7 +64,7 @@
 
 #include <qsplitter.h>
 #include <qevent.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 
 
 #ifdef COMPILE_SSL_SUPPORT
@@ -91,7 +91,7 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
 	m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter");
 	KviThemedLabel * dummy;
 	dummy = new KviThemedLabel(m_pTopSplitter,"dummy_label");
-	QVBox * box = new QVBox(m_pTopSplitter);
+	KviTalVBox * box = new KviTalVBox(m_pTopSplitter);
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	createCryptControllerButton(box);
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 308e8273f..8c30a03e3 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -926,7 +926,7 @@ void KviDccFileTransfer::abort()
 }
 
 
-void KviDccFileTransfer::fillContextPopup(QPopupMenu * m,int column)
+void KviDccFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column)
 {
 	m->insertItem(__tr2qs_ctx("Configure Bandwidth...","dcc"),this,SLOT(configureBandwidth()));
 	m->insertSeparator();
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index 29baf9cff..e7bd7ceda 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -36,9 +36,9 @@
 #include "kvi_list.h"
 #include <qlabel.h>
 #include <qprogressbar.h>
-#include <qpopupmenu.h>
-#include <qhbox.h>
-#include <qvbox.h>
+#include "kvi_tal_popupmenu.h"
+#include "kvi_tal_hbox.h"
+#include "kvi_tal_vbox.h"
 #include <qfile.h>
 #include <qdialog.h>
 
@@ -167,7 +167,7 @@ protected slots:
 
 class KviDccMarshal;
 class QPainter;
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviDccFileTransfer : public KviFileTransfer, public KviDccMarshalOutputContext
 {
@@ -219,7 +219,7 @@ public:
 
 	virtual void displayPaint(QPainter * p,int column,int width,int height);
 	virtual int displayHeight(int iLineSpacing);
-	virtual void fillContextPopup(QPopupMenu * m,int column);
+	virtual void fillContextPopup(KviTalPopupMenu * m,int column);
 	virtual void fillStatusString(QString &szBuffer);
 	virtual bool active();
 	virtual void die();
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index c3884a69d..26ef25f67 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -42,7 +42,7 @@
 
 #include <qframe.h>
 #include <qsplitter.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include <qslider.h>
 #include <qtooltip.h>
 
@@ -655,9 +655,9 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter");
 	m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this);
 
-	m_pHBox = new QHBox(this,"h_box");
+	m_pHBox = new KviTalHBox(this);
 
-	QVBox * vbox = new QVBox(m_pHBox,"v_box");
+	KviTalVBox * vbox = new KviTalVBox(m_pHBox);
 
 	m_pInputLabel = new QLabel(__tr2qs_ctx("Input buffer","dcc"),vbox);
 	m_pInputLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
@@ -665,7 +665,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	m_pOutputLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
 	vbox->setSpacing(1);
 	
-	QVBox * vbox2 = new QVBox(m_pHBox,"v_box_2");
+	KviTalVBox * vbox2 = new KviTalVBox(m_pHBox);
 
 	m_pRecordingLabel = new QLabel(vbox2);
 	m_pRecordingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RECORD)));
diff --git a/src/modules/dcc/voice.h b/src/modules/dcc/voice.h
index c123d98f1..bfbe62ac0 100644
--- a/src/modules/dcc/voice.h
+++ b/src/modules/dcc/voice.h
@@ -32,7 +32,7 @@
 #include "thread.h"
 #include "window.h"
 
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qlabel.h>
 #include <qtoolbutton.h>
 #include <qtimer.h>
@@ -107,7 +107,7 @@ public:
 	KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name);
 	~KviDccVoice();
 protected:
-	QHBox                  * m_pHBox;
+	KviTalHBox                  * m_pHBox;
 	QSlider                * m_pVolumeSlider;
 	QLabel                 * m_pInputLabel;
 	QLabel                 * m_pOutputLabel;
diff --git a/src/modules/dcc/window.cpp b/src/modules/dcc/window.cpp
index dc7bc396f..11fe893fd 100644
--- a/src/modules/dcc/window.cpp
+++ b/src/modules/dcc/window.cpp
@@ -21,7 +21,7 @@
 //
 
 #include "window.h"
-#include <qhbox.h> 
+#include "kvi_tal_hbox.h" 
 
 KviDccWindow::KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDescriptor * d)
 : KviWindow(type,lpFrm,name)
@@ -29,7 +29,7 @@ KviDccWindow::KviDccWindow(int type,KviFrame * lpFrm,const char * name,KviDccDes
 	m_pDescriptor = d;
 	m_pDescriptor->setWindow(this);
 	m_pMarshal    = 0;
-	m_pButtonBox = new QHBox(this,"button_box");
+	m_pButtonBox = new KviTalHBox(this);
 	createTextEncodingButton(m_pButtonBox);
 }
 
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index d3263fdb4..4237553a5 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -27,7 +27,7 @@
 
 #include <qmessagebox.h>
 #include <qlayout.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qlineedit.h>
 #include <qmultilineedit.h>
 #include <qlabel.h>
@@ -237,7 +237,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput(
 
 	g->addMultiCellWidget(m_pEdit,1,1,0,1);
 
-	QHBox * box = new QHBox(this);
+	KviTalHBox * box = new KviTalHBox(this);
 	g->addMultiCellWidget(box,2,2,0,1);
 
 	m_iEscapeButton = 0;
diff --git a/src/modules/dockwidget/libkvidockwidget.cpp b/src/modules/dockwidget/libkvidockwidget.cpp
index 9a4775918..b15842c46 100644
--- a/src/modules/dockwidget/libkvidockwidget.cpp
+++ b/src/modules/dockwidget/libkvidockwidget.cpp
@@ -45,10 +45,12 @@
 	#include <kwin.h>
 	#include <kpopupmenu.h>
 #else
-	#include <qpopupmenu.h>
 	#include <qlabel.h>
 #endif
 
+#include "kvi_tal_popupmenu.h"
+
+
 #include <qpixmap.h>
 #include <qpainter.h>
 #include <qtimer.h>
@@ -129,13 +131,13 @@ KviDockWidget::KviDockWidget(KviFrame * frm,const char * name)
 	m_pTip = new KviDynamicToolTip(this,"dock_tooltip");
 	connect(m_pTip,SIGNAL(tipRequest(KviDynamicToolTip *,const QPoint &)),this,SLOT(tipRequest(KviDynamicToolTip *,const QPoint &)));
 	
-	m_pAwayPopup = new QPopupMenu(this);
+	m_pAwayPopup = new KviTalPopupMenu(this);
 	
 #ifdef COMPILE_KDE_SUPPORT
 	m_pContextPopup = new KPopupMenu(this);
 	m_pContextPopup->insertTitle(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_KVIRC)),__tr2qs("KVIrc"));
 #else
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 	QLabel * l = new QLabel(__tr2qs("KVIrc"),m_pContextPopup);
 	l->setFrameStyle(QFrame::Raised | QFrame::StyledPanel);
 	m_pContextPopup->insertItem(l);
diff --git a/src/modules/dockwidget/libkvidockwidget.h b/src/modules/dockwidget/libkvidockwidget.h
index 343b18be3..4a8a25d36 100644
--- a/src/modules/dockwidget/libkvidockwidget.h
+++ b/src/modules/dockwidget/libkvidockwidget.h
@@ -26,7 +26,7 @@
 #ifdef COMPILE_KDE_SUPPORT
 	class KPopupMenu;
 #else
-	class QPopupMenu;
+	class KviTalPopupMenu;
 #endif
 class QPixmap;
 class QTimer;
@@ -46,9 +46,9 @@ protected:
 #ifdef COMPILE_KDE_SUPPORT
 	KPopupMenu        * m_pContextPopup;
 #else
-	QPopupMenu        * m_pContextPopup;
+	KviTalPopupMenu        * m_pContextPopup;
 #endif
-	QPopupMenu        * m_pAwayPopup;
+	KviTalPopupMenu        * m_pAwayPopup;
 	int m_iToggleFrame;
 	int m_iAwayMenuId;
 
diff --git a/src/modules/dockwidget/trayicon.cpp b/src/modules/dockwidget/trayicon.cpp
index de8b590d2..cf2e46d8d 100644
--- a/src/modules/dockwidget/trayicon.cpp
+++ b/src/modules/dockwidget/trayicon.cpp
@@ -19,7 +19,7 @@
  */
 
 #include "trayicon.h"
-#include "qpopupmenu.h"
+#include "kvi_tal_popupmenu.h"
 
 /*!
   \class TrayIcon qtrayicon.h
@@ -45,7 +45,7 @@ TrayIcon::TrayIcon( QObject *parent, const char *name )
 
   \sa show
 */
-TrayIcon::TrayIcon( const QPixmap &icon, const QString &tooltip, QPopupMenu *popup, QObject *parent, const char *name )
+TrayIcon::TrayIcon( const QPixmap &icon, const QString &tooltip, KviTalPopupMenu *popup, QObject *parent, const char *name )
 : QObject(parent, name), pop(popup), pm(icon), tip(tooltip), d(0)
 {
 	v_isWMDock = FALSE;
@@ -79,7 +79,7 @@ void TrayIcon::newTrayOwner()
   Sets the context menu to \a popup. The context menu will pop up when the
   user clicks the system tray entry with the right mouse button.
 */
-void TrayIcon::setPopup( QPopupMenu* popup )
+void TrayIcon::setPopup( KviTalPopupMenu* popup )
 {
     pop = popup;
 }
@@ -89,7 +89,7 @@ void TrayIcon::setPopup( QPopupMenu* popup )
 
   \sa setPopup
 */
-QPopupMenu* TrayIcon::popup() const
+KviTalPopupMenu* TrayIcon::popup() const
 {
     return pop;
 }
diff --git a/src/modules/dockwidget/trayicon.h b/src/modules/dockwidget/trayicon.h
index b0ef7c087..f730d2aa5 100644
--- a/src/modules/dockwidget/trayicon.h
+++ b/src/modules/dockwidget/trayicon.h
@@ -26,7 +26,7 @@
 #include <qobject.h>
 #include <qimage.h>
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class TrayIcon : public QObject
 {
@@ -37,7 +37,7 @@ class TrayIcon : public QObject
 
 public:
 	TrayIcon( QObject *parent = 0, const char *name = 0 );
-	TrayIcon( const QPixmap &, const QString &, QPopupMenu *popup = 0, QObject *parent = 0, const char *name = 0 );
+	TrayIcon( const QPixmap &, const QString &, KviTalPopupMenu *popup = 0, QObject *parent = 0, const char *name = 0 );
 	~TrayIcon();
 
 	// use WindowMaker dock mode.  ignored on non-X11 platforms
@@ -45,8 +45,8 @@ public:
 	bool isWMDock() { return v_isWMDock; }
 
 	// Set a popup menu to handle RMB
-	void setPopup( QPopupMenu * );
-	QPopupMenu* popup() const;
+	void setPopup( KviTalPopupMenu * );
+	KviTalPopupMenu* popup() const;
 
 	QPixmap icon() const;
 	QString toolTip() const;
@@ -75,7 +75,7 @@ protected:
 	virtual void mouseDoubleClickEvent( QMouseEvent *e );
 
 private:
-	QPopupMenu *pop;
+	KviTalPopupMenu *pop;
 	QPixmap pm;
 	QString tip;
 	bool v_isWMDock;
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index 5fddae3c2..bd27cae06 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -28,7 +28,7 @@
 #include <qlayout.h>
 #include <qtoolbutton.h>
 #include <qgroupbox.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qmessagebox.h>
 #include <qtimer.h>
 #include <qobjectlist.h>
@@ -838,7 +838,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 	b->setMinimumWidth(24);
 	g->addWidget(b,1,0);
 
-	QPopupMenu * pop = new QPopupMenu(b);
+	KviTalPopupMenu * pop = new KviTalPopupMenu(b);
 	pop->insertItem(__tr2qs_ctx("&Open...","editor"),this,SLOT(loadFromFile()));
 	pop->insertItem(__tr2qs_ctx("&Save As...","editor"),this,SLOT(saveToFile()));
 	pop->insertSeparator();
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index e010369a1..ca2dd5e3f 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -43,8 +43,8 @@
 
 #include <qsplitter.h>
 #include <qlayout.h>
-#include <qvbox.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_vbox.h"
+#include "kvi_tal_popupmenu.h"
 #include <qtooltip.h>
 #include <qpushbutton.h>
 
@@ -73,7 +73,7 @@ KviEventEditor::KviEventEditor(QWidget * par)
 
 	l->addWidget(spl,0,0);
 
-	QVBox * boxi = new QVBox(spl);
+	KviTalVBox * boxi = new KviTalVBox(spl);
 	m_pListView = new QListView(boxi);
 	m_pListView->addColumn(__tr2qs("Event"));
 	m_pListView->setMultiSelection(false);
@@ -83,7 +83,7 @@ KviEventEditor::KviEventEditor(QWidget * par)
 	QPushButton * pb = new QPushButton(__tr2qs("&Export All To..."),boxi);
 	connect(pb,SIGNAL(clicked()),this,SLOT(exportAllEvents()));
 
-	QVBox * box = new QVBox(spl);
+	KviTalVBox * box = new KviTalVBox(spl);
 	m_pNameEditor = new QLineEdit(box);
 	QToolTip::add(m_pNameEditor,__tr2qs("Edit the event handler name."));
 	m_pEditor = KviScriptEditor::createInstance(box);
@@ -125,7 +125,7 @@ void KviEventEditor::oneTimeSetup()
 	}
 
 
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 
 	connect(m_pListView,SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(selectionChanged(QListViewItem *)));
 	connect(m_pListView,SIGNAL(rightButtonPressed(QListViewItem *,const QPoint &,int)),
diff --git a/src/modules/eventeditor/eventeditor.h b/src/modules/eventeditor/eventeditor.h
index 17d774900..cfd2783fd 100644
--- a/src/modules/eventeditor/eventeditor.h
+++ b/src/modules/eventeditor/eventeditor.h
@@ -61,7 +61,7 @@ public:
 	virtual const QPixmap * pixmap(int col) const;
 };
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviEventEditor : public QWidget
 {
@@ -73,7 +73,7 @@ public:
 	KviScriptEditor * m_pEditor;
 	QListView       * m_pListView;
 	QLineEdit       * m_pNameEditor;
-	QPopupMenu      * m_pContextPopup;
+	KviTalPopupMenu      * m_pContextPopup;
 	KviEventHandlerListViewItem * m_pLastEditedItem;
 	bool              m_bOneTimeSetupDone;
 public:
diff --git a/src/modules/filetransferwindow/filetransferwindow.cpp b/src/modules/filetransferwindow/filetransferwindow.cpp
index d88433f8e..740790300 100644
--- a/src/modules/filetransferwindow/filetransferwindow.cpp
+++ b/src/modules/filetransferwindow/filetransferwindow.cpp
@@ -38,7 +38,7 @@
 
 #include <qsplitter.h>
 #include <qtooltip.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qheader.h>
 #include <qpainter.h>
 #include <qmessagebox.h>
@@ -276,11 +276,11 @@ void KviFileTransferWindow::doubleClicked(QListViewItem *it,const QPoint &pnt,in
 
 void KviFileTransferWindow::rightButtonPressed(QListViewItem *it,const QPoint &pnt,int col)
 {
-	if(!m_pContextPopup)m_pContextPopup = new QPopupMenu(this);
-	if(!m_pLocalFilePopup)m_pLocalFilePopup = new QPopupMenu(this);
+	if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this);
+	if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this);
 	if(!m_pOpenFilePopup)
 	{
-		m_pOpenFilePopup= new QPopupMenu(this);
+		m_pOpenFilePopup= new KviTalPopupMenu(this);
 		connect(m_pOpenFilePopup,SIGNAL(activated(int)),this,SLOT(openFilePopupActivated(int)));
 	}
 
diff --git a/src/modules/filetransferwindow/filetransferwindow.h b/src/modules/filetransferwindow/filetransferwindow.h
index 5fcaca4ab..17eddb41a 100644
--- a/src/modules/filetransferwindow/filetransferwindow.h
+++ b/src/modules/filetransferwindow/filetransferwindow.h
@@ -34,7 +34,7 @@
 #include "kvi_dynamictooltip.h"
 
 #include <qlistview.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qtoolbutton.h>
 #include <qtimer.h>
 #include <qpixmap.h>
@@ -66,9 +66,9 @@ public:
 protected:
 	QSplitter           * m_pVertSplitter;
 	QListView           * m_pListView;
-	QPopupMenu          * m_pContextPopup;
-	QPopupMenu          * m_pLocalFilePopup;
-	QPopupMenu          * m_pOpenFilePopup;
+	KviTalPopupMenu          * m_pContextPopup;
+	KviTalPopupMenu          * m_pLocalFilePopup;
+	KviTalPopupMenu          * m_pOpenFilePopup;
 	QTimer              * m_pTimer;
 	QPixmap             * m_pMemPixmap;
 	int                   m_iLineSpacing; // cached fm value
diff --git a/src/modules/help/helpwidget.cpp b/src/modules/help/helpwidget.cpp
index a95fee59f..a3e04d6ca 100644
--- a/src/modules/help/helpwidget.cpp
+++ b/src/modules/help/helpwidget.cpp
@@ -53,7 +53,7 @@ KviHelpWidget::KviHelpWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 	m_pTextBrowser = new QTextBrowser(this,"text_browser");
 	m_pTextBrowser->setFrameStyle(QFrame::StyledPanel|QFrame::Sunken);
 	m_pTextBrowser->setFocusPolicy(QWidget::NoFocus);
-	m_pToolBar = new QHBox(this,"help_tool_bar");
+	m_pToolBar = new KviTalHBox(this);
 
 	m_pBtnIndex = new KviStyledToolButton(m_pToolBar);
 	m_pBtnIndex->setIconSet(*g_pIconManager->getBigIcon(KVI_BIGICON_HELPINDEX));
diff --git a/src/modules/help/helpwidget.h b/src/modules/help/helpwidget.h
index 9bc9539c2..8d592e93c 100644
--- a/src/modules/help/helpwidget.h
+++ b/src/modules/help/helpwidget.h
@@ -22,7 +22,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qtextbrowser.h>
 #include "index.h"
 #include <qprogressbar.h> 
@@ -42,7 +42,7 @@ private:
 	QToolButton  * m_pBtnIndex;
 	QToolButton  * m_pBtnBackward;
 	QToolButton  * m_pBtnForward;
-	QHBox        * m_pToolBar;
+	KviTalHBox        * m_pToolBar;
 	QTextBrowser * m_pTextBrowser;
 	bool           m_bIsStandalone;
 protected:
diff --git a/src/modules/help/helpwindow.cpp b/src/modules/help/helpwindow.cpp
index eef121e19..c051ebbb8 100644
--- a/src/modules/help/helpwindow.cpp
+++ b/src/modules/help/helpwindow.cpp
@@ -73,14 +73,14 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"main_splitter");
 	m_pHelpWidget = new KviHelpWidget(m_pSplitter,lpFrm);
 
-	m_pToolBar=new QVBox(m_pSplitter);
+	m_pToolBar=new KviTalVBox(m_pSplitter);
 
 	m_pTabWidget = new QTabWidget(m_pToolBar);
 	
-	m_pIndexTab  = new QVBox(m_pTabWidget);
+	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
 	m_pTabWidget->insertTab(m_pIndexTab,__tr2qs("Index"));
 	
-	QHBox* pSearchBox = new QHBox(m_pIndexTab);
+	KviTalHBox* pSearchBox = new KviTalHBox(m_pIndexTab);
 	m_pIndexSearch = new QLineEdit(pSearchBox);
 	connect( m_pIndexSearch, SIGNAL( textChanged(const QString&) ),
 	     this, SLOT( searchInIndex(const QString&) ) );
@@ -98,7 +98,7 @@ KviHelpWindow::KviHelpWindow(KviFrame * lpFrm,const char * name)
 	connect(m_pIndexListBox,SIGNAL(selected(int)),this,SLOT(indexSelected ( int )));
 	m_pIndexListBox->sort();
 	
-	m_pSearchTab  = new QVBox(m_pTabWidget);
+	m_pSearchTab  = new KviTalVBox(m_pTabWidget);
 	m_pTabWidget->insertTab(m_pSearchTab,__tr2qs("Search"));
 	
 	m_pTermsEdit = new QLineEdit(m_pSearchTab);
diff --git a/src/modules/help/helpwindow.h b/src/modules/help/helpwindow.h
index be59af7a8..1a48cd73d 100644
--- a/src/modules/help/helpwindow.h
+++ b/src/modules/help/helpwindow.h
@@ -24,7 +24,7 @@
 
 #include "kvi_window.h"
 #include "kvi_string.h"
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include <qtabwidget.h> 
 #include <qlistbox.h>
 #include <qlineedit.h>
@@ -41,10 +41,10 @@ public:
 	~KviHelpWindow();
 protected:
 	KviHelpWidget * m_pHelpWidget;
-	QVBox	      * m_pToolBar;
+	KviTalVBox	      * m_pToolBar;
 	QTabWidget    * m_pTabWidget;
-	QVBox         * m_pIndexTab;
-	QVBox         * m_pSearchTab;
+	KviTalVBox         * m_pIndexTab;
+	KviTalVBox         * m_pSearchTab;
 	
 	QListBox     * m_pIndexListBox;
 	QLineEdit    * m_pIndexSearch;
diff --git a/src/modules/http/httpfiletransfer.cpp b/src/modules/http/httpfiletransfer.cpp
index 37bb9a251..6ea79d634 100644
--- a/src/modules/http/httpfiletransfer.cpp
+++ b/src/modules/http/httpfiletransfer.cpp
@@ -34,7 +34,7 @@
 
 #include "kvi_kvs_script.h"
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qpainter.h>
 
 static KviPtrList<KviHttpFileTransfer> * g_pHttpFileTransfers = 0;
@@ -102,7 +102,7 @@ void KviHttpFileTransfer::abort()
 	m_pHttpRequest->abort();
 }
 
-void KviHttpFileTransfer::fillContextPopup(QPopupMenu * m,int column)
+void KviHttpFileTransfer::fillContextPopup(KviTalPopupMenu * m,int column)
 {
 	int id = m->insertItem(__tr2qs_ctx("Abort","http"),this,SLOT(abort()));
 	if(!active())m->setItemEnabled(id,false);
diff --git a/src/modules/http/httpfiletransfer.h b/src/modules/http/httpfiletransfer.h
index 837e25e12..0a556a6bf 100644
--- a/src/modules/http/httpfiletransfer.h
+++ b/src/modules/http/httpfiletransfer.h
@@ -34,7 +34,7 @@
 #include <qtimer.h>
 
 class QPainter;
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviHttpFileTransfer : public KviFileTransfer
 {
@@ -79,7 +79,7 @@ public:
 
 	virtual void displayPaint(QPainter * p,int column,int width,int height);
 	virtual int displayHeight(int iLineSpacing);
-	virtual void fillContextPopup(QPopupMenu * m,int column);
+	virtual void fillContextPopup(KviTalPopupMenu * m,int column);
 	virtual bool active();
 	virtual void die();
 	virtual QString tipText();
diff --git a/src/modules/links/linkswindow.cpp b/src/modules/links/linkswindow.cpp
index 2a1f8ab43..35d76fa7a 100644
--- a/src/modules/links/linkswindow.cpp
+++ b/src/modules/links/linkswindow.cpp
@@ -35,7 +35,7 @@
 
 #include <qsplitter.h>
 #include <qtooltip.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include <qlabel.h>
 
 extern KviPtrList<KviLinksWindow> * g_pLinksWindowList;
@@ -48,7 +48,7 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter");
 
 	// The button box on the left
-	QHBox * box = new QHBox(m_pTopSplitter,"button_box");
+	KviTalHBox * box = new KviTalHBox(m_pTopSplitter);
 
 	m_pRequestButton = new QToolButton(box,"request_button");
 	m_pRequestButton->setUsesBigPixmap(false);
@@ -80,7 +80,7 @@ KviLinksWindow::KviLinksWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pLinkList = new KviPtrList<KviLink>;
 	m_pLinkList->setAutoDelete(true);
 
-	m_pHostPopup = new QPopupMenu();
+	m_pHostPopup = new KviTalPopupMenu();
 	connect(m_pHostPopup,SIGNAL(activated(int)),this,SLOT(hostPopupClicked(int)));
 
 	connectionStateChange();
diff --git a/src/modules/links/linkswindow.h b/src/modules/links/linkswindow.h
index c27e608f3..8de5b8be2 100644
--- a/src/modules/links/linkswindow.h
+++ b/src/modules/links/linkswindow.h
@@ -30,7 +30,7 @@
 #include "kvi_irccontext.h"
 
 #include <qlistview.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qtoolbutton.h>
 
 class KviThemedLabel;
@@ -56,7 +56,7 @@ protected:
 	QSplitter      * m_pTopSplitter;
 	QListView      * m_pListView;
 	KviPtrList<KviLink> * m_pLinkList;
-	QPopupMenu     * m_pHostPopup;
+	KviTalPopupMenu     * m_pHostPopup;
 	QString          m_szRootServer;
 	QToolButton    * m_pRequestButton;
 	KviThemedLabel * m_pInfoLabel;
diff --git a/src/modules/list/listwindow.cpp b/src/modules/list/listwindow.cpp
index e45ca49a5..32d0be5d9 100644
--- a/src/modules/list/listwindow.cpp
+++ b/src/modules/list/listwindow.cpp
@@ -45,7 +45,7 @@
 #include <qfontmetrics.h>
 #include <qsplitter.h>
 #include <qtooltip.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 
 extern KviPtrList<KviListWindow> * g_pListWindowList;
 
@@ -171,7 +171,7 @@ KviListWindow::KviListWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 	m_pTopSplitter = new QSplitter(QSplitter::Horizontal,this,"top_splitter");
 	m_pVertSplitter = new QSplitter(QSplitter::Vertical,m_pSplitter,"vsplitter");
 
-	QHBox * box = new QHBox(m_pTopSplitter);
+	KviTalHBox * box = new KviTalHBox(m_pTopSplitter);
 
 	m_pRequestButton = new QToolButton(box,"request_button");
 	m_pRequestButton->setUsesBigPixmap(false);
diff --git a/src/modules/list/listwindow.h b/src/modules/list/listwindow.h
index 0b57d5f0e..4bce65750 100644
--- a/src/modules/list/listwindow.h
+++ b/src/modules/list/listwindow.h
@@ -33,7 +33,7 @@
 #include "kvi_irccontext.h"
 
 #include <qlistview.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index fd3574b6d..91be75ce1 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -38,7 +38,7 @@
 #include <qlistview.h>
 #include <qfileinfo.h>
 #include <qdir.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
 
 #ifdef COMPILE_ZLIB_SUPPORT
@@ -57,7 +57,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	
 	m_pTabWidget = new QTabWidget(m_pSplitter);
 	
-	m_pIndexTab  = new QVBox(m_pTabWidget);
+	m_pIndexTab  = new KviTalVBox(m_pTabWidget);
 	m_pTabWidget->insertTab(m_pIndexTab,__tr2qs_ctx("Index","logview"));
 	m_pListView = new QListView(m_pIndexTab);
 	m_pListView->addColumn(__tr2qs_ctx("Log File","logview"),135);
@@ -69,7 +69,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	connect(m_pListView,SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(itemSelected(QListViewItem *)));
 	connect(m_pListView,SIGNAL(rightButtonClicked ( QListViewItem * , const QPoint &, int )),this,SLOT(rightButtonClicked ( QListViewItem * , const QPoint &, int )));
 	
-	//m_pSearchTab  = new QVBox(m_pTabWidget);
+	//m_pSearchTab  = new KviTalVBox(m_pTabWidget);
 	//m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Search","logview"));
 
 	m_pIrcView = new KviIrcView(m_pSplitter,g_pFrame,this);
@@ -293,7 +293,7 @@ void KviLogViewMDIWindow::rightButtonClicked ( QListViewItem * it, const QPoint
 {
 	if(!it) return;
 	if(((KviLogListViewItem *)it)->fileName(0).isEmpty()) return;
-	QPopupMenu* popup = new QPopupMenu(this);
+	KviTalPopupMenu* popup = new KviTalPopupMenu(this);
 	popup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_QUIT)),__tr2qs_ctx("Remove file","logview"),this,SLOT(deleteCurrent()));
 	popup->exec( QCursor::pos() );
 }
diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index 1f47fb093..a106e98bf 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -25,7 +25,7 @@
 #include "kvi_window.h"
 #include "kvi_moduleextension.h"
 
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include <qtabwidget.h>
 
 class QListView;
@@ -44,8 +44,8 @@ protected:
 	QStringList     * m_pFileNames;
 	QString           m_szLogDirectory;
 	QTabWidget    * m_pTabWidget;
-	QVBox         * m_pIndexTab;
-	QVBox         * m_pSearchTab;
+	KviTalVBox         * m_pIndexTab;
+	KviTalVBox         * m_pSearchTab;
 protected:
 	QStringList getFileNames();
 	
diff --git a/src/modules/mircimport/libkvimircimport.cpp b/src/modules/mircimport/libkvimircimport.cpp
index 0af12203b..d8563882f 100644
--- a/src/modules/mircimport/libkvimircimport.cpp
+++ b/src/modules/mircimport/libkvimircimport.cpp
@@ -32,7 +32,7 @@
 #include <qmessagebox.h>
 #include <qdir.h>
 #include <qpushbutton.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 
 KviMircServersIniImport * g_pMircServersIniImport = 0;
 KviRemoteMircServersIniImport * g_pRemoteMircServersIniImport = 0;
@@ -153,7 +153,7 @@ KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircSe
 	addPage(l,capt);
 
 
-	QVBox * vb = new QVBox(this);
+	KviTalVBox * vb = new KviTalVBox(this);
 	l = new QLabel(vb);
 	l->setText(__tr2qs("<center>Here you can modify the URL that the list will be downloaded from. In most cases the default URL is acceptable.</center>"));
 
@@ -165,7 +165,7 @@ KviRemoteMircServerImportWizard::KviRemoteMircServerImportWizard(KviRemoteMircSe
 
 	addPage(vb,__tr2qs("URL Selection"));
 
-	vb = new QVBox(this);
+	vb = new KviTalVBox(this);
 
 	l = new QLabel(__tr2qs("Please wait while the list is being downloaded"),vb);
 	vb->setStretchFactor(l,1);
diff --git a/src/modules/notifier/notifiermessage.cpp b/src/modules/notifier/notifiermessage.cpp
index e30dde69c..02d2bd900 100644
--- a/src/modules/notifier/notifiermessage.cpp
+++ b/src/modules/notifier/notifiermessage.cpp
@@ -45,7 +45,7 @@
 #endif
 */
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qapplication.h>
 #include <qpainter.h>
 #include <qimage.h>
diff --git a/src/modules/notifier/notifiermessage.h b/src/modules/notifier/notifiermessage.h
index adeb8c292..f91f4097a 100644
--- a/src/modules/notifier/notifiermessage.h
+++ b/src/modules/notifier/notifiermessage.h
@@ -46,7 +46,7 @@
 class KviWindow;
 class KviNotifierWindow;
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviNotifierMessage
 {
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index ac71c35b6..dcaa44f84 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -36,7 +36,7 @@
 #include "kvi_options.h"
 #include "kvi_userinput.h"
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qapplication.h>
 #include <qpainter.h>
 #include <qimage.h>
@@ -1039,9 +1039,9 @@ void KviNotifierWindow::contextPopup(const QPoint &pos)
 {
 	if(!m_pContextPopup)
 	{
-		m_pContextPopup = new QPopupMenu(this);
+		m_pContextPopup = new KviTalPopupMenu(this);
 		connect(m_pContextPopup,SIGNAL(aboutToShow()),this,SLOT(fillContextPopup()));
-		m_pDisablePopup = new QPopupMenu(this);
+		m_pDisablePopup = new KviTalPopupMenu(this);
 	}
 
 	m_pContextPopup->clear();
diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
index ebe3c2024..9cc04144a 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/notifierwindow.h
@@ -53,7 +53,7 @@ class KviNotifierWindowBody;
 class KviNotifierWindowBorder;
 class KviNotifierWindowProgressBar;
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
 extern kvi_time_t g_tNotifierDisabledUntil;
 
@@ -115,8 +115,8 @@ protected:
 	int          m_iInputHeight;
 	int          m_iBlinkTimeout;
 	int          m_iBlinkCount;
-	QPopupMenu * m_pContextPopup;
-	QPopupMenu * m_pDisablePopup;
+	KviTalPopupMenu * m_pContextPopup;
+	KviTalPopupMenu * m_pDisablePopup;
 	KviWindow * m_pWindowToRaise;
 	kvi_time_t  m_tAutoHideAt;
 	kvi_time_t  m_tStartedAt;
diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index cbd62155c..698eac85c 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -550,7 +550,7 @@ void KviNotifierWindowTabs::setFocusOn(KviNotifierWindowTab * tab)
 	g_pNotifierWindow->update();
 }
 
-void KviNotifierWindowTabs::contextPopup(QPopupMenu *pPopup,const QPoint& pos)
+void KviNotifierWindowTabs::contextPopup(KviTalPopupMenu *pPopup,const QPoint& pos)
 {
 	if(m_rctTabs.contains(pos))
 	{
diff --git a/src/modules/notifier/notifierwindowtabs.h b/src/modules/notifier/notifierwindowtabs.h
index 925ada104..488654156 100644
--- a/src/modules/notifier/notifierwindowtabs.h
+++ b/src/modules/notifier/notifierwindowtabs.h
@@ -30,7 +30,7 @@
 #include <qpixmap.h>
 #include <qpoint.h>
 #include <qrect.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
 #include "kvi_list.h"
 #include "notifiersettings.h"
@@ -188,7 +188,7 @@ private:
 
 public:
 	QMap<KviWindow *, KviNotifierWindowTab *>* tabs() { return &m_tabMap; };
-	void contextPopup(QPopupMenu *pPopup,const QPoint& pos);
+	void contextPopup(KviTalPopupMenu *pPopup,const QPoint& pos);
 	void addMessage(KviWindow *, KviNotifierMessage *);
 	void closeCurrentTab();
 	void closeTab(KviWindow * pWnd); // referes to void closeTab(KviWindow * pWnd, KviNotifierWindowTab * pTab);
diff --git a/src/modules/objects/class_hbox.cpp b/src/modules/objects/class_hbox.cpp
index 3b6c0a37e..f9d509440 100644
--- a/src/modules/objects/class_hbox.cpp
+++ b/src/modules/objects/class_hbox.cpp
@@ -68,7 +68,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_hbox)
 bool KviKvsObject_hbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
 	
-		setObject(new QHBox(parentScriptWidget(), name()), true);
+		setObject(new KviTalHBox(parentScriptWidget()), true);
 	return true;
 }
 bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c)
@@ -77,7 +77,7 @@ bool KviKvsObject_hbox::functionsetMargin(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("margin",KVS_PT_UNSIGNEDINTEGER,0,uMargin)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QHBox *)widget())->setMargin(uMargin);
+    if (widget()) ((KviTalHBox *)widget())->setMargin(uMargin);
 	return true;
 }
 
@@ -87,7 +87,7 @@ bool KviKvsObject_hbox::functionsetSpacing(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("spacing",KVS_PT_UNSIGNEDINTEGER,0,uSpacing)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QHBox *)widget())->setSpacing(uSpacing);
+    if (widget()) ((KviTalHBox *)widget())->setSpacing(uSpacing);
 	return true;
 }
 bool KviKvsObject_hbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
@@ -121,7 +121,7 @@ bool KviKvsObject_hbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("The widget must be a child of this hbox"));
 		return true;
 	}
-	((QHBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
+	((KviTalHBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
 	return true;
 }
 
diff --git a/src/modules/objects/class_hbox.h b/src/modules/objects/class_hbox.h
index 59f20cc8e..ae067b5fe 100644
--- a/src/modules/objects/class_hbox.h
+++ b/src/modules/objects/class_hbox.h
@@ -23,7 +23,7 @@
 //
 #include "kvi_string.h"
 
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 #include "object_macros.h"
 #include "class_widget.h"
 
diff --git a/src/modules/objects/class_popupmenu.cpp b/src/modules/objects/class_popupmenu.cpp
index ee0762ae1..c32d0f891 100644
--- a/src/modules/objects/class_popupmenu.cpp
+++ b/src/modules/objects/class_popupmenu.cpp
@@ -184,7 +184,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_popupmenu)
 
 bool KviKvsObject_popupmenu::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new QPopupMenu(parentScriptWidget(), name()), true);
+	setObject(new KviTalPopupMenu(parentScriptWidget(), name()), true);
 	connect(widget(),SIGNAL(activated(int)),this,SLOT(slotactivated(int)));
 	connect(widget(),SIGNAL(highlighted(int)),this,SLOT(slothighlighted(int)));
 	return true;
@@ -203,12 +203,12 @@ bool KviKvsObject_popupmenu::functioninsertItem(KviKvsObjectFunctionCall *c)
     if(!szIcon.isEmpty())
 	{
 		pix = g_pIconManager->getImage(szIcon);
-        if (pix) id=((QPopupMenu *)widget())->insertItem(*pix,szItem);
+        if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szItem);
 		else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon);
 
 	}
 	else
-		id=((QPopupMenu *)widget())->insertItem(szItem);
+		id=((KviTalPopupMenu *)widget())->insertItem(szItem);
 	c->returnValue()->setInteger(id);
 	return true;
 }
@@ -235,7 +235,7 @@ bool KviKvsObject_popupmenu::functioninsertWidget(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("Can't add a non-widget object"));
         return TRUE;
     }
-	if (widget()) ((QPopupMenu *)widget())->insertItem(((QPopupMenu  *)(pObject->object())));
+	if (widget()) ((KviTalPopupMenu *)widget())->insertItem(((KviTalPopupMenu  *)(pObject->object())));
 	return true;
 }
 bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c)
@@ -260,12 +260,12 @@ bool KviKvsObject_popupmenu::functioninsertHandle(KviKvsObjectFunctionCall *c)
     if(!szIcon.isEmpty())
 	{
 		pix = g_pIconManager->getImage(szIcon);
-        if (pix) id=((QPopupMenu *)widget())->insertItem(*pix,szLabel,((QPopupMenu  *)(ob->object())));
+        if (pix) id=((KviTalPopupMenu *)widget())->insertItem(*pix,szLabel,((KviTalPopupMenu  *)(ob->object())));
 		else c->warning(__tr2qs("pix '%Q' doesn't exists"),&szIcon);
 
 	}
 	else
-		id=((QPopupMenu *)widget())->insertItem(szLabel,((QPopupMenu  *)(ob->object())));
+		id=((KviTalPopupMenu *)widget())->insertItem(szLabel,((KviTalPopupMenu  *)(ob->object())));
 	c->returnValue()->setInteger(id);
 	return true;
 }
@@ -273,7 +273,7 @@ bool KviKvsObject_popupmenu::functionexec(KviKvsObjectFunctionCall *c)
 {
 	if(!c->params()->count())
 	{
-	 ((QPopupMenu *)widget())->exec(QCursor::pos());
+	 ((KviTalPopupMenu *)widget())->exec(QCursor::pos());
 	 return true;
 	}
 
@@ -303,7 +303,7 @@ bool KviKvsObject_popupmenu::functionexec(KviKvsObjectFunctionCall *c)
 		return true;
 	}
 
-	((QPopupMenu *)widget())->exec(((QWidget *)(pObject->object()))->mapToGlobal(QPoint(iX,iY)) );
+	((KviTalPopupMenu *)widget())->exec(((QWidget *)(pObject->object()))->mapToGlobal(QPoint(iX,iY)) );
 
 	return true;
 }
@@ -313,7 +313,7 @@ bool KviKvsObject_popupmenu::functionremoveItem(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("item_id",KVS_PT_UNSIGNEDINTEGER,0,uItem)
 	KVSO_PARAMETERS_END(c)
-	if(widget()) ((QPopupMenu *)widget())->removeItem(uItem);
+	if(widget()) ((KviTalPopupMenu *)widget())->removeItem(uItem);
 	return true;
 }
 bool KviKvsObject_popupmenu::functionremoveItemAt(KviKvsObjectFunctionCall *c)
@@ -322,7 +322,7 @@ bool KviKvsObject_popupmenu::functionremoveItemAt(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
 	KVSO_PARAMETERS_END(c)
-	if(widget())((QPopupMenu *)widget())->removeItemAt(uIndex);
+	if(widget())((KviTalPopupMenu *)widget())->removeItemAt(uIndex);
 	return true;
 }
 
@@ -332,7 +332,7 @@ bool KviKvsObject_popupmenu::functioninsertSeparator(KviKvsObjectFunctionCall *c
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("index",KVS_PT_UNSIGNEDINTEGER,0,uIndex)
 	KVSO_PARAMETERS_END(c)
-	if(widget())((QPopupMenu *)widget())->insertSeparator(uIndex);
+	if(widget())((KviTalPopupMenu *)widget())->insertSeparator(uIndex);
 	return true;
 }
 
diff --git a/src/modules/objects/class_popupmenu.h b/src/modules/objects/class_popupmenu.h
index 51eaf4586..9f5048020 100644
--- a/src/modules/objects/class_popupmenu.h
+++ b/src/modules/objects/class_popupmenu.h
@@ -24,7 +24,7 @@
 //
 
 
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
 #include "class_widget.h"
 #include "object_macros.h"
diff --git a/src/modules/objects/class_toolbutton.cpp b/src/modules/objects/class_toolbutton.cpp
index b31e32b1d..4508540bc 100644
--- a/src/modules/objects/class_toolbutton.cpp
+++ b/src/modules/objects/class_toolbutton.cpp
@@ -27,7 +27,7 @@
 
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 /*
 	@doc:	toolbutton
 	@keyterms:
@@ -265,7 +265,7 @@ bool KviKvsObject_toolbutton::functionsetPopup(KviKvsObjectFunctionCall *c)
         return TRUE;
     }
 	if(widget())
-		((QToolButton *)widget())->setPopup(((QPopupMenu  *)(ob->object())));
+		((QToolButton *)widget())->setPopup(((KviTalPopupMenu  *)(ob->object())));
 	return true;
 }
 bool KviKvsObject_toolbutton::functionopenPopup(KviKvsObjectFunctionCall *c)
diff --git a/src/modules/objects/class_vbox.cpp b/src/modules/objects/class_vbox.cpp
index d87a24c5c..f3bf44969 100644
--- a/src/modules/objects/class_vbox.cpp
+++ b/src/modules/objects/class_vbox.cpp
@@ -67,7 +67,7 @@ KVSO_END_CONSTRUCTOR(KviKvsObject_vbox)
 
 bool KviKvsObject_vbox::init(KviKvsRunTimeContext * pContext,KviKvsVariantList *pParams)
 {
-	setObject(new QVBox(parentScriptWidget(), name()), true);
+	setObject(new KviTalVBox(parentScriptWidget()), true);
 	return true;
 }
 
@@ -77,7 +77,7 @@ bool KviKvsObject_vbox::functionsetMargin(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("margin",KVS_PT_INT,0,iMargin)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QVBox *)widget())->setMargin(iMargin);
+    if (widget()) ((KviTalVBox *)widget())->setMargin(iMargin);
 	return true;
 }
 
@@ -87,7 +87,7 @@ bool KviKvsObject_vbox::functionsetSpacing(KviKvsObjectFunctionCall *c)
 	KVSO_PARAMETERS_BEGIN(c)
 		KVSO_PARAMETER("spacing",KVS_PT_INT,0,iSpacing)
 	KVSO_PARAMETERS_END(c)
-    if (widget()) ((QVBox *)widget())->setSpacing(iSpacing);
+    if (widget()) ((KviTalVBox *)widget())->setSpacing(iSpacing);
 	return true;
 }
 
@@ -123,6 +123,6 @@ bool KviKvsObject_vbox::functionsetStretchFactor(KviKvsObjectFunctionCall *c)
 		c->warning(__tr2qs("The widget must be a child of this vbox"));
 		return true;
 	}
-	((QVBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
+	((KviTalVBox *)widget())->setStretchFactor(((QWidget *)(pObject->object())),uStretch);
 	return true;
 }
 \ No newline at end of file
diff --git a/src/modules/objects/class_vbox.h b/src/modules/objects/class_vbox.h
index cd2bf6c05..11cef7d0e 100644
--- a/src/modules/objects/class_vbox.h
+++ b/src/modules/objects/class_vbox.h
@@ -24,7 +24,7 @@
 #include "kvi_string.h"
 
 #include "class_widget.h"
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include "object_macros.h"
 
 class KviKvsObject_vbox : public KviKvsObject_widget
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index e4b5835a9..79af2b671 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -36,13 +36,13 @@
 #include <qlayout.h>
 #include <qaccel.h>
 #include <qlabel.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include <qsplitter.h>
-#include <qwidgetstack.h>
+#include "kvi_tal_widgetstack.h"
 #include <qpushbutton.h>
 #include <qtooltip.h>
 #include <qheader.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qtoolbutton.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
@@ -184,7 +184,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 
 	g1->addMultiCellWidget(spl,0,0,0,4);
 
-	QVBox * vbox = new QVBox(spl);
+	KviTalVBox * vbox = new KviTalVBox(spl);
 	vbox->setSpacing(2);
 	vbox->setMargin(0);
 
@@ -196,7 +196,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	m_pListView->setSorting(-1);
 	connect(m_pListView,SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(listViewItemSelectionChanged(QListViewItem *)));
 
-	QHBox * hbox = new QHBox(vbox);
+	KviTalHBox * hbox = new KviTalHBox(vbox);
 	vbox->setSpacing(2);
 	vbox->setMargin(0);
 
@@ -219,7 +219,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	QToolTip::add(m_pSearchButton,szTip);
 #endif
 
-	vbox = new QVBox(spl);
+	vbox = new KviTalVBox(spl);
 	vbox->setSpacing(2);
 	vbox->setMargin(0);
 
@@ -230,7 +230,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
 
 	// Widget stack
-	m_pWidgetStack = new QWidgetStack(vbox);
+	m_pWidgetStack = new KviTalWidgetStack(vbox);
 	vbox->setStretchFactor(m_pWidgetStack,1);
 
 	// First widget visible
diff --git a/src/modules/options/dialog.h b/src/modules/options/dialog.h
index 12d88de65..2263f829e 100644
--- a/src/modules/options/dialog.h
+++ b/src/modules/options/dialog.h
@@ -34,7 +34,7 @@
 #include "instances.h"
 
 class QLabel;
-class QWidgetStack;
+class KviTalWidgetStack;
 class QPushButton;
 class QLineEdit;
 class QToolButton;
@@ -72,7 +72,7 @@ public:
 private:
 	QListView    * m_pListView;
 	QLabel       * m_pCategoryLabel;
-	QWidgetStack * m_pWidgetStack;
+	KviTalWidgetStack * m_pWidgetStack;
 	KviGeneralOptionsFrontWidget* m_pFrontWidget;
 	QString        m_szGroup;
 	QLineEdit    * m_pSearchLineEdit;
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index fee788ea4..86c1801ab 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -97,7 +97,7 @@ KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
 	mergeTip(b,__tr2qs_ctx("<center>Enable this option if you want specify a local port range for DCC.</center>","options"));
 #endif
 
-	QHBox * hb = new QHBox(g);
+	KviTalHBox * hb = new KviTalHBox(g);
 	hb->setSpacing(4);
 	KviUIntSelector * u = addUIntSelector(hb,__tr2qs_ctx("Lowest port:","options"),KviOption_uintDccMinPort,1,65535,5000,KVI_OPTION_BOOL(KviOption_boolUserDefinedPortRange));
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
@@ -261,13 +261,13 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 
 	g = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Limits","options"));
 
-	QHBox * hb = new QHBox(g);
+	KviTalHBox * hb = new KviTalHBox(g);
 	b = addBoolSelector(hb,__tr2qs_ctx("Limit upload bandwidth to","options"),KviOption_boolLimitDccSendSpeed);
 	KviUIntSelector * u = addUIntSelector(hb,"",KviOption_uintMaxDccSendSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccSendSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
 	connect(b,SIGNAL(toggled(bool)),u,SLOT(setEnabled(bool)));
 	
-	hb = new QHBox(g);
+	hb = new KviTalHBox(g);
 	b = addBoolSelector(hb,__tr2qs_ctx("Limit download bandwidth to","options"),KviOption_boolLimitDccRecvSpeed);
 	u = addUIntSelector(hb,"",KviOption_uintMaxDccRecvSpeed,0,0xffffff1,1024,KVI_OPTION_BOOL(KviOption_boolLimitDccRecvSpeed));
 	u->setSuffix(" " + __tr2qs_ctx("bytes/sec","options"));
@@ -290,7 +290,7 @@ KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * paren
 				"Most clients can handle this kind of optimisation so disable it only if you have problems.</center>","options"));
 #endif //COMPILE_INFO_TIPS
 
-	hb = new QHBox(g);
+	hb = new KviTalHBox(g);
 
 	b = addBoolSelector(hb,__tr2qs_ctx("Force idle step","options"),KviOption_boolDccSendForceIdleStep);
 #ifdef COMPILE_INFO_TIPS
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index 42fca0013..fb56518e9 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -86,7 +86,7 @@ KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString
 	m_pNickEdit3 = new QLineEdit(this);
 	g->addMultiCellWidget(m_pNickEdit3,3,3,1,2);
 	m_pNickEdit3->setText(n3);
-	QHBox * h = new QHBox(this);
+	KviTalHBox * h = new KviTalHBox(this);
 	h->setSpacing(8);
 	g->addWidget(h,4,2);
 
@@ -238,7 +238,7 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &
 	QPushButton * b = new QPushButton(__tr2qs_ctx("&Browse...","options"),this);
 	connect(b,SIGNAL(clicked()),this,SLOT(chooseFileClicked()));
 	g->addWidget(b,1,2);
-	QHBox * h = new QHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2);
+	KviTalHBox * h = new KviTalHBox(this);h->setSpacing(8);g->addMultiCellWidget(h,2,2,1,2);
 	b = new QPushButton(__tr2qs_ctx("&OK","options"),h);
 	b->setMinimumWidth(80);
 	b->setDefault(true);
@@ -314,7 +314,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	layout()->setMargin(10);
 
 	QGroupBox * gbox = addGroupBox(0,0,0,0,1,QGroupBox::Horizontal,__tr2qs_ctx("Basic Properties","options"));
-	QHBox * hb = new QHBox(gbox);
+	KviTalHBox * hb = new KviTalHBox(gbox);
 	hb->setSpacing(3);
 
 	KviStringSelector * sel = addStringSelector(hb,__tr2qs_ctx("Nickname:","options"),KviOption_stringNickname1);
@@ -355,7 +355,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 
 	gbox = addGroupBox(0,1,0,1,1,QGroupBox::Horizontal,__tr2qs_ctx("Profile","options"));
 
-	hb = new QHBox(gbox);
+	hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
 	
 	QLabel * l = new QLabel(__tr2qs_ctx("Age:","options"),hb);
@@ -385,7 +385,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	hb->setStretchFactor(m_pAgeCombo,1);
 
 
-	hb = new QHBox(gbox);
+	hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
 	
 	l = new QLabel(__tr2qs_ctx("Gender:","options"),hb);
@@ -524,7 +524,7 @@ KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
 	mergeTip(m_pAvatarPreview,szTip);
 #endif
 
-	QHBox * hb = new QHBox(this);
+	KviTalHBox * hb = new KviTalHBox(this);
 	hb->setSpacing(4);
 	addWidgetToLayout(hb,0,2,0,2);
 
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 90d7c78e6..4c7fb0090 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -28,7 +28,7 @@
 
 #include <qlayout.h>
 #include <qpushbutton.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 #include <qcursor.h>
 #include <qpainter.h>
 #include "kvi_styled_controls.h"
@@ -103,7 +103,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 		l,
 		SLOT(setEnabled(bool)));
 
-	QHBox * hb = new QHBox(g);
+	KviTalHBox * hb = new KviTalHBox(g);
 
 	connect(
 		b,
@@ -128,7 +128,7 @@ KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 	
 	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),b,SLOT(setEnabled(bool)));
 	
-	hb = new QHBox(g);
+	hb = new KviTalHBox(g);
 	
 	m_pSpecialTimestampColorSelector = addBoolSelector(hb,__tr2qs_ctx("Use special color for timestamps","options"),KviOption_boolUseSpecialColorForTimestamp,KVI_OPTION_BOOL(KviOption_boolIrcViewTimestamp));
 	connect(m_pSpecialTimestampColorSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool)));
@@ -381,7 +381,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 
 	addWidgetToLayout(m_pListView,0,0,2,0);
 
-	QVBox * box = new QVBox(this);
+	KviTalVBox * box = new KviTalVBox(this);
 	addWidgetToLayout(box,3,0,3,0);
 
 	QLabel * l = new QLabel(__tr2qs_ctx("Background:","options"),box);
@@ -415,7 +415,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 	m_pIconButton = new KviStyledToolButton(box);
 	connect(m_pIconButton,SIGNAL(clicked()),this,SLOT(iconButtonClicked()));
 
-	m_pIconPopup = new QPopupMenu(this);
+	m_pIconPopup = new KviTalPopupMenu(this);
 	KviIconWidget * iw = new KviIconWidget(m_pIconPopup);
 	connect(iw,SIGNAL(selected(int)),this,SLOT(newIconSelected(int)));
 	m_pIconPopup->insertItem(iw);
@@ -423,7 +423,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 
 	m_pEnableLogging = new KviStyledCheckBox(__tr2qs_ctx("Log this","options"),box);
 
-	QHBox * h = new QHBox(this);
+	KviTalHBox * h = new KviTalHBox(this);
 	addWidgetToLayout(h,0,1,3,1);
 	QPushButton * b = new QPushButton(__tr2qs_ctx("Load From...","options"),h);
 	connect(b,SIGNAL(clicked()),this,SLOT(load()));
diff --git a/src/modules/options/optw_messages.h b/src/modules/options/optw_messages.h
index 72c2b1807..4f6d59652 100644
--- a/src/modules/options/optw_messages.h
+++ b/src/modules/options/optw_messages.h
@@ -31,7 +31,7 @@
 #include <qlistbox.h>
 #include <qcheckbox.h>
 #include <qtoolbutton.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
 #define KVI_OPTIONS_WIDGET_ICON_KviMessageOptionsWidget KVI_SMALLICON_MESSAGES
 #define KVI_OPTIONS_WIDGET_NAME_KviMessageOptionsWidget __tr2qs_no_lookup("Text")
@@ -136,7 +136,7 @@ public:
 	KviMessageListViewItem     * m_pLastItem;
 	QCheckBox                  * m_pEnableLogging;
 	QToolButton                * m_pIconButton;
-	QPopupMenu                 * m_pIconPopup;
+	KviTalPopupMenu                 * m_pIconPopup;
 public:
 	void saveLastItem();
 protected slots:
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index 4148e5d3e..9af3b7d6f 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -35,7 +35,7 @@
 #include <qcombobox.h>
 #include <qcheckbox.h>
 #include <qgroupbox.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
 #include <qtooltip.h>
 #include <qtoolbutton.h>
@@ -79,7 +79,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
   mergeTip(m_pListView->viewport(),tiptxt);
 #endif
 
-  QVBox * vbox = new QVBox(this);
+  KviTalVBox * vbox = new KviTalVBox(this);
   addWidgetToLayout(vbox,1,1,1,1);
 
   QToolButton * tb = new KviStyledToolButton(vbox);
@@ -150,7 +150,7 @@ KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 	layout()->setRowStretch(0,1);
 	layout()->setColStretch(0,1);
 
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 
 
 }
diff --git a/src/modules/options/optw_proxy.h b/src/modules/options/optw_proxy.h
index a74400d15..fe188869b 100644
--- a/src/modules/options/optw_proxy.h
+++ b/src/modules/options/optw_proxy.h
@@ -45,7 +45,7 @@ class QLabel;
 class QLineEdit;
 class KviIpEditor;
 class QCheckBox;
-class QPopupMenu;
+class KviTalPopupMenu;
 class QComboBox;
 
 #define KVI_OPTIONS_WIDGET_ICON_KviProxyOptionsWidget KVI_SMALLICON_PROXY
@@ -74,7 +74,7 @@ protected:
 	QLineEdit    * m_pPortEdit;
 	QLabel       * m_pProtocolLabel;
 	QComboBox    * m_pProtocolBox;
-	QPopupMenu   * m_pContextPopup;
+	KviTalPopupMenu   * m_pContextPopup;
 	QCheckBox    * m_pIpV6Check;
 	KviProxyOptionsListViewItem * m_pLastEditedItem;
 private:
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 932c125ac..11ca4ac6e 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -54,7 +54,7 @@
 #include <qtoolbutton.h>
 #include <qlineedit.h>
 #include <qcheckbox.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
 #include <qtooltip.h>
 #include <qvalidator.h>
@@ -1026,8 +1026,8 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 {
 	createLayout(4,2);
 
-	m_pContextPopup = new QPopupMenu(this);
-	m_pImportPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
+	m_pImportPopup = new KviTalPopupMenu(this);
 
 	connect(m_pImportPopup,SIGNAL(aboutToShow()),this,SLOT(importPopupAboutToShow()));
 	connect(m_pImportPopup,SIGNAL(activated(int)),this,SLOT(importPopupActivated(int)));
@@ -1058,7 +1058,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	QToolTip::add(m_pListView->viewport(),tiptxt);
 #endif
 
-	QVBox * vbox = new QVBox(this);
+	KviTalVBox * vbox = new KviTalVBox(this);
 	addWidgetToLayout(vbox,1,0,1,0);
 
 	m_pNewNetworkButton = new KviStyledToolButton(vbox);
@@ -1164,7 +1164,7 @@ KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
 	QToolTip::add(m_pConnectCurrent,__tr2qs_ctx("<center>Hit this button to connect to the currently selected server.</center>","options"));
 #endif
 
-	m_pRecentPopup = new QPopupMenu(this);
+	m_pRecentPopup = new KviTalPopupMenu(this);
 	connect(m_pRecentPopup,SIGNAL(aboutToShow()),this,SLOT(recentServersPopupAboutToShow()));
 	connect(m_pRecentPopup,SIGNAL(activated(int)),this,SLOT(recentServersPopupClicked(int)));
 
diff --git a/src/modules/options/optw_servers.h b/src/modules/options/optw_servers.h
index e2b0a691f..17595b938 100644
--- a/src/modules/options/optw_servers.h
+++ b/src/modules/options/optw_servers.h
@@ -56,7 +56,7 @@ class QLineEdit;
 class KviIpEditor;
 class KviIrcServer;
 class QCheckBox;
-class QPopupMenu;
+class KviTalPopupMenu;
 class KviScriptEditor;
 class QComboBox;
 class QPushButton;
@@ -164,9 +164,9 @@ protected:
 	//QLabel                       * m_pPortLabel;
 	//QLineEdit                    * m_pPortEdit;
 	QPushButton                  * m_pDetailsButton;
-	QPopupMenu                   * m_pRecentPopup;
-	QPopupMenu                   * m_pContextPopup;
-	QPopupMenu                   * m_pImportPopup;
+	KviTalPopupMenu                   * m_pRecentPopup;
+	KviTalPopupMenu                   * m_pContextPopup;
+	KviTalPopupMenu                   * m_pImportPopup;
 	KviIrcServer                 * m_pClipboard;
 	//QCheckBox                    * m_pIpV6Check;
 	QPushButton                  * m_pConnectCurrent;
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index c3fc7c695..f66ed4800 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -33,7 +33,7 @@
 
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 
 #ifdef COMPILE_INFO_TIPS
 	#include <qtooltip.h>
@@ -65,7 +65,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	QToolTip::add(g,__tr2qs_ctx("This allows you to select the sound system to be used with KVIrc.","options"));
 
-	QHBox * h = new QHBox(g);
+	KviTalHBox * h = new KviTalHBox(g);
 
 	m_pSoundSystemBox = new QComboBox(false,h);
 
@@ -81,7 +81,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	QToolTip::add(g,__tr2qs_ctx("This allows you to select the preferred media player to be used with " \
 		"the mediaplayer.* module commands and functions.","options"));
 
-	h = new QHBox(g);
+	h = new KviTalHBox(g);
 
 	m_pMediaPlayerBox = new QComboBox(false,h);
 
@@ -103,7 +103,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	QToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of mp3 tags.","options"));
 
-	h = new QHBox(g);
+	h = new KviTalHBox(g);
 
 	m_pTagsEncodingCombo = new QComboBox(false,h);
 	m_pTagsEncodingCombo->insertItem(__tr2qs_ctx("Use Language Encoding","options"));
@@ -126,7 +126,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	QToolTip::add(g,__tr2qs_ctx("This allows you to select encoding of winamp messages.","options"));
 
-	h = new QHBox(g);
+	h = new KviTalHBox(g);
 
 	m_pWinampEncodingCombo = new QComboBox(false,h);
 	
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index ae6de5494..79a263b53 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -29,11 +29,11 @@
 
 #include <qlayout.h>
 #include <qcursor.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 
 
 KviTextIconEditor::KviTextIconEditor(QWidget * par,KviTextIcon * icon,KviTextIconTableItem* item)
-: QHBox(par),m_pTableItem(item)
+: KviTalHBox(par),m_pTableItem(item)
 {
 	m_pIconButton=new QToolButton(this);
 	m_pBrowseButton=new QToolButton(this);
@@ -56,7 +56,7 @@ void KviTextIconEditor::doPopup()
 {
 	if(!m_pPopup)
 	{
-		m_pPopup = new QPopupMenu(this);
+		m_pPopup = new KviTalPopupMenu(this);
 		KviIconWidget * iw = new KviIconWidget(m_pPopup);
 		connect(iw,SIGNAL(selected(int)),this,SLOT(iconSelected(int)));
 		m_pPopup->insertItem(iw);
diff --git a/src/modules/options/optw_texticons.h b/src/modules/options/optw_texticons.h
index 38f847921..0a33cfbc2 100644
--- a/src/modules/options/optw_texticons.h
+++ b/src/modules/options/optw_texticons.h
@@ -33,12 +33,12 @@
 
 #include <qtable.h>
 #include <qtoolbutton.h>
-#include <qpopupmenu.h>
-#include <qhbox.h> 
+#include "kvi_tal_popupmenu.h"
+#include "kvi_tal_hbox.h" 
 
 class KviTextIconTableItem;
 
-class KviTextIconEditor : public QHBox
+class KviTextIconEditor : public KviTalHBox
 {
 	Q_OBJECT
 public:
@@ -47,7 +47,7 @@ public:
 protected:
 	KviTextIconTableItem *m_pTableItem;
 	KviTextIcon     *m_pIcon;
-	QPopupMenu      *m_pPopup;
+	KviTalPopupMenu      *m_pPopup;
 	QToolButton     *m_pIconButton;
 	QToolButton     *m_pBrowseButton;
 public:
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index e5c754329..5dd4881a0 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -61,7 +61,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q
 	addColorSelector(g,__tr2qs_ctx("User-op:","options"),KviOption_colorUserListViewUserOpForeground);
 	addColorSelector(g,__tr2qs_ctx("Away:","options"),KviOption_colorUserListViewAwayForeground);
 	
-	QHBox * hb = new QHBox(g);
+	KviTalHBox * hb = new KviTalHBox(g);
 	hb->setSpacing(4);
 	KviBoolSelector * b = addBoolSelector(hb,__tr2qs_ctx("Use different color for own nick:","options"),KviOption_boolUseDifferentColorForOwnNick);
 	KviColorSelector * s = addColorSelector(hb,"",KviOption_colorUserListViewOwnForeground,KVI_OPTION_BOOL(KviOption_boolUseDifferentColorForOwnNick));
@@ -73,7 +73,7 @@ KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(Q
 	s = addColorSelector(g,__tr2qs_ctx("Grid color:","options"),KviOption_colorUserListViewGrid,KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
 	connect(b,SIGNAL(toggled(bool)),s,SLOT(setEnabled(bool)));
 
-	hb = new QHBox(g);
+	hb = new KviTalHBox(g);
 	hb->setSpacing(4);
 
 	QLabel * l = new QLabel(__tr2qs_ctx("Grid type:","options"),hb);
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 496f34e47..21d4fef81 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -48,7 +48,7 @@
 #include <qtooltip.h>
 #include "kvi_asciidict.h"
 #include <qpushbutton.h>
-#include <qvbox.h>
+#include "kvi_tal_vbox.h"
 
 extern KviPopupEditorWindow * g_pPopupEditorWindow;
 
@@ -188,7 +188,7 @@ KviSinglePopupEditor::KviSinglePopupEditor(QWidget * par)
 : QWidget(par)
 {
 	m_pLastSelectedItem = 0;
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 	m_pClipboard = 0;
 	m_pTestPopup = 0;
 
@@ -1028,7 +1028,7 @@ KviPopupEditor::KviPopupEditor(QWidget * par)
 	QSplitter * spl = new QSplitter(QSplitter::Horizontal,this);
 	l->addWidget(spl,0,0);
 	
-	QVBox * box = new QVBox(spl);
+	KviTalVBox * box = new KviTalVBox(spl);
 
 	m_pListView = new QListView(box);
 	m_pListView->addColumn(__tr2qs("Popup"));
@@ -1045,7 +1045,7 @@ KviPopupEditor::KviPopupEditor(QWidget * par)
 	m_bOneTimeSetupDone = false;
 	m_pLastEditedItem = 0;
 
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 
 	currentItemChanged(0);
 }
diff --git a/src/modules/popupeditor/popupeditor.h b/src/modules/popupeditor/popupeditor.h
index 0ff9eccfd..d2795b961 100644
--- a/src/modules/popupeditor/popupeditor.h
+++ b/src/modules/popupeditor/popupeditor.h
@@ -29,7 +29,7 @@
 #include <qwidget.h>
 #include <qlistview.h>
 #include <qlineedit.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qpushbutton.h>
 
 class KviKvsPopupMenu;
@@ -85,7 +85,7 @@ protected:
 	QLineEdit            * m_pIconEditor;
 	QLineEdit            * m_pConditionEditor;
 	QLineEdit            * m_pExtNameEditor;
-	QPopupMenu           * m_pContextPopup;
+	KviTalPopupMenu           * m_pContextPopup;
 public:
 	void edit(KviMenuListViewItem * it);
 	KviKvsPopupMenu * getMenu();
@@ -158,7 +158,7 @@ public:
 	QListView            * m_pListView;
 	KviMenuListViewItem  * m_pLastEditedItem;
 	bool                   m_bOneTimeSetupDone;
-	QPopupMenu           * m_pContextPopup;
+	KviTalPopupMenu           * m_pContextPopup;
 public:
 	void commit();
 	void exportPopups(bool);
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 262a8b0e2..7a3189a4f 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -39,8 +39,8 @@
 #include <qmessagebox.h>
 #include <qsplitter.h>
 #include <qlayout.h>
-#include <qvbox.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_vbox.h"
+#include "kvi_tal_popupmenu.h"
 #include <qtooltip.h>
 #include <qinputdialog.h>
 #include <qpushbutton.h>
@@ -79,7 +79,7 @@ KviRawEditor::KviRawEditor(QWidget * par)
 
 	l->addWidget(spl,0,0);
 
-	QVBox * boxi = new QVBox(spl);
+	KviTalVBox * boxi = new KviTalVBox(spl);
 	m_pListView = new QListView(boxi);
 	m_pListView->addColumn(__tr2qs("Raw Event"));
 	m_pListView->setMultiSelection(false);
@@ -89,7 +89,7 @@ KviRawEditor::KviRawEditor(QWidget * par)
 	QPushButton * pb = new QPushButton(__tr2qs("&Export All To..."),boxi);
 	connect(pb,SIGNAL(clicked()),this,SLOT(exportAllEvents()));
 	
-	QVBox * box = new QVBox(spl);
+	KviTalVBox * box = new KviTalVBox(spl);
 	m_pNameEditor = new QLineEdit(box);
 	QToolTip::add(m_pNameEditor,__tr2qs("Edit the raw event handler name."));
 	m_pEditor = KviScriptEditor::createInstance(box);
@@ -130,7 +130,7 @@ void KviRawEditor::oneTimeSetup()
 	}
 
 
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 
 	connect(m_pListView,SIGNAL(selectionChanged(QListViewItem *)),this,SLOT(selectionChanged(QListViewItem *)));
 	connect(m_pListView,SIGNAL(rightButtonPressed(QListViewItem *,const QPoint &,int)),
diff --git a/src/modules/raweditor/raweditor.h b/src/modules/raweditor/raweditor.h
index 926fb0d8b..8e5759ef1 100644
--- a/src/modules/raweditor/raweditor.h
+++ b/src/modules/raweditor/raweditor.h
@@ -58,7 +58,7 @@ public:
 	virtual const QPixmap * pixmap(int col) const;
 };
 
-class QPopupMenu;
+class KviTalPopupMenu;
 
 class KviRawEditor : public QWidget
 {
@@ -70,7 +70,7 @@ public:
 	KviScriptEditor * m_pEditor;
 	QListView       * m_pListView;
 	QLineEdit       * m_pNameEditor;
-	QPopupMenu      * m_pContextPopup;
+	KviTalPopupMenu      * m_pContextPopup;
 	KviRawHandlerListViewItem * m_pLastEditedItem;
 	bool              m_bOneTimeSetupDone;
 public:
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 7232885c6..60e1cfeec 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -51,8 +51,8 @@
 
 #include <qstyle.h>
 #include <qpainter.h>
-#include <qhbox.h>
-#include <qvbox.h>
+#include "kvi_tal_hbox.h"
+#include "kvi_tal_vbox.h"
 #include <qinputdialog.h>
 
 #include "wizard.h"
@@ -92,7 +92,7 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviDict<QStri
 	m_pTable->setMinimumSize(250,250);
 	//connect(m_pTable,SIGNAL(valueChanged(int,int)),this,SLOT(propertyValueChanged(int,int)));
 
-	QVBox * vb = new QVBox(this);
+	KviTalVBox * vb = new KviTalVBox(this);
 	vb->setSpacing(4);
 	g->addWidget(vb,0,2);
 
@@ -104,7 +104,7 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviDict<QStri
 	connect(m_pDelButton,SIGNAL(clicked()),this,SLOT(delClicked()));
 	m_pDelButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DELETEITEM)));
 
-	QHBox * b = new QHBox(this);
+	KviTalHBox * b = new KviTalHBox(this);
 	b->setSpacing(4);
 	g->addMultiCellWidget(b,2,2,1,2);
 
@@ -208,7 +208,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m)
 	//l->setAlignment(AlignCenter);
 	g->addMultiCellWidget(l,0,0,0,1);
 
-	QHBox * b = new QHBox(this);
+	KviTalHBox * b = new KviTalHBox(this);
 	g->addMultiCellWidget(b,1,1,0,1);
 
 	m_pNickEdit = new QLineEdit(b);
@@ -248,7 +248,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m)
 //	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
 //	g->addMultiCellWidget(f,3,3,0,1);
 
-	b = new QHBox(this);
+	b = new KviTalHBox(this);
 	b->setSpacing(4);
 	g->addWidget(b,2,1);
 
@@ -349,7 +349,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 
 	g->addMultiCellWidget(m_pMaskListBox,4,4,0,1);
 
-	QHBox * b = new QHBox(p1);
+	KviTalHBox * b = new KviTalHBox(p1);
 	g->addMultiCellWidget(b,5,5,0,1);
 	b->setSpacing(4);
 
@@ -851,7 +851,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 
 	g->addMultiCellWidget(m_pListView,0,1,0,1);
 
-	QVBox * vbox = new QVBox(this);
+	KviTalVBox * vbox = new KviTalVBox(this);
 	vbox->setSpacing(4);
 	g->addWidget(vbox,0,2);
 
@@ -914,7 +914,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 	m_pImportButton->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_FOLDER)));
 
 
-	QHBox * hbox = new QHBox(this);
+	KviTalHBox * hbox = new KviTalHBox(this);
 	hbox->setSpacing(4);
 	g->addMultiCellWidget(hbox,3,3,1,2);
 
@@ -1078,7 +1078,7 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( QListViewItem * pIte
 		KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)pItem;
 		if(b->type()==KviRegisteredUsersDialogItemBase::User)
 		{
-			QPopupMenu *groups = new QPopupMenu;
+			KviTalPopupMenu *groups = new KviTalPopupMenu;
 			
 			KviDict<KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
 			KviDictIterator<KviRegisteredUserGroup> git(*pGroups);
@@ -1092,7 +1092,7 @@ void KviRegisteredUsersDialog::listViewRightButtonClicked ( QListViewItem * pIte
 			
 			connect(groups,SIGNAL(activated ( int )),this,SLOT(moveToGroupMenuClicked(int)));
 			
-			QPopupMenu *mainPopup = new QPopupMenu;
+			KviTalPopupMenu *mainPopup = new KviTalPopupMenu;
 			mainPopup->insertItem(__tr("Move to group"),groups);
 			mainPopup->exec(point);
 		}
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index 1403d70a7..2a98cffe5 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -36,7 +36,7 @@
 #include "kvi_dict.h"
 #include <qtabdialog.h>
 #include <qtable.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 
 class KviRegisteredUser;
 
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h
index 278874a66..0b97c3bcf 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/wizard.h
@@ -28,8 +28,8 @@
 
 class KviPixmap;
 class KviPixmapSelector;
-class QVBoxLayout; 
-class QHBoxLayout; 
+class KviTalVBoxLayout; 
+class KviTalHBoxLayout; 
 class QGridLayout; 
 class QCheckBox;
 class QLabel;
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index bdd312aeb..c265d8aad 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -42,7 +42,7 @@
 #include <qpushbutton.h>
 #include <qvalidator.h>
 #include <qtextcodec.h>
-#include <qhbox.h> 
+#include "kvi_tal_hbox.h" 
 
 #ifdef COMPILE_ON_WINDOWS
 	#include <windows.h>
@@ -68,7 +68,7 @@ extern QString szUrl;
 #endif
 
 KviSetupPage::KviSetupPage(KviSetupWizard * w)
-: QHBox(w)
+: KviTalHBox(w)
 {
 	// we need this to set localized text on buttons (see QT doc/ QWizard class)
 	w->QWizard::backButton()->setText(__tr2qs("< &Back"));
@@ -86,7 +86,7 @@ KviSetupPage::KviSetupPage(KviSetupWizard * w)
 	m_pPixmapLabel->setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
 	m_pPixmapLabel->setMargin(0);
 
-	m_pVBox = new QVBox(this);
+	m_pVBox = new KviTalVBox(this);
 	m_pVBox->setSpacing(8);
 
 	QLabel * l = new QLabel(m_pVBox);
@@ -215,7 +215,7 @@ KviSetupWizard::KviSetupWizard()
 	m_pDirUsePrev = new QRadioButton(__tr2qs("Use settings folder from previous installation"),m_pDirButtonGroup);
 	connect(m_pDirUsePrev,SIGNAL(clicked()),this,SLOT(oldDirClicked()));
 	
-	m_pOldPathBox = new QHBox(m_pDirButtonGroup);
+	m_pOldPathBox = new KviTalHBox(m_pDirButtonGroup);
 	m_pOldDataPathEdit = new QLineEdit(m_pOldPathBox);
 	connect(m_pOldDataPathEdit,SIGNAL(textChanged ( const QString & )),this,SLOT(oldDataTextChanged ( const QString & )));
 	
@@ -230,7 +230,7 @@ KviSetupWizard::KviSetupWizard()
 	QLabel* l = new QLabel(m_pDirButtonGroup);
 	l->setText(__tr2qs("Settings folder:"));
 	
-	m_pNewPathBox = new QHBox(m_pDirButtonGroup);
+	m_pNewPathBox = new KviTalHBox(m_pDirButtonGroup);
 	m_pDataPathEdit = new QLineEdit(m_pNewPathBox);
 	
 	pb = new QPushButton(__tr2qs("&Browse..."),m_pNewPathBox);
@@ -257,7 +257,7 @@ KviSetupWizard::KviSetupWizard()
 	l->setText(__tr2qs("Download files to folder:"));
 
 
-	m_pNewIncomingBox = new QHBox(m_pDirButtonGroup);
+	m_pNewIncomingBox = new KviTalHBox(m_pDirButtonGroup);
 
 	m_pIncomingPathEdit = new QLineEdit(m_pNewIncomingBox);
 	
@@ -330,7 +330,7 @@ KviSetupWizard::KviSetupWizard()
 
 	gbox = new QGroupBox(1,QGroupBox::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox);
 
-	QHBox* hb = new QHBox(gbox);
+	KviTalHBox* hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
 	
 	l = new QLabel(__tr2qs("Age:"),hb);
@@ -356,7 +356,7 @@ KviSetupWizard::KviSetupWizard()
 	hb->setStretchFactor(m_pAgeCombo,1);
 
 
-	hb = new QHBox(gbox);
+	hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
 	
 	l = new QLabel(__tr2qs("Gender:"),hb);
@@ -407,9 +407,9 @@ KviSetupWizard::KviSetupWizard()
 
 	m_pThemeButtonGroup = new QVButtonGroup(m_pTheme->m_pVBox);
 	
-	QHBox* pThemesHb = new QHBox(m_pThemeButtonGroup);
+	KviTalHBox* pThemesHb = new KviTalHBox(m_pThemeButtonGroup);
 
-	QVBox* pThemesVb = new QVBox(pThemesHb);
+	KviTalVBox* pThemesVb = new KviTalVBox(pThemesHb);
 	
 	QString szThemeImagePath;
 	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_hires.png");
@@ -430,7 +430,7 @@ KviSetupWizard::KviSetupWizard()
 	
 	m_pThemeHiRes = new QRadioButton(__tr2qs("&Fancy Theme"),pThemesVb);
 	
-	pThemesVb = new QVBox(pThemesHb);
+	pThemesVb = new KviTalVBox(pThemesHb);
 	g_pApp->getGlobalKvircDirectory(szThemeImagePath,KviApp::Pics,"kvi_setup_theme_lowres.png");
 	QPixmap* pLowResPixmap = new QPixmap(szThemeImagePath);
 	if(pLowResPixmap->isNull())
@@ -470,7 +470,7 @@ KviSetupWizard::KviSetupWizard()
 	m_pServersChooseFromList = new QRadioButton(__tr2qs("Choose from built-in server list"),m_pServersButtonGroup);
 	
 	m_pServersSpecifyManually = new QRadioButton(__tr2qs("Specify server manually"),m_pServersButtonGroup);
-	hb = new QHBox(m_pServersButtonGroup);
+	hb = new KviTalHBox(m_pServersButtonGroup);
 	
 	m_uServerPort=6667;
 	m_pServerHostSelector = new KviStringSelector(hb,__tr2qs("Server:"),&m_szServerHost,true);
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index 6457767aa..b50234ac6 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -24,8 +24,8 @@
 
 
 #include <qwizard.h>
-#include <qvbox.h>
-#include <qhbox.h>
+#include "kvi_tal_vbox.h"
+#include "kvi_tal_hbox.h"
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qlineedit.h>
@@ -40,14 +40,14 @@
 
 class KviSetupWizard;
 
-class KviSetupPage : public QHBox
+class KviSetupPage : public KviTalHBox
 {
 	Q_OBJECT
 public:
 	KviSetupPage(KviSetupWizard * w);
 	~KviSetupPage();
 public:
-	QVBox * m_pVBox;
+	KviTalVBox * m_pVBox;
 	QLabel * m_pPixmapLabel;
 	QLabel * m_pTextLabel;
    
@@ -95,9 +95,9 @@ public:
 #endif
 	QRadioButton  * m_pDirRestore;
 	QLineEdit     * m_pOldDataPathEdit;
-	QHBox         * m_pOldPathBox;
-	QHBox         * m_pNewPathBox;
-	QHBox         * m_pNewIncomingBox;
+	KviTalHBox         * m_pOldPathBox;
+	KviTalHBox         * m_pNewPathBox;
+	KviTalHBox         * m_pNewIncomingBox;
 	
 	//Identify
 	QComboBox        * m_pAgeCombo;
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index e80530938..874a54f61 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -42,8 +42,8 @@
 #include <qlineedit.h>
 #include <qpushbutton.h>
 #include <qsplitter.h>
-#include <qhbox.h>
-#include <qvbox.h>
+#include "kvi_tal_hbox.h"
+#include "kvi_tal_vbox.h"
 #include <qlayout.h>
 #include <qcheckbox.h>
 #include <qmessagebox.h>
@@ -209,7 +209,7 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF
 
 	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter");
 
-	QVBox * vbox = new QVBox(m_pSplitter);
+	KviTalVBox * vbox = new KviTalVBox(m_pSplitter);
 
 	m_pListView  = new QListView(vbox);
 	//m_pListView->header()->hide();
@@ -225,7 +225,7 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF
 	connect(g_pSharedFilesManager,SIGNAL(sharedFileAdded(KviSharedFile *)),this,SLOT(sharedFileAdded(KviSharedFile *)));
 	connect(g_pSharedFilesManager,SIGNAL(sharedFileRemoved(KviSharedFile *)),this,SLOT(sharedFileRemoved(KviSharedFile *)));
 
-	QHBox * b = new QHBox(vbox);
+	KviTalHBox * b = new KviTalHBox(vbox);
 
 	m_pAddButton = new QPushButton(__tr2qs_ctx("&Add...","sharedfileswindow"),b);
 	connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked()));
@@ -376,11 +376,11 @@ void KviSharedFilesWindow::transferUnregistering(KviSharedFiles * t)
 
 void KviSharedFilesWindow::rightButtonPressed(QListViewItem *it,const QPoint &pnt,int col)
 {
-	if(!m_pContextPopup)m_pContextPopup = new QPopupMenu(this);
-	if(!m_pLocalFilePopup)m_pLocalFilePopup = new QPopupMenu(this);
+	if(!m_pContextPopup)m_pContextPopup = new KviTalPopupMenu(this);
+	if(!m_pLocalFilePopup)m_pLocalFilePopup = new KviTalPopupMenu(this);
 	if(!m_pOpenFilePopup)
 	{
-		m_pOpenFilePopup= new QPopupMenu(this);
+		m_pOpenFilePopup= new KviTalPopupMenu(this);
 		connect(m_pOpenFilePopup,SIGNAL(activated(int)),this,SLOT(openFilePopupActivated(int)));
 	}
 
diff --git a/src/modules/term/termwidget.cpp b/src/modules/term/termwidget.cpp
index 90d494cc2..703ba01d0 100644
--- a/src/modules/term/termwidget.cpp
+++ b/src/modules/term/termwidget.cpp
@@ -55,7 +55,7 @@ KviTermWidget::KviTermWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone)
 
 	if(bIsStandalone)
 	{
-		m_pHBox = new QHBox(this);
+		m_pHBox = new KviTalHBox(this);
 		m_pTitleLabel = new QLabel(__tr2qs("Terminal emulator"),m_pHBox);
 		m_pTitleLabel->setFrameStyle(QFrame::Raised | QFrame::WinPanel);
 		m_pCloseButton = new QPushButton("",m_pHBox);
diff --git a/src/modules/term/termwidget.h b/src/modules/term/termwidget.h
index 308e2f446..37e29b9f6 100644
--- a/src/modules/term/termwidget.h
+++ b/src/modules/term/termwidget.h
@@ -29,7 +29,7 @@
 #include <qframe.h>
 #include <qlabel.h>
 #include <qpushbutton.h>
-#include <qhbox.h>
+#include "kvi_tal_hbox.h"
 
 #include "kparts/part.h"
 
@@ -44,7 +44,7 @@ public:
 	KviTermWidget(QWidget * par,KviFrame * lpFrm,bool bIsStandalone = false);
 	~KviTermWidget();
 private:
-	QHBox        * m_pHBox;
+	KviTalHBox        * m_pHBox;
 	QLabel       * m_pTitleLabel;
 	QPushButton  * m_pCloseButton;
 	KParts::Part * m_pKonsolePart;
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index fdc210aea..d385e4746 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -48,7 +48,7 @@
 #include <qstringlist.h>
 #include <qdatetime.h>
 #include <qfiledialog.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qcombobox.h>
 #include <qpainter.h>
 #include <qtooltip.h>
@@ -150,7 +150,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 
 	QGridLayout * g = new QGridLayout(this,3,2,4,4);
 
-	QHBox *hb = new QHBox(this);
+	KviTalHBox *hb = new KviTalHBox(this);
 	g->addMultiCellWidget(hb,0,0,0,1);
 
 	KviStyledToolButton * tb;
@@ -218,7 +218,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 	g->setColStretch(0,1);
 
 	fillThemeBox();
-	m_pContextPopup = new QPopupMenu(this);
+	m_pContextPopup = new KviTalPopupMenu(this);
 
 	if(g_rectManagementDialogGeometry.y() < 5)
 	{
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index f7d77460b..25658a9dc 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -32,7 +32,7 @@
 #include <qsimplerichtext.h>
 #include <qlistbox.h>
 #include <qcombobox.h>
-#include <qpopupmenu.h>
+#include "kvi_tal_popupmenu.h"
 #include <qcursor.h>
 #include <qwizard.h>
 
@@ -73,7 +73,7 @@ public:
 protected:
 	static KviThemeManagementDialog * m_pInstance;
 	QListBox            * m_pListBox;
-	QPopupMenu          * m_pContextPopup; 
+	KviTalPopupMenu          * m_pContextPopup; 
 	KviStyledToolButton * m_pDeleteThemeButton;
 	KviStyledToolButton * m_pPackThemeButton;
 public:
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index bc82d405a..32ca7759d 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -24,6 +24,7 @@
 #include "kvi_app.h"
 #include "kvi_frame.h"
 #include "kvi_kvs_eventmanager.h"
+#include "kvi_tal_popupmenu.h"
 
 #include "kvi_menubar.h"
 #include "kvi_internalcmd.h"
@@ -113,15 +114,15 @@ UrlDialog::UrlDialog(KviPtrList<KviUrl> *g_pList)
 	//m_pUrlList = new KviListView(this,"list");
 	KviConfig cfg(szConfigPath.ptr(),KviConfig::Read);
 
-	QPopupMenu *pop;
+	KviTalPopupMenu *pop;
 
-	pop = new QPopupMenu(this);
+	pop = new KviTalPopupMenu(this);
 	pop->insertItem(__tr2qs("&Configure"),this,SLOT(config()));
 	pop->insertItem(__tr2qs("&Help"),this,SLOT(help()));
 	pop->insertItem(__tr2qs("Clo&se"),this,SLOT(close_slot()));
 	m_pMenuBar->insertItem(__tr2qs("&Module"),pop);
 
-	pop = new QPopupMenu(this);
+	pop = new KviTalPopupMenu(this);
 	pop->insertItem(__tr2qs("&Load"),this,SLOT(loadList()));
 	pop->insertItem(__tr2qs("&Save"),this,SLOT(saveList()));
 	pop->insertItem(__tr2qs("&Clear"),this,SLOT(clear()));
@@ -255,11 +256,11 @@ void UrlDialog::popup(QListViewItem *item, const QPoint &point, int col)
 {
 	if (col == 0) {
 		m_szUrl = item->text(0);
-		QPopupMenu p(0,"menu");
+		KviTalPopupMenu p(0,"menu");
 		p.insertItem(__tr2qs("&Remove"),this,SLOT(remove()));
 		p.insertItem(__tr2qs("&Find Text"),this,SLOT(findtext()));
 		p.insertSeparator();
-		m_pListPopup = new QPopupMenu(0,"list");
+		m_pListPopup = new KviTalPopupMenu(0,"list");
 		int i=0;
 		for(KviWindow *w=g_pFrame->windowList()->first();w;w=g_pFrame->windowList()->next()){
 			if ((w->type() <= 2) || (w->type() == 2) || (w->type() == 6)) {	// values defined in kvi_define.h (console,channel,query,chat,uwindow)
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index ad9d134d7..56d635084 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -63,7 +63,7 @@ public:
 	~UrlDialog();
 private:
 	KviTalMenuBar *m_pMenuBar;
-	QPopupMenu *m_pListPopup;	// dynamic popup menu
+	KviTalPopupMenu *m_pListPopup;	// dynamic popup menu
 	KviStr m_szUrl;			// used to pass urls to sayToWin slot
 protected:
 	QPixmap *myIconPtr();
author	Szymon Tomasz Stefanek	2007-01-23 22:24:31 +0000
committer	Szymon Tomasz Stefanek	2007-01-23 22:24:31 +0000
commit	daf9b531b3b8b058dc07b2e818876ece1943cb76 (patch)
tree	e605c2b2a174ca3ddca4f35bae9d8c66e9497dac
parent	not important fix (diff)
download	KVIrc-daf9b531b3b8b058dc07b2e818876ece1943cb76.tar.gz KVIrc-daf9b531b3b8b058dc07b2e818876ece1943cb76.tar.bz2 KVIrc-daf9b531b3b8b058dc07b2e818876ece1943cb76.zip