More Qt 4.x port

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

14 files changed, 55 insertions, 55 deletions

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