more qt4 misc porting

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

11 files changed, 60 insertions, 53 deletions

diff --git a/src/kvilib/tal/kvi_tal_toolbar.cpp b/src/kvilib/tal/kvi_tal_toolbar.cpp
index c4b1111ad..e88b4cda9 100644
--- a/src/kvilib/tal/kvi_tal_toolbar.cpp
+++ b/src/kvilib/tal/kvi_tal_toolbar.cpp
@@ -41,7 +41,6 @@
 
 #else
 	KviTalToolBar::KviTalToolBar(const QString &label,QMainWindow *w,QT_TOOLBARDOCK_TYPE dock,bool bNewLine,const char * nam)
-	//: Q3ToolBar(label,w,dock,bNewLine,nam)
 	: QToolBar(label,w)
 	{
 		//setFrameStyle(QFrame::NoFrame);
diff --git a/src/kvirc/kernel/kvi_action.cpp b/src/kvirc/kernel/kvi_action.cpp
index 596c41f03..f442ec1d7 100644
--- a/src/kvirc/kernel/kvi_action.cpp
+++ b/src/kvirc/kernel/kvi_action.cpp
@@ -409,12 +409,13 @@ QWidget * KviAction::addToCustomToolBar(KviCustomToolBar *pParentToolBar)
 {
 	if(!setupDone())setup();
 	QPixmap * p = bigIcon();
-	QToolButton * b = new QToolButton(
-			p ? *p : QPixmap(),
-			visibleName(),
-			visibleName(),
-			this,SLOT(activate()),pParentToolBar,
-			m_szName.toUtf8().data());
+	QToolButton * b = new QToolButton(pParentToolBar);
+
+	b->setIcon(p ? *p : QPixmap());
+	b->setText(visibleName());
+	b->setStatusTip(visibleName());
+	setObjectName(m_szName.toUtf8().data());
+	connect(b,SIGNAL(clicked()),this,SLOT(activate()));
 
 	pParentToolBar->addWidget(b);
 	if(!isEnabled())b->setEnabled(false);
diff --git a/src/kvirc/kernel/kvi_app.cpp b/src/kvirc/kernel/kvi_app.cpp
index ae9a5b2a8..2d67ab7a3 100644
--- a/src/kvirc/kernel/kvi_app.cpp
+++ b/src/kvirc/kernel/kvi_app.cpp
@@ -94,9 +94,6 @@
 #include <QTextCodec>
 #include <QMetaObject>
 
-// FIXME: Qt4 #include <QMimeData>
-#include <q3mimefactory.h>
-
 #ifdef COMPILE_SSL_SUPPORT
 	#include "kvi_ssl.h"
 #endif
@@ -265,7 +262,8 @@ void KviApp::setup()
 	list.append(tmp);
 	getGlobalKvircDirectory(tmp,HelpNoIntl);
 	list.append(tmp);
-	Q3MimeSourceFactory::defaultFactory()->setFilePath(list);
+	//FIXME reimplement as QResource
+	//Q3MimeSourceFactory::defaultFactory()->setFilePath(list);
 
 	KVI_SPLASH_SET_PROGRESS(1)
 
@@ -1244,18 +1242,18 @@ void KviApp::fileDownloadTerminated(bool bSuccess,const QString &szRemoteUrl,con
 		KVI_OPTION_UINT(KviOption_uintGlobalTransparencyParentFadeFactor) %= 100;
 		if(KVI_OPTION_UINT(KviOption_uintGlobalTransparencyParentFadeFactor) > 0)
 		{
-			g_pShadedParentGlobalDesktopBackground->convertFromImage(
+			*g_pShadedParentGlobalDesktopBackground = QPixmap::fromImage(
 				kimageeffect_fade(img,
 					(float)((float)KVI_OPTION_UINT(KviOption_uintGlobalTransparencyParentFadeFactor) / (float)100),
-					KVI_OPTION_COLOR(KviOption_colorGlobalTransparencyFade)),0);
+					KVI_OPTION_COLOR(KviOption_colorGlobalTransparencyFade)));
 		}
 		KVI_OPTION_UINT(KviOption_uintGlobalTransparencyChildFadeFactor) %= 100;
 		if(KVI_OPTION_UINT(KviOption_uintGlobalTransparencyChildFadeFactor) > 0)
 		{
-			g_pShadedChildGlobalDesktopBackground->convertFromImage(
+			*g_pShadedChildGlobalDesktopBackground = QPixmap::fromImage(
 				kimageeffect_fade(img,
 					(float)((float)KVI_OPTION_UINT(KviOption_uintGlobalTransparencyChildFadeFactor) / (float)100),
-					KVI_OPTION_COLOR(KviOption_colorGlobalTransparencyFade)),0);
+					KVI_OPTION_COLOR(KviOption_colorGlobalTransparencyFade)));
 		}
 		if(g_pFrame)g_pFrame->updatePseudoTransparency();
 	}
diff --git a/src/kvirc/kernel/kvi_coreactions.cpp b/src/kvirc/kernel/kvi_coreactions.cpp
index 15e905356..04dd486b0 100644
--- a/src/kvirc/kernel/kvi_coreactions.cpp
+++ b/src/kvirc/kernel/kvi_coreactions.cpp
@@ -668,11 +668,12 @@ bool KviConnectAction::addToPopupMenu(KviTalPopupMenu *p)
 QWidget * KviConnectAction::addToCustomToolBar(KviCustomToolBar *t)
 {
 	if(!setupDone())setup();
-	QToolButton * b = new QToolButton(
-			*(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)),
-			m_szConnectString,
-			m_szConnectString,
-			this,SLOT(activate()),t,name());
+	QToolButton * b = new QToolButton(t);
+	b->setIcon(*(g_pIconManager->getBigIcon(KVI_BIGICON_DISCONNECTED)));
+	b->setText(m_szConnectString);
+	b->setStatusTip(m_szConnectString);
+	b->setObjectName(name());
+	connect(b, SIGNAL(clicked()), this, SLOT(activate()));
 	registerWidget(b);
 	t->addWidget(b);
 	activeContextStateChanged();
@@ -737,11 +738,13 @@ bool KviSubmenuAction::addToPopupMenu(KviTalPopupMenu *p)
 QWidget * KviSubmenuAction::addToCustomToolBar(KviCustomToolBar *t)
 {
 	if(!setupDone())setup();
-	QToolButton * b = new QToolButton(
-			*(bigIcon()),
-			visibleName(),
-			visibleName(),
-			this,SLOT(activate()),t,name());
+	QToolButton * b = new QToolButton(t);
+	b->setIcon(*(bigIcon()));
+	b->setText(visibleName());
+	b->setStatusTip(visibleName());
+	b->setObjectName(name());
+	connect(b, SIGNAL(clicked()), this, SLOT(activate()));
+
 	b->setMenu(m_pPopup);
 	
 	b->setPopupMode( scriptCode().isEmpty() ? QToolButton::InstantPopup :  QToolButton::MenuButtonPopup);
@@ -1067,11 +1070,14 @@ bool KviGoAwayAction::addToPopupMenu(KviTalPopupMenu *p)
 QWidget * KviGoAwayAction::addToCustomToolBar(KviCustomToolBar *t)
 {
 	if(!setupDone())setup();
-	QToolButton * b = new QToolButton(
-			*(g_pIconManager->getBigIcon("kvi_bigicon_nokeyboard.png")),
-			m_szAwayString,
-			m_szAwayString,
-			this,SLOT(activate()),t,name());
+
+	QToolButton * b = new QToolButton(t);
+	b->setIcon(*(g_pIconManager->getBigIcon("kvi_bigicon_nokeyboard.png")));
+	b->setText(m_szAwayString);
+	b->setStatusTip(m_szAwayString);
+	b->setObjectName(name());
+	connect(b, SIGNAL(clicked()), this, SLOT(activate()));
+
 	registerWidget(b);
 	t->addWidget(b);
 	activeContextStateChanged();
diff --git a/src/kvirc/kernel/kvi_filetransfer.cpp b/src/kvirc/kernel/kvi_filetransfer.cpp
index 185d017e3..e297af700 100644
--- a/src/kvirc/kernel/kvi_filetransfer.cpp
+++ b/src/kvirc/kernel/kvi_filetransfer.cpp
@@ -28,7 +28,6 @@
 
 #include "kvi_app.h"
 
-#include "kvi_tal_listview.h"
 #include "kvi_tal_popupmenu.h"
 
 static KviFileTransferManager * g_pFileTransferManager = 0;
@@ -90,8 +89,8 @@ void KviFileTransferManager::invokeTransferWindow(KviWindow * pWnd,bool bCreateM
 	{
 		KviPointerHashTable<QString,QVariant> d(7,false);
 		d.setAutoDelete(true);
-		d.replace("bCreateMinimized",new QVariant(bCreateMinimized,0));
-		d.replace("bNoRaise",new QVariant(bNoRaise,0));
+		d.replace("bCreateMinimized",new QVariant(bCreateMinimized));
+		d.replace("bNoRaise",new QVariant(bNoRaise));
 
 		KviModuleExtensionManager::instance()->allocateExtension(
 				"tool",
diff --git a/src/kvirc/kernel/kvi_iconmanager.cpp b/src/kvirc/kernel/kvi_iconmanager.cpp
index a31e155bc..4de90fdd0 100644
--- a/src/kvirc/kernel/kvi_iconmanager.cpp
+++ b/src/kvirc/kernel/kvi_iconmanager.cpp
@@ -668,7 +668,7 @@ KviCachedPixmap * KviIconManager::getPixmapWithCacheScaleOnLoad(const QString &s
 			}
 	
 			QImage img = pix->toImage();
-			pix->convertFromImage(img.scaled(scaleW,scaleH,Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
+			*pix = QPixmap::fromImage(img.scaled(scaleW,scaleH,Qt::IgnoreAspectRatio,Qt::SmoothTransformation));
 		}
 	} else {
 		return 0;
@@ -731,7 +731,7 @@ QPixmap * KviIconManager::getBigIcon(const QString &szName)
 			QImage tmpi = p->toImage();
 			QImage tmp2 = tmpi.scaled(32,32,Qt::IgnoreAspectRatio,Qt::SmoothTransformation);
 			QPixmap *pix=new QPixmap();
-			pix->convertFromImage(tmp2);
+			*pix = QPixmap::fromImage(tmp2);
 			KviCachedPixmap * cp = new KviCachedPixmap(pix,QString::null);
 			addToCache(tmpName,cp);
 			return cp->pixmap();
diff --git a/src/kvirc/kernel/kvi_theme.cpp b/src/kvirc/kernel/kvi_theme.cpp
index 1fd73fc1d..018ee8970 100644
--- a/src/kvirc/kernel/kvi_theme.cpp
+++ b/src/kvirc/kernel/kvi_theme.cpp
@@ -172,7 +172,7 @@ const QPixmap & KviThemeInfo::smallScreenshot()
 		if(pix.width() > 300 || pix.height() > 225)
 		{
 			QImage sbri = pix.toImage();
-			pix.convertFromImage(sbri.scaled(300,225,QIMAGE_SCALE_MIN,Qt::SmoothTransformation));
+			pix = QPixmap::fromImage(sbri.scaled(300,225,QIMAGE_SCALE_MIN,Qt::SmoothTransformation));
 		}
 		pix.save(szFileName,"PNG");
 
@@ -205,7 +205,7 @@ const QPixmap & KviThemeInfo::mediumScreenshot()
 		if(pix.width() > 600 || pix.height() > 450)
 		{
 			QImage sbri = pix.toImage();
-			pix.convertFromImage(sbri.scaled(640,450,QIMAGE_SCALE_MIN,Qt::SmoothTransformation));
+			pix.fromImage(sbri.scaled(640,450,QIMAGE_SCALE_MIN,Qt::SmoothTransformation));
 		}
 
 		pix.save(szFileName,"PNG");
@@ -263,9 +263,9 @@ namespace KviTheme
 		}
 
 		if(pix.width() > 600 || pix.height() > 450)
-			out.convertFromImage(pix.scaled(640,450,QIMAGE_SCALE_MIN,Qt::SmoothTransformation));
+			out.fromImage(pix.scaled(640,450,QIMAGE_SCALE_MIN,Qt::SmoothTransformation));
 		else
-			out.convertFromImage(pix);
+			out.fromImage(pix);
 
 		szScreenshotFileName = options.absoluteDirectory();
 		KviQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR);
@@ -277,9 +277,9 @@ namespace KviTheme
 		}
 
 		if(pix.width() > 300 || pix.height() > 225)
-			out.convertFromImage(pix.scaled(300,225,QIMAGE_SCALE_MIN,Qt::SmoothTransformation));
+			out.fromImage(pix.scaled(300,225,QIMAGE_SCALE_MIN,Qt::SmoothTransformation));
 		else
-			out.convertFromImage(pix);
+			out.fromImage(pix);
 
 		szScreenshotFileName = options.absoluteDirectory();
 		KviQString::ensureLastCharIs(szScreenshotFileName,KVI_PATH_SEPARATOR_CHAR);
diff --git a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
index 11053e81a..a82cd78c7 100644
--- a/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
+++ b/src/kvirc/kvs/kvi_kvs_corecallbackcommands.cpp
@@ -438,7 +438,8 @@ namespace KviKvsCoreCallbackCommands
 			return true;
 		}
 
-		pButton = (KviScriptUserButton *)(KVSCCC_pWindow->buttonContainer())->child(szName.toUtf8().data(),"KviWindowScriptButton");
+		//pButton = (KviScriptUserButton *)(KVSCCC_pWindow->buttonContainer())->child(szName.toUtf8().data(),"KviWindowScriptButton");
+		pButton = (KviScriptUserButton *)(KVSCCC_pWindow->buttonContainer())->findChild<KviWindowScriptButton*>(szName);
 
 		if(KVSCCC_pCallback->code().isEmpty())
 		{
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
index cacc46748..a9a917bbd 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_af.cpp
@@ -412,7 +412,8 @@ namespace KviKvsCoreSimpleCommands
 			return true;
 		}
 	
-		pButton = (KviScriptUserButton *)(KVSCSC_pWindow->buttonContainer())->child(tbName.toUtf8().data(),"KviWindowScriptButton");
+		//pButton = (KviScriptUserButton *)(KVSCSC_pWindow->buttonContainer())->child(tbName.toUtf8().data(),"KviWindowScriptButton");
+		pButton = (KviScriptUserButton *)(KVSCSC_pWindow->buttonContainer())->findChild<KviWindowScriptButton*>(tbName);
 
 		if(!pButton)
 		{
diff --git a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
index 16d7c20e0..01160ea11 100644
--- a/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
+++ b/src/kvirc/kvs/kvi_kvs_coresimplecommands_gl.cpp
@@ -37,8 +37,6 @@
 
 #include "kvi_out.h"
 
-#include <q3mimefactory.h>
-
 namespace KviKvsCoreSimpleCommands
 {
 	/*
@@ -125,6 +123,8 @@ namespace KviKvsCoreSimpleCommands
 		QString szCommand;
 		if(szTopic.isEmpty())szCommand = "help.open index.html";
 		else {
+/* FIXME removed this usage if the evil goto. better if reimplemented directly in the help module
+			
 			bool bWasFunc = false;
 			if(szTopic[0] == QChar('$'))
 			{
@@ -227,6 +227,8 @@ try_again:
 	
 			szCommand = "help.open ";
 			szCommand += topik;
+*/
+			szCommand = "help.open " + szTopic;
 		}
 
 		// We don't care about the return value...
diff --git a/src/kvirc/ui/kvi_ircview.cpp b/src/kvirc/ui/kvi_ircview.cpp
index bad875cec..7cd4f7e4a 100644
--- a/src/kvirc/ui/kvi_ircview.cpp
+++ b/src/kvirc/ui/kvi_ircview.cpp
@@ -4857,7 +4857,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
 		case 'u': // url link
 		{
 			tip = "<table width=\"100%\">" \
-				"<tr><td valign=\"center\"><img src=\"url_icon\"> <u><font color=\"blue\"><nowrap>";
+				"<tr><td valign=\"center\"><img src=\":/url_icon\"> <u><font color=\"blue\"><nowrap>";
 			if(linkText.length() > 50)
 			{
 				tip += linkText.left(47);
@@ -4866,7 +4866,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
 				tip += linkText;
 			}
 			tip+="</nowrap></font></u></td></tr><tr><td>";
-			QResource::registerResource(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL)->toImage().bits(), "url_icon");
+			QResource::registerResource(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL)->toImage().bits(), "/url_icon");
 			//QMimeSourceFactory::defaultFactory()->setPixmap("url_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_URL)));
 			tip += __tr2qs("Double-click to open this link");
 			tip += "</td></tr></table>";
@@ -4875,7 +4875,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
 		case 'h': // host link
 		{
 			tip = "<table width=\"100%\">" \
-				"<tr><td valign=\"center\"><img src=\"host_icon\"> <u><font color=\"blue\"><nowrap>";
+				"<tr><td valign=\"center\"><img src=\":/host_icon\"> <u><font color=\"blue\"><nowrap>";
 			if(linkText.length() > 50)
 			{
 				tip += linkText.left(47);
@@ -4884,7 +4884,7 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
 				tip += linkText;
 			}
 			tip+="</nowrap></font></u></td></tr><tr><td>";
-			QResource::registerResource(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)->toImage().bits(), "host_icon");
+			QResource::registerResource(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)->toImage().bits(), "/host_icon");
 			//QMimeSourceFactory::defaultFactory()->setPixmap("host_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_SERVER)));
 
 			if(linkText.indexOf('*') != -1)
@@ -4902,8 +4902,8 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
 			// FIXME: #warning "Spit out some server info...hub ?...registered ?"
 
 			tip = "<table width=\"100%\">" \
-				"<tr><td valign=\"center\"><img src=\"server_icon\"> <u><font color=\"blue\"><nowrap>";
-			QResource::registerResource(g_pIconManager->getSmallIcon(KVI_SMALLICON_IRC)->toImage().bits(), "server_icon");
+				"<tr><td valign=\"center\"><img src=\":/server_icon\"> <u><font color=\"blue\"><nowrap>";
+			QResource::registerResource(g_pIconManager->getSmallIcon(KVI_SMALLICON_IRC)->toImage().bits(), "/server_icon");
 			//QMimeSourceFactory::defaultFactory()->setPixmap("server_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_IRC)));
 			if(linkText.length() > 50)
 			{
@@ -4983,8 +4983,8 @@ void KviIrcView::doLinkToolTip(const QRect &rct,QString &linkCmd,QString &linkTe
 			{
 				QString szChan = linkText;
 				QString buf;
-				tip = "<img src=\"chan_icon\"> ";
-				QResource::registerResource(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)->toImage().bits(), "chan_icon");
+				tip = "<img src=\":/chan_icon\"> ";
+				QResource::registerResource(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)->toImage().bits(), "/chan_icon");
 				//QMimeSourceFactory::defaultFactory()->setPixmap("chan_icon",*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CHANNEL)));
 
 				if(szCmd.length()>0) szChan=szCmd;