more QT4 port commit (wip)

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

17 files changed, 113 insertions, 75 deletions

diff --git a/src/kvirc/ui/kvi_maskeditor.cpp b/src/kvirc/ui/kvi_maskeditor.cpp
index 972234612..27bbb6f87 100644
--- a/src/kvirc/ui/kvi_maskeditor.cpp
+++ b/src/kvirc/ui/kvi_maskeditor.cpp
@@ -74,10 +74,12 @@ KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEdi
 	QGridLayout * g = new QGridLayout(this);
 	
 	QLabel * tl = new QLabel(__tr2qs("New mask must match an *!*@* expression"),this);
-	g->addMultiCellWidget(tl,0,0,0,3);
+	g->addWidget(tl,0,0,1,4);
+//	g->addMultiCellWidget(tl,0,0,0,3);
 	
 	m_pEdit=new QLineEdit(szMask,this);
-	g->addMultiCellWidget(m_pEdit,1,1,0,3);
+	g->addWidget(m_pEdit,1,0,1,4);
+//	g->addMultiCellWidget(m_pEdit,1,1,0,3);
 	
 	m_pOkButton= new QPushButton(__tr2qs("Ok"),this);
 	connect(m_pOkButton,SIGNAL(clicked()), this, SLOT(accept()));
@@ -89,7 +91,7 @@ KviMaskInputDialog::KviMaskInputDialog(const QString &szMask,KviMaskEditor* pEdi
 	g->addWidget(m_pChancelButton,2,2);
 	m_pChancelButton->setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	
-	QRegExp rx( "*!*@*", false,true );
+	QRegExp rx( "*!*@*", Qt::CaseInsensitive,QRegExp::Wildcard );
 	QValidator* validator = new QRegExpValidator( rx, this );
 	
 	m_pEdit->setValidator( validator );
@@ -104,13 +106,13 @@ void KviMaskInputDialog::accept()
 	if(m_szOldMask.isEmpty()) 
 	{
 		m_pChannel->connection()->sendFmtData("MODE %s +%c %s",
-			m_pChannel->connection()->encodeText(m_pChannel->name()).data(),
+			m_pChannel->connection()->encodeText(m_pChannel->objectName()).data(),
 			m_pEditor->flag(),
 			m_pChannel->connection()->encodeText(m_pEdit->text()).data()
 			);
 	} else {
 		m_pChannel->connection()->sendFmtData("MODE %s -%c+%c %s %s",
-			m_pChannel->connection()->encodeText(m_pChannel->name()).data(),
+			m_pChannel->connection()->encodeText(m_pChannel->objectName()).data(),
 			m_pEditor->flag(),
 			m_pEditor->flag(),
 			m_pChannel->connection()->encodeText(m_szOldMask).data(),
@@ -172,7 +174,8 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 	g->addWidget(l,0,1);
 
 	KviTalHBox * hb = new KviTalHBox(this);
-	g->addMultiCellWidget(hb,1,1,0,1);
+	g->addWidget(hb,1,0,1,2);
+//	g->addMultiCellWidget(hb,1,1,0,1);
 
 	new QLabel(__tr2qs("Filter:"),hb);
 	m_pSearch = new QLineEdit(hb);
@@ -180,7 +183,8 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 
 	l = new QLabel(__tr2qs("Use doubleclick to edit item"),this);
 	g->addWidget(l,1,1);
-	g->addMultiCellWidget(l,2,2,0,1);
+	g->addWidget(l,2,0,1,2);
+//	g->addMultiCellWidget(l,2,2,0,1);
 	
 	//FIX ME
 	m_pMaskBox = new KviTalTreeWidget(this);
@@ -195,7 +199,8 @@ KviMaskEditor::KviMaskEditor(QWidget * par,KviWindowToolPageButton* button,KviPo
 //	m_pMaskBox->setShowSortIndicator(true);
 	m_pMaskBox->setSortingEnabled(true);
 	connect(m_pMaskBox,SIGNAL(doubleClicked ( KviTalTreeWidgetItem * )),this,SLOT(listViewDoubleClicked( KviTalTreeWidgetItem * )));
-	g->addMultiCellWidget(m_pMaskBox,3,3,0,1);
+	g->addWidget(m_pMaskBox,3,0,1,2);
+//	g->addMultiCellWidget(m_pMaskBox,3,3,0,1);
 
 	m_pRemoveMask  = new QPushButton(__tr2qs("Re&move"),this);
 	m_pRemoveMask->setEnabled(isEnabled);
diff --git a/src/kvirc/ui/kvi_mdicaption.cpp b/src/kvirc/ui/kvi_mdicaption.cpp
index 5ec942375..2bda9fbb9 100644
--- a/src/kvirc/ui/kvi_mdicaption.cpp
+++ b/src/kvirc/ui/kvi_mdicaption.cpp
@@ -48,6 +48,7 @@
 #include <QEvent>
 #include <QPaintEvent>
 #include <QStyleOption>
+#include <QTextDocument>
 
 #include <q3simplerichtext.h>
 #define QSimpleRichText Q3SimpleRichText
@@ -55,9 +56,10 @@
 
 
 KviMdiCaptionButton::KviMdiCaptionButton(const QPixmap &pix,QWidget * parent,const char * name)
-: QToolButton(parent,name)
+: QToolButton(parent)
 {
-	setPixmap(pix);
+	setObjectName(name);
+	setIcon(QIcon(pix));
 	//setAutoRaise(true);
 	setMinimumSize(18,18);
 }
@@ -77,7 +79,7 @@ void KviMdiCaptionButton::drawButton(QPainter *p)
 	QBrush b(parentWidget()->palette().window());
 	
 	if(isDown())
-		qDrawShadePanel(p,0,0,width(),height(),colorGroup(),true,1,&b);
+		qDrawShadePanel(p,0,0,width(),height(),palette(),true,1,&b);
 	else
 		p->fillRect(0,0,width(),height(),b);
 
@@ -88,8 +90,9 @@ void KviMdiCaptionButton::drawButton(QPainter *p)
 
 
 KviMdiCaption::KviMdiCaption(KviMdiChild * parent,const char * name)
-: QWidget(parent,name)
+: QWidget(parent)
 {
+	setObjectName(name);
 	m_pMaximizeButton    = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MAXIMIZE)),this,"maximize_button");
 	connect(m_pMaximizeButton,SIGNAL(clicked()),parent,SLOT(maximize()));
 	m_pMinimizeButton    = new KviMdiCaptionButton(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_MINIMIZE)),this,"minimize_button");
@@ -205,14 +208,17 @@ void KviMdiCaption::paintEvent(QPaintEvent * e)
 	QRect r = e->rect();
 	QPainter p(this);
 	p.fillRect(r,m_bActive ? KVI_OPTION_COLOR(KviOption_colorMdiCaptionActive) : KVI_OPTION_COLOR(KviOption_colorMdiCaptionInactive));
-	QSimpleRichText rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption(),font());
-	rt.draw(&p,height() + 2,-1,rect(),colorGroup());
+	//FIXME
+	QTextDocument rt(m_bActive ? ((KviMdiChild *)parent())->xmlActiveCaption() : ((KviMdiChild *)parent())->xmlInactiveCaption());
+	rt.setDefaultFont(font());
+	//rt.draw(&p,height() + 2,-1,rect(),palette());
+	rt.drawContents(&p,rect());
 }
 
 void KviMdiCaption::mouseReleaseEvent(QMouseEvent *)
 {
 	m_bMouseGrabbed = false;
-	setCursor(Qt::arrowCursor);
+	setCursor(Qt::ArrowCursor);
 //	releaseMouse();
 }
 
diff --git a/src/kvirc/ui/kvi_mdicaption.h b/src/kvirc/ui/kvi_mdicaption.h
index 376de08d7..cf2b41121 100644
--- a/src/kvirc/ui/kvi_mdicaption.h
+++ b/src/kvirc/ui/kvi_mdicaption.h
@@ -77,7 +77,7 @@ public:
 	int heightHint();
 	void setActive(bool bActive);
 	bool active(){ return m_bActive; };
-	void setSystemIcon(const QPixmap &pix){ m_pSystemButton->setPixmap(pix); m_pixSystemIcon = pix; };
+	void setSystemIcon(const QPixmap &pix){ m_pSystemButton->setIcon(QIcon(pix)); m_pixSystemIcon = pix; };
 	const QPixmap * systemIcon(){ return &m_pixSystemIcon; };
 	void enableClose(bool bEnable){ m_pCloseButton->setEnabled(bEnable); };
 	bool closeEnabled(){ return m_pCloseButton->isEnabled(); };
diff --git a/src/kvirc/ui/kvi_mdichild.cpp b/src/kvirc/ui/kvi_mdichild.cpp
index 475c32e52..719942a1a 100644
--- a/src/kvirc/ui/kvi_mdichild.cpp
+++ b/src/kvirc/ui/kvi_mdichild.cpp
@@ -69,8 +69,9 @@
 
 
 KviMdiChild::KviMdiChild(KviMdiManager * par,const char * name)
-: QFrame(par->viewport(),name ? name : "mdi_child")
+: QFrame(par->viewport())
 {
+	setObjectName(name ? name : "mdi_child");
 	setFrameStyle(QFrame::StyledPanel | QFrame::Raised);
 	setFrameShape(NoFrame);
 	m_pManager = par;
@@ -311,29 +312,29 @@ QCursor KviMdiChild::getResizeCursor(int resizeCorner)
 	{ 
 		case KVI_MDI_RESIZE_LEFT: 
 		case KVI_MDI_RESIZE_RIGHT: 
-			return Qt::sizeHorCursor;
+			return Qt::SizeHorCursor;
 			break; 
 		case KVI_MDI_RESIZE_TOP: 
 		case KVI_MDI_RESIZE_BOTTOM: 
-			return Qt::sizeVerCursor;
+			return Qt::SizeVerCursor;
 			break; 
 		case KVI_MDI_RESIZE_TOPLEFT: 
 		case KVI_MDI_RESIZE_BOTTOMRIGHT: 
-			return Qt::sizeFDiagCursor;
+			return Qt::SizeFDiagCursor;
 			break; 
 		case KVI_MDI_RESIZE_BOTTOMLEFT: 
 		case KVI_MDI_RESIZE_TOPRIGHT: 
-			return Qt::sizeBDiagCursor;
+			return Qt::SizeBDiagCursor;
 			break; 
 		default:
-			return Qt::arrowCursor;
+			return Qt::ArrowCursor;
 			break;
 	}
 }
 
 void KviMdiChild::mouseMoveEvent(QMouseEvent *e)
 {
-	if(e->state() & Qt::LeftButton)
+	if(e->modifiers() & Qt::LeftButton)
 	{
 		if(m_iResizeCorner && (m_state != Maximized))resizeWindowOpaque(m_iResizeCorner);
 	} else {
@@ -479,7 +480,9 @@ void KviMdiChild::setClient(QWidget *w)
 	if(w->parent()!=this){
 		//reparent to this widget , no flags , point , show it
 		QPoint pnt2(KVI_MDICHILD_BORDER,clientYPos);
-		w->reparent(this,pnt2,true);
+		w->setParent(this, w->windowFlags() & ~Qt::WindowType_Mask);
+		w->setGeometry(pnt2.x(),pnt2.y(),w->width(),w->height());
+		w->show();
 	} else w->move(KVI_MDICHILD_BORDER,clientYPos);
 
 	setFocusProxy(w);
@@ -500,8 +503,8 @@ void KviMdiChild::setClient(QWidget *w)
 					m_pCaption->heightHint() + KVI_MDICHILD_SPACING);
 	}
 
-	KviStr tmp(KviStr::Format,"mdi_child_%s",w->name());
-	setName(tmp.ptr());
+	KviStr tmp(KviStr::Format,"mdi_child_%s",w->objectName());
+	setObjectName(tmp.ptr());
 }
 
 void KviMdiChild::unsetClient()
@@ -514,14 +517,21 @@ void KviMdiChild::unsetClient()
 	//Kewl...the reparent function has a small prob now..
 	//the new toplelvel widgets gets not reenabled for dnd
 #ifndef COMPILE_ON_MAC
-	m_pClient->reparent(0,m_pClient->mapToGlobal(QPoint(0,0)),true);
+	//m_pClient->reparent(0,m_pClient->mapToGlobal(QPoint(0,0)),true);
+	QPoint p=m_pClient->mapToGlobal(QPoint(0,0));
+	m_pClient->setParent(0, m_pClient->windowFlags() & ~Qt::WindowType_Mask);
+	m_pClient->setGeometry(p.x(),p.y(),m_pClient->width(),m_pClient->height());
+	m_pClient->show();
 #else
 	QRect r = g_pApp->desktop()->availableGeometry(m_pClient); 
 	r.moveBy(0, 22);
 	m_pClient->reparent(0,r.topLeft(),true);
+	m_pClient->setParent(0, m_pClient->windowFlags() & ~Qt::WindowType_Mask);
+	m_pClient->setGeometry(r.topLeft().x(),r.topLeft().y(),m_pClient->width(),m_pClient->height());
+	m_pClient->show();
 #endif
 	m_pClient=0;
-	setName("mdi_child");
+	setObjectName("mdi_child");
 }
 
 void KviMdiChild::activate(bool bSetFocus)
diff --git a/src/kvirc/ui/kvi_mdimanager.cpp b/src/kvirc/ui/kvi_mdimanager.cpp
index 4e4ab7a39..8fd419589 100644
--- a/src/kvirc/ui/kvi_mdimanager.cpp
+++ b/src/kvirc/ui/kvi_mdimanager.cpp
@@ -504,7 +504,7 @@ void KviMdiManager::updateSDIMode()
 		m_pSdiIconButton->show();
 		connect(m_pSdiIconButton,SIGNAL(destroyed()),this,SLOT(sdiIconButtonDestroyed()));
 	} else {
-		m_pSdiIconButton->setPixmap(*pix);
+		m_pSdiIconButton->setIcon(QIcon(*pix));
 	}
 #endif //COMPILE_ON_MAC
 }
diff --git a/src/kvirc/ui/kvi_modeeditor.cpp b/src/kvirc/ui/kvi_modeeditor.cpp
index 31ff5a69e..196335bf3 100644
--- a/src/kvirc/ui/kvi_modeeditor.cpp
+++ b/src/kvirc/ui/kvi_modeeditor.cpp
@@ -91,11 +91,14 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 	g->addWidget(l,0,0);
 
 	l = new QLabel(__tr2qs("Channel Modes"),pBackground);
-	g->addMultiCellWidget(l,0,0,1,2);
+
+	g->addWidget(l,0,1,1,1);
+//	g->addMultiCellWidget(l,0,0,1,2);
 
 	QFrame * f = new QFrame(pBackground);
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
-	g->addMultiCellWidget(f,1,1,0,2);
+	g->addWidget(f,1,0,1,3);
+//	g->addMultiCellWidget(f,1,1,0,2);
 
 	int i = 1;
 	QString tmp;
@@ -118,19 +121,22 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 		m_pCheckBoxes->append(cb);
 		cb->setChecked(m_szMode.contains((char)ccc.unicode()));
 		i++;
-		g->addMultiCellWidget(cb,i,i,0,2);
+		g->addWidget(cb,i,0,1,3);
+	//	g->addMultiCellWidget(cb,i,i,0,2);
 	}
 
 	KviQString::sprintf(tmp,"l: %Q",&(c->connection()->serverInfo()->getChannelModeDescription('l')));
 	m_pLimitBox = new KviStyledCheckBox(tmp,pBackground);
 	m_pLimitBox->setEnabled(isEnabled);
 	i++;
-	g->addMultiCellWidget(m_pLimitBox,i,i,0,2);
+	g->addWidget(m_pLimitBox,i,0,1,3);
+	//g->addMultiCellWidget(m_pLimitBox,i,i,0,2);
 	connect(m_pLimitBox,SIGNAL(toggled(bool)),this,SLOT(limitBoxToggled(bool)));
 	m_pLimitEdit = new QLineEdit(pBackground);
 	m_pLimitEdit->setEnabled(isEnabled);
 	i++;
-	g->addMultiCellWidget(m_pLimitEdit,i,i,1,2);
+	g->addWidget(m_pLimitEdit,i,1,1,2);
+//	g->addMultiCellWidget(m_pLimitEdit,i,i,1,2);
 	if(!m_szLimit.isEmpty())
 	{
 		m_pLimitBox->setChecked(true);
@@ -144,12 +150,15 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 	m_pKeyBox = new KviStyledCheckBox(tmp,pBackground);
 	m_pKeyBox->setEnabled(isEnabled);
 	i++;
-	g->addMultiCellWidget(m_pKeyBox,i,i,0,2);
+
+	g->addWidget(m_pKeyBox,i,0,1,3);
+	//g->addMultiCellWidget(m_pKeyBox,i,i,0,2);
 	connect(m_pKeyBox,SIGNAL(toggled(bool)),this,SLOT(keyBoxToggled(bool)));
 	m_pKeyEdit = new QLineEdit(pBackground);
 	m_pKeyEdit->setEnabled(isEnabled);
 	i++;
-	g->addMultiCellWidget(m_pKeyEdit,i,i,1,2);
+	g->addWidget(m_pKeyEdit,i,1,1,2);
+//	g->addMultiCellWidget(m_pKeyEdit,i,i,1,2);
 	if(!m_szKey.isEmpty())
 	{
 		m_pKeyBox->setChecked(true);
@@ -165,7 +174,7 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 			szModes = c->connection()->serverInfo()->supportedChannelModes();
 	}
 
-	int idx = szModes.findRev(',');
+	int idx = szModes.lastIndexOf(',');
 	if(idx != -1)szModes.remove(0,idx+1);
 
 	szModes.replace("p","");
@@ -190,7 +199,8 @@ KviModeEditor::KviModeEditor(QWidget * par,KviWindowToolPageButton* button,const
 		m_pCheckBoxes->append(cb);
 		cb->setChecked(m_szMode.contains((char)ccc.unicode()));
 		i++;
-		g->addMultiCellWidget(cb,i,i,0,2);
+		g->addWidget(cb,i,0,1,3);
+	//	g->addMultiCellWidget(cb,i,i,0,2);
 	}
 
 	i++;
@@ -228,7 +238,7 @@ void KviModeEditor::commit()
 		if(m_pKeyBox->isChecked())
 		{
 			// still have it
-			QString tmp = m_pKeyEdit->text().stripWhiteSpace();
+			QString tmp = m_pKeyEdit->text().trimmed();
 			if(!tmp.isEmpty())
 			{
 				if(tmp != m_szKey)
@@ -250,7 +260,7 @@ void KviModeEditor::commit()
 		// there was no key before
 		if(m_pKeyBox->isChecked())
 		{
-			QString tmp = m_pKeyEdit->text().stripWhiteSpace();
+			QString tmp = m_pKeyEdit->text().trimmed();
 			if(!tmp.isEmpty())
 			{
 				// new key to be set
@@ -266,7 +276,7 @@ void KviModeEditor::commit()
 		if(m_pLimitBox->isChecked())
 		{
 			// still have it
-			QString tmp = m_pLimitEdit->text().stripWhiteSpace();
+			QString tmp = m_pLimitEdit->text().trimmed();
 			bool bOk;
 			unsigned int uLimit = tmp.toUInt(&bOk);
 			if(bOk)
@@ -286,7 +296,7 @@ void KviModeEditor::commit()
 		// there was no limit before
 		if(m_pLimitBox->isChecked())
 		{
-			QString tmp = m_pLimitEdit->text().stripWhiteSpace();
+			QString tmp = m_pLimitEdit->text().trimmed();
 			bool bOk;
 			unsigned int uLimit = tmp.toUInt(&bOk);
 			if(bOk)
diff --git a/src/kvirc/ui/kvi_modew.cpp b/src/kvirc/ui/kvi_modew.cpp
index 5624feeb5..557641d3f 100755
--- a/src/kvirc/ui/kvi_modew.cpp
+++ b/src/kvirc/ui/kvi_modew.cpp
@@ -36,8 +36,9 @@
 #include <QResizeEvent>
 
 KviModeWidget::KviModeWidget(QWidget * par,KviChannel* chan,const char * name)
-:QFrame(par,name)
+:QFrame(par)
 {
+	setObjectName(name);
 	m_pChannel=chan;
 	m_pLabel=0;
 	m_pLineEdit=0;
@@ -95,7 +96,7 @@ void KviModeWidget::labelDoubleClick()
 	{
 		delete m_pLabel;
 		m_pLabel=0;
-		m_pLineEdit = new QLineEdit(this,0);
+		m_pLineEdit = new QLineEdit(this);
 		m_pLineEdit->setText(m_pChannel->channelMode());
 		m_pLineEdit->show();
 		m_pLineEdit->setFocus();
@@ -141,7 +142,7 @@ void KviModeWidget::editorReturnPressed()
 	if(!szNewModes.isEmpty()) mode+=QString("+"+szNewModes);
 	if(!mode.isEmpty())
 	{
-		KviQCString chan = m_pChannel->connection()->encodeText(m_pChannel->name());
+		KviQCString chan = m_pChannel->connection()->encodeText(m_pChannel->objectName());
 		m_pChannel->connection()->sendFmtData("MODE %s %s",chan.data(),mode.toUtf8().data());
 	}
 	reset();
@@ -154,7 +155,7 @@ void KviModeWidget::editorTextChanged( const QString & text)
 	for(i=0;i<szText.length();i++)
 	{
 		if( !m_pChannel->connection()->serverInfo()->supportedPlainModes().contains(szText[i]) || 
-			szText.find(szText[i])<i )
+			szText.indexOf(szText[i])<i,Qt::CaseInsensitive )
 			szText.remove(i,1);
 	}
 	m_pLineEdit->setText(szText);
diff --git a/src/kvirc/ui/kvi_optionswidget.cpp b/src/kvirc/ui/kvi_optionswidget.cpp
index 1aefc7272..6abdc24aa 100644
--- a/src/kvirc/ui/kvi_optionswidget.cpp
+++ b/src/kvirc/ui/kvi_optionswidget.cpp
@@ -40,8 +40,9 @@ QString KviOptionsWidget::m_szBasicTipStart; // empty decl
 QString KviOptionsWidget::m_szBasicTipEnd;
 
 KviOptionsWidget::KviOptionsWidget(QWidget * parent,const char * name,bool bSunken)
-: QFrame(parent,name), KviSelectorInterface()
+: QFrame(parent), KviSelectorInterface()
 {
+	setObjectName(name);
 	if(m_szBasicTipStart.isEmpty())
 	{
 		m_szBasicTipStart = "<center><font color=\"#a0a0a0\">";
diff --git a/src/kvirc/ui/kvi_scriptbutton.h b/src/kvirc/ui/kvi_scriptbutton.h
index 414491691..ecd5eff86 100644
--- a/src/kvirc/ui/kvi_scriptbutton.h
+++ b/src/kvirc/ui/kvi_scriptbutton.h
@@ -43,7 +43,7 @@ protected:
 public:
 	void setButtonCode(KviKvsScript * pScript);
 	virtual void setButtonPixmap(const QPixmap & pix){ setIcon(pix); };
-	void setButtonText(const QString &text){ setTextLabel(text); };
+	void setButtonText(const QString &text){ setText(text); };
 	virtual KviWindow * window();
 protected slots:
 	void btnClicked();
@@ -58,7 +58,7 @@ public:
 protected:
 	KviWindow * m_pWnd;
 public:
-	virtual void setButtonPixmap(const QPixmap & pix){ setIcon(QIcon(pix)); setUsesBigPixmap(false); };
+	virtual void setButtonPixmap(const QPixmap & pix){ setIcon(QIcon(pix)); setIconSize(QSize(22,22)); };
 	virtual KviWindow * window(){ return m_pWnd; };
 };
 
diff --git a/src/kvirc/ui/kvi_selectors.cpp b/src/kvirc/ui/kvi_selectors.cpp
index 05ec07ca5..dfa71f78c 100644
--- a/src/kvirc/ui/kvi_selectors.cpp
+++ b/src/kvirc/ui/kvi_selectors.cpp
@@ -78,8 +78,8 @@ KviUIntSelector::KviUIntSelector(QWidget * par,const QString & txt,unsigned int
 	m_uHighBound = uHighBound;
 	m_uDefault = uDefault;
 
-	m_pSpinBox->setMinValue(m_uLowBound);
-	m_pSpinBox->setMaxValue(m_uHighBound);
+	m_pSpinBox->setMinimum(m_uLowBound);
+	m_pSpinBox->setMaximum(m_uHighBound);
 
 	//KviStr tmp(KviStr::Format,"%u",bShortInt ? (unsigned int) *((unsigned short int *)pOption) : *pOption);
 	//m_pLineEdit->setText(tmp.ptr());
@@ -218,11 +218,14 @@ KviPixmapSelector::KviPixmapSelector(QWidget * par,const QString & txt,KviPixmap
 	m_pCheckBox = new KviStyledCheckBox(txt,this);
 	m_pCheckBox->setChecked(m_localPixmap.pixmap());
 	connect(m_pCheckBox,SIGNAL(toggled(bool)),this,SLOT(checkBoxToggled(bool)));
-	g->addMultiCellWidget(m_pCheckBox,0,0,0,1);
+
+	g->addWidget(m_pCheckBox,0,0,1,2);
+//	g->addMultiCellWidget(m_pCheckBox,0,0,0,1);
 
 	m_pPreview = new KviPixmapPreview(this);
 	m_pPreview->setPixmap(&m_localPixmap);
-	g->addMultiCellWidget(m_pPreview,1,1,0,1);
+	g->addWidget(m_pPreview,1,0,1,2);
+//	g->addMultiCellWidget(m_pPreview,1,1,0,1);
 
 	m_pFileNameLabel = new QLabel(this);
 	m_pFileNameLabel->setFrameStyle(QFrame::StyledPanel | QFrame::Sunken);
@@ -422,7 +425,7 @@ void KviStringListSelector::selectionChanged()
 
 void KviStringListSelector::textChanged(const QString &str)
 {
-	str.stripWhiteSpace();
+	str.trimmed();
 	m_pAddButton->setEnabled((str.length() > 0) && isEnabled());
 }
 
@@ -432,7 +435,7 @@ void KviStringListSelector::setEnabled(bool bEnabled)
 	m_pLineEdit->setEnabled(bEnabled);
 	m_pLabel->setEnabled(bEnabled);
 	QString txt = m_pLineEdit->text();
-	txt.stripWhiteSpace();
+	txt.trimmed();
 	m_pAddButton->setEnabled(bEnabled && (txt.length() > 0));
 	unsigned int uCount = m_pListBox->count();
 	bool bSomeSelected = false;
@@ -455,7 +458,7 @@ void KviStringListSelector::commit()
 	for(unsigned int u=0;u<uCount;u++)
 	{
 		QString str = m_pListBox->text(u);
-		str.stripWhiteSpace();
+		str.trimmed();
 		if(str.length() > 0)m_pOption->append(str);
 	}
 }
@@ -463,7 +466,7 @@ void KviStringListSelector::commit()
 void KviStringListSelector::addClicked()
 {
 	QString str = m_pLineEdit->text();
-	str.stripWhiteSpace();
+	str.trimmed();
 	if(str.length() > 0)m_pListBox->insertItem(str);
 	m_pLineEdit->setText("");
 }
@@ -499,7 +502,7 @@ KviColorSelector::KviColorSelector(QWidget * par,const QString & txt,QColor * pO
 
 void KviColorSelector::setButtonPalette(QColor * pOption)
 {
-	QPalette pal(*pOption,colorGroup().background());
+	QPalette pal(*pOption,palette().background().color());
 	m_memColor = *pOption;
 	m_pButton->setPalette(pal);
 
@@ -658,8 +661,8 @@ void KviMircTextColorSelector::setButtonPalette()
 
 	if(m_uFore > KVI_MIRCCOLOR_MAX_FOREGROUND)m_uFore = KVI_MIRCCOLOR_MAX_FOREGROUND;
 	
-	pal.setColor(QColorGroup::ButtonText,KVI_OPTION_MIRCCOLOR(m_uFore));
-	pal.setColor(QColorGroup::Text,KVI_OPTION_MIRCCOLOR(m_uFore));
+	pal.setColor(QPalette::ButtonText,KVI_OPTION_MIRCCOLOR(m_uFore));
+	pal.setColor(QPalette::Text,KVI_OPTION_MIRCCOLOR(m_uFore));
 
 	m_pButton->setPalette(pal);
 }
@@ -797,7 +800,7 @@ void KviCahnnelListSelector::addClicked()
 {
 	if(!m_pChanLineEdit->text().isEmpty())
 	{
-		new KviChanTreeViewItem(m_pListView,m_pChanLineEdit->text().stripWhiteSpace(),m_pPassLineEdit->text().stripWhiteSpace());
+		new KviChanTreeViewItem(m_pListView,m_pChanLineEdit->text().trimmed(),m_pPassLineEdit->text().trimmed());
 		m_pChanLineEdit->clear();
 		m_pPassLineEdit->clear();
 	}
diff --git a/src/kvirc/ui/kvi_splash.cpp b/src/kvirc/ui/kvi_splash.cpp
index 1eff5f217..0e255573d 100644
--- a/src/kvirc/ui/kvi_splash.cpp
+++ b/src/kvirc/ui/kvi_splash.cpp
@@ -40,7 +40,7 @@
 
 
 KviSplashScreen::KviSplashScreen()
-: QSplashScreen(QPixmap(1,1),Qt::WStyle_NoBorder | Qt::WType_TopLevel | Qt::WStyle_Customize | Qt::WStyle_StaysOnTop | Qt::WStyle_Splash)
+: QSplashScreen(QPixmap(1,1),Qt::FramelessWindowHint | Qt::Window | Qt::WindowStaysOnTopHint | Qt::SplashScreen)
 {
 	QString szPix;
 	QPixmap * pix = 0;
diff --git a/src/kvirc/ui/kvi_statusbar.cpp b/src/kvirc/ui/kvi_statusbar.cpp
index 11d3e9dbd..a42b7d95f 100644
--- a/src/kvirc/ui/kvi_statusbar.cpp
+++ b/src/kvirc/ui/kvi_statusbar.cpp
@@ -90,7 +90,8 @@ KviStatusBar::KviStatusBar(KviFrame * pFrame)
 
 	m_pMessageTimer = 0;
 
-	m_pMessageLabel = new QLabel("<b>[x]</b> x",this,"msgstatuslabel");
+	m_pMessageLabel = new QLabel("<b>[x]</b> x",this);
+	m_pMessageLabel->setObjectName("msgstatuslabel");
 	m_pMessageLabel->setMargin(1);
 	//m_pMessageLabel->setAlignment(Qt::AlignVCenter | Qt::AlignLeft);
 	//m_pMessageLabel->setMinimumWidth(350);
@@ -213,7 +214,7 @@ void KviStatusBar::resizeEvent(QResizeEvent * e)
 */
 bool KviStatusBar::event(QEvent * e)
 {
-	if(e->type() == QEvent::LayoutHint)
+	if(e->type() == QEvent::LayoutRequest)
 	{
 		//updateLayout();
 		return false; // send to parents too!
@@ -465,7 +466,7 @@ void KviStatusBar::paintEvent(QPaintEvent * e)
 void KviStatusBar::mousePressEvent(QMouseEvent * e)
 {
 	m_pClickedApplet = 0;
-	if((e->button() & Qt::LeftButton) && (e->state() & (Qt::ShiftButton | Qt::ControlButton)))
+	if((e->modifiers() & Qt::LeftButton) && (e->modifiers() & (Qt::ShiftModifier | Qt::ControlModifier)))
 	{
 		// move!
 		m_pClickedApplet = appletAt(mapToGlobal(e->pos()));
diff --git a/src/kvirc/ui/kvi_statusbarapplet.cpp b/src/kvirc/ui/kvi_statusbarapplet.cpp
index 11929b5eb..cf6be87cb 100644
--- a/src/kvirc/ui/kvi_statusbarapplet.cpp
+++ b/src/kvirc/ui/kvi_statusbarapplet.cpp
@@ -137,7 +137,7 @@ void KviStatusBarApplet::paintEvent(QPaintEvent * e)
 	// workaround to fix "Warning:QPainter::setCompositionMode: PorterDuff modes not supported on device on win"
 		#ifdef COMPILE_ON_WINDOWS
 			QPalette pal=palette();
-			QColor col=pal.highlight();
+			QColor col=pal.highlight().color();
 			col.setAlpha(127);
 			p.fillRect(rect(),QBrush(col));
 		#else
diff --git a/src/kvirc/ui/kvi_styled_controls.cpp b/src/kvirc/ui/kvi_styled_controls.cpp
index 82d60327a..8d20329f9 100644
--- a/src/kvirc/ui/kvi_styled_controls.cpp
+++ b/src/kvirc/ui/kvi_styled_controls.cpp
@@ -41,7 +41,7 @@
 
 
 KviStyledControlInternal::KviStyledControlInternal( KviStyledControl* control)
-:QObject(0,0)
+:QObject(0)
 {
 	m_pControl=control;
 }
diff --git a/src/kvirc/ui/kvi_texticonwin.cpp b/src/kvirc/ui/kvi_texticonwin.cpp
index 9356a0d3e..bf4fd777b 100644
--- a/src/kvirc/ui/kvi_texticonwin.cpp
+++ b/src/kvirc/ui/kvi_texticonwin.cpp
@@ -134,7 +134,7 @@ bool KviTextIconWindow::findTypedSeq()
 			int j;

 			for(j=0;j<((int)(szIt.length()));j++)

 			{

-				if(szIt[j].lower() != m_szTypedSeq[j].lower())break;

+				if(szIt[j].toLower() != m_szTypedSeq[j].toLower())break;

 			}

 			if(j < max)

 			{

@@ -238,7 +238,7 @@ void KviTextIconWindow::keyPressEvent(QKeyEvent *e)
 		break;

 	}

 

-	int as = e->ascii();

+	int as = e->text().toInt();

 	if((as >= 'a' && as <= 'z') || (as >= 'A' && as <= 'Z') || (as >= '0' && as <= '9')

 		|| (as == '?') || (as == '$') || (as == '.') || (as == ',') || (as == '!') || (as =='&'))

 	{

diff --git a/src/kvirc/ui/kvi_themedlabel.cpp b/src/kvirc/ui/kvi_themedlabel.cpp
index a98112396..05601a089 100644
--- a/src/kvirc/ui/kvi_themedlabel.cpp
+++ b/src/kvirc/ui/kvi_themedlabel.cpp
@@ -33,8 +33,9 @@
 #endif
 
 KviThemedLabel::KviThemedLabel(QWidget * par,const char * name)
-: QFrame(par,name)
+: QFrame(par)
 {
+	setObjectName(name);
 	setFrameStyle(QFrame::Sunken | QFrame::StyledPanel);
 	applyOptions();
 	m_bAutoHeight=0;
@@ -57,7 +58,7 @@ void KviThemedLabel::setText(const char * text)
 	m_szText = QString(text);
 	if(m_bAutoHeight)
 	{
-		int iHeight=fontMetrics().height()*QStringList::split('\n',m_szText).count()+4;
+		int iHeight=fontMetrics().height()*m_szText.split('\n',QString::SkipEmptyParts).count()+4;
 		setMinimumHeight(iHeight);
 		//g_pApp->postEvent(parent(),new QEvent(QEvent::Resize));
 	}
@@ -69,7 +70,7 @@ void KviThemedLabel::setText(const QString& text)
 	m_szText = text;
 	if(m_bAutoHeight)
 	{
-		int iHeight=fontMetrics().height()*QStringList::split('\n',m_szText).count()+4;
+		int iHeight=fontMetrics().height()*m_szText.split('\n',QString::SkipEmptyParts).count()+4;
 		setMinimumHeight(iHeight);
  		//g_pApp->postEvent(parent(),new QEvent(QEvent::Resize));
 	}
diff --git a/src/kvirc/ui/kvi_toolwindows_container.cpp b/src/kvirc/ui/kvi_toolwindows_container.cpp
index e3669a541..29dce59ca 100644
--- a/src/kvirc/ui/kvi_toolwindows_container.cpp
+++ b/src/kvirc/ui/kvi_toolwindows_container.cpp
@@ -43,7 +43,7 @@ KviWindowToolWidget::KviWindowToolWidget(QWidget * parent, KviWindowToolPageButt
 	m_pButton=button;
 	m_bAutoDelete=1;
 	m_bHidden=0;
-	if(m_pButton) m_pButton->setOn(!isHidden());
+	if(m_pButton) m_pButton->setChecked(!isHidden());
 //	m_ObjectHandler.add(button);
 //	setMinimumWidth(0);
 }
@@ -107,8 +107,8 @@ KviWindowToolPageButton::KviWindowToolPageButton ( int pixon,int pixoff, const Q
 	setToolTip(text);
 	setObjectName("kvi_window_tool_button");
 	setIcon(QIcon(*(g_pIconManager->getSmallIcon(pixon))));
-	setToggleButton(true);
-	setOn(bOn);
+	setCheckable(true);
+	setChecked(bOn);
 
 //	setSizePolicy(QSizePolicy(QSizePolicy::Fixed,QSizePolicy::Ignored));
 }