More Qt4 port and some small fixes

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

15 files changed, 62 insertions, 21 deletions

diff --git a/src/modules/dcc/broker.cpp b/src/modules/dcc/broker.cpp
index 221084dae..66962fd38 100644
--- a/src/modules/dcc/broker.cpp
+++ b/src/modules/dcc/broker.cpp
@@ -24,7 +24,9 @@
 #include "dialogs.h"
 #include "chat.h"
 #include "send.h"
+#ifdef COMPILE_DCC_CANVAS
 #include "canvas.h"
+#endif
 #include "voice.h"
 
 #include "kvi_app.h"
@@ -398,6 +400,8 @@ void KviDccBroker::passiveVoiceExecute(KviDccDescriptor * dcc)
 // ACTIVE CANVAS
 ///////////////////////////////////////////////////////////////////////////////
 
+#ifdef COMPILE_DCC_CANVAS
+
 void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc)
 {
 	if(!dcc->bAutoAccept)
@@ -423,8 +427,11 @@ void KviDccBroker::activeCanvasManage(KviDccDescriptor * dcc)
 	}
 }
 
+#endif
+
 void KviDccBroker::activeCanvasExecute(KviDccBox *box,KviDccDescriptor * dcc)
 {
+#ifdef COMPILE_DCC_CANVAS
 	if(box)box->forgetDescriptor();
 
 	if(!g_pApp->windowExists(dcc->console()))
@@ -445,12 +452,13 @@ void KviDccBroker::activeCanvasExecute(KviDccBox *box,KviDccDescriptor * dcc)
 	if(bMinimized)cnv->minimize();
 
 	m_pDccWindowList->append(cnv);
+#endif
 }
 
 ///////////////////////////////////////////////////////////////////////////////
 // PASSIVE CANVAS
 ///////////////////////////////////////////////////////////////////////////////
-
+#ifdef COMPILE_DCC_CANVAS
 void KviDccBroker::passiveCanvasExecute(KviDccDescriptor * dcc)
 {
 	KviStr tmp(KviStr::Format,"dcc: canvas %s@%s:%s",dcc->szNick.utf8().data(),dcc->szIp.utf8().data(),dcc->szPort.utf8().data());
@@ -462,6 +470,7 @@ void KviDccBroker::passiveCanvasExecute(KviDccDescriptor * dcc)
 	m_pDccWindowList->append(cnv);
 }
 
+#endif
 
 ///////////////////////////////////////////////////////////////////////////////
 // SEND
diff --git a/src/modules/dcc/broker.h b/src/modules/dcc/broker.h
index 5bac15613..c1f253849 100644
--- a/src/modules/dcc/broker.h
+++ b/src/modules/dcc/broker.h
@@ -25,6 +25,13 @@
 //=======================================================================================
 
 #include "kvi_settings.h"
+
+#ifdef COMPILE_USE_QT4
+	// #define COMPILE_DCC_CANVAS
+#else
+	#define COMPILE_DCC_CANVAS
+#endif
+
 #include "kvi_string.h"
 #include "kvi_list.h"
 #include "kvi_sparser.h"
@@ -75,9 +82,10 @@ public:
 
 	void handleChatRequest(KviDccDescriptor * dcc);
 
-
+#ifdef COMPILE_DCC_CANVAS
 	void activeCanvasManage(KviDccDescriptor * dcc);
 	void passiveCanvasExecute(KviDccDescriptor * dcc);
+#endif
 
 	void activeVoiceManage(KviDccDescriptor * dcc);
 	void passiveVoiceExecute(KviDccDescriptor * dcc);
diff --git a/src/modules/dcc/canvas.cpp b/src/modules/dcc/canvas.cpp
index d5475b47e..dfe39e975 100644
--- a/src/modules/dcc/canvas.cpp
+++ b/src/modules/dcc/canvas.cpp
@@ -23,6 +23,9 @@
 #define QT_MODULE_CANVAS
 
 #include "canvas.h"
+
+#ifdef COMPILE_DCC_CANVAS
+
 #include "dialogs.h"
 #include "marshal.h"
 #include "canvaswidget.h"
@@ -294,3 +297,5 @@ void KviDccCanvas::connected()
 
 
 #include "m_canvas.moc"
+
+#endif
diff --git a/src/modules/dcc/canvas.h b/src/modules/dcc/canvas.h
index c9b4b68e3..2e993a25e 100644
--- a/src/modules/dcc/canvas.h
+++ b/src/modules/dcc/canvas.h
@@ -22,6 +22,10 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
+#include "broker.h"
+
+#ifdef COMPILE_DCC_CANVAS
+
 #include "kvi_window.h"
 #include "kvi_string.h"
 
@@ -65,6 +69,6 @@ protected slots:
 	void connected();
 };
 
-
+#endif
 
 #endif // _CANVAS_H_
diff --git a/src/modules/dcc/canvaswidget.cpp b/src/modules/dcc/canvaswidget.cpp
index bccf8e5ab..ef5d70495 100644
--- a/src/modules/dcc/canvaswidget.cpp
+++ b/src/modules/dcc/canvaswidget.cpp
@@ -22,6 +22,9 @@
 
 #include "canvaswidget.h"
 
+#ifdef COMPILE_DCC_CANVAS
+
+
 #include <qcursor.h>
 #include <qpainter.h>
 #include <qsimplerichtext.h>
@@ -1594,3 +1597,5 @@ void KviCanvasWidget::resizeEvent(QResizeEvent *)
 
 
 #include "m_canvaswidget.moc"
+
+#endif
diff --git a/src/modules/dcc/canvaswidget.h b/src/modules/dcc/canvaswidget.h
index c00a6fb74..28d123e19 100644
--- a/src/modules/dcc/canvaswidget.h
+++ b/src/modules/dcc/canvaswidget.h
@@ -22,6 +22,10 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
+#include "broker.h"
+
+#ifdef COMPILE_DCC_CANVAS
+
 
 #include <qcanvas.h>
 
@@ -313,5 +317,6 @@ protected:
 };
 
 
+#endif
 
 #endif //_CANVAS_WIDGET_H_
diff --git a/src/modules/dcc/chat.cpp b/src/modules/dcc/chat.cpp
index 8700640b3..f096ecc71 100644
--- a/src/modules/dcc/chat.cpp
+++ b/src/modules/dcc/chat.cpp
@@ -55,6 +55,7 @@
 #include "kvi_ircconnection.h"
 #include "kvi_ircconnectionuserinfo.h"
 #include "kvi_kvs_eventtriggers.h"
+#include "kvi_qcstring.h"
 
 #ifdef COMPILE_CRYPT_SUPPORT
 	#include "kvi_crypt.h"
@@ -88,7 +89,7 @@ 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(QSplitter::Horizontal,this,"top_splitter");
+	m_pTopSplitter = new QSplitter(Qt::Horizontal,this,"top_splitter");
 	KviThemedLabel * dummy;
 	dummy = new KviThemedLabel(m_pTopSplitter,"dummy_label");
 	KviTalVBox * box = new KviTalVBox(m_pTopSplitter);
@@ -97,7 +98,7 @@ KviDccChat::KviDccChat(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name)
 	createCryptControllerButton(box);
 #endif
 
-	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter");
+	m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
 	m_pIrcView  = new KviIrcView(m_pSplitter,pFrm,this);
 	connect(m_pIrcView,SIGNAL(rightClicked()),this,SLOT(textViewRightClicked()));
 	m_pInput    = new KviInput(this);
@@ -302,7 +303,7 @@ void KviDccChat::ownMessage(const QString &text)
 		return;
 	}
 	
-	QCString szData = encodeText(text);
+	KviQCString szData = encodeText(text);
 	const char * d = szData.data();
 	if(!d)return;
 	
@@ -377,7 +378,7 @@ void KviDccChat::ownAction(const QString &text)
 {
 	if(m_pSlaveThread)
 	{
-		QCString szData = encodeText(text);
+		KviQCString szData = encodeText(text);
 		const char * d = szData.data();
 		if(!d)return;
 		KviStr buf(KviStr::Format,"%cACTION %s%c\r\n",0x01,d,0x01);
diff --git a/src/modules/dcc/descriptor.cpp b/src/modules/dcc/descriptor.cpp
index 77202251c..38adb65a3 100644
--- a/src/modules/dcc/descriptor.cpp
+++ b/src/modules/dcc/descriptor.cpp
@@ -35,9 +35,9 @@
 
 
 static unsigned int g_uNextDescriptorId = 1; // we use 0 as an invalid descriptor id
-static QIntDict<KviDccDescriptor> * g_pDescriptorDict = 0;
+static KviIntDict<KviDccDescriptor> * g_pDescriptorDict = 0;
 
-QIntDict<KviDccDescriptor> * KviDccDescriptor::descriptorDict()
+KviIntDict<KviDccDescriptor> * KviDccDescriptor::descriptorDict()
 {
 	return g_pDescriptorDict;
 }
@@ -62,7 +62,7 @@ KviDccDescriptor::KviDccDescriptor(KviConsole * pConsole)
 	
 	if(!g_pDescriptorDict)
 	{
-		g_pDescriptorDict = new QIntDict<KviDccDescriptor>;
+		g_pDescriptorDict = new KviIntDict<KviDccDescriptor>;
 		g_pDescriptorDict->setAutoDelete(false);
 	}
 	g_pDescriptorDict->replace((long)m_uId,this);
diff --git a/src/modules/dcc/descriptor.h b/src/modules/dcc/descriptor.h
index 4b5b82c60..e08ff6015 100644
--- a/src/modules/dcc/descriptor.h
+++ b/src/modules/dcc/descriptor.h
@@ -27,7 +27,7 @@
 #include "kvi_string.h"
 #include "kvi_console.h"
 
-#include <qintdict.h>
+#include "kvi_intdict.h"
 
 
 class KviDccWindow;
@@ -71,7 +71,7 @@ public:
 	unsigned int id() const { return m_uId; };
 	const QString & idString() const { return m_szId; };
 	static KviDccDescriptor * find(unsigned int uId);
-	static QIntDict<KviDccDescriptor> * descriptorDict();
+	static KviIntDict<KviDccDescriptor> * descriptorDict();
 
 	void triggerCreationEvent(); // this MUST be called by the creator of the descriptor!
 //private:
diff --git a/src/modules/dcc/dialogs.cpp b/src/modules/dcc/dialogs.cpp
index 9f3f28465..b29b21d67 100644
--- a/src/modules/dcc/dialogs.cpp
+++ b/src/modules/dcc/dialogs.cpp
@@ -29,6 +29,8 @@
 #include <qpushbutton.h>
 #include <qlabel.h>
 #include <qstringlist.h>
+#include <qevent.h>
+#include <qdesktopwidget.h>
 
 KviDccBox::KviDccBox(KviDccBroker * br,KviDccDescriptor * dcc)
 {
diff --git a/src/modules/dcc/libkvidcc.cpp b/src/modules/dcc/libkvidcc.cpp
index c8736216b..992701a09 100644
--- a/src/modules/dcc/libkvidcc.cpp
+++ b/src/modules/dcc/libkvidcc.cpp
@@ -2601,10 +2601,10 @@ static bool dcc_kvs_fnc_sessionList(KviKvsModuleFunctionCall * c)
 	KviKvsArray * a = new KviKvsArray();
 	c->returnValue()->setArray(a);
 
-	QIntDict<KviDccDescriptor> * dict = KviDccDescriptor::descriptorDict();
+	KviIntDict<KviDccDescriptor> * dict = KviDccDescriptor::descriptorDict();
 	if(!dict)return true;
 
-	QIntDictIterator<KviDccDescriptor> it(*dict);
+	KviIntDictIterator<KviDccDescriptor> it(*dict);
 
 	int idx = 0;
 	
diff --git a/src/modules/dcc/requests.cpp b/src/modules/dcc/requests.cpp
index 6d7b60d63..db8fb3e72 100644
--- a/src/modules/dcc/requests.cpp
+++ b/src/modules/dcc/requests.cpp
@@ -427,7 +427,7 @@ static void dccModuleParseDccSend(KviDccRequest *dcc)
 	}
 
 	// First of all we check the transfer limits
-	dcc->szParam1=dcc->pConsole->decodeText(dcc->szParam1).data();
+	dcc->szParam1=dcc->pConsole->decodeText(dcc->szParam1);
 	if(!dcc_module_check_limits(dcc))return;
 	if(!dcc_module_check_concurrent_transfers_limit(dcc))return;
 
@@ -716,7 +716,7 @@ static void dccModuleParseDccRSend(KviDccRequest *dcc)
 	//
 	//      DCC [ST]RSEND <filename> <filesize>
 	//
-	dcc->szParam1 = dcc->pConsole->decodeText(dcc->szParam1).data();
+	dcc->szParam1 = dcc->pConsole->decodeText(dcc->szParam1);
 	if(!dcc_module_check_limits(dcc))return;
 	if(!dcc_module_check_concurrent_transfers_limit(dcc))return;
 
@@ -1057,7 +1057,7 @@ static void dccModuleParseDccCanvas(KviDccRequest *dcc)
 //				__tr("The above request is broken: the second parameter is '%s' and shoud be 'chat'; trying to continue"),dcc->szParam1.ptr());
 //		}
 //	}
-
+#ifdef COMPILE_DCC_CANVAS
 	KviDccDescriptor * d = new KviDccDescriptor(dcc->pConsole);
 	d->szNick            = dcc->ctcpMsg->pSource->nick();
 	d->szUser            = dcc->ctcpMsg->pSource->username();
@@ -1075,6 +1075,7 @@ static void dccModuleParseDccCanvas(KviDccRequest *dcc)
 	dcc_module_set_dcc_type(d,"CANVAS");
 	d->triggerCreationEvent();
 	g_pDccBroker->activeCanvasManage(d);
+#endif
 }
 
 
diff --git a/src/modules/dcc/send.cpp b/src/modules/dcc/send.cpp
index 8c30a03e3..fe28e6020 100644
--- a/src/modules/dcc/send.cpp
+++ b/src/modules/dcc/send.cpp
@@ -1513,7 +1513,7 @@ void KviDccFileTransfer::connectionInProgress()
 			}
 		}
 
-		KviStr port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort.utf8().data() : m_pMarshal->localPort();
+		KviStr port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
 		//#warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned nuumber)"
 		struct in_addr a;
 		if(KviNetUtils::stringIpToBinaryIp(ip,&a))ip.setNum(htonl(a.s_addr));
diff --git a/src/modules/dcc/send.h b/src/modules/dcc/send.h
index e7bd7ceda..81276820b 100644
--- a/src/modules/dcc/send.h
+++ b/src/modules/dcc/send.h
@@ -143,10 +143,11 @@ protected:
 };
 
 class KviDccFileTransfer;
-class KviStyledCheckBox;
 class QSpinBox;
 class QTimer;
 
+#include "kvi_styled_controls.h"
+
 class KviDccFileTransferBandwidthDialog : public QDialog
 {
 	Q_OBJECT
diff --git a/src/modules/dcc/voice.cpp b/src/modules/dcc/voice.cpp
index 26ef25f67..787d43665 100644
--- a/src/modules/dcc/voice.cpp
+++ b/src/modules/dcc/voice.cpp
@@ -652,7 +652,7 @@ KviDccVoice::KviDccVoice(KviFrame *pFrm,KviDccDescriptor * dcc,const char * name
 	m_pDescriptor = dcc;
 	m_pSlaveThread = 0;
 
-	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter");
+	m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
 	m_pIrcView = new KviIrcView(m_pSplitter,pFrm,this);
 
 	m_pHBox = new KviTalHBox(this);
@@ -767,7 +767,7 @@ void KviDccVoice::connectionInProgress()
 		if(m_pDescriptor->bSendRequest)
 		{
 			KviStr ip     = !m_pDescriptor->szFakeIp.isEmpty() ? m_pDescriptor->szFakeIp : m_pDescriptor->szListenIp;
-			KviStr port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort.utf8().data() : m_pMarshal->localPort();
+			KviStr port   = !m_pDescriptor->szFakePort.isEmpty() ? m_pDescriptor->szFakePort : m_pMarshal->localPort();
 //#warning "OPTION FOR SENDING 127.0.0.1 and so on (not an unsigned nuumber)"
 			struct in_addr a;
 			if(kvi_stringIpToBinaryIp(ip.ptr(),&a))ip.setNum(htonl(a.s_addr));