More Qt 4.x port

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

79 files changed, 262 insertions, 258 deletions

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();