more QT4 port

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

17 files changed, 59 insertions, 46 deletions

diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
index d6ca87ab3..d511bbede 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands.cpp
@@ -153,7 +153,7 @@ namespace KviKvsCoreSimpleCommands
 			return true;
 		}
 
-		QStringList sl = QStringList::split(QRegExp("[, ]+"),szTokens,false);
+		QStringList sl = szTokens.split(QRegExp("[, ]+"),QString::SkipEmptyParts);
 		
 		KviQCString szFlags;
 		KviQCString szTarget = KVSCSC_pConnection->encodeText(KVSCSC_pWindow->windowName());
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index dc8ed8e9b..16d7c20e0 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -383,7 +383,7 @@ try_again:
 
 		KVSCSC_REQUIRE_CONNECTION
 
-		QStringList slChans = QStringList::split(",",szChans);
+		QStringList slChans = szChans.split(",",QString::SkipEmptyParts);
 
 		QString szChanTypes = KVSCSC_pConnection->serverInfo()->supportedChannelTypes();
 		for(QStringList::Iterator it=slChans.begin();it != slChans.end();++it)
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
index a5656f100..a43e6c7a5 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_mr.cpp
@@ -619,7 +619,7 @@ namespace KviKvsCoreSimpleCommands
 				if(QString * pszPath = KVSCSC_pContext->scriptFilePath())
 				{
 					QFileInfo inf2(*pszPath);
-					QString szCheckFileName = inf2.dirPath();
+					QString szCheckFileName = inf2.path();
 					KviQString::ensureLastCharIs(szCheckFileName,KVI_PATH_SEPARATOR_CHAR);
 					szCheckFileName += szFileName;
 					if(KviFileUtils::fileExists(szCheckFileName))
@@ -629,7 +629,7 @@ namespace KviKvsCoreSimpleCommands
 		}
 
 		QFileInfo infz(szFileName);
-		szFileName = infz.absFilePath();
+		szFileName = infz.absoluteFilePath();
 
 		QString szBuffer;
 		if(!KviFileUtils::loadFile(szFileName,szBuffer,true)) // <-- scripts SHOULD be shipped in utf8 format
@@ -719,7 +719,7 @@ namespace KviKvsCoreSimpleCommands
 
 		KviQCString szEncodedChans = KVSCSC_pConnection->encodeText(szChans);
 
-		QStringList sl = QStringList::split(",",szChans);
+		QStringList sl = szChans.split(",",QString::SkipEmptyParts);
 	
 		if(!szMsg.isEmpty())
 		{
@@ -1004,7 +1004,7 @@ namespace KviKvsCoreSimpleCommands
 
 		KviQuery * query;
 		
-		QStringList sl = QStringList::split(",",szTargets);
+		QStringList sl = szTargets.split(",",QString::SkipEmptyParts);
 		for(QStringList::Iterator it = sl.begin();it != sl.end();it++)
 		{
 			QString szNick = *it;
@@ -1135,7 +1135,7 @@ namespace KviKvsCoreSimpleCommands
 		KVSCSC_pWindow->frame()->raise();
 		//KVSCSC_pWindow->frame()->setActiveWindow();
 		//KVSCSC_pWindow->frame()->setFocus();
-		((KviTalMainWindow *)KVSCSC_pWindow->frame())->setActiveWindow();
+		((KviTalMainWindow *)KVSCSC_pWindow->frame())->activateWindow();
 		return true;
 	}
 
diff --git a/src/kvirc/kvs/kvi_kvs_object.cpp b/src/kvirc/kvs/kvi_kvs_object.cpp
index 499f2ecb1..f3a72a568 100644
--- a/src/kvirc/kvs/kvi_kvs_object.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object.cpp
@@ -1388,7 +1388,7 @@ bool KviKvsObject::function_property(KviKvsObjectFunctionCall * c)
 			c->returnValue()->setString(v.toString());
 		break;
 		case QVariant::ByteArray:
-			c->returnValue()->setString(QString::fromUtf8(v.toCString().data()));
+			c->returnValue()->setString(QString::fromUtf8(v.toByteArray().data()));
 		break;
 		case QVariant::Point:
 		{
@@ -1661,13 +1661,13 @@ KviKvsObject * KviKvsObject::findChild(const QString &szClass,const QString &szN
 			// any class matches
 			if(szName.isEmpty())return o; // any name matches
 			// name must match
-			if(KviQString::equalCI(szName,o->name()))return o;
+			if(KviQString::equalCI(szName,o->objectName()))return o;
 		} else {
 			if(KviQString::equalCI(szClass,o->getClass()->name()))
 			{
 				if(szName.isEmpty())return o; // any name matches
 				// name must match
-				if(KviQString::equalCI(szName,o->name()))return o;
+				if(KviQString::equalCI(szName,o->objectName()))return o;
 			}
 		}
 		KviKvsObject * c = o->findChild(szClass,szName);
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index 58f4dd5be..3ff6960c6 100644
--- a/src/kvirc/kvs/kvi_kvs_object_controller.cpp
+++ b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
@@ -171,7 +171,7 @@ void KviKvsObjectController::flushUserClasses()
 				if(c->save(szPath))
 					c->clearDirtyFlag();
 				else
-					debug("Oops.. failed to save the object class %s",c->name().latin1());
+					debug("Oops.. failed to save the object class %s",c->name().toLatin1());
 			}
 		}
 		++it;
diff --git a/src/kvirc/kvs/kvi_kvs_parser.cpp b/src/kvirc/kvs/kvi_kvs_parser.cpp
index a22ac927f..5ca9c7b9f 100644
--- a/src/kvirc/kvs/kvi_kvs_parser.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser.cpp
@@ -2867,12 +2867,12 @@ KviKvsTreeNodeSwitchList * KviKvsParser::parseCommandSwitchList()
 			if(bLong)
 				sw->addLong(QString(pSw,pSwEnd - pSw),p);
 			else
-				sw->addShort(pSw->lower().unicode(),p);
+				sw->addShort(pSw->toLower().unicode(),p);
 		} else {
 			if(bLong)
 				sw->addLong(QString(pSw,pSwEnd - pSw),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
 			else
-				sw->addShort(pSw->lower().unicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
+				sw->addShort(pSw->toLower().unicode(),new KviKvsTreeNodeConstantData(KVSP_curCharPointer,new KviKvsVariant(true))); // empty param
 		}
 	}
 
diff --git a/src/kvirc/kvs/kvi_kvs_parser_command.cpp b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
index b92606e35..66ac33f87 100644
--- a/src/kvirc/kvs/kvi_kvs_parser_command.cpp
+++ b/src/kvirc/kvs/kvi_kvs_parser_command.cpp
@@ -133,7 +133,7 @@ KviKvsTreeNodeCommand * KviKvsParser::parseCommand()
 		// perl.begin has a *really* half special parsing routine
 		if(iIdentifierLen == 4)
 		{
-			if(pIdentifier->lower().unicode() == 'p')
+			if(pIdentifier->toLower().unicode() == 'p')
 			{
 				if(KviQString::equalCI(szIdentifier,"perl"))
 				{
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 538c90fc5..162b1d2dc 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -396,7 +396,7 @@ KviKvsPopupMenuItemMenu::~KviKvsPopupMenuItemMenu()
 
 KviKvsPopupMenuItem * KviKvsPopupMenuItemMenu::clone() const
 {
-	KviKvsPopupMenu * copy = new KviKvsPopupMenu(m_pMenu->name());
+	KviKvsPopupMenu * copy = new KviKvsPopupMenu(m_pMenu->objectName().toLatin1());
 	copy->copyFrom(m_pMenu);
 	return new KviKvsPopupMenuItemMenu(m_szItemName,copy,m_pKvsText,m_pKvsIcon,m_pKvsCondition);
 }
@@ -1203,7 +1203,7 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer)
 
 void KviKvsPopupMenu::generateDefPopup(QString &buffer)
 {
-	KviQString::sprintf(buffer,"defpopup(%s)\n",name());
+	KviQString::sprintf(buffer,"defpopup(%s)\n",objectName().toLatin1());
 	QString core;
 
 	generateDefPopupCore(core);
diff --git a/src/kvirc/kvs/kvi_kvs_processmanager.cpp b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
index 196020b85..9a28af9a4 100644
--- a/src/kvirc/kvs/kvi_kvs_processmanager.cpp
+++ b/src/kvirc/kvs/kvi_kvs_processmanager.cpp
@@ -68,7 +68,7 @@ bool KviKvsProcessAsyncOperation::start()
 
 	if(m_pData->iFlags & KVI_KVS_PROCESSDESCRIPTOR_NOSHELL)
 	{
-		args = QStringList::split(" ",m_pData->szCommandline);
+		args = m_pData->szCommandline.split(" ",QString::SkipEmptyParts);
 	} else {
 		QString szShell = m_pData->szShell;
 		if(szShell.isEmpty())
@@ -87,7 +87,7 @@ bool KviKvsProcessAsyncOperation::start()
 			szShell = "sh -c";
 #endif
 		}
-		args = QStringList::split(" ",szShell);
+		args = szShell.split(" ",QString::SkipEmptyParts);
 		args.append(m_pData->szCommandline);
 	}
 
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
index a8c87719a..e363801c9 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_operation.cpp
@@ -1222,15 +1222,17 @@ bool KviKvsTreeNodeOperationStringSubstitution::execute(KviKvsRunTimeContext * c
 
 	bool bGlobal = szF.indexOf('g',Qt::CaseInsensitive) != -1;
 
-	QRegExp re(szL,szF.find('i',Qt::CaseInsensitive) == -1,szF.find('w',Qt::CaseInsensitive) != -1);
-	re.setMinimal(szF.find('m',Qt::CaseInsensitive) != -1); // greedy or minimal ?
+	//QRegExp re(szL,szF.indexOf('i',Qt::CaseInsensitive) == -1,szF.indexOf('w',Qt::CaseInsensitive) != -1);
+	QRegExp re(szL,szF.indexOf('i',Qt::CaseInsensitive) == -1?Qt::CaseSensitive:Qt::CaseInsensitive,szF.indexOf('w',Qt::CaseInsensitive) != -1?QRegExp::Wildcard:QRegExp::RegExp);
+
+	re.setMinimal(szF.indexOf('m',Qt::CaseInsensitive) != -1); // greedy or minimal ?
 
 	int idx = 0;
 
 	while((!str.isEmpty()) && (idx != -1))
 	{
 		int len;
-		idx = re.search(str,idx);
+		idx = re.indexIn(str,idx);
 		if(idx != -1)
 		{
 			len = re.matchedLength();
diff --git a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
index 6a35ff2d1..25b07926a 100644
--- a/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
+++ b/src/kvirc/kvs/kvi_kvs_treenode_specialcommandswitch.cpp
@@ -166,8 +166,8 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelMatch::execute(KviKvsRunTimeContext
 	QString reg;
 	v.asString(reg);
 
-	QRegExp rx(reg,false,true);
-
+	//QRegExp rx(reg,false,true);
+	QRegExp rx(reg,Qt::CaseInsensitive,QRegExp::Wildcard);
 	QString val;
 	pRealParameter->asString(val);
 
@@ -218,8 +218,8 @@ bool KviKvsTreeNodeSpecialCommandSwitchLabelRegexp::execute(KviKvsRunTimeContext
 	QString reg;
 	v.asString(reg);
 
-	QRegExp rx(reg,false,false);
-
+//	QRegExp rx(reg,false,false);
+	QRegExp rx(reg,Qt::CaseInsensitive,QRegExp::RegExp);
 	QString val;
 	pRealParameter->asString(val);
 
diff --git a/src/kvirc/kvs/kvi_kvs_variant.cpp b/src/kvirc/kvs/kvi_kvs_variant.cpp
index 9e223abe7..a69b5250b 100644
--- a/src/kvirc/kvs/kvi_kvs_variant.cpp
+++ b/src/kvirc/kvs/kvi_kvs_variant.cpp
@@ -631,7 +631,7 @@ void KviKvsVariant::dump(const char * prefix) const
 	}
 	switch(m_pData->m_eType)
 	{
-		case KviKvsVariantData::String: debug("%s String(%s) [this=0x%lx]",prefix,m_pData->m_u.pString->utf8().data(),this); break;
+		case KviKvsVariantData::String: debug("%s String(%s) [this=0x%lx]",prefix,m_pData->m_u.pString->toUtf8().data(),this); break;
 		case KviKvsVariantData::Array: debug("%s Array(ptr=0x%lx) [this=0x%lx]",prefix,m_pData->m_u.pArray,this); break;
 		case KviKvsVariantData::Hash: debug("%s Hash(ptr=0x%lx,dict=0x%lx) [this=0x%lx]",prefix,m_pData->m_u.pHash,m_pData->m_u.pHash->dict(),this); break;
 		case KviKvsVariantData::Integer:  debug("%s Integer(%d) [this=0x%lx]",prefix,m_pData->m_u.iInteger,this); break;
diff --git a/src/kvirc/sparser/kvi_sp_numeric.cpp b/src/kvirc/sparser/kvi_sp_numeric.cpp
index e3af2668b..3c8eef40e 100644
--- a/src/kvirc/sparser/kvi_sp_numeric.cpp
+++ b/src/kvirc/sparser/kvi_sp_numeric.cpp
@@ -75,7 +75,7 @@ void KviServerParser::parseNumeric001(KviIrcMessage *msg)
 	// FIXME: #warning "SET THE USERMASK FROM SERVER"
 	QString szText = msg->connection()->decodeText(msg->safeTrailing());
 	QRegExp rx( " ([^ ]+)!([^ ]+)@([^ ]+)$" );
-	if( rx.search(szText) != -1)
+	if( rx.indexIn(szText) != -1)
 	{
 		msg->connection()->userInfo()->setUnmaskedHostName(rx.cap(3));
 		msg->connection()->userInfo()->setNickName(rx.cap(1));
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 0968db127..a14647375 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -87,7 +87,8 @@ extern KviDccBroker * g_pDccBroker;
 KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
 : KviDccWindow(KVI_WINDOW_TYPE_DCCCHAT,pFrm,name,dcc)
 {
-	m_pTopSplitter = new QSplitter(Qt::Horizontal,this,"top_splitter");
+	m_pTopSplitter = new QSplitter(Qt::Horizontal,this);
+	m_pTopSplitter->setObjectName("top_splitter");
 	KviThemedLabel * dummy;
 	dummy = new KviThemedLabel(m_pTopSplitter,"dummy_label");
 	KviTalVBox * box = new KviTalVBox(m_pTopSplitter);
@@ -275,9 +276,9 @@ void KviDccChat::fillCaptionBuffers()
 	m_szPlainTextCaption = tmp;
 
 	m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),tmp.toUtf8().data());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii(),tmp.toUtf8().data());
 	m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),tmp.toUtf8().data());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(),tmp.toUtf8().data());
 }
 
 QPixmap * KviDccChat::myIconPtr()
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index ccc3236c5..84ca3dc18 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -33,6 +33,7 @@
 #include <QEvent>
 #include <QCloseEvent>
 #include <QShowEvent>
+#include <QIcon>
 
 KviDccBox::KviDccBox(KviDccBroker * br,KviDccDescriptor * dcc)
 {
@@ -53,8 +54,9 @@ void KviDccBox::forgetDescriptor()
 }
 
 KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,const QString &capt)
-: QWidget(0,"dcc_accept_box") , KviDccBox(br,dcc)
+: QWidget(0) , KviDccBox(br,dcc)
 {
+	setObjectName("dcc_accept_box");
 	QVBoxLayout * vb = new QVBoxLayout(this,4,4);
 	QLabel * l = new QLabel(text,this);
 	l->setWordWrap(true);
@@ -71,10 +73,10 @@ KviDccAcceptBox::KviDccAcceptBox(KviDccBroker * br,KviDccDescriptor * dcc,const
 	connect(btn,SIGNAL(clicked()),this,SLOT(rejectClicked()));
 	hb->addWidget(btn);
 
-	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG)));
+	setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG))));
 	setWindowTitle(capt);
 
-	l->setActiveWindow();
+	l->activateWindow();
 	l->setFocus();
 }
 
@@ -113,8 +115,9 @@ void KviDccAcceptBox::showEvent(QShowEvent *e)
 
 
 KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const QString &text,bool bDisableResume)
-: QWidget(0,"dcc_rename_box") , KviDccBox(br,dcc)
+: QWidget(0) , KviDccBox(br,dcc)
 {
+	setObjectName("dcc_rename_box");
 	QVBoxLayout * vb = new QVBoxLayout(this,4,4);
 	QLabel * l = new QLabel(text,this);
 	l->setWordWrap(true);
@@ -142,7 +145,7 @@ KviDccRenameBox::KviDccRenameBox(KviDccBroker * br,KviDccDescriptor * dcc,const
 	btn->setDefault(true);
 	//btn->setFocus();
 
-	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG)));
+	setWindowIcon(QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DCCMSG))));
 	setWindowTitle(__tr2qs_ctx("File Already Exists - KVIrc","dcc"));
 }
 
diff --git a/src/modules/dcc/marshal.cpp b/src/modules/dcc/marshal.cpp
index 06a947583..b970f6334 100644
--- a/src/modules/dcc/marshal.cpp
+++ b/src/modules/dcc/marshal.cpp
@@ -35,8 +35,9 @@
 
 
 KviDccMarshal::KviDccMarshal(KviDccMarshalOutputContext * ctx)
-: QObject(0,"dcc_marshal")
+: QObject(0)
 {
+	setObjectName("dcc_marshal");
 	m_pSn                   = 0;
 	m_fd                    = KVI_INVALID_SOCKET;
 	m_pTimeoutTimer         = 0;
@@ -121,7 +122,9 @@ int KviDccMarshal::dccListen(const QString &ip,const QString &port,bool bUseTime
 	if(m_pTimeoutTimer)delete m_pTimeoutTimer;
 	m_pTimeoutTimer = new QTimer();
 	connect(m_pTimeoutTimer,SIGNAL(timeout()),this,SLOT(doListen()));
-	m_pTimeoutTimer->start(100,true);
+//	m_pTimeoutTimer->start(100,true);
+	m_pTimeoutTimer->setInterval(199);
+	m_pTimeoutTimer->setSingleShot(true);
 
 	return KviError_success;
 }
@@ -284,7 +287,9 @@ void KviDccMarshal::doListen()
 	{
 		m_pTimeoutTimer = new QTimer();
 		connect(m_pTimeoutTimer,SIGNAL(timeout()),this,SLOT(connectionTimedOut()));
-		m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true);
+		//m_pTimeoutTimer->start(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000,true);
+		m_pTimeoutTimer->setInterval(KVI_OPTION_UINT(KviOption_uintDccSocketTimeout) * 1000);
+		m_pTimeoutTimer->setSingleShot(true);
 	}
 	// and wait for connect
 
@@ -309,8 +314,9 @@ int KviDccMarshal::dccConnect(const char * ip,const char * port,bool bUseTimeout
 	if(m_pTimeoutTimer)delete m_pTimeoutTimer;
 	m_pTimeoutTimer = new QTimer();
 	connect(m_pTimeoutTimer,SIGNAL(timeout()),this,SLOT(doConnect()));
-	m_pTimeoutTimer->start(100,true);
-
+//	m_pTimeoutTimer->start(100,true);
+	m_pTimeoutTimer->setInterval(100);
+	m_pTimeoutTimer->setSingleShot(true);
 	return KviError_success;
 }
 
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index a0a3c958d..d6291c8b2 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -643,7 +643,8 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	m_pDescriptor = dcc;
 	m_pSlaveThread = 0;
 
-	m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
+	m_pSplitter = new QSplitter(Qt::Horizontal,this);
+	m_pSplitter->setObjectName("dcc_window_splitter");
 	m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this);
 
 	m_pHBox = new KviTalHBox(this);
@@ -681,12 +682,12 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 
 	m_pTalkButton = new KviStyledToolButton(m_pHBox);
 	m_pTalkButton->setEnabled(false);
-	m_pTalkButton->setToggleButton(true);
+	m_pTalkButton->setCheckable(true);
 	QIcon iset;
 	iset.addPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)),QIcon::Normal,QIcon::Off);
 	iset.addPixmap(*(g_pIconManager->getBigIcon(KVI_BIGICON_CONNECTED)),QIcon::Normal,QIcon::On);
 	m_pTalkButton->setIcon(iset);
-	m_pTalkButton->setUsesBigPixmap(true);
+	m_pTalkButton->setIconSize(QSize(32,32));
 	connect(m_pTalkButton,SIGNAL(toggled(bool)),this,SLOT(startOrStopTalking(bool)));
 
 	m_pHBox->setStretchFactor(vbox,1);
@@ -789,9 +790,9 @@ void KviDccVoice::fillCaptionBuffers()
 	m_szPlainTextCaption = tmp;
 
 	m_szHtmlActiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().ascii(),tmp.ptr());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii(),tmp.ptr());
 	m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().ascii(),tmp.ptr());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(),tmp.ptr());
 }
 
 QPixmap * KviDccVoice::myIconPtr()
@@ -894,7 +895,7 @@ void KviDccVoice::handleMarshalError(int err)
 	QString ssss = KviError::getDescription(err);
 	output(KVI_OUT_DCCERROR,__tr2qs_ctx("DCC Failed: %Q","dcc"),&ssss);
 	m_pTalkButton->setEnabled(false);
-	m_pTalkButton->setOn(false);
+	m_pTalkButton->setChecked(false);
 	m_pRecordingLabel->setEnabled(false);
 	m_pPlayingLabel->setEnabled(false);
 }