Removed obsolete QGridLayout QT3 constructor.

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

61 files changed, 151 insertions, 156 deletions

diff --git a/src/modules/about/aboutdialog.cpp b/src/modules/about/aboutdialog.cpp
index 69aeaba2d..9ae053e1a 100644
--- a/src/modules/about/aboutdialog.cpp
+++ b/src/modules/about/aboutdialog.cpp
@@ -86,7 +86,7 @@ KviAboutDialog::KviAboutDialog()
 	QPixmap pix(buffer.ptr());
 
 	QWidget * w = new QWidget(this);
-	QGridLayout * g = new QGridLayout(w,2,1,4,8);
+	QGridLayout * g = new QGridLayout(w);
 
 	QLabel * l = new QLabel(w);
 	l->setFrameStyle(QFrame::WinPanel | QFrame::Sunken);
@@ -108,7 +108,7 @@ KviAboutDialog::KviAboutDialog()
 
 	// Info tab
 	w = new QWidget(this);
-	g = new QGridLayout(w,1,1,4,8);
+	g = new QGridLayout(w);
 
 	KviTalTextEdit * v = new KviTalTextEdit(w);
 	v->setReadOnly(true);
@@ -184,7 +184,7 @@ KviAboutDialog::KviAboutDialog()
 
 	// Honor & Glory tab
 	w = new QWidget(this);
-	g = new QGridLayout(w,1,1,4,8);
+	g = new QGridLayout(w);
 
 	v = new KviTalTextEdit(w);
 	v->setReadOnly(true);
@@ -197,7 +197,7 @@ KviAboutDialog::KviAboutDialog()
 
 	// License tab
 	w = new QWidget(this);
-	g = new QGridLayout(w,1,1,4,8);
+	g = new QGridLayout(w);
 
 	v = new KviTalTextEdit(w);
 	v->setReadOnly(true);
diff --git a/src/modules/actioneditor/actioneditor.cpp b/src/modules/actioneditor/actioneditor.cpp
index 9b227c480..c9d8ee097 100644
--- a/src/modules/actioneditor/actioneditor.cpp
+++ b/src/modules/actioneditor/actioneditor.cpp
@@ -143,7 +143,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
 	m_pActionEditor = ed;

 	m_pActionData = 0;

 

-	QGridLayout * g = new QGridLayout(this,3,2,0,4);

+	QGridLayout * g = new QGridLayout(this);

 

 	QLabel * l = new QLabel(__tr2qs("Name:"),this);

 	g->addWidget(l,0,0);

@@ -162,7 +162,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
 

 	// code tab

 	QWidget * tab = new QWidget(tw);

-	QGridLayout * gl = new QGridLayout(tab,1,1,8,4);

+	QGridLayout * gl = new QGridLayout(tab);

 

 	m_pScriptEditor = KviScriptEditor::createInstance(tab);

 	gl->addWidget(m_pScriptEditor,0,0);

@@ -172,7 +172,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
 

 	// properties tab

 	tab = new QWidget(tw);

-	gl = new QGridLayout(tab,7,4,8,4);

+	gl = new QGridLayout(tab);

 

 	l = new QLabel(__tr2qs("Category:"),tab);

 	gl->addWidget(l,0,0);

@@ -237,7 +237,7 @@ KviSingleActionEditor::KviSingleActionEditor(QWidget * par,KviActionEditor * ed)
 

 	// flags tab

 	tab = new QWidget(tw);

-	gl = new QGridLayout(tab,12,4,8,4);

+	gl = new QGridLayout(tab);

 

 

 	m_pNeedsContextCheck = new KviStyledCheckBox(__tr2qs("Needs IRC Context"),tab);

@@ -635,7 +635,7 @@ KviActionEditor::KviActionEditor(QWidget * par)
 : QWidget(par)

 {

 	

-	QGridLayout * l = new QGridLayout(this,1,1,2,2);

+	QGridLayout * l = new QGridLayout(this);

 	m_pSplitter = new QSplitter(Qt::Horizontal,this);

 	m_pSplitter->setOpaqueResize(false);

 	l->addWidget(m_pSplitter,0,0);

@@ -897,7 +897,7 @@ KviActionEditorWindow::KviActionEditorWindow(KviFrame * lpFrm)
 	m_pEditor = new KviActionEditor(this);

 

 	m_pBase = new QWidget(this);

-	QGridLayout * g = new QGridLayout(m_pBase,1,4,4,4);

+	QGridLayout * g = new QGridLayout(m_pBase);

 

 	QPushButton * btn = new QPushButton(__tr2qs("OK"),m_pBase);

 	btn->setMinimumWidth(80);

diff --git a/src/modules/addon/managementdialog.cpp b/src/modules/addon/managementdialog.cpp
index 1461644fc..fa522ba6a 100644
--- a/src/modules/addon/managementdialog.cpp
+++ b/src/modules/addon/managementdialog.cpp
@@ -166,7 +166,7 @@ KviScriptManagementDialog::KviScriptManagementDialog(QWidget * p)
 

 	m_pInstance = this;

 

-	QGridLayout * g = new QGridLayout(this,11,3,4,5);

+	QGridLayout * g = new QGridLayout(this);

 	

 	/*QLabel * lb = new QLabel(this);

 	lb->setFrameStyle(QFrame::WinPanel | QFrame::Sunken);

diff --git a/src/modules/aliaseditor/aliaseditor.cpp b/src/modules/aliaseditor/aliaseditor.cpp
index 1913ca246..5bd55d333 100644
--- a/src/modules/aliaseditor/aliaseditor.cpp
+++ b/src/modules/aliaseditor/aliaseditor.cpp
@@ -231,7 +231,7 @@ KviAliasEditor::KviAliasEditor(QWidget * par)
 	m_pLastClickedItem = 0;

 	m_szDir = QDir::homeDirPath();

 

-	QGridLayout * l = new QGridLayout(this,1,1,2,2);

+	QGridLayout * l = new QGridLayout(this);

 

 	m_pSplitter = new QSplitter(Qt::Horizontal,this);

 	m_pSplitter->setOpaqueResize(false);

@@ -1576,7 +1576,7 @@ KviAliasEditorWindow::KviAliasEditorWindow(KviFrame * lpFrm)
 	m_pEditor = new KviAliasEditor(this);

 

 	m_pBase = new QWidget(this);

-	QGridLayout * g = new QGridLayout(m_pBase,1,4,4,4);

+	QGridLayout * g = new QGridLayout(m_pBase);

 

 	QPushButton * btn = new QPushButton(__tr2qs("&OK"),m_pBase);

 	connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));

diff --git a/src/modules/avatar/libkviavatar.cpp b/src/modules/avatar/libkviavatar.cpp
index 814b230fc..81e759d86 100644
--- a/src/modules/avatar/libkviavatar.cpp
+++ b/src/modules/avatar/libkviavatar.cpp
@@ -65,8 +65,7 @@ KviAsyncAvatarSelectionDialog::KviAsyncAvatarSelectionDialog(QWidget * par,const
 
 	setWindowTitle(__tr2qs("Choose Avatar - KVIrc"));
 
-	QGridLayout * g = new QGridLayout(this,3,3,4,8);
-	
+	QGridLayout * g = new QGridLayout(this);
 	QString msg = "<center>";
 	msg += __tr2qs("Please select an avatar image. " \
 		"The full path to a local file or an image on the Web can be used.<br>" \
diff --git a/src/modules/channelsjoin/channelsjoinwindow.cpp b/src/modules/channelsjoin/channelsjoinwindow.cpp
index 13f196b5c..82a99e977 100644
--- a/src/modules/channelsjoin/channelsjoinwindow.cpp
+++ b/src/modules/channelsjoin/channelsjoinwindow.cpp
@@ -62,7 +62,7 @@ KviChannelsJoinWindow::KviChannelsJoinWindow(QWidget * par, const char * name)
 
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)));
 
-	QGridLayout * g = new QGridLayout(this,4,2,4,8);
+	QGridLayout * g = new QGridLayout(this);
 	
 	m_pListView = new KviTalListView(this);
 	m_pListView->addColumn(__tr2qs("Channel"));
diff --git a/src/modules/codetester/codetester.cpp b/src/modules/codetester/codetester.cpp
index eacdb9e7b..0d0ff6cf3 100644
--- a/src/modules/codetester/codetester.cpp
+++ b/src/modules/codetester/codetester.cpp
@@ -47,7 +47,7 @@ extern KviPointerList<KviCodeTesterWindow> * g_pCodeTesterWindowList;
 KviCodeTester::KviCodeTester(QWidget * par)
 : QWidget(par,"code_tester")
 {
-	QGridLayout * g = new QGridLayout(this,2,4,2,2);
+	QGridLayout * g = new QGridLayout(this);
 	m_pEditor = KviScriptEditor::createInstance(this);
 	g->addMultiCellWidget(m_pEditor,0,0,0,3);
 	m_pExecuteButton = new QPushButton(__tr2qs("&Execute"),this);
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 45a1532ed..53066eac8 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1812,7 +1812,7 @@ bool KviDccFileTransfer::doResume(const char * filename,const char * port,unsign
 KviDccFileTransferBandwidthDialog::KviDccFileTransferBandwidthDialog(QWidget * pParent,KviDccFileTransfer * t)
 : QDialog(pParent)
 {
-	QGridLayout * g = new QGridLayout(this,3,3,4,4);
+	QGridLayout * g = new QGridLayout(this);
 
 	m_pTransfer = t;
 	int iVal = m_pTransfer->bandwidthLimit();
diff --git a/src/modules/dialog/libkvidialog.cpp b/src/modules/dialog/libkvidialog.cpp
index d97abcf6d..0ad90b369 100644
--- a/src/modules/dialog/libkvidialog.cpp
+++ b/src/modules/dialog/libkvidialog.cpp
@@ -208,7 +208,7 @@ KviKvsCallbackTextInput::KviKvsCallbackTextInput(
 	setModal(modal);
 	setWindowTitle(szCaption);
 
-	QGridLayout * g = new QGridLayout(this,2,3,5,5);
+	QGridLayout * g = new QGridLayout(this);
 
 	QPixmap * pix = g_pIconManager->getImage(szIcon);
 
diff --git a/src/modules/editor/scripteditor.cpp b/src/modules/editor/scripteditor.cpp
index bf4206f11..7baab1e7f 100644
--- a/src/modules/editor/scripteditor.cpp
+++ b/src/modules/editor/scripteditor.cpp
@@ -41,8 +41,6 @@
 #include "kvi_tal_scrollview.h"

 

 //FIXME

-#include <Q3TextEdit>

-#include <Q3PopupMenu>

 

 #include <QLayout>

 #include <QToolButton>

@@ -172,7 +170,7 @@ KviScriptEditorWidgetColorOptions::KviScriptEditorWidgetColorOptions(QWidget * p
 	m_pSelectorInterfaceList = new KviPointerList<KviSelectorInterface>;

         m_pSelectorInterfaceList->setAutoDelete(false);

 	setWindowTitle(__tr2qs_ctx("Preferences","editor"));

-	QGridLayout * g = new QGridLayout(this,3,3,4,4);

+	QGridLayout * g = new QGridLayout(this);

 

 	KviFontSelector * f = new KviFontSelector(this,__tr2qs_ctx("Font:","editor"),&g_fntNormal,true);

 	g->addMultiCellWidget(f,0,0,0,2);

@@ -907,7 +905,7 @@ KviScriptEditorImplementation::KviScriptEditorImplementation(QWidget * par)
 	if(g_pScriptEditorWindowList->isEmpty())loadOptions();

 	g_pScriptEditorWindowList->append(this);

 	m_lastCursorPos=0;

-	QGridLayout * g = new QGridLayout(this,2,3,0,0);

+	QGridLayout * g = new QGridLayout(this);

 

 	m_pFindLineedit = new QLineEdit(" ",this);

 	m_pFindLineedit->setText("");

@@ -1193,7 +1191,8 @@ KviScriptEditorReplaceDialog::KviScriptEditorReplaceDialog( QWidget* parent, con
 	p.setColor(backgroundRole(),QColor( 236, 233, 216 )); 

 	setPalette(p);

 

-	QGridLayout *layout = new QGridLayout( this, 1, 1, 11, 6, "replace layout"); 

+	QGridLayout *layout = new QGridLayout( this);

+		layout->setObjectName("replace layout"); 

 

 

 	QLabel *findlabel = new QLabel( this, "findlabel" );

diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/eventeditor.cpp
index 372bc49f6..281b2b971 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/eventeditor.cpp
@@ -64,7 +64,7 @@ const QPixmap * KviEventHandlerListViewItem::pixmap(int col) const
 KviEventEditor::KviEventEditor(QWidget * par)
 : QWidget(par,"event_editor")
 {
-	QGridLayout * l = new QGridLayout(this,1,1,2,2);
+	QGridLayout * l = new QGridLayout(this);
 
 	QSplitter * spl = new QSplitter(Qt::Horizontal,this);
 	spl->setOpaqueResize(false);
@@ -420,7 +420,7 @@ KviEventEditorWindow::KviEventEditorWindow(KviFrame * lpFrm)
 	m_pEditor = new KviEventEditor(this);
 
 	m_pBase = new QWidget(this);
-	QGridLayout * g = new QGridLayout(m_pBase,1,4,4,4);
+	QGridLayout * g = new QGridLayout(m_pBase);
 
 	QPushButton * btn = new QPushButton(__tr2qs("&OK"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));
diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index 7389dd614..c032fc0c9 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -84,7 +84,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	m_pSearchTab  = new QWidget(m_pTabWidget);
 	m_pTabWidget->insertTab(m_pSearchTab,__tr2qs_ctx("Filter","logview"));
 
-	QGridLayout *layout = new QGridLayout(m_pSearchTab,10,2,3,5);
+	QGridLayout *layout = new QGridLayout(m_pSearchTab);
 	
 	m_pShowChannelsCheck = new KviStyledCheckBox(__tr2qs_ctx("Show channel logs","logview"),m_pSearchTab);
 	m_pShowChannelsCheck->setChecked(true);
diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index e6a446c85..d99a072f7 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -51,7 +51,7 @@ KviOptionsWidgetContainer::~KviOptionsWidgetContainer()
 
 void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 {
-	QGridLayout * g = new QGridLayout(this,2,3,4,8);
+	QGridLayout * g = new QGridLayout(this);
 
 	g->addMultiCellWidget(w,0,0,0,2);
 
diff --git a/src/modules/options/dialog.cpp b/src/modules/options/dialog.cpp
index 3bcb35c09..6a88c59b5 100644
--- a/src/modules/options/dialog.cpp
+++ b/src/modules/options/dialog.cpp
@@ -64,7 +64,7 @@ extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 KviGeneralOptionsFrontWidget::KviGeneralOptionsFrontWidget(QWidget *parent,const QString &szText)
 :KviOptionsWidget(parent,"general_options_front_widget")
 {
-	createLayout(1,1);
+	createLayout();
 	QLabel * l = new QLabel(szText,this);
 	l->setWordWrap(true);
 	l->setAlignment(Qt::AlignTop);
@@ -176,7 +176,7 @@ KviOptionsDialog::KviOptionsDialog(QWidget * par,const QString &szGroup)
 	QString szCaption = szDialogTitle + " - KVIrc";
 	setWindowTitle(szCaption);
 
-	QGridLayout * g1 = new QGridLayout(this,2,5,8,8);
+	QGridLayout * g1 = new QGridLayout(this);
 	QSplitter * spl = new QSplitter(Qt::Horizontal,this);
 
 	g1->addMultiCellWidget(spl,0,0,0,4);
diff --git a/src/modules/options/optw_antispam.cpp b/src/modules/options/optw_antispam.cpp
index 8d9ab5fc3..84ae36ae9 100644
--- a/src/modules/options/optw_antispam.cpp
+++ b/src/modules/options/optw_antispam.cpp
@@ -31,7 +31,7 @@
 KviAntispamOptionsWidget::KviAntispamOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"antispam_options_widget")
 {
-	createLayout(3,1);
+	createLayout();
 
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Enable Anti-spam For","options"));
 	m_b1 = addBoolSelector(g,__tr2qs_ctx("Private messages","options"),KviOption_boolUseAntiSpamOnPrivmsg);
diff --git a/src/modules/options/optw_avatar.cpp b/src/modules/options/optw_avatar.cpp
index 59657e1b6..8fe452e89 100644
--- a/src/modules/options/optw_avatar.cpp
+++ b/src/modules/options/optw_avatar.cpp
@@ -32,7 +32,7 @@
 KviAvatarAdvancedOptionsWidget::KviAvatarAdvancedOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"avatar_advanced_options_widget")
 {
-	createLayout(4,1);
+	createLayout();
 	// AVATAR
 
 	// 1st Box
diff --git a/src/modules/options/optw_away.cpp b/src/modules/options/optw_away.cpp
index b97cda151..088dd23eb 100644
--- a/src/modules/options/optw_away.cpp
+++ b/src/modules/options/optw_away.cpp
@@ -31,7 +31,7 @@
 KviAwayOptionsWidget::KviAwayOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"away_options_widget")
 {
-	createLayout(4,1);
+	createLayout();
 
 	addStringSelector(0,0,0,0, __tr2qs_ctx("Default away message:","options"), KviOption_stringAwayMessage);
 
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index 836965a6d..c088cc7c0 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -35,7 +35,7 @@
 KviConnectionOptionsWidget::KviConnectionOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"connection_options_widget")
 {
-	createLayout(2,1);
+	createLayout();
 	KviTalGroupBox *gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("On Disconnect","options"));
 
 	KviBoolSelector *b1 = addBoolSelector(gbox,__tr2qs_ctx("Keep channels open","options"),KviOption_boolKeepChannelsOpenOnDisconnect,true);
@@ -98,7 +98,7 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ssl_options_widget")
 {
 #ifdef COMPILE_SSL_SUPPORT
-	createLayout(3,1);
+	createLayout();
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Certificate","options"));
 
@@ -122,7 +122,7 @@ KviSSLOptionsWidget::KviSSLOptionsWidget(QWidget * parent)
 	connect(b,SIGNAL(toggled(bool)),p,SLOT(setEnabled(bool)));
 	addRowSpacer(0,2,0,2);
 #else
-	createLayout(1,1);
+	createLayout();
 	addLabel(0,0,0,0,__tr2qs_ctx("This executable has no SSL support.","options"));
 #endif
 }
@@ -135,7 +135,7 @@ KviSSLOptionsWidget::~KviSSLOptionsWidget()
 KviTransportOptionsWidget::KviTransportOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"transport_options_widget")
 {
-	createLayout(5,1);
+	createLayout();
 	KviUIntSelector * u;
 	
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Timeout Values","options"),this);
@@ -180,7 +180,7 @@ KviTransportOptionsWidget::~KviTransportOptionsWidget()
 KviIdentOptionsWidget::KviIdentOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ident_options_widget")
 {
-	createLayout(6,1);
+	createLayout();
 
 	m_pEnableIdent = addBoolSelector(0,0,0,0,__tr2qs_ctx("Enable ident service (bad practice on UNIX!)","options"),KviOption_boolUseIdentService);
 	connect(m_pEnableIdent,SIGNAL(toggled(bool)),this,SLOT(enableIpv4InIpv6(bool)));
diff --git a/src/modules/options/optw_ctcp.cpp b/src/modules/options/optw_ctcp.cpp
index 25c759226..1f16ebcaa 100644
--- a/src/modules/options/optw_ctcp.cpp
+++ b/src/modules/options/optw_ctcp.cpp
@@ -30,7 +30,7 @@
 KviCtcpOptionsWidget::KviCtcpOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ctcp_options_widget")
 {
-	createLayout(4,1);
+	createLayout();
 
 	QLabel * l;
 	l = addLabel(0,0,0,0,__tr2qs_ctx("<center><b>Settings for CTCP.</b></center>"\
diff --git a/src/modules/options/optw_ctcpfloodprotection.cpp b/src/modules/options/optw_ctcpfloodprotection.cpp
index 32baabdf5..fa84df40a 100644
--- a/src/modules/options/optw_ctcpfloodprotection.cpp
+++ b/src/modules/options/optw_ctcpfloodprotection.cpp
@@ -74,7 +74,7 @@
 KviCtcpFloodProtectionOptionsWidget::KviCtcpFloodProtectionOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ctcpfloodprotection_options_widget")
 {
-	createLayout(4,2);
+	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,0,1,0,__tr2qs_ctx("Use flood protection (recommended)","options"),KviOption_boolUseCtcpFloodProtection);
 	mergeTip(b,__tr2qs_ctx("<center>This option makes KVIrc only respond to a limited number of CTCP requests within a specified time interval, to prevent \"flooding\" CTCP messages.</center>","options"));
diff --git a/src/modules/options/optw_dcc.cpp b/src/modules/options/optw_dcc.cpp
index 7b9a43ed1..0381d533c 100644
--- a/src/modules/options/optw_dcc.cpp
+++ b/src/modules/options/optw_dcc.cpp
@@ -45,7 +45,7 @@ KviDccOptionsWidget::~KviDccOptionsWidget()
 KviDccGeneralOptionsWidget::KviDccGeneralOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"dccgeneral_options_widget")
 {
-	createLayout(2,1);
+	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use workaround for firewall","options"),KviOption_boolCantAcceptIncomingDccConnections);
 
@@ -65,7 +65,7 @@ KviDccGeneralOptionsWidget::~KviDccGeneralOptionsWidget()
 KviDccAdvancedOptionsWidget::KviDccAdvancedOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"dccgeneral_options_widget")
 {
-	createLayout(5,1);
+	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Network Properties","options"));
 	
@@ -163,7 +163,7 @@ KviDccSendOptionsWidget::~KviDccSendOptionsWidget()
 KviDccSendGeneralOptionsWidget::KviDccSendGeneralOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"dccsend_options_widget")
 {
-	createLayout(5,1);
+	createLayout();
 
 	KviBoolSelector * b;
 
@@ -203,7 +203,7 @@ KviDccSendGeneralOptionsWidget::~KviDccSendGeneralOptionsWidget()
 KviDccSendAdvancedOptionsWidget::KviDccSendAdvancedOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"dccsend_advanced_options_widget")
 {
-	createLayout(4,1);
+	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Bug Compatibility","options"));
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Send ACK for byte 0","options"),KviOption_boolSendZeroAckInDccRecv);
@@ -296,7 +296,7 @@ KviDccSendAdvancedOptionsWidget::~KviDccSendAdvancedOptionsWidget()
 KviDccChatOptionsWidget::KviDccChatOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"dccchat_options_widget")
 {
-	createLayout(3,1);
+	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("On Chat Request","options"));
 	KviBoolSelector * b = addBoolSelector(g,__tr2qs_ctx("Automatically accept","options"),KviOption_boolAutoAcceptDccChat);
@@ -316,7 +316,7 @@ KviDccChatOptionsWidget::~KviDccChatOptionsWidget()
 
 KviDccVoiceOptionsWidget::KviDccVoiceOptionsWidget(QWidget *p):KviOptionsWidget(p)
 {
-	createLayout(8, 1);
+	createLayout();
 
 	KviBoolSelector * b1 = addBoolSelector(0,0,0,0,__tr2qs_ctx("Open all minimized","options"),KviOption_boolCreateMinimizedDccVoice);
 	KviTalGroupBox * g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("On Voice Request","options"));
diff --git a/src/modules/options/optw_generalopt.cpp b/src/modules/options/optw_generalopt.cpp
index 81b1aaf5d..a6001ab90 100644
--- a/src/modules/options/optw_generalopt.cpp
+++ b/src/modules/options/optw_generalopt.cpp
@@ -33,7 +33,7 @@ KviGeneralOptOptionsWidget::KviGeneralOptOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"generalopt_options_widget")
 {
 
-	createLayout(1,4);
+	createLayout();
 
 	QLabel * l;
 	l = addLabel(0,0,4,0,__tr2qs_ctx("This section contains the general client options<br>"\
diff --git a/src/modules/options/optw_highlighting.cpp b/src/modules/options/optw_highlighting.cpp
index cb63afd33..d200f9cff 100644
--- a/src/modules/options/optw_highlighting.cpp
+++ b/src/modules/options/optw_highlighting.cpp
@@ -42,7 +42,7 @@ KviAlertHighlightingOptionsWidget::~KviAlertHighlightingOptionsWidget()
 KviHighlightingOptionsWidget::KviHighlightingOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"highlighting_options_widget")
 {
-	createLayout(7,1);
+	createLayout();
 
 	KviBoolSelector * b;
 
@@ -71,10 +71,9 @@ KviHighlightingOptionsWidget::~KviHighlightingOptionsWidget()
 KviAlertOptionsWidget::KviAlertOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"highlighting_options_widget")
 {
-	createLayout(2,1);
-
-	KviBoolSelector * b;
+	createLayout();
 
+	
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Alert Restrictions","options"));
 	KviBoolSelector * b3 = addBoolSelector(g,__tr2qs_ctx("Restrict alert","options"),KviOption_boolHighlightOnlyNormalMsg);
 	mergeTip(b3, __tr2qs_ctx("<center>If this option is enabled, KVIrc will alert in the taskbar only if a normal message is received in a channel.<br>Actions like joins, parts and mode changes will be ignored.<br> This is useful if you are in channels with a high rate of traffic and only want to be alerted for messages that are interesting to you.</center>","options"));
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index dc5c86fe4..09a7788ef 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -51,7 +51,7 @@
 KviNickAlternativesDialog::KviNickAlternativesDialog(QWidget * par,const QString &n1,const QString &n2,const QString &n3)
 : QDialog(par)
 {
-	QGridLayout * g = new QGridLayout(this,5,3,4,12);
+	QGridLayout * g = new QGridLayout(this);
 
 	setWindowTitle(__tr2qs_ctx("Nickname alternatives","options"));
 
@@ -118,7 +118,7 @@ KviAvatarDownloadDialog::KviAvatarDownloadDialog(QWidget * par,const QString &sz
 
 	m_szUrl = szUrl;
 
-	QGridLayout * g = new QGridLayout(this,2,2,4,8);
+	QGridLayout * g = new QGridLayout(this);
 
 	m_pOutput = new QLabel(__tr2qs_ctx("<center>Please wait while the avatar is being downloaded</center>","options"),this);
 	g->addMultiCellWidget(m_pOutput,0,0,0,1);
@@ -199,7 +199,7 @@ KviAvatarSelectionDialog::KviAvatarSelectionDialog(QWidget * par,const QString &
 {
 	setWindowTitle(__tr2qs_ctx("Choose Avatar - KVIrc","options"));
 
-	QGridLayout * g = new QGridLayout(this,3,3,4,8);
+	QGridLayout * g = new QGridLayout(this);
 	
 
 	QString msg = "<center>";
@@ -291,7 +291,7 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	m_szAltNicknames[2] = KVI_OPTION_STRING(KviOption_stringNickname4);
 
 
-	createLayout(3,1);
+	createLayout();
 	layout()->setMargin(10);
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Basic Properties","options"));
@@ -454,7 +454,7 @@ void KviIdentityGeneralOptionsWidget::commit()
 KviIdentityAvatarOptionsWidget::KviIdentityAvatarOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
 {
-	createLayout(4,1);
+	createLayout();
 	layout()->setMargin(10);
 	
 	m_pLocalAvatar = new KviPixmap(KVI_OPTION_PIXMAP(KviOption_pixmapMyAvatar));
@@ -626,7 +626,7 @@ KviIdentityAdvancedOptionsWidget::KviIdentityAdvancedOptionsWidget(QWidget * par
 	m_bW = m_sModeStr.contains('w');
 	m_bS = m_sModeStr.contains('s');
 
-	createLayout(2,1);
+	createLayout();
 	layout()->setMargin(10);
 
 	KviTalGroupBox * gbox = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("User Mode","options"));
diff --git a/src/modules/options/optw_ignore.cpp b/src/modules/options/optw_ignore.cpp
index 747c3bf94..e6d1e2b13 100644
--- a/src/modules/options/optw_ignore.cpp
+++ b/src/modules/options/optw_ignore.cpp
@@ -31,7 +31,7 @@
 KviIgnoreOptionsWidget::KviIgnoreOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ignore_options_widget")
 {
-	createLayout(3,1);
+	createLayout();
 
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Enable Ignore For","options"));
 	m_pIgnorePrivmsg = addBoolSelector(g,__tr2qs_ctx("Private/channel messages","options"),KviOption_boolEnableIgnoreOnPrivMsg);
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index c82b3f247..887a245a9 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -29,7 +29,7 @@
 KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ircviewlook_options_widget")
 {
-	createLayout(10,2);
+	createLayout();
 
 	addFontSelector(0,0,1,0,__tr2qs_ctx("Font","options"),KviOption_fontInput);
 	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color","options"),KviOption_colorInputBackground);
@@ -134,7 +134,7 @@ void KviInputLookOptionsWidget::commit()
 KviInputFeaturesOptionsWidget::KviInputFeaturesOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ircviewfeatures_options_widget")
 {
-	createLayout(6,1);
+	createLayout();
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Warp cursor at the end of line when browsing history","options"),KviOption_boolInputHistoryCursorAtEnd);
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Disable the input history window and it's log memory.","options"),KviOption_boolDisableInputHistory); //G&N 2005
diff --git a/src/modules/options/optw_interfacefeatures.cpp b/src/modules/options/optw_interfacefeatures.cpp
index d28a9c4ad..31f9fcb81 100644
--- a/src/modules/options/optw_interfacefeatures.cpp
+++ b/src/modules/options/optw_interfacefeatures.cpp
@@ -38,7 +38,7 @@
 KviInterfaceFeaturesOptionsWidget::KviInterfaceFeaturesOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"interfacefeatures_options_widget")
 {
-	createLayout(8,1);
+	createLayout();
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize on startup","options"),KviOption_boolStartupMinimized);
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Confirm quit with active connections","options"),KviOption_boolConfirmCloseWhenThereAreConnections);
diff --git a/src/modules/options/optw_interfacelookglobal.cpp b/src/modules/options/optw_interfacelookglobal.cpp
index 9fb9f9ab5..085619d6c 100644
--- a/src/modules/options/optw_interfacelookglobal.cpp
+++ b/src/modules/options/optw_interfacelookglobal.cpp
@@ -33,7 +33,7 @@
 KviThemeGeneralOptionsWidget::KviThemeGeneralOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
 {
-	createLayout(4,2);
+	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,1,1,1,__tr2qs_ctx("Use global application font","options"),KviOption_boolUseGlobalApplicationFont);
 	KviBoolSelector * g = addBoolSelector(0,0,1,0,__tr2qs_ctx("Hide icons in Popup","options"),KviOption_boolDisablePopupIcons);
@@ -58,9 +58,9 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * p
 #ifdef COMPILE_PSEUDO_TRANSPARENCY
 
 	#ifdef COMPILE_KDE_SUPPORT
-		createLayout(7,2);
+		createLayout();
 	#else
-		createLayout(5,2);
+		createLayout();
 	#endif
 
 	m_pUseTransparencyBoolSelector = addBoolSelector(0,0,1,0,__tr2qs_ctx("Enable fake transparency","options"),KviOption_boolUseGlobalPseudoTransparency);
@@ -112,7 +112,7 @@ KviThemeTransparencyOptionsWidget::KviThemeTransparencyOptionsWidget(QWidget * p
 	connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableGlobalBackgroundPixmapSelector(bool)));
 	connect(m_pUseTransparencyBoolSelector,SIGNAL(toggled(bool)),this,SLOT(enableUpdateKdeBackgroundBoolSelector(bool)));
 #else
-	createLayout(1,1);
+	createLayout();
 	addRowSpacer(0,0,0,0);
 #endif
 }
@@ -147,7 +147,7 @@ void KviThemeTransparencyOptionsWidget::enableUpdateKdeBackgroundBoolSelector(bo
 KviThemeMdiCaptionsOptionsWidget::KviThemeMdiCaptionsOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
 {
-	createLayout(7,1);
+	createLayout();
 
 	addColorSelector(0,0,0,0,__tr2qs_ctx("Active Background","options"),KviOption_colorMdiCaptionActive);
 	addColorSelector(0,1,0,1,__tr2qs_ctx("Inactive Background","options"),KviOption_colorMdiCaptionInactive);
@@ -169,7 +169,7 @@ KviThemeMdiCaptionsOptionsWidget::~KviThemeMdiCaptionsOptionsWidget()
 KviThemeMdiAreaOptionsWidget::KviThemeMdiAreaOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
 {
-	createLayout(2,1);
+	createLayout();
 
 	addColorSelector(0,0,0,0,__tr2qs_ctx("Background","options"),KviOption_colorMdiBackground);
 	addPixmapSelector(0,1,0,1,__tr2qs_ctx("Background Image","options"),KviOption_pixmapMdiBackground);
@@ -187,7 +187,7 @@ KviThemeMdiAreaOptionsWidget::~KviThemeMdiAreaOptionsWidget()
 KviThemeToolBarAppletsOptionsWidget::KviThemeToolBarAppletsOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
 {
-	createLayout(9,1);
+	createLayout();
 	
 	addFontSelector(0,0,0,0,__tr2qs_ctx("Font","options"),KviOption_fontIrcToolBarApplet);
 	
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 2e8524ee4..a5025ce39 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -45,7 +45,7 @@ KviIrcOptionsWidget::~KviIrcOptionsWidget()
 KviIrcGeneralOptionsWidget::KviIrcGeneralOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"irc_options_widget")
 {
-	createLayout(3,1);
+	createLayout();
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Minimize console after successful login","options"),KviOption_boolMinimizeConsoleAfterConnect);
 
 	mergeTip(b,__tr2qs_ctx("<center>This option will cause KVIrc to minimize the console window after successfully logging into a server.</center>","options"));
@@ -65,7 +65,7 @@ KviIrcGeneralOptionsWidget::~KviIrcGeneralOptionsWidget()
 KviIrcAdvancedOptionsWidget::KviIrcAdvancedOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"irc_advanced_options_widget")
 {
-	createLayout(3,1);
+	createLayout();
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Force immediate quit","options"),KviOption_boolForceBrutalQuit);    
 	mergeTip(b,
 		__tr2qs_ctx("<center>This option causes KVIrc to close " \
@@ -94,7 +94,7 @@ KviChannelOptionsWidget::~KviChannelOptionsWidget()
 KviChannelGeneralOptionsWidget::KviChannelGeneralOptionsWidget(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
-	createLayout(5,1);
+	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("On Channel Kick","options"));
 
@@ -140,7 +140,7 @@ KviChannelGeneralOptionsWidget::~KviChannelGeneralOptionsWidget()
 KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
-	createLayout(6,4);
+	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,0,4,0,__tr2qs_ctx("Log joined channels history","options"),KviOption_boolLogChannelHistory);
 	
diff --git a/src/modules/options/optw_ircoutput.cpp b/src/modules/options/optw_ircoutput.cpp
index 8bbeb6f56..7542a4468 100644
--- a/src/modules/options/optw_ircoutput.cpp
+++ b/src/modules/options/optw_ircoutput.cpp
@@ -35,7 +35,7 @@
 KviIrcOutputOptionsWidget::KviIrcOutputOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ircoutput_options_widget")
 {
-	createLayout(7,2);
+	createLayout();
 
 	QLabel * l =new QLabel(__tr2qs_ctx("Output verbosity","options"),this);
 	addWidgetToLayout(l,0,0,0,0);
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 819b8b60d..1d85010e1 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -40,7 +40,7 @@ KviIrcViewThemeOptionsWidget::~KviIrcViewThemeOptionsWidget()
 KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ircviewlook_options_widget")
 {
-	createLayout(6,2);
+	createLayout();
 
 	addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontIrcView);
 	addColorSelector(0,1,1,1,__tr2qs_ctx("Background color:","options"),KviOption_colorIrcViewBackground);
@@ -141,7 +141,7 @@ void KviIrcViewLookOptionsWidget::commit()
 KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"ircviewfeatures_options_widget")
 {
-	createLayout(14,1);
+	createLayout();
 
 	
 
diff --git a/src/modules/options/optw_lag.cpp b/src/modules/options/optw_lag.cpp
index 30e1f9907..08d6d46d7 100644
--- a/src/modules/options/optw_lag.cpp
+++ b/src/modules/options/optw_lag.cpp
@@ -33,7 +33,7 @@
 KviLagOptionsWidget::KviLagOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"lag_options_widget")
 {
-	createLayout(3,1);
+	createLayout();
 
 	KviBoolSelector * pUse = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable lag meter","options"), KviOption_boolUseLagMeterEngine);
 	mergeTip(pUse,__tr2qs_ctx("<center>This enables the lag meter engine, which checks at regular intervals how much lag (latency) the server has.</center>","options"));
diff --git a/src/modules/options/optw_logging.cpp b/src/modules/options/optw_logging.cpp
index eeb5a3bae..ddbda70db 100644
--- a/src/modules/options/optw_logging.cpp
+++ b/src/modules/options/optw_logging.cpp
@@ -32,7 +32,7 @@
 KviLoggingOptionsWidget::KviLoggingOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"logging_options_widget")
 {
-	createLayout(4,1);
+	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Automatically Log","options"));
 	addBoolSelector(g,__tr2qs_ctx("Query windows","options"),KviOption_boolAutoLogQueries);
diff --git a/src/modules/options/optw_mediatypes.cpp b/src/modules/options/optw_mediatypes.cpp
index 1773b7b0e..df3ec84d6 100644
--- a/src/modules/options/optw_mediatypes.cpp
+++ b/src/modules/options/optw_mediatypes.cpp
@@ -65,7 +65,7 @@ void KviMediaTypeListViewItem::copyData(KviMediaType * t)
 KviMediaTypesOptionsWidget::KviMediaTypesOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"mediatypes_options_widget")
 {
-	createLayout(11,3);
+	createLayout();
 
 	m_pListView = new KviTalListView(this);
 	m_pListView->addColumn(__tr2qs_ctx("Pattern","options"));
diff --git a/src/modules/options/optw_messages.cpp b/src/modules/options/optw_messages.cpp
index 237e9c843..2b5d4d3a9 100644
--- a/src/modules/options/optw_messages.cpp
+++ b/src/modules/options/optw_messages.cpp
@@ -69,7 +69,7 @@ KviMessageOptionsWidget::~KviMessageOptionsWidget()
 KviPrivmsgOptionsWidget::KviPrivmsgOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"privmsg_options_widget")
 {
-	createLayout(4,1);
+	createLayout();
 
 	KviBoolSelector * b1;
 	KviBoolSelector * b2;
@@ -122,7 +122,7 @@ KviPrivmsgOptionsWidget::~KviPrivmsgOptionsWidget()
 KviTimestampOptionsWidget::KviTimestampOptionsWidget(QWidget * pParent)
 : KviOptionsWidget(pParent)
 {
-	createLayout(5,1);
+	createLayout();
 	m_pUseTimestampSelector = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show timestamp","options"),KviOption_boolIrcViewTimestamp);
 	
 	connect(m_pUseTimestampSelector,SIGNAL(toggled(bool)),this,SLOT(enableDisableTimestampSelector(bool)));
@@ -160,7 +160,7 @@ void KviTimestampOptionsWidget::enableDisableTimestampSelector(bool)
 KviStandardColorsOptionsWidget::KviStandardColorsOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"stdcolors")
 {
-	createLayout(5,4);
+	createLayout();
 	
 	addColorSelector(0,0,0,0,"0:",&(KVI_OPTION_MIRCCOLOR(0)));
 	addColorSelector(1,0,1,0,"1:",&(KVI_OPTION_MIRCCOLOR(1)));
@@ -353,7 +353,7 @@ int KviMessageColorListBoxItem::height(const KviTalListBox *) const
 KviIrcColorsOptionsWidget::KviIrcColorsOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"irccolors","options")
 {
-	createLayout(5,4);
+	createLayout();
 
 	addRowSpacer(0,4,3,4);
 }
@@ -368,7 +368,7 @@ KviMessageColorsOptionsWidget::KviMessageColorsOptionsWidget(QWidget * parent)
 {
 	int i;
 
-	createLayout(2,4);
+	createLayout();
 
 	m_pLastItem = 0;
 
diff --git a/src/modules/options/optw_nickserv.cpp b/src/modules/options/optw_nickserv.cpp
index f723fb0c5..29f7f7545 100644
--- a/src/modules/options/optw_nickserv.cpp
+++ b/src/modules/options/optw_nickserv.cpp
@@ -216,7 +216,7 @@ bool KviNickServRuleEditor::editRule(KviNickServRule * r)
 KviNickServOptionsWidget::KviNickServOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"nickserv_options_widget")
 {
-	createLayout(3,3);
+	createLayout();
 	
 	QGridLayout * gl = layout();
 
diff --git a/src/modules/options/optw_notify.cpp b/src/modules/options/optw_notify.cpp
index 9e90a40ab..d44206d8d 100644
--- a/src/modules/options/optw_notify.cpp
+++ b/src/modules/options/optw_notify.cpp
@@ -31,7 +31,7 @@
 KviNotifyOptionsWidget::KviNotifyOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"notify_options_widget")
 {
-	createLayout(5,1);
+	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use online notify list","options"),KviOption_boolUseNotifyList);
 	KviTalGroupBox *g = addGroupBox(0,1,0,1,1,Qt::Horizontal,__tr2qs_ctx("Configuration","options"));
@@ -102,7 +102,7 @@ KviNotifyOptionsWidget::~KviNotifyOptionsWidget()
 KviNotifierOptionsWidget::KviNotifierOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"notifier_options_widget")
 {
-	createLayout(3,1);
+	createLayout();
 
 	KviBoolSelector * b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Forcibly and completely disable the notifier","options"),KviOption_boolForciblyDisableNotifier);
 	QString tip = "<center>";
diff --git a/src/modules/options/optw_protection.cpp b/src/modules/options/optw_protection.cpp
index ea56bb822..f67ff80e0 100644
--- a/src/modules/options/optw_protection.cpp
+++ b/src/modules/options/optw_protection.cpp
@@ -34,7 +34,7 @@ KviProtectionOptionsWidget::KviProtectionOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"protection_options_widget")
 {
 	
-	createLayout(1,1);
+	createLayout();
 
 	QLabel * l;
 	l = addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc protection tools<br>"\
diff --git a/src/modules/options/optw_proxy.cpp b/src/modules/options/optw_proxy.cpp
index e38e0e375..2ade6dfd9 100644
--- a/src/modules/options/optw_proxy.cpp
+++ b/src/modules/options/optw_proxy.cpp
@@ -57,7 +57,7 @@ KviProxyOptionsListViewItem::~KviProxyOptionsListViewItem()
 KviProxyOptionsWidget::KviProxyOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"proxy_options_widget")
 {
-	createLayout(3,2);
+	createLayout();
 
 	addBoolSelector(0,0,1,0,__tr2qs_ctx("Use proxy","options"),KviOption_boolUseProxyHost);
 
diff --git a/src/modules/options/optw_query.cpp b/src/modules/options/optw_query.cpp
index 0f9720f9c..45b3f67a9 100644
--- a/src/modules/options/optw_query.cpp
+++ b/src/modules/options/optw_query.cpp
@@ -33,7 +33,7 @@
 KviQueryOptionsWidget::KviQueryOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"query_options_widget")
 {
-	createLayout(8,1);
+	createLayout();
 
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Open Query For","options"));
 	KviBoolSelector *b  = addBoolSelector(g, __tr2qs_ctx("Private messages","options"),KviOption_boolCreateQueryOnPrivmsg);
diff --git a/src/modules/options/optw_servers.cpp b/src/modules/options/optw_servers.cpp
index 60e097efb..527ce90ee 100644
--- a/src/modules/options/optw_servers.cpp
+++ b/src/modules/options/optw_servers.cpp
@@ -89,7 +89,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	
 	m_pChannelListSelector=0;
 	
-	QGridLayout * g = new QGridLayout(this,4,4,10,4);
+	QGridLayout * g = new QGridLayout(this);
 
 	setWindowTitle(__tr2qs_ctx("Network Details","options"));
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_WORLD)));
@@ -118,7 +118,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	g->addMultiCellWidget(tw,2,2,0,3);
 
 	QWidget * tab = new QWidget(tw);
-	QGridLayout * gl = new QGridLayout(tab,4,2,10,4);
+	QGridLayout * gl = new QGridLayout(tab);
 
 	KviTalGroupBox *gbox = new KviTalGroupBox(2,Qt::Horizontal,__tr2qs_ctx("Properties","options"),tab);
 	gl->addMultiCellWidget(gbox,0,0,0,1);
@@ -188,7 +188,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	// after login join channels
 	tab = new QWidget(tw);
 
-	gl = new QGridLayout(tab,1,1,10,4);
+	gl = new QGridLayout(tab);
 
 	if(n->autoJoinChannelList())
 		m_lstChannels = *(n->autoJoinChannelList());
@@ -205,7 +205,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 
 	// after connect execute
 	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,1,1,10,4);
+	gl = new QGridLayout(tab);
 	
 	m_pOnConnectEditor = KviScriptEditor::createInstance(tab);
 	gl->addWidget(m_pOnConnectEditor,0,0);
@@ -221,7 +221,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 
 	// after login execute
 	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,1,1,10,4);
+	gl = new QGridLayout(tab);
 
 	m_pOnLoginEditor = KviScriptEditor::createInstance(tab);
 	gl->addWidget(m_pOnLoginEditor,0,0);
@@ -240,7 +240,7 @@ KviNetworkDetailsWidget::KviNetworkDetailsWidget(QWidget * par,KviIrcNetwork * n
 	// nick serv rules
 	
 	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,3,3,10,5);
+	gl = new QGridLayout(tab);
 	
 	KviNickServRuleSet * rs = n->nickServRuleSet();
 	bool bNickServEnabled = rs ? (rs->isEnabled() && !rs->isEmpty()) : false;
@@ -416,7 +416,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
     : QDialog(par,"server_details",true)
 {
 	m_szHostname = s->hostName();
-	QGridLayout * g = new QGridLayout(this,4,4,10,4);
+	QGridLayout * g = new QGridLayout(this);
 
 	setWindowTitle(__tr2qs_ctx("Server Details","options"));
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)));
@@ -442,7 +442,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	g->addMultiCellWidget(tw,2,2,0,3);
 
 	QWidget * tab = new QWidget(tw);
-	QGridLayout * gl = new QGridLayout(tab,3,1,10,4);
+	QGridLayout * gl = new QGridLayout(tab);
 
 	KviTalGroupBox *gbox = new KviTalGroupBox(2,Qt::Horizontal,__tr2qs_ctx("Properties","options"),tab);
 	gl->addWidget(gbox,0,0);
@@ -510,7 +510,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	// Connection tab
 	
 	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,11,1,10,4);
+	gl = new QGridLayout(tab);
 	
 	l = new QLabel(__tr2qs_ctx("Port:","options"),tab);
 	gl->addWidget(l,0,0);
@@ -687,7 +687,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	// after login join channels
 	tab = new QWidget(tw);
 
-	gl = new QGridLayout(tab,1,1,10,4);
+	gl = new QGridLayout(tab);
 
 	if(s->autoJoinChannelList())
 		m_lstChannels = *(s->autoJoinChannelList());
@@ -702,7 +702,7 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 
 	// after connect execute
 	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,1,1,10,4);
+	gl = new QGridLayout(tab);
 
 
 	m_pOnConnectEditor = KviScriptEditor::createInstance(tab);
@@ -718,7 +718,8 @@ KviServerDetailsWidget::KviServerDetailsWidget(QWidget * par,KviIrcServer * s)
 	// after login execute
 
 	tab = new QWidget(tw);
-	gl = new QGridLayout(tab,1,1,10,4);
+	gl = new QGridLayout(tab
+		);
 
 	m_pOnLoginEditor = KviScriptEditor::createInstance(tab);
 	gl->addWidget(m_pOnLoginEditor,0,0);
@@ -951,7 +952,7 @@ void KviServerOptionsListViewItem::updateVisibleStrings()
 KviServerOptionsWidget::KviServerOptionsWidget(QWidget * parent)
     : KviOptionsWidget(parent,"server_options_widget")
 {
-	createLayout(4,2);
+	createLayout();
 
 	m_pContextPopup = new KviTalPopupMenu(this);
 	m_pImportPopup = new KviTalPopupMenu(this);
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 209c6ae5e..dbd40e9ca 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -54,11 +54,8 @@ KviSoundOptionsWidget::~KviSoundOptionsWidget()
 KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"sound_system_options_widget")
 {
-#ifdef COMPILE_ON_WINDOWS
-	createLayout(4,1);
-#else
-	createLayout(3,1);
-#endif
+	createLayout();
+
 	KviTalGroupBox * g = addGroupBox(0,0,0,0,1,Qt::Horizontal,__tr2qs_ctx("Sound System","options"),true);
 
 	KviTalToolTip::add(g,__tr2qs_ctx("This allows you to select the sound system to be used with KVIrc.","options"));
@@ -279,7 +276,7 @@ void KviSoundGeneralOptionsWidget::commit()
 KviSoundsOptionsWidget::KviSoundsOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"sound_options_widget")
 {
-	createLayout(5,2);
+	createLayout();
 	addLabel(0,0,0,0,__tr2qs_ctx("New Query opened","options"));
 	addSoundSelector(1,0,1,0,"",KviOption_stringOnNewQueryOpenedSound);
 	
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index 6a3eb200d..bafdd1c20 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -30,7 +30,7 @@
 KviTaskBarOptionsWidget::KviTaskBarOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"taskbar_options_widget")
 {
-	createLayout(7,1);
+	createLayout();
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Use tree taskbar","options"),KviOption_boolUseTreeWindowListTaskBar);
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Sort windows by name","options"),KviOption_boolSortTaskBarItemsByName);
@@ -72,7 +72,7 @@ KviTreeTaskBarOptionsWidget::~KviTreeTaskBarOptionsWidget()
 KviTreeTaskBarForegroundOptionsWidget::KviTreeTaskBarForegroundOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
-	createLayout(3,1);
+	createLayout();
 	
 	KviTalGroupBox *g = addGroupBox(0,0,0,0,2,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
 	
@@ -102,7 +102,7 @@ KviTreeTaskBarForegroundOptionsWidget::~KviTreeTaskBarForegroundOptionsWidget()
 KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
-	createLayout(4,2);
+	createLayout();
 	
 	KviTalGroupBox * g = addGroupBox(0,0,1,0,2,Qt::Horizontal,__tr2qs_ctx("Background Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTreeTaskBarBackground);
@@ -204,7 +204,7 @@ void KviTreeTaskBarBackgroundOptionsWidget::commit()
 KviTreeTaskBarFeaturesOptionsWidget::KviTreeTaskBarFeaturesOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"treetaskbar_options_widget")
 {
-	createLayout(4,1);
+	createLayout();
 
 	addBoolSelector(0,0,1,0,__tr2qs_ctx("Show header","options"),KviOption_boolShowTreeTaskbarHeader);
 	
@@ -225,7 +225,7 @@ KviTreeTaskBarFeaturesOptionsWidget::~KviTreeTaskBarFeaturesOptionsWidget()
 KviClassicTaskBarOptionsWidget::KviClassicTaskBarOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"classictaskbar_options_widget")
 {
-	createLayout(8,1);
+	createLayout();
 	addFontSelector(0,0,0,0,__tr2qs_ctx("Font:","options"),KviOption_fontTaskbar);
 	KviTalGroupBox *g = addGroupBox(0,1,0,1,2,Qt::Horizontal,__tr2qs_ctx("Text/Alert Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorTaskBarNormalText);
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index 7103c625e..7848b04a3 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -35,7 +35,7 @@ QString g_szPrevSettedLocale;
 KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"textencoding_options_widget")
 {
-	createLayout(5,2);
+	createLayout();
 
 	addLabel(0,0,0,0,__tr2qs_ctx("Default text encoding:","options"));
 
diff --git a/src/modules/options/optw_texticons.cpp b/src/modules/options/optw_texticons.cpp
index 4684513c5..2a20ca740 100644
--- a/src/modules/options/optw_texticons.cpp
+++ b/src/modules/options/optw_texticons.cpp
@@ -68,7 +68,7 @@ KviTextIconsOptionsWidget::KviTextIconsOptionsWidget(QWidget * parent)
 	m_iLastEditedRow=-1;
 	
 	setObjectName("texticons_options_widget");
-	createLayout(2,2);
+	createLayout();
 
 	KviPointerHashTableIterator<QString,KviTextIcon> it(*(g_pTextIconManager->textIconDict()));
 
diff --git a/src/modules/options/optw_tools.cpp b/src/modules/options/optw_tools.cpp
index 9addb7fda..54c883027 100644
--- a/src/modules/options/optw_tools.cpp
+++ b/src/modules/options/optw_tools.cpp
@@ -34,7 +34,7 @@ KviToolsOptionsWidget::KviToolsOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"tools_options_widget")
 {
 	
-	createLayout(1,1);
+	createLayout();
 
 	QLabel * l;
 	l = addLabel(0,0,0,0,__tr2qs_ctx("This section contains irc tools<br>"\
diff --git a/src/modules/options/optw_topiclabel.cpp b/src/modules/options/optw_topiclabel.cpp
index 76565544b..b7c6af517 100644
--- a/src/modules/options/optw_topiclabel.cpp
+++ b/src/modules/options/optw_topiclabel.cpp
@@ -28,7 +28,7 @@
 
 KviTopicLabelLookOptionsWidget::KviTopicLabelLookOptionsWidget(QWidget *p):KviOptionsWidget(p, "topic_label_look_options_widget")
 {
-	createLayout(4, 1);
+	createLayout();
 
 	addFontSelector(0, 0, 0, 0, __tr2qs_ctx("Font","options"), KviOption_fontLabel);
 	addColorSelector(0, 1, 0, 1, __tr2qs_ctx("Foreground color","options"), KviOption_colorLabelForeground);
diff --git a/src/modules/options/optw_tray.cpp b/src/modules/options/optw_tray.cpp
index 9b200a962..796aa8d05 100644
--- a/src/modules/options/optw_tray.cpp
+++ b/src/modules/options/optw_tray.cpp
@@ -33,7 +33,7 @@
 KviTrayOptionsWidget::KviTrayOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"tray_options_widget")
 {
-	createLayout(7,1);
+	createLayout();
 	
 	m_pEnable = addBoolSelector(0,0,0,0, __tr2qs_ctx("Enable tray icon","options"), KviOption_boolShowDockExtension);
 	m_pCloseInTray = addBoolSelector(0,1,0,1,__tr2qs_ctx("Close in tray","options"),KviOption_boolCloseInTray);
diff --git a/src/modules/options/optw_uparser.cpp b/src/modules/options/optw_uparser.cpp
index ecceb3a4b..0749091e3 100644
--- a/src/modules/options/optw_uparser.cpp
+++ b/src/modules/options/optw_uparser.cpp
@@ -33,7 +33,7 @@
 KviUParserOptionsWidget::KviUParserOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"uparser_options_widget")
 {
-	createLayout(11,1);
+	createLayout();
 
 	addBoolSelector(0,0,0,0,__tr2qs_ctx("Disable parser warnings","options"),KviOption_boolAvoidParserWarnings);
 	addBoolSelector(0,1,0,1,__tr2qs_ctx("Disable broken event handlers","options"),KviOption_boolDisableBrokenEventHandlers);
diff --git a/src/modules/options/optw_urlhandlers.cpp b/src/modules/options/optw_urlhandlers.cpp
index b50b5da9a..12787c604 100644
--- a/src/modules/options/optw_urlhandlers.cpp
+++ b/src/modules/options/optw_urlhandlers.cpp
@@ -40,7 +40,7 @@ KviUrlHandlersOptionsWidget::KviUrlHandlersOptionsWidget(QWidget * parent)
 	#define START_ROW 0
 #endif
 
-	createLayout(START_ROW+7,1);
+	createLayout();
 
 #ifdef COMPILE_ON_WINDOWS
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Use system URL handlers","options"),KviOption_boolUseSystemUrlHandlers);
diff --git a/src/modules/options/optw_userlist.cpp b/src/modules/options/optw_userlist.cpp
index f9993963c..c39dc34e9 100644
--- a/src/modules/options/optw_userlist.cpp
+++ b/src/modules/options/optw_userlist.cpp
@@ -44,7 +44,7 @@ KviUserListLookOptionsWidget::~KviUserListLookOptionsWidget()
 KviUserListLookForegroundOptionsWidget::KviUserListLookForegroundOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"userlistlook_foreground_options_widget")
 {
-	createLayout(2,2);
+	createLayout();
 
 	addFontSelector(0,0,1,0,__tr2qs_ctx("Font:","options"),KviOption_fontUserListView);
 	
@@ -75,7 +75,7 @@ KviUserListLookForegroundOptionsWidget::~KviUserListLookForegroundOptionsWidget(
 KviUserListGridOptionsWidget::KviUserListGridOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent)
 {
-	createLayout(5,1);
+	createLayout();
 	KviBoolSelector* b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Draw nickname grid","options"),KviOption_boolUserListViewDrawGrid);
 
 	KviColorSelector* s = addColorSelector(0,1,0,1,__tr2qs_ctx("Grid color:","options"),KviOption_colorUserListViewGrid,KVI_OPTION_BOOL(KviOption_boolUserListViewDrawGrid));
@@ -117,7 +117,7 @@ void KviUserListGridOptionsWidget::commit()
 KviUserListLookBackgroundOptionsWidget::KviUserListLookBackgroundOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"userlistlook_background_options_widget")
 {
-	createLayout(3,2);
+	createLayout();
 
 	KviTalGroupBox * g = addGroupBox(0,0,1,0,1,Qt::Horizontal,__tr2qs_ctx("Background Colors","options"));
 	addColorSelector(g,__tr2qs_ctx("Normal:","options"),KviOption_colorUserListViewBackground);
@@ -223,7 +223,7 @@ void KviUserListLookBackgroundOptionsWidget::commit()
 KviUserListFeaturesOptionsWidget::KviUserListFeaturesOptionsWidget(QWidget * parent)
 : KviOptionsWidget(parent,"userlistfeatures_options_widget")
 {
-	createLayout(7,1);
+	createLayout();
 
 	KviBoolSelector *b = addBoolSelector(0,0,0,0,__tr2qs_ctx("Show gender icons","options"),KviOption_boolDrawGenderIcons);
 	b = addBoolSelector(0,1,0,1,__tr2qs_ctx("Show user channel icons","options"),KviOption_boolShowUserChannelIcons);
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 8b648a513..89e160d3c 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -183,7 +183,7 @@ KviSinglePopupEditor::KviSinglePopupEditor(QWidget * par)
 	m_pClipboard = 0;
 	m_pTestPopup = 0;
 
-	QGridLayout * g = new QGridLayout(this,7,3,2,2);
+	QGridLayout * g = new QGridLayout(this);
 
 	m_pNameEditor = new QLineEdit(this);
 	QToolTip::add(m_pNameEditor,__tr2qs("Popup name"));
@@ -989,7 +989,7 @@ void KviMenuListViewItem::replacePopup(KviKvsPopupMenu * popup)
 KviPopupEditor::KviPopupEditor(QWidget * par)
 : QWidget(par)
 {
-	QGridLayout * l = new QGridLayout(this,1,1,0,2);
+	QGridLayout * l = new QGridLayout(this);
 	QSplitter * spl = new QSplitter(Qt::Horizontal,this,"popupeditor");
 	spl->setOpaqueResize(false);
 	l->addWidget(spl,0,0);
@@ -1276,7 +1276,7 @@ KviPopupEditorWindow::KviPopupEditorWindow(KviFrame * lpFrm)
 	m_pEditor = new KviPopupEditor(this);
 
 	m_pBase = new QWidget(this);
-	QGridLayout * g = new QGridLayout(m_pBase,1,4,4,4);
+	QGridLayout * g = new QGridLayout(m_pBase);
 
 	QPushButton * btn = new QPushButton(__tr2qs("&OK"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 2a4f5d649..7ae9b417c 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -71,7 +71,7 @@ const QPixmap * KviRawHandlerListViewItem::pixmap(int col) const
 KviRawEditor::KviRawEditor(QWidget * par)
 : QWidget(par,"raw_event_editor")
 {
-	QGridLayout * l = new QGridLayout(this,1,1,2,2);
+	QGridLayout * l = new QGridLayout(this);
 	QSplitter * spl = new QSplitter(Qt::Horizontal,this,"raweditorv");
 	spl->setOpaqueResize(false);
 	l->addWidget(spl,0,0);
@@ -445,7 +445,7 @@ KviRawEditorWindow::KviRawEditorWindow(KviFrame * lpFrm)
 	m_pEditor = new KviRawEditor(this);
 
 	m_pBase = new QWidget(this);
-	QGridLayout * g = new QGridLayout(m_pBase,1,4,4,4);
+	QGridLayout * g = new QGridLayout(m_pBase);
 
 	QPushButton * btn = new QPushButton(__tr2qs("&OK"),m_pBase);
 	connect(btn,SIGNAL(clicked()),this,SLOT(okClicked()));
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 09a800be8..325bc41cb 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -165,7 +165,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_REGUSERS)));

 	setWindowTitle(__tr2qs("Registered Users - KVIrc"));

 

-	QGridLayout * g = new QGridLayout(this,4,3,4,4);

+	QGridLayout * g = new QGridLayout(this);

 

 

 	m_pListView = new KviTalListView(this);

diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 203748675..bafa1815d 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -76,11 +76,11 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas
 	setWindowTitle(__tr2qs("Property Editor"));

 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINUX)));

 

-	QGridLayout * g = new QGridLayout(this,3,3,4,4);

+	QGridLayout * g = new QGridLayout(this);

 

 	m_pTable = new QTableWidget(this);

-	g->addMultiCellWidget(m_pTable,0,1,0,1);

-

+	//g->addMultiCellWidget(m_pTable,0,1,0,1);

+	g->addWidget(m_pTable,0,0);

 	m_pTable->setColumnCount(2);

 	m_pTable->setSelectionMode(QTableWidget::NoSelection);

 

@@ -94,7 +94,7 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas
 

 	KviTalVBox * vb = new KviTalVBox(this);

 	vb->setSpacing(4);

-	g->addWidget(vb,0,2);

+	g->addWidget(vb,0,1,0,3);

 

 	m_pAddButton = new QPushButton(__tr2qs("&New"),vb);

 	connect(m_pAddButton,SIGNAL(clicked()),this,SLOT(addClicked()));

@@ -106,15 +106,15 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas
 

 	KviTalHBox * b = new KviTalHBox(this);

 	b->setSpacing(4);

-	g->addMultiCellWidget(b,2,2,1,2);

-

+	//g->addMultiCellWidget(b,2,2,1,2);

+	g->addWidget(b,1,1);

 	QPushButton * pb = new QPushButton(__tr2qs("&OK"),b);

 	connect(pb,SIGNAL(clicked()),this,SLOT(okClicked()));

-	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

+	pb->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

 

 	pb = new QPushButton(__tr2qs("Cancel"),b);

 	connect(pb,SIGNAL(clicked()),this,SLOT(reject()));

-	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

+	pb->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

 

 	g->setRowStretch(1,1);

 	g->setColumnStretch(0,1);

@@ -223,7 +223,7 @@ KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m)
 

 	setWindowTitle(__tr2qs("Mask Editor"));

 

-	QGridLayout * g = new QGridLayout(this,3,2,4,4);

+	QGridLayout * g = new QGridLayout(this);

 

 	QLabel * l = new QLabel(__tr2qs("Insert a mask for this user.<br>It can contain the wildcard characters '*' and '?'."),this);

 	//l->setAlignment(Qt::AlignCenter);

@@ -333,7 +333,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 

 	QWidget * p1 = new QWidget(this);

 

-	QGridLayout * g = new QGridLayout(p1,6,2,4,4);

+	QGridLayout * g = new QGridLayout(p1);

 

 	QLabel * l = new QLabel(__tr2qs("Name:"),p1);

 	g->addWidget(l,0,0);

@@ -385,7 +385,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 

 	QWidget * p2 = new QWidget(this);

 

-	g = new QGridLayout(p2,6,3,5,2);

+	g = new QGridLayout(p2);

 

 	m_pNotifyCheck = new KviStyledCheckBox(__tr2qs("Notify when user is online"),p2);

 	g->addMultiCellWidget(m_pNotifyCheck,0,0,0,2);

diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index b8642fd71..66ca6b6db 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -55,7 +55,7 @@ extern KVIRC_API KviSharedFilesManager * g_pSharedFilesManager;
 KviSharedFileEditDialog::KviSharedFileEditDialog(QWidget * par,KviSharedFile * f)
 : QDialog(par,"shared_file_editor",true)
 {
-	QGridLayout * g = new QGridLayout(this,1,1,11,6);
+	QGridLayout * g = new QGridLayout(this);
 
 	setWindowTitle(__tr2qs_ctx("Edit Shared File - KVIrc","sharedfileswindow"));
 
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index b9a33322c..4e92298c5 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -146,7 +146,7 @@ KviThemeManagementDialog::KviThemeManagementDialog(QWidget * parent)
 
 	m_pInstance = this;
 
-	QGridLayout * g = new QGridLayout(this,3,2,4,4);
+	QGridLayout * g = new QGridLayout(this);
 
 	KviTalHBox *hb = new KviTalHBox(this);
 	g->addMultiCellWidget(hb,0,0,0,1);
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index e36f148ca..ccf44505f 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -117,7 +117,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
 
 	// welcome page ==================================================================================
 	QWidget * pPage = new QWidget(this);
-	QGridLayout * pLayout = new QGridLayout(pPage,2,1,4,4);
+	QGridLayout * pLayout = new QGridLayout(pPage);
 	
 	QLabel * pLabel = new QLabel(pPage);
 	QString szText = "<p>";
@@ -141,7 +141,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
 	// theme data name ================================================================================
 
 	pPage = new QWidget(this);
-	pLayout = new QGridLayout(pPage,2,1,4,4);
+	pLayout = new QGridLayout(pPage);
 
 	pLabel = new QLabel(pPage);
 	pLabel->setText(__tr2qs_ctx("This is the information list for the themes you're packaging. If it looks OK press \"Next\" to continue, otherwise press \"Cancel\" and rewiew your themes first.","theme"));
@@ -203,7 +203,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
 	// packager informations ================================================================================
 
 	pPage = new QWidget(this);
-	pLayout = new QGridLayout(pPage,5,2,4,4);
+	pLayout = new QGridLayout(pPage);
 
 	pLabel = new QLabel(pPage);
 	pLabel->setText(__tr2qs_ctx("Here you need to provide informations about you (the packager) and a short description of the package you're creating.","theme"));
@@ -255,7 +255,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
 	// screenshot/logo/icon ================================================================================
 
 	pPage = new QWidget(this);
-	pLayout = new QGridLayout(pPage,3,1,4,4);
+	pLayout = new QGridLayout(pPage);
 
 	pLabel = new QLabel(pPage);
 	pLabel->setText(__tr2qs_ctx("Here you can choose the image that will appear in the installation dialog for your theme package. It can be an icon, a logo or a screenshot and it should be not larger than 300x225. If you don't provide an image a simple default icon will be used at installation stage.","theme"));
@@ -284,7 +284,7 @@ KviPackThemeDialog::KviPackThemeDialog(QWidget * pParent,KviPointerList<KviTheme
 	// save file name ================================================================================
 
 	pPage = new QWidget(this);
-	pLayout = new QGridLayout(pPage,4,1,4,4);
+	pLayout = new QGridLayout(pPage);
 
 	pLabel = new QLabel(pPage);
 	pLabel->setText(__tr2qs_ctx("Here you must choose the file name for the theme package. It should have a *.%1 extension.","theme").arg(KVI_FILEEXTENSION_THEMEPACKAGE));
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index 17e4de525..97a5c5ccf 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -67,7 +67,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
 
 	// welcome page ==================================================================================
 	QWidget * pPage = new QWidget(this);
-	QGridLayout * pLayout = new QGridLayout(pPage,2,1,4,4);
+	QGridLayout * pLayout = new QGridLayout(pPage);
 	
 	QLabel * pLabel = new QLabel(pPage);
 	QString szText = "<p>";
@@ -91,7 +91,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
 	// packager informations ================================================================================
 
 	pPage = new QWidget(this);
-	pLayout = new QGridLayout(pPage,5,2,4,4);
+	pLayout = new QGridLayout(pPage);
 
 	pLabel = new QLabel(pPage);
 	pLabel->setText(__tr2qs_ctx("Here you need to provide informations about you (the author) and a short description of the theme you're creating.","theme"));
@@ -143,7 +143,7 @@ KviSaveThemeDialog::KviSaveThemeDialog(QWidget * pParent)
 	// screenshot/logo/icon ================================================================================
 
 	pPage = new QWidget(this);
-	pLayout = new QGridLayout(pPage,4,1,4,4);
+	pLayout = new QGridLayout(pPage);
 
 	pLabel = new QLabel(pPage);
 	pLabel->setText(__tr2qs_ctx("Here you can either choose a screenshot image from disk or make one now. The screenshot will be displayed in the tooltips of the theme management dialog and will be also visible in the package installation dialog if you will export the theme to a distributable package.","theme"));
diff --git a/src/modules/toolbareditor/toolbareditor.cpp b/src/modules/toolbareditor/toolbareditor.cpp
index e74c80508..7b8ed1188 100644
--- a/src/modules/toolbareditor/toolbareditor.cpp
+++ b/src/modules/toolbareditor/toolbareditor.cpp
@@ -125,7 +125,7 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
 	setWindowTitle(__tr2qs("ToolBar Properties"));
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_TOOLBAR)));
 	
-	QGridLayout * g = new QGridLayout(this,5,6,5,3);
+	QGridLayout * g = new QGridLayout(this);
 	
 	QLabel * l = new QLabel(szText,this);
 	g->addMultiCellWidget(l,0,0,0,5);
@@ -152,7 +152,7 @@ KviCustomToolBarPropertiesDialog::KviCustomToolBarPropertiesDialog(QWidget * p,c
 	iconSelected(szIconId);
 
 	m_pAdvanced = new QWidget(this);
-	QGridLayout * ag = new QGridLayout(m_pAdvanced,1,2,0,3);
+	QGridLayout * ag = new QGridLayout(m_pAdvanced);
 
 	l = new QLabel(__tr2qs("Id") + ":",m_pAdvanced);
 	l->setMinimumWidth(100);
@@ -282,7 +282,7 @@ KviCustomizeToolBarsDialog::KviCustomizeToolBarsDialog(QWidget * p)
 
 	m_pInstance = this;
 
-	QGridLayout * g = new QGridLayout(this,8,2,4,5);
+	QGridLayout * g = new QGridLayout(this);
 	m_pDrawer = new KviActionDrawer(this);
 	g->addMultiCellWidget(m_pDrawer,0,6,0,0);
 
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 5afc147cb..f3789f307 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -341,7 +341,7 @@ ConfigDialog::ConfigDialog()
 {
 	setWindowTitle(__tr2qs("URL Module Configuration"));
 
-	QGridLayout *g = new QGridLayout(this,4,2,10,10);
+	QGridLayout *g = new QGridLayout(this);
 
 	KviConfig *cfg = new KviConfig(szConfigPath.ptr(),KviConfig::Read);
 	cfg->setGroup("ConfigDialog");
@@ -411,7 +411,7 @@ BanFrame::BanFrame(QWidget *parent, const char *name, bool banEnabled)
 {
 	setFrameStyle(QFrame::Panel | QFrame::Raised);
 
-	QGridLayout *g = new QGridLayout(this,2,2,10,10);
+	QGridLayout *g = new QGridLayout(this);
 
 	m_pEnable = new KviStyledCheckBox(__tr2qs("Enable URL ban list"),this);
 	connect(m_pEnable,SIGNAL(clicked()),this,SLOT(enableClicked()));