fixed some compilation warnings

fixed a crash on theme applying

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

5 files changed, 77 insertions, 71 deletions

diff --git a/src/kvilib/tal/kvi_tal_itemdelegates.cpp b/src/kvilib/tal/kvi_tal_itemdelegates.cpp
index 249b4a7d7..cf338eab0 100644
--- a/src/kvilib/tal/kvi_tal_itemdelegates.cpp
+++ b/src/kvilib/tal/kvi_tal_itemdelegates.cpp
@@ -26,53 +26,59 @@
 #include "kvi_tal_itemdelegates.h"
 #include <QListWidget>
 #include <QPainter>
-#include <QAbstractTextDocumentLayout>

-

-void KviTalIconAndRichTextItemDelegate::paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const

-{

-	painter->save();

-	if (option.state & QStyle::State_Selected)

-	{

-		QPalette pal=option.palette;

-		QBrush brush=pal.highlight();

-		QColor col=brush.color();

-		col.setAlpha(127);

-		brush.setColor(col);

-		painter->fillRect(option.rect,brush);

-	}

-	QString text=index.data(Qt::DisplayRole).toString();

-	QPixmap pixmap;

-	QRect decorationRect;

-	QVariant value = index.data(Qt::DecorationRole);

-	QStyle::State state=option.state;

-	QRect rect=option.rect;

-	int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING;

-	QIcon ico=QIcon(value.value<QIcon>());

-	if (ico.isNull())

-	{

-		if (m_pDefaultPix) painter->drawPixmap(option.rect.x()+LVI_BORDER,option.rect.y()+LVI_BORDER,*m_pDefaultPix);

-	}

-	else

-		painter->drawPixmap(option.rect.x()+LVI_BORDER,option.rect.y()+LVI_BORDER,ico.pixmap(LVI_ICON_SIZE,LVI_ICON_SIZE));

-	QTextDocument doc;

-	doc.setHtml( text );

-	doc.setDefaultFont(painter->font());

-	painter->translate(option.rect.x()+afterIcon,option.rect.y()+LVI_BORDER);

-	doc.setTextWidth(option.rect.width()-10);

-	QRect cliprect=QRect(QPoint(0,0),QSize(option.rect.width()-afterIcon,option.rect.height()-(LVI_BORDER*2)-4));

-	doc.drawContents(painter, cliprect);	

-	painter->restore();

-}

-

-QSize KviTalIconAndRichTextItemDelegate::sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const

-{

-	QString text=index.data(Qt::DisplayRole).toString();

-	QTextDocument doc;

-	doc.setHtml( text );

-	int height=doc.documentLayout()->documentSize().height();

-	if (height<(LVI_ICON_SIZE+(2 * LVI_BORDER))) height=LVI_ICON_SIZE;

-	return QSize(((QListWidget*)parent())->viewport()->size().width(), height + (2 * LVI_BORDER));		

-}

+#include <QAbstractTextDocumentLayout>
+
+void KviTalIconAndRichTextItemDelegate::paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const
+{
+	painter->save();
+	if (option.state & QStyle::State_Selected)
+	{
+		QPalette pal=option.palette;
+		QBrush brush=pal.highlight();
+		QColor col=brush.color();
+		col.setAlpha(127);
+		brush.setColor(col);
+		painter->fillRect(option.rect,brush);
+	}
+	QString text=index.data(Qt::DisplayRole).toString();
+	QPixmap pixmap;
+	QRect decorationRect;
+	QVariant value = index.data(Qt::DecorationRole);
+	QStyle::State state=option.state;
+	QRect rect=option.rect;
+	int afterIcon = LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING;
+	QIcon ico;
+	if(value.canConvert<QIcon>())
+	{
+		ico= QIcon(value.value<QIcon>());
+		if (ico.isNull())
+		{
+			if (m_pDefaultPix) painter->drawPixmap(option.rect.x()+LVI_BORDER,option.rect.y()+LVI_BORDER,*m_pDefaultPix);
+		} else {
+			painter->drawPixmap(option.rect.x()+LVI_BORDER,option.rect.y()+LVI_BORDER,ico.pixmap(LVI_ICON_SIZE,LVI_ICON_SIZE));
+		}
+	} else {
+		painter->drawPixmap(option.rect.x()+LVI_BORDER,option.rect.y()+LVI_BORDER,ico.pixmap(LVI_ICON_SIZE,LVI_ICON_SIZE));
+	}
+	QTextDocument doc;
+	doc.setHtml( text );
+	doc.setDefaultFont(painter->font());
+	painter->translate(option.rect.x()+afterIcon,option.rect.y()+LVI_BORDER);
+	doc.setTextWidth(option.rect.width()-10);
+	QRect cliprect=QRect(QPoint(0,0),QSize(option.rect.width()-afterIcon,option.rect.height()-(LVI_BORDER*2)-4));
+	doc.drawContents(painter, cliprect);	
+	painter->restore();
+}
+
+QSize KviTalIconAndRichTextItemDelegate::sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const
+{
+	QString text=index.data(Qt::DisplayRole).toString();
+	QTextDocument doc;
+	doc.setHtml( text );
+	int height=doc.documentLayout()->documentSize().height();
+	if (height<(LVI_ICON_SIZE+(2 * LVI_BORDER))) height=LVI_ICON_SIZE;
+	return QSize(((QListWidget*)parent())->viewport()->size().width(), height + (2 * LVI_BORDER));		
+}
 
 
 
diff --git a/src/kvirc/kvs/kvi_kvs_object_controller.cpp b/src/kvirc/kvs/kvi_kvs_object_controller.cpp
index 3ff6960c6..de2e3ff90 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().toLatin1());
+					debug("Oops.. failed to save the object class %s",c->name().toLatin1().data());
 			}
 		}
 		++it;
diff --git a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
index 162b1d2dc..353f9a4b2 100644
--- a/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
+++ b/src/kvirc/kvs/kvi_kvs_popupmenu.cpp
@@ -593,7 +593,7 @@ KviKvsPopupMenuTopLevelData * KviKvsPopupMenu::topLevelData()
 bool KviKvsPopupMenu::removeItemByName(const QString &szItemName,bool bRecursive)
 {
 	KviKvsScript * se;
-	
+
 	for(se = m_pEpilogues->first();se;se = m_pEpilogues->next())
 	{
 		if(KviQString::equalCI(szItemName,se->name()))
@@ -635,7 +635,7 @@ bool KviKvsPopupMenu::removeItemByName(const QString &szItemName,bool bRecursive
 			}
 		}
 	}
-	
+
 	return false;
 }
 
@@ -950,11 +950,11 @@ void KviKvsPopupMenu::load(const QString &prefix,KviConfig * cfg)
 	{
 		QString pre;
 		KviQString::sprintf(pre,"%Q_%d",&prefix,idx);
-		
+
 		KviQString::sprintf(tmp,"%Q_Id",&pre);
 		QString itemName = cfg->readQStringEntry(tmp,QString::null);
 		KviQString::sprintf(tmp,"%Q_Type",&pre);
-		
+
 		int type = cfg->readIntEntry(tmp,3);
 		switch(type)
 		{
@@ -1099,14 +1099,14 @@ void KviKvsPopupMenu::save(const QString & prefix,KviConfig * cfg)
 			KviQString::sprintf(tmp,"%Q_Icon",&pre);
 			cfg->writeEntry(tmp,s->code());
 		}
-		
+
 		s = it->kvsText();
 		if(s)
 		{
 			KviQString::sprintf(tmp,"%Q_Text",&pre);
 			cfg->writeEntry(tmp,s->code());
 		}
-		
+
 		s = it->kvsCode();
 		if(s)
 		{
@@ -1135,7 +1135,7 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer)
 	buffer = "";
 
 	KviKvsScript * s;
-	
+
 	for(s = m_pPrologues->first();s;s = m_pPrologues->next())
 	{
 		buffer.append("prologue\n");
@@ -1203,7 +1203,7 @@ void KviKvsPopupMenu::generateDefPopupCore(QString &buffer)
 
 void KviKvsPopupMenu::generateDefPopup(QString &buffer)
 {
-	KviQString::sprintf(buffer,"defpopup(%s)\n",objectName().toLatin1());
+	KviQString::sprintf(buffer,"defpopup(%s)\n",objectName().toLatin1().data());
 	QString core;
 
 	generateDefPopupCore(core);
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index a14647375..533a3456f 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -189,7 +189,7 @@ void KviDccChat::connectionInProgress()
 				ip = m_pDescriptor->szFakeIp;
 			} else {
 				ip = m_pDescriptor->szListenIp;
-	
+
 				if(KVI_OPTION_BOOL(KviOption_boolDccGuessIpFromServerWhenLocalIsUnroutable))
 				{
 					if(!kvi_isRoutableIpString(ip.ptr()))
@@ -220,7 +220,7 @@ void KviDccChat::connectionInProgress()
 
 			QString szReq = QString("PRIVMSG %1 :%2DCC %3 chat %4 %5").arg(m_pDescriptor->szNick).arg((char)0x01).arg(m_pDescriptor->szType).arg(ip.ptr()).arg(port);
 
-			if(m_pDescriptor->isZeroPortRequest())	
+			if(m_pDescriptor->isZeroPortRequest())
 			{
 				szReq.append(" ");
 				szReq+=m_pDescriptor->zeroPortRequestTag();
@@ -276,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().toAscii(),tmp.toUtf8().data());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),tmp.toUtf8().data());
 	m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(),tmp.toUtf8().data());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),tmp.toUtf8().data());
 }
 
 QPixmap * KviDccChat::myIconPtr()
@@ -298,11 +298,11 @@ void KviDccChat::ownMessage(const QString &text)
 		output(KVI_OUT_SYSTEMWARNING,__tr2qs_ctx("Cannot send data: No active connection","dcc"));
 		return;
 	}
-	
+
 	KviQCString szData = encodeText(text);
 	const char * d = szData.data();
 	if(!d)return;
-	
+
 #ifdef COMPILE_CRYPT_SUPPORT
 	if(cryptSessionInfo())
 	{
@@ -435,7 +435,7 @@ bool KviDccChat::event(QEvent *e)
 									delete encoded;
 									return true;
 								break;
-								
+
 								default: // also case KviCryptEngine::DecryptError
 								{
 									QString szErr = cinf->pEngine->lastError();
@@ -500,7 +500,7 @@ void KviDccChat::connected()
 	}
 
 	updateCaption();
-	
+
 	m_pSlaveThread = new KviDccChatThread(this,m_pMarshal->releaseSocket());
 #ifdef COMPILE_SSL_SUPPORT
 	KviSSL * s = m_pMarshal->releaseSSL();
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index d6291c8b2..f9c40b780 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -44,7 +44,7 @@
 #include <QSplitter>
 #include <QSlider>
 #include <QToolTip>
-

+
 #if !defined(COMPILE_ON_WINDOWS) && !defined(COMPILE_ON_MINGW)
 	#include <sys/time.h>
 	#include <sys/types.h>
@@ -412,7 +412,7 @@ bool KviDccVoiceThread::soundStep()
 				m_iLastSignalBufferSize = m_inSignalBuffer.size();
 			} else {
 				// have stuff to play , but it's not enough to fill the pre-buffer
-				// 
+				//
 				struct timeval tv;
 				gettimeofday(&tv,0);
 
@@ -656,14 +656,14 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	m_pOutputLabel = new QLabel(__tr2qs_ctx("Output buffer","dcc"),vbox);
 	m_pOutputLabel->setFrameStyle(QFrame::Sunken | QFrame::Panel);
 	vbox->setSpacing(1);
-	
+
 	KviTalVBox * vbox2 = new KviTalVBox(m_pHBox);
 
 	m_pRecordingLabel = new QLabel(vbox2);
 	m_pRecordingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_RECORD)));
 	m_pRecordingLabel->setEnabled(false);
 	m_pRecordingLabel->setFrameStyle(QFrame::Raised | QFrame::Panel);
-	
+
 	m_pPlayingLabel = new QLabel(vbox2);
 	m_pPlayingLabel->setPixmap(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_PLAY)));
 	m_pPlayingLabel->setEnabled(false);
@@ -746,7 +746,7 @@ void KviDccVoice::connectionInProgress()
 	{
 		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Contacting host %Q on port %Q","dcc"),&(m_pDescriptor->szIp),&(m_pDescriptor->szPort));
 	} else {
-		
+
 		output(KVI_OUT_DCCMSG,__tr2qs_ctx("Listening on interface %Q port %Q","dcc"),
 			&(m_pMarshal->localIp()),&(m_pMarshal->localPort()));
 
@@ -790,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().toAscii(),tmp.ptr());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextActive).name().toAscii().data(),tmp.ptr());
 	m_szHtmlInactiveCaption.sprintf("<nobr><font color=\"%s\"><b>%s</b></font></nobr>",
-		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii(),tmp.ptr());
+		KVI_OPTION_COLOR(KviOption_colorCaptionTextInactive).name().toAscii().data(),tmp.ptr());
 }
 
 QPixmap * KviDccVoice::myIconPtr()