options module QT4 port (wip)

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

9 files changed, 113 insertions, 110 deletions

diff --git a/src/modules/options/container.cpp b/src/modules/options/container.cpp
index 19b7e3d0d..e6d7dc8be 100644
--- a/src/modules/options/container.cpp
+++ b/src/modules/options/container.cpp
@@ -33,13 +33,15 @@
 #include <QDesktopWidget>
 #include <QEvent>
 #include <QCloseEvent>
+#include <QIcon>
 
 
 extern KviOptionsInstanceManager * g_pOptionsInstanceManager;
 
 KviOptionsWidgetContainer::KviOptionsWidgetContainer(QWidget * par,bool bModal)
-: QDialog(par,"container","options")
+: QDialog(par)
 {
+	setObjectName("container");
 	m_pOptionsWidget = 0;
 	setModal(bModal);
 }
@@ -53,7 +55,8 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 {
 	QGridLayout * g = new QGridLayout(this);
 
-	g->addMultiCellWidget(w,0,0,0,2);
+	g->addWidget(w,0,0,1,3);
+	//g->addMultiCellWidget(w,0,0,0,2);
 
 
 	QPushButton * b = new QPushButton(__tr2qs_ctx("&OK","options"),this);
@@ -74,11 +77,11 @@ void KviOptionsWidgetContainer::setup(KviOptionsWidget * w)
 	g->setRowStretch(0,1);
 	g->setColumnStretch(0,1);
 
-	KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->className());
+	KviOptionsWidgetInstanceEntry * e = g_pOptionsInstanceManager->findInstanceEntry(w->metaObject()->className());
 	if(e)
 	{
 		//KviStr caption(KviStr::Format,"%s - KVIrc",e->szName);
-		setIcon(*(g_pIconManager->getSmallIcon(e->iIcon)));
+		setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(e->iIcon))));
 		setWindowTitle(e->szName);
 	}
 	m_pOptionsWidget = w;
diff --git a/src/modules/options/optw_connection.cpp b/src/modules/options/optw_connection.cpp
index cd0dab4b1..3e23baa85 100644
--- a/src/modules/options/optw_connection.cpp
+++ b/src/modules/options/optw_connection.cpp
@@ -261,11 +261,11 @@ KviIdentOptionsWidget::~KviIdentOptionsWidget()
 void KviIdentOptionsWidget::commit()
 {
 	KviOptionsWidget::commit();
-	if(m_pConsoleRadio->isOn())
+	if(m_pConsoleRadio->isChecked())
 		KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)=KviIdentdOutputMode::ToConsole;
-	if(m_pActiveRadio->isOn())
+	if(m_pActiveRadio->isChecked())
 		KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)=KviIdentdOutputMode::ToActiveWindow;
-	if(m_pQuietRadio->isOn())
+	if(m_pQuietRadio->isChecked())
 		KVI_OPTION_UINT(KviOption_uintIdentdOutputMode)=KviIdentdOutputMode::Quiet;
 }
 
diff --git a/src/modules/options/optw_identity.cpp b/src/modules/options/optw_identity.cpp
index f6c1a9045..27cd424d0 100644
--- a/src/modules/options/optw_identity.cpp
+++ b/src/modules/options/optw_identity.cpp
@@ -352,13 +352,13 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	QString szTip1 = szCenterBegin + __tr2qs_ctx("Here you can specify your age.","options") + szTrailing;
 	KviTalToolTip::add(l,szTip1);
 	KviTalToolTip::add(m_pAgeCombo,szTip1);
-	m_pAgeCombo->insertItem(__tr2qs_ctx("Unspecified","options"));
+	m_pAgeCombo->addItem(__tr2qs_ctx("Unspecified","options"));
 	unsigned int i;
 	for(i=1;i<120;i++)
 	{
 		QString tmp;
 		tmp.setNum(i);
-		m_pAgeCombo->insertItem(tmp);
+		m_pAgeCombo->insertItem(m_pAgeCombo->count(),tmp);
 	}
 
 	bool bOk;
@@ -380,16 +380,16 @@ KviIdentityGeneralOptionsWidget::KviIdentityGeneralOptionsWidget(QWidget * paren
 	QString szTip2 =  szCenterBegin + __tr2qs_ctx("Here you can specify your gender.","options") + szTrailing;
 	KviTalToolTip::add(l,szTip2);
 	KviTalToolTip::add(m_pGenderCombo,szTip2);
-	m_pGenderCombo->insertItem(__tr2qs_ctx("Unspecified","options"));
-	m_pGenderCombo->insertItem(__tr2qs_ctx("Female","options"));
-	m_pGenderCombo->insertItem(__tr2qs_ctx("Male","options"));
+	m_pGenderCombo->addItem(__tr2qs_ctx("Unspecified","options"));
+	m_pGenderCombo->addItem(__tr2qs_ctx("Female","options"));
+	m_pGenderCombo->addItem(__tr2qs_ctx("Male","options"));
 
 	if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Male"))
-		m_pGenderCombo->setCurrentItem(2);
+		m_pGenderCombo->setCurrentIndex(2);
 	else if(KviQString::equalCI(KVI_OPTION_STRING(KviOption_stringCtcpUserInfoGender),"Female"))
-		m_pGenderCombo->setCurrentItem(1);
+		m_pGenderCombo->setCurrentIndex(1);
 	else
-		m_pGenderCombo->setCurrentItem(0);
+		m_pGenderCombo->setCurrentIndex(0);
 
 	hb->setStretchFactor(m_pGenderCombo,1);
 
@@ -438,13 +438,13 @@ void KviIdentityGeneralOptionsWidget::commit()
 	KVI_OPTION_STRING(KviOption_stringNickname4) = m_szAltNicknames[2];
 
 
-	int i = m_pAgeCombo->currentItem();
+	int i = m_pAgeCombo->currentIndex();
 	if(i < 0)i = 0;
 	if(i > 120)i = 120;
 	if(i <= 0)KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge) = "";
 	else KVI_OPTION_STRING(KviOption_stringCtcpUserInfoAge).setNum(i);
 
-	switch(m_pGenderCombo->currentItem())
+	switch(m_pGenderCombo->currentIndex())
 	{
 		case 1:
 			// this should be in english
@@ -540,7 +540,7 @@ void KviIdentityAvatarOptionsWidget::chooseAvatar()
 	if(dlg.exec() != QDialog::Accepted)return;
 
 	szCurrent = dlg.avatarName();
-	szCurrent.stripWhiteSpace();
+	szCurrent.trimmed();
 
 	if(KviQString::equalCIN(szCurrent,"http://",7))
 	{
diff --git a/src/modules/options/optw_input.cpp b/src/modules/options/optw_input.cpp
index e8f630dbe..8fac7255a 100644
--- a/src/modules/options/optw_input.cpp
+++ b/src/modules/options/optw_input.cpp
@@ -49,44 +49,44 @@ KviInputLookOptionsWidget::KviInputLookOptionsWidget(QWidget * parent)
 	m_pVerticalAlign=new QComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,9,1,9);
 	
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Tile","options"));
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Left","options"));
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Right","options"));
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Center","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options"));
 	
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Tile","options"));
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Top","options"));
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Bottom","options"));
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Center","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options"));
 	
 	switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignHorizontal_Mask)
 	{
 		case Qt::AlignLeft:
-			m_pHorizontalAlign->setCurrentItem(1);
+			m_pHorizontalAlign->setCurrentIndex(1);
 			break;
 		case Qt::AlignRight:
-			m_pHorizontalAlign->setCurrentItem(2);
+			m_pHorizontalAlign->setCurrentIndex(2);
 			break;
 		case Qt::AlignHCenter:
-			m_pHorizontalAlign->setCurrentItem(3);
+			m_pHorizontalAlign->setCurrentIndex(3);
 			break;
 		default:
-			m_pHorizontalAlign->setCurrentItem(0);
+			m_pHorizontalAlign->setCurrentIndex(0);
 	}
 	
 	switch( KVI_OPTION_UINT(KviOption_uintInputPixmapAlign) & Qt::AlignVertical_Mask)
 	{
 		case Qt::AlignTop:
-			m_pVerticalAlign->setCurrentItem(1);
+			m_pVerticalAlign->setCurrentIndex(1);
 			break;
 		case Qt::AlignBottom:
-			m_pVerticalAlign->setCurrentItem(2);
+			m_pVerticalAlign->setCurrentIndex(2);
 			break;
 		case Qt::AlignVCenter:
-			m_pVerticalAlign->setCurrentItem(3);
+			m_pVerticalAlign->setCurrentIndex(3);
 			break;
 		default:
-			m_pVerticalAlign->setCurrentItem(0);
+			m_pVerticalAlign->setCurrentIndex(0);
 	}
 
 
@@ -100,7 +100,7 @@ KviInputLookOptionsWidget::~KviInputLookOptionsWidget()
 void KviInputLookOptionsWidget::commit()
 {
 	int iFlags=0;
-	switch(m_pHorizontalAlign->currentItem())
+	switch(m_pHorizontalAlign->currentIndex())
 	{
 		case 1:
 			iFlags|=Qt::AlignLeft;
@@ -112,7 +112,7 @@ void KviInputLookOptionsWidget::commit()
 			iFlags|=Qt::AlignHCenter;
 			break;
 	}
-	switch(m_pVerticalAlign->currentItem())
+	switch(m_pVerticalAlign->currentIndex())
 	{
 		case 1:
 			iFlags|=Qt::AlignTop;
diff --git a/src/modules/options/optw_irc.cpp b/src/modules/options/optw_irc.cpp
index 70c7860b7..eab71b346 100644
--- a/src/modules/options/optw_irc.cpp
+++ b/src/modules/options/optw_irc.cpp
@@ -158,9 +158,9 @@ KviChannelAdvancedOptionsWidget::KviChannelAdvancedOptionsWidget(QWidget * pPare
 		
 		hostmask.mask(tmp1,(KviIrcMask::MaskType)i);
 		ipmask.mask(tmp2,(KviIrcMask::MaskType)i);
-		m_pBanTypeCombo->insertItem(QString("%1 (%2)").arg(tmp1).arg(tmp2));
+		m_pBanTypeCombo->insertItem(m_pBanTypeCombo->count(),QString("%1 (%2)").arg(tmp1).arg(tmp2));
 	}
-	m_pBanTypeCombo->setCurrentItem(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
+	m_pBanTypeCombo->setCurrentIndex(KVI_OPTION_UINT(KviOption_uintDefaultBanType));
 
 	KviTalGroupBox * g = addGroupBox(0,2,4,2,Qt::Horizontal,__tr2qs_ctx("On Channel Join","options"));
 	addBoolSelector(g,__tr2qs_ctx("Do not send /WHO request","options"),KviOption_boolDisableWhoRequestOnJoin);
@@ -187,7 +187,7 @@ KviChannelAdvancedOptionsWidget::~KviChannelAdvancedOptionsWidget()
 
 void KviChannelAdvancedOptionsWidget::commit()
 {
-	KVI_OPTION_UINT(KviOption_uintDefaultBanType)=m_pBanTypeCombo->currentItem();
+	KVI_OPTION_UINT(KviOption_uintDefaultBanType)=m_pBanTypeCombo->currentIndex();
 	if((KVI_OPTION_UINT(KviOption_uintDefaultBanType)<0 )|| (KVI_OPTION_UINT(KviOption_uintDefaultBanType)>26)) KVI_OPTION_UINT(KviOption_uintDefaultBanType)=7;
 	KviOptionsWidget::commit();
 }
diff --git a/src/modules/options/optw_ircview.cpp b/src/modules/options/optw_ircview.cpp
index 1d85010e1..08e3f8861 100644
--- a/src/modules/options/optw_ircview.cpp
+++ b/src/modules/options/optw_ircview.cpp
@@ -57,44 +57,44 @@ KviIrcViewLookOptionsWidget::KviIrcViewLookOptionsWidget(QWidget * parent)
 		
 	addColorSelector(0,5,1,5,__tr2qs_ctx("Mark Line:","options"),KviOption_colorIrcViewMarkLine);
 	
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Tile","options"));
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Left","options"));
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Right","options"));
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Center","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options"));
 	
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Tile","options"));
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Top","options"));
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Bottom","options"));
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Center","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options"));
 	
 	switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & Qt::AlignHorizontal_Mask)
 	{
 		case Qt::AlignLeft:
-			m_pHorizontalAlign->setCurrentItem(1);
+			m_pHorizontalAlign->setCurrentIndex(1);
 			break;
 		case Qt::AlignRight:
-			m_pHorizontalAlign->setCurrentItem(2);
+			m_pHorizontalAlign->setCurrentIndex(2);
 			break;
 		case Qt::AlignHCenter:
-			m_pHorizontalAlign->setCurrentItem(3);
+			m_pHorizontalAlign->setCurrentIndex(3);
 			break;
 		default:
-			m_pHorizontalAlign->setCurrentItem(0);
+			m_pHorizontalAlign->setCurrentIndex(0);
 	}
 	
 	switch( KVI_OPTION_UINT(KviOption_uintIrcViewPixmapAlign) & Qt::AlignVertical_Mask)
 	{
 		case Qt::AlignTop:
-			m_pVerticalAlign->setCurrentItem(1);
+			m_pVerticalAlign->setCurrentIndex(1);
 			break;
 		case Qt::AlignBottom:
-			m_pVerticalAlign->setCurrentItem(2);
+			m_pVerticalAlign->setCurrentIndex(2);
 			break;
 		case Qt::AlignVCenter:
-			m_pVerticalAlign->setCurrentItem(3);
+			m_pVerticalAlign->setCurrentIndex(3);
 			break;
 		default:
-			m_pVerticalAlign->setCurrentItem(0);
+			m_pVerticalAlign->setCurrentIndex(0);
 	}
 	
 	layout()->setRowStretch(2,1);
@@ -107,7 +107,7 @@ KviIrcViewLookOptionsWidget::~KviIrcViewLookOptionsWidget()
 void KviIrcViewLookOptionsWidget::commit()
 {
 	int iFlags=0;
-	switch(m_pHorizontalAlign->currentItem())
+	switch(m_pHorizontalAlign->currentIndex())
 	{
 		case 1:
 			iFlags|=Qt::AlignLeft;
@@ -119,7 +119,7 @@ void KviIrcViewLookOptionsWidget::commit()
 			iFlags|=Qt::AlignHCenter;
 			break;
 	}
-	switch(m_pVerticalAlign->currentItem())
+	switch(m_pVerticalAlign->currentIndex())
 	{
 		case 1:
 			iFlags|=Qt::AlignTop;
@@ -139,11 +139,11 @@ void KviIrcViewLookOptionsWidget::commit()
 ////////////////////////////////////////////////////////////////////////////////////////////////////////////////////
 
 KviIrcViewFeaturesOptionsWidget::KviIrcViewFeaturesOptionsWidget(QWidget * parent)
-: KviOptionsWidget(parent,"ircviewfeatures_options_widget")
+: KviOptionsWidget(parent)
 {
 	createLayout();
 
-	
+	setObjectName("ircviewfeatures_options_widget");
 
 	addBoolSelector(0,7,0,7,__tr2qs_ctx("Enable URL highlighting","options"),KviOption_boolIrcViewUrlHighlighting);
 	addBoolSelector(0,8,0,8,__tr2qs_ctx("Use line wrap margin","options"),KviOption_boolIrcViewWrapMargin);
diff --git a/src/modules/options/optw_sound.cpp b/src/modules/options/optw_sound.cpp
index 307610bcd..42dbe1e86 100644
--- a/src/modules/options/optw_sound.cpp
+++ b/src/modules/options/optw_sound.cpp
@@ -62,7 +62,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	KviTalHBox * h = new KviTalHBox(g);
 
-	m_pSoundSystemBox = new QComboBox(false,h);
+	m_pSoundSystemBox = new QComboBox(h);
 
 	m_pSoundAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect","options"),h);
 	connect(m_pSoundAutoDetectButton,SIGNAL(clicked()),this,SLOT(soundAutoDetect()));
@@ -77,7 +77,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	h = new KviTalHBox(g);
 
-	m_pMediaPlayerBox = new QComboBox(false,h);
+	m_pMediaPlayerBox = new QComboBox(h);
 
 	m_pMediaAutoDetectButton = new QPushButton(__tr2qs_ctx("Auto-detect","options"),h);
 	connect(m_pMediaAutoDetectButton,SIGNAL(clicked()),this,SLOT(mediaAutoDetect()));
@@ -99,8 +99,8 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	h = new KviTalHBox(g);
 
-	m_pTagsEncodingCombo = new QComboBox(false,h);
-	m_pTagsEncodingCombo->insertItem(__tr2qs_ctx("Use Language Encoding","options"));
+	m_pTagsEncodingCombo = new QComboBox(h);
+	m_pTagsEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding","options"));
 
 	int i = 0;
 	int iMatch = 0;
@@ -109,11 +109,11 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	while(d->szName)
 	{
 		if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding)))iMatch = i + 1;
-		m_pTagsEncodingCombo->insertItem(d->szName);
+		m_pTagsEncodingCombo->insertItem(m_pTagsEncodingCombo->count(),d->szName);
 		i++;
 		d = KviLocale::encodingDescription(i);
 	}
-	m_pTagsEncodingCombo->setCurrentItem(iMatch);
+	m_pTagsEncodingCombo->setCurrentIndex(iMatch);
 
 #ifdef COMPILE_ON_WINDOWS
 	g = addGroupBox(0,3,0,3,Qt::Horizontal,__tr2qs_ctx("Winamp messages ecoding","options"),true);
@@ -122,7 +122,7 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 
 	h = new KviTalHBox(g);
 
-	m_pWinampEncodingCombo = new QComboBox(false,h);
+	m_pWinampEncodingCombo = new QComboBox(h);
 	
 	m_pWinampEncodingCombo->insertItem(__tr2qs_ctx("Use Language Encoding","options"));
 	i = 0;
@@ -132,11 +132,11 @@ KviSoundGeneralOptionsWidget::KviSoundGeneralOptionsWidget(QWidget * parent)
 	while(d->szName)
 	{
 		if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringWinampTextEncoding)))iMatch = i + 1;
-		m_pWinampEncodingCombo->insertItem(d->szName);
+		m_pWinampEncodingCombo->insertItem(m_pWinampEncodingCombo->count(),d->szName);
 		i++;
 		d = KviLocale::encodingDescription(i);
 	}
-	m_pWinampEncodingCombo->setCurrentItem(iMatch);
+	m_pWinampEncodingCombo->setCurrentIndex(iMatch);
 #endif
 }
 
@@ -187,17 +187,17 @@ void KviSoundGeneralOptionsWidget::soundFillBox()
 
 	for ( it = l.begin(); it != l.end(); ++it )
 	{
-		m_pSoundSystemBox->insertItem(*it);
+		m_pSoundSystemBox->addItem(*it);
 	}
 
 	cnt = m_pSoundSystemBox->count();
 
 	for(i=0;i<cnt;i++)
 	{
-		QString t = m_pSoundSystemBox->text(i);
+		QString t = m_pSoundSystemBox->itemText(i);
 		if(KviQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringSoundSystem)))
 		{
-			m_pSoundSystemBox->setCurrentItem(i);
+			m_pSoundSystemBox->setCurrentIndex(i);
 			break;
 		}
 	}
@@ -223,7 +223,7 @@ void KviSoundGeneralOptionsWidget::mediaFillBox()
 	m_pMediaPlayerBox->clear();
 	for ( it = l.begin(); it != l.end(); ++it )
 	{
-		m_pMediaPlayerBox->insertItem(*it);
+		m_pMediaPlayerBox->addItem(*it);
 	}
 	cnt = m_pMediaPlayerBox->count();
 
@@ -232,7 +232,7 @@ void KviSoundGeneralOptionsWidget::mediaFillBox()
 		QString t = m_pMediaPlayerBox->text(i);
 		if(KviQString::equalCI(t,KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer)))
 		{
-			m_pMediaPlayerBox->setCurrentItem(i);
+			m_pMediaPlayerBox->setCurrentIndex(i);
 			break;
 		}
 	}
@@ -251,24 +251,24 @@ void KviSoundGeneralOptionsWidget::commit()
 	KVI_OPTION_STRING(KviOption_stringSoundSystem) = m_pSoundSystemBox->currentText();
 	KVI_OPTION_STRING(KviOption_stringPreferredMediaPlayer) = m_pMediaPlayerBox->currentText();
 	
-	int idx = m_pTagsEncodingCombo->currentItem();
+	int idx = m_pTagsEncodingCombo->currentIndex();
 	if(idx <= 0)
 	{
 		// guess from locale
 		KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding) = "";
 	} else {
-		KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding) = m_pTagsEncodingCombo->text(idx);
+		KVI_OPTION_STRING(KviOption_stringMp3TagsEncoding) = m_pTagsEncodingCombo->itemText(idx);
 	}
 
 
 #ifdef COMPILE_ON_WINDOWS
-	idx = m_pWinampEncodingCombo->currentItem();
+	idx = m_pWinampEncodingCombo->currentIndex();
 	if(idx <= 0)
 	{
 		// guess from locale
 		KVI_OPTION_STRING(KviOption_stringWinampTextEncoding) = "";
 	} else {
-		KVI_OPTION_STRING(KviOption_stringWinampTextEncoding) = m_pWinampEncodingCombo->text(idx);
+		KVI_OPTION_STRING(KviOption_stringWinampTextEncoding) = m_pWinampEncodingCombo->itemText(idx);
 	}
 #endif
 }
diff --git a/src/modules/options/optw_taskbar.cpp b/src/modules/options/optw_taskbar.cpp
index e0ae14d8a..46a31a6e9 100644
--- a/src/modules/options/optw_taskbar.cpp
+++ b/src/modules/options/optw_taskbar.cpp
@@ -118,44 +118,44 @@ KviTreeTaskBarBackgroundOptionsWidget::KviTreeTaskBarBackgroundOptionsWidget(QWi
 	m_pVerticalAlign=new QComboBox(this);
 	addWidgetToLayout(m_pVerticalAlign,1,3,1,3);
 	
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Tile","options"));
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Left","options"));
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Right","options"));
-	m_pHorizontalAlign->insertItem(__tr2qs_ctx("Center","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Tile","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Left","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Right","options"));
+	m_pHorizontalAlign->addItem(__tr2qs_ctx("Center","options"));
 	
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Tile","options"));
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Top","options"));
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Bottom","options"));
-	m_pVerticalAlign->insertItem(__tr2qs_ctx("Center","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Tile","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Top","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Bottom","options"));
+	m_pVerticalAlign->addItem(__tr2qs_ctx("Center","options"));
 	
 	switch( KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign) & Qt::AlignHorizontal_Mask)
 	{
 		case Qt::AlignLeft:
-			m_pHorizontalAlign->setCurrentItem(1);
+			m_pHorizontalAlign->setCurrentIndex(1);
 			break;
 		case Qt::AlignRight:
-			m_pHorizontalAlign->setCurrentItem(2);
+			m_pHorizontalAlign->setCurrentIndex(2);
 			break;
 		case Qt::AlignHCenter:
-			m_pHorizontalAlign->setCurrentItem(3);
+			m_pHorizontalAlign->setCurrentIndex(3);
 			break;
 		default:
-			m_pHorizontalAlign->setCurrentItem(0);
+			m_pHorizontalAlign->setCurrentIndex(0);
 	}
 	
 	switch( KVI_OPTION_UINT(KviOption_uintTreeTaskBarPixmapAlign) & Qt::AlignVertical_Mask)
 	{
 		case Qt::AlignTop:
-			m_pVerticalAlign->setCurrentItem(1);
+			m_pVerticalAlign->setCurrentIndex(1);
 			break;
 		case Qt::AlignBottom:
-			m_pVerticalAlign->setCurrentItem(2);
+			m_pVerticalAlign->setCurrentIndex(2);
 			break;
 		case Qt::AlignVCenter:
-			m_pVerticalAlign->setCurrentItem(3);
+			m_pVerticalAlign->setCurrentIndex(3);
 			break;
 		default:
-			m_pVerticalAlign->setCurrentItem(0);
+			m_pVerticalAlign->setCurrentIndex(0);
 	}
 
 	layout()->setRowStretch(1,1);
diff --git a/src/modules/options/optw_textencoding.cpp b/src/modules/options/optw_textencoding.cpp
index 7848b04a3..ac2c994c1 100644
--- a/src/modules/options/optw_textencoding.cpp
+++ b/src/modules/options/optw_textencoding.cpp
@@ -42,19 +42,19 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 	m_pTextEncodingCombo = new QComboBox(this);
 	addWidgetToLayout(m_pTextEncodingCombo,1,0,1,0);
 
-	m_pTextEncodingCombo->insertItem(__tr2qs_ctx("Use Language Encoding","options"));
+	m_pTextEncodingCombo->addItem(__tr2qs_ctx("Use Language Encoding","options"));
 	int i = 0;
 	int iMatch = 0;
 	KviLocale::EncodingDescription * d = KviLocale::encodingDescription(i);
 	while(d->szName)
 	{
 		if(KviQString::equalCI(d->szName,KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding)))iMatch = i + 1;
-		m_pTextEncodingCombo->insertItem(d->szName);
+		m_pTextEncodingCombo->insertItem(m_pTextEncodingCombo->count(),d->szName);
 		i++;
 		d = KviLocale::encodingDescription(i);
 	}
 
-	m_pTextEncodingCombo->setCurrentItem(iMatch);
+	m_pTextEncodingCombo->setCurrentIndex(iMatch);
 	
  	addLabel(0,1,0,1,__tr2qs_ctx("Force language:","options"));
 	
@@ -65,10 +65,10 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 	QLabel * l = new QLabel(__tr2qs_ctx("<b>Note:</b> You need to restart KVirc to apply a language changing","options"),this);
 	addWidgetToLayout(l,0,2,1,2);
 	
-	m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("Automatic detection","options"));
-	m_pForcedLocaleCombo->insertItem(__tr2qs_ctx("en","options"));
+	m_pForcedLocaleCombo->addItem(__tr2qs_ctx("Automatic detection","options"));
+	m_pForcedLocaleCombo->addItem(__tr2qs_ctx("en","options"));
 	
-	QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homeDirPath());
+	QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homePath());
 
 	bool bIsDefaultLocale = !KviFileUtils::fileExists(szLangFile);
 	//We Have setted locale, but not restarted kvirc
@@ -82,7 +82,7 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 	QString szLocaleDir;
 	g_pApp->getGlobalKvircDirectory(szLocaleDir,KviApp::Locale);
 
-	QStringList list=QDir(szLocaleDir).entryList("kvirc_*.mo",QDir::Files);
+	QStringList list=QDir(szLocaleDir).entryList(QStringList("kvirc_*.mo"),QDir::Files);
 	
 	i = 0;
 	iMatch = 0;
@@ -91,17 +91,17 @@ KviTextEncodingOptionsWidget::KviTextEncodingOptionsWidget(QWidget * parent)
 		QString szTmp=*it;
 		szTmp.replace("kvirc_","");
 		szTmp.replace(".mo","");
-		m_pForcedLocaleCombo->insertItem(szTmp);
+		m_pForcedLocaleCombo->insertItem(m_pForcedLocaleCombo->count(),szTmp);
 		if(KviQString::equalCI(szTmp,m_szLanguage))
 			iMatch = i + 2;
 		i++;
 	}
 	if(bIsDefaultLocale)
-		m_pForcedLocaleCombo->setCurrentItem(0);
+		m_pForcedLocaleCombo->setCurrentIndex(0);
 	else if(KviQString::equalCI(m_szLanguage,"en"))
-		m_pForcedLocaleCombo->setCurrentItem(1);
+		m_pForcedLocaleCombo->setCurrentIndex(1);
 	else
-		m_pForcedLocaleCombo->setCurrentItem(iMatch);
+		m_pForcedLocaleCombo->setCurrentIndex(iMatch);
 	addRowSpacer(0,3,1,3);
 }
 
@@ -111,23 +111,23 @@ KviTextEncodingOptionsWidget::~KviTextEncodingOptionsWidget()
 
 void KviTextEncodingOptionsWidget::commit()
 {
-	int idx = m_pTextEncodingCombo->currentItem();
+	int idx = m_pTextEncodingCombo->currentIndex();
 	if(idx <= 0)
 	{
 		// guess from locale
 		KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding) = "";
 	} else {
-		KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding) = m_pTextEncodingCombo->text(idx);
+		KVI_OPTION_STRING(KviOption_stringDefaultTextEncoding) = m_pTextEncodingCombo->itemText(idx);
 	}
 	
-	idx=m_pForcedLocaleCombo->currentItem();
-	QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homeDirPath());
+	idx=m_pForcedLocaleCombo->currentIndex();
+	QString szLangFile=QString("%1/.kvirc_force_locale").arg(QDir::homePath());
 	if(idx==0) {
 		if(KviFileUtils::fileExists(szLangFile))
 			KviFileUtils::removeFile(szLangFile);
 	} else {
-		g_szPrevSettedLocale=m_pForcedLocaleCombo->text(idx);
-		if(!KviFileUtils::writeFile(szLangFile,m_pForcedLocaleCombo->text(idx)))
+		g_szPrevSettedLocale=m_pForcedLocaleCombo->itemText(idx);
+		if(!KviFileUtils::writeFile(szLangFile,m_pForcedLocaleCombo->itemText(idx)))
 		{
 			QMessageBox::critical(this,"KVIrc",__tr2qs_ctx("Unable to write language information to","options")+"\n"+szLangFile,__tr2qs_ctx("Ok","options"));
 		}