more qt4 port

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

17 files changed, 134 insertions, 34 deletions

diff --git a/src/modules/my/win32/idleui_05.vcproj b/src/modules/my/win32/idleui_05.vcproj
index dbdb5c55c..03208f917 100644
--- a/src/modules/my/win32/idleui_05.vcproj
+++ b/src/modules/my/win32/idleui_05.vcproj
@@ -187,7 +187,7 @@
 			/>

 			<Tool

 				Name="VCLinkerTool"

-				AdditionalDependencies="qt-$(QTTAG).lib qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib"

+				AdditionalDependencies="qt3support4.lib qtcore4.lib qtnetwork4.lib qtgui4.lib  qtmain.lib libeay32.lib SSLeay32.lib ws2_32.lib kvilib.lib kvirc.lib msvcrt.lib perl58.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib winmm.lib"

 				OutputFile="$(OutDir)/$(ProjectName).dll"

 				LinkIncremental="1"

 				SuppressStartupBanner="true"

diff --git a/src/modules/perlcore/libkviperlcore.cpp b/src/modules/perlcore/libkviperlcore.cpp
index 308b4a8d8..38526094f 100644
--- a/src/modules/perlcore/libkviperlcore.cpp
+++ b/src/modules/perlcore/libkviperlcore.cpp
@@ -32,7 +32,7 @@
 #include "kvi_kvs_script.h"
 #include "kvi_kvs_variant.h"
 #include "kvi_userinput.h"
-
+#include "kvi_qcstring.h"
 #include "kvi_dict.h"
 
 #ifdef DEBUG
@@ -227,7 +227,7 @@ bool KviPerlInterpreter::execute(
 	
 	g_lWarningList.clear();
 
-	QCString szUtf8 = szCode.utf8();
+	KviQCString szUtf8 = szCode.utf8();
 	PERL_SET_CONTEXT(m_pInterpreter);
 	
 	// clear the _ array
diff --git a/src/modules/popupeditor/popupeditor.cpp b/src/modules/popupeditor/popupeditor.cpp
index 06478ff3e..fbf27a931 100644
--- a/src/modules/popupeditor/popupeditor.cpp
+++ b/src/modules/popupeditor/popupeditor.cpp
@@ -202,8 +202,11 @@ KviSinglePopupEditor::KviSinglePopupEditor(QWidget * par)
 	m_pMenuButton = new QPushButton(__tr2qs("Test"),this);
 	g->addWidget(m_pMenuButton,0,2);
 	connect(m_pMenuButton,SIGNAL(clicked()),this,SLOT(testPopup()));
-
+#ifdef COMPILE_USE_QT4
+	QSplitter * spl = new QSplitter(Qt::Vertical,this,"popupeditor");
+#else
 	QSplitter * spl = new QSplitter(QSplitter::Vertical,this);
+#endif
 
 	m_pListView = new KviTalListView(spl);
 	m_pListView->addColumn(__tr2qs("Item"));
@@ -1024,8 +1027,11 @@ KviPopupEditor::KviPopupEditor(QWidget * par)
 : QWidget(par)
 {
 	QGridLayout * l = new QGridLayout(this,1,1,0,2);
-
+#ifdef COMPILE_USE_QT4
+	QSplitter * spl = new QSplitter(Qt::Horizontal,this,"popupeditor");
+#else
 	QSplitter * spl = new QSplitter(QSplitter::Horizontal,this);
+#endif
 	l->addWidget(spl,0,0);
 	
 	KviTalVBox * box = new KviTalVBox(spl);
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 3b2d2fdcd..c85b383bc 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -74,9 +74,11 @@ KviRawEditor::KviRawEditor(QWidget * par)
 : QWidget(par,"raw_event_editor")
 {
 	QGridLayout * l = new QGridLayout(this,1,1,2,2);
-
+#ifdef COMPILE_USE_QT4
+	QSplitter * spl = new QSplitter(Qt::Horizontal,this,"raweditorv");
+#else
 	QSplitter * spl = new QSplitter(QSplitter::Horizontal,this);
-
+#endif
 	l->addWidget(spl,0,0);
 
 	KviTalVBox * boxi = new KviTalVBox(spl);
diff --git a/src/modules/setup/setupwizard.cpp b/src/modules/setup/setupwizard.cpp
index d1bd90d32..4aa323b54 100644
--- a/src/modules/setup/setupwizard.cpp
+++ b/src/modules/setup/setupwizard.cpp
@@ -211,7 +211,7 @@ KviSetupWizard::KviSetupWizard()
 
 	QString tmp;
 
-	m_pDirButtonGroup = new QVButtonGroup(__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox);
+	m_pDirButtonGroup = new KviTalVButtonGroup(__tr2qs("Store configuration in folder"),m_pDirectory->m_pVBox);
 	m_pDirUsePrev = new QRadioButton(__tr2qs("Use settings folder from previous installation"),m_pDirButtonGroup);
 	connect(m_pDirUsePrev,SIGNAL(clicked()),this,SLOT(oldDirClicked()));
 	
@@ -311,7 +311,7 @@ KviSetupWizard::KviSetupWizard()
 	if(nick.isEmpty())nick = "newbie";
 	if(nick == "root")nick = "newbie";
 //m_pIdentity->m_pVBox
-	KviTalGroupBox * gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Basic Properties"),m_pIdentity->m_pVBox);
+	KviTalGroupBox * gbox = new KviTalGroupBox(1,Qt::Horizontal,__tr2qs("Basic Properties"),m_pIdentity->m_pVBox);
 
 	m_pNickSelector = new KviStringSelector(gbox,__tr2qs("Nickname:"),&(KVI_OPTION_STRING(KviOption_stringNickname1)),true);
 	m_pNickSelector->setMinimumLabelWidth(120);
@@ -328,7 +328,7 @@ KviSetupWizard::KviSetupWizard()
 	QString szCenterEnd("</center>");
 	QString szTrailing = "<br><br>" + szOptionalCtcpUserInfo + szCenterEnd;
 
-	gbox = new KviTalGroupBox(1,KviTalGroupBox::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox);
+	gbox = new KviTalGroupBox(1,Qt::Horizontal,__tr2qs("Profile"),m_pIdentity->m_pVBox);
 
 	KviTalHBox* hb = new KviTalHBox(gbox);
 	hb->setSpacing(4);
@@ -405,7 +405,7 @@ KviSetupWizard::KviSetupWizard()
 		"in order to preserve your current visual settings.<br><br>" \
 		"If you don't know what to choose, just use the default.</p>"));
 
-	m_pThemeButtonGroup = new QVButtonGroup(m_pTheme->m_pVBox);
+	m_pThemeButtonGroup = new KviTalVButtonGroup(m_pTheme->m_pVBox);
 	
 	KviTalHBox* pThemesHb = new KviTalHBox(m_pThemeButtonGroup);
 
@@ -465,7 +465,7 @@ KviSetupWizard::KviSetupWizard()
 			"Now you should specify an IRC server, to be connected to it"));
 
 
-	m_pServersButtonGroup = new QVButtonGroup(__tr2qs("Choose a server to connect"),m_pServers->m_pVBox);
+	m_pServersButtonGroup = new KviTalVButtonGroup(__tr2qs("Choose a server to connect"),m_pServers->m_pVBox);
 	
 	m_pServersChooseFromList = new QRadioButton(__tr2qs("Choose from built-in server list"),m_pServersButtonGroup);
 	
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index 476e969bf..f0229bf3d 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -30,7 +30,13 @@
 #include <qlabel.h>
 #include <qpixmap.h>
 #include <qlineedit.h>
-#include <qvbuttongroup.h>
+#ifdef COMPILE_USE_QT4
+#include <Q3VButtonGroup>
+#define KviTalVButtonGroup Q3VButtonGroup
+#else
+ #include <qvbuttongroup.h>
+#define KviTalVButtonGroup QVButtonGroup
+#endif
 #include <qradiobutton.h>
 #include <qcombobox.h>
 #include <qcheckbox.h>
@@ -76,7 +82,10 @@ public:
 	KviSetupPage  * m_pServers;
 	
 	// Theme
-	QVButtonGroup * m_pThemeButtonGroup;
+
+
+	KviTalVButtonGroup * m_pThemeButtonGroup;
+
 	QRadioButton  * m_pThemeHiRes;
 	QRadioButton  * m_pThemeLoRes;
 	QRadioButton  * m_pThemeNone;
@@ -88,7 +97,7 @@ public:
 	//Dir
 	QLineEdit     * m_pDataPathEdit;
 	QLineEdit     * m_pIncomingPathEdit;
-	QVButtonGroup * m_pDirButtonGroup;
+	KviTalVButtonGroup * m_pDirButtonGroup;
 	QRadioButton  * m_pDirUsePrev;
 	QRadioButton  * m_pDirUseNew;
 #ifdef COMPILE_ON_WINDOWS
@@ -111,7 +120,7 @@ public:
 	KviStringSelector * m_pOtherInfoSelector;
 	
 	//Servers
-	QVButtonGroup * m_pServersButtonGroup;
+	KviTalVButtonGroup * m_pServersButtonGroup;
 	QRadioButton  * m_pServersChooseFromList;
 	QRadioButton  * m_pServersSpecifyManually;
 	QRadioButton  * m_pServersOpenIrcUrl;
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.cpp b/src/modules/sharedfileswindow/sharedfileswindow.cpp
index 119ab0dc2..c6deec20d 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.cpp
+++ b/src/modules/sharedfileswindow/sharedfileswindow.cpp
@@ -206,8 +206,11 @@ KviSharedFilesWindow::KviSharedFilesWindow(KviModuleExtensionDescriptor * d,KviF
 : KviWindow(KVI_WINDOW_TYPE_TOOL,lpFrm,"shared files window",0) , KviModuleExtension(d)
 {
 	g_pSharedFilesWindow = this;
-
+#ifdef COMPILE_USE_QT4
+	m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
+#else
 	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter");
+#endif
 
 	KviTalVBox * vbox = new KviTalVBox(m_pSplitter);
 
diff --git a/src/modules/socketspy/socketspywindow.cpp b/src/modules/socketspy/socketspywindow.cpp
index d7e0dd040..6456d5992 100644
--- a/src/modules/socketspy/socketspywindow.cpp
+++ b/src/modules/socketspy/socketspywindow.cpp
@@ -37,7 +37,11 @@ KviSocketSpyWindow::KviSocketSpyWindow(KviFrame * lpFrm,KviConsole * lpConsole)
 : KviWindow(KVI_WINDOW_TYPE_SOCKETSPY,lpFrm,"socket_spy",lpConsole) , KviIrcDataStreamMonitor(lpConsole->context())
 {
 	g_pSocketSpyWindowList->append(this);
+	#ifdef COMPILE_USE_QT4
+	m_pSplitter = new QSplitter(Qt::Horizontal,this,"splitter");
+	#else
 	m_pSplitter = new QSplitter(QSplitter::Horizontal,this,"splitter");
+#endif
 	m_pIrcView = new KviIrcView(m_pSplitter,lpFrm,this);
 	// Ensure proper focusing
 	//setFocusHandler(m_pIrcView,this);
diff --git a/src/modules/system/libkvisystem.cpp b/src/modules/system/libkvisystem.cpp
index 7f29e2c23..56e0bbd3c 100644
--- a/src/modules/system/libkvisystem.cpp
+++ b/src/modules/system/libkvisystem.cpp
@@ -27,7 +27,7 @@
 #include "kvi_string.h"
 
 #include "kvi_locale.h"
-
+#include "kvi_qcstring.h"
 #include "kvi_app.h"
 #include "kvi_env.h"
 #include "kvi_osinfo.h"
@@ -196,11 +196,11 @@ static bool system_kvs_fnc_getenv(KviKvsModuleFunctionCall *c)
 		KVSM_PARAMETER("variable",KVS_PT_NONEMPTYSTRING,0,szVariable)
 	KVSM_PARAMETERS_END(c)
 
-	QCString szVar = szVariable.local8Bit();
+	KviQCString szVar = szVariable.local8Bit();
 #ifdef COMPILE_ON_WINDOWS
 	QString env = getenv(szVar.data());
 	QString def = __tr2qs("No environment variable found, please don't use the %% in the request");
-	c->returnValue()->setString(env ? QString::fromLocal8Bit(env) : QString::fromLocal8Bit(def));
+	c->returnValue()->setString(env.isEmpty() ? QString::fromLocal8Bit(env) : QString::fromLocal8Bit(def));
 #else
 	char * b = kvi_getenv(szVar.data());
 	c->returnValue()->setString(b ? QString::fromLocal8Bit(b) : QString::null);
@@ -442,7 +442,7 @@ static bool system_kvs_fnc_dcop(KviKvsModuleFunctionCall *c)
 {
 	bool bTestMode = false;
 
-	QCString szApp,szObj,szFun;
+	KviQCString szApp,szObj,szFun;
 	QStringList parms;
 	
 	KVSM_PARAMETERS_BEGIN(c)
@@ -624,8 +624,8 @@ static bool system_kvs_cmd_setenv(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("value",KVS_PT_STRING,KVS_PF_OPTIONAL,szValue)
 	KVSM_PARAMETERS_END(c)
 
-	QCString szVar = szVariable.local8Bit();
-	QCString szVal = szValue.local8Bit();
+	KviQCString szVar = szVariable.local8Bit();
+	KviQCString szVal = szValue.local8Bit();
 
 	if(szVal.isEmpty())kvi_unsetenv(szVar.data());
 	else
diff --git a/src/modules/theme/managementdialog.cpp b/src/modules/theme/managementdialog.cpp
index 4b0150731..e72ede3d6 100644
--- a/src/modules/theme/managementdialog.cpp
+++ b/src/modules/theme/managementdialog.cpp
@@ -54,7 +54,10 @@
 #include <qtooltip.h>
 #include <qimage.h>
 #include <kvi_tal_textedit.h>
-#include <qmultilineedit.h>
+//#include <qmultilineedit.h>
+#ifdef COMPILE_USE_QT4
+#include <QCloseEvent>
+#endif
 #include <qbuffer.h>
 
 #include "kvi_options.h"
@@ -105,7 +108,7 @@ KviThemeListBoxItem::KviThemeListBoxItem(KviTalListBox * box,KviThemeInfo * inf)
 	t += "<br><nobr><font size=\"-1\">";
 	t += inf->description();
 	t += "</font></nobr>";
-	m_pText = new QSimpleRichText(t,box->font());
+	m_pText = new KviTalSimpleRichText(t,box->font());
 	int iWidth = box->visibleWidth();
 	if(iWidth < LVI_MINIMUM_CELL_WIDTH)iWidth = LVI_MINIMUM_CELL_WIDTH;
 	iWidth -= LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER;
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index 7f363618e..c01096af0 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -29,7 +29,13 @@
 #include "kvi_theme.h"
 
 #include <qdialog.h>
+#ifdef COMPILE_USE_QT4
+#include <Q3SimpleRichText>
+#define KviTalSimpleRichText Q3SimpleRichText
+#else
 #include <qsimplerichtext.h>
+#define KviTalSimpleRichText QSimpleRichText
+#endif
 #include "kvi_tal_listbox.h"
 #include <qcombobox.h>
 #include "kvi_tal_popupmenu.h"
@@ -42,7 +48,8 @@ class KviTalTextEdit;
 class QPushButton;
 class QLabel;
 class QCheckBox;
-class QMultiLineEdit;
+
+//class QMultiLineEdit;
 
 class KviDynamicToolTip;
 class KviStyledToolButton;
@@ -55,7 +62,7 @@ public:
 	virtual ~KviThemeListBoxItem();
 public:
 	KviThemeInfo * m_pThemeInfo;
-	QSimpleRichText * m_pText;
+	KviTalSimpleRichText * m_pText;
 public:
 	KviThemeInfo * themeInfo(){ return m_pThemeInfo; };
 	virtual int height ( const KviTalListBox * lb ) const ;
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index 43f80fa89..a9401f5c2 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -36,7 +36,12 @@
 #include <qtooltip.h>
 #include <qimage.h>
 #include <kvi_tal_textedit.h>
+#ifdef COMPILE_USE_QT4
+#include <Q3MultiLineEdit>
+#include <QDateTime>
+#else
 #include <qmultilineedit.h>
+#endif
 #include <qbuffer.h>
 #include <qlabel.h>
 #include <qregexp.h>
@@ -328,7 +333,11 @@ void KviPackThemeDialog::imageSelectionChanged(const QString &szImagePath)
 	{
 		QPixmap out;
 		if(pix.width() > 300 || pix.height() > 225)
+#ifdef COMPILE_USE_QT4
+			out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio,Qt::SmoothTransformation));
+#else
 			out.convertFromImage(pix.smoothScale(300,225,QImage::ScaleMin));
+#endif
 		else
 			out.convertFromImage(pix);
 		m_pImageLabel->setPixmap(out);
@@ -365,7 +374,11 @@ bool KviPackThemeDialog::packTheme()
 	if(!pix.isNull())
 	{
 		if(pix.width() > 300 || pix.height() > 225)
+		#ifdef COMPILE_USE_QT4
+			out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
+	#else
 			out.convertFromImage(pix.smoothScale(300,225,QImage::ScaleMin));
+#endif
 		else
 			out.convertFromImage(pix);
 	} else {
@@ -394,7 +407,11 @@ bool KviPackThemeDialog::packTheme()
 	if(!out.isNull())
 	{
 		QByteArray * pba = new QByteArray();
+#ifdef COMPILE_USE_QT4
+	QBuffer buffer(pba,0);
+#else		
 		QBuffer buffer(*pba);
+#endif	
 		buffer.open(IO_WriteOnly);
 		out.save(&buffer,"PNG");
 		buffer.close();
@@ -428,7 +445,11 @@ bool KviPackThemeDialog::packTheme()
 		{
 			KviQString::sprintf(szTmp,"Theme%dScreenshot",iIdx);
 			QByteArray * pba = new QByteArray();
+#ifdef COMPILE_USE_QT4
+			QBuffer bufferz(pba,0);
+#else
 			QBuffer bufferz(*pba);
+#endif
 			bufferz.open(IO_WriteOnly);
 			pixScreenshot.save(&bufferz,"PNG");
 			bufferz.close();
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index b40620c54..62ca0116e 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -36,7 +36,12 @@
 #include <qtooltip.h>
 #include <qimage.h>
 #include <kvi_tal_textedit.h>
+#ifdef COMPILE_USE_QT4
+#include <Q3MultiLineEdit>
+#include <QDateTime>
+#else
 #include <qmultilineedit.h>
+#endif
 #include <qbuffer.h>
 #include <qlabel.h>
 
@@ -187,7 +192,11 @@ void KviSaveThemeDialog::imageSelectionChanged(const QString &szImagePath)
 	{
 		QPixmap out;
 		if(pix.width() > 300 || pix.height() > 225)
+			#ifdef COMPILE_USE_QT4
+			out.convertFromImage(pix.scaled(300,225,Qt::KeepAspectRatio));
+		#else
 			out.convertFromImage(pix.smoothScale(300,225,QImage::ScaleMin));
+#endif
 		else
 			out.convertFromImage(pix);
 		m_pImageLabel->setPixmap(out);
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index 776eb23a9..fb508c7a4 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -34,7 +34,12 @@
 #include "kvi_sourcesdate.h"
 #include "kvi_theme.h"
 #include "kvi_frame.h"
-
+#ifdef COMPILE_USE_QT4
+#define KviTalMimeSourceFactory Q3MimeSourceFactory
+#include <Q3MimeSourceFactory>
+#else
+#define KviTalMimeSourceFactory QMimeSourceFactory
+#endif
 #include <qmime.h>
 
 namespace KviThemeFunctions
@@ -257,9 +262,9 @@ namespace KviThemeFunctions
 
 		
 
-		QMimeSourceFactory::defaultFactory()->setPixmap("theme_dialog_pack_image",pix);
-		QMimeSourceFactory::defaultFactory()->setText("theme_dialog_details",szDetails);
-		QMimeSourceFactory::defaultFactory()->setText("theme_dialog_main",hd.szHtmlText);
+		KviTalMimeSourceFactory::defaultFactory()->setPixmap("theme_dialog_pack_image",pix);
+		KviTalMimeSourceFactory::defaultFactory()->setText("theme_dialog_details",szDetails);
+		KviTalMimeSourceFactory::defaultFactory()->setText("theme_dialog_main",hd.szHtmlText);
 	
 		QString beginCenter = "<center>";
 		QString endCenter = "</center>";
@@ -320,7 +325,7 @@ namespace KviThemeFunctions
 			KviQString::sprintf(szScreenshot,"<p><center><img src=\"theme_shot%d\"></center></p>",iUniqueIndexInDocument);
 			QString szTmp;
 			KviQString::sprintf(szTmp,"theme_shot%d",iUniqueIndexInDocument);
-			QMimeSourceFactory::defaultFactory()->setPixmap(szTmp,pixScreenshot);
+			KviTalMimeSourceFactory::defaultFactory()->setPixmap(szTmp,pixScreenshot);
 		} else {
 			szScreenshot = "";
 		}
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index 2beb20829..aa78ad9b5 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -32,7 +32,17 @@
 #include "kvi_fileutils.h"
 
 #include <qpushbutton.h>
+
+#ifdef COMPILE_USE_QT4
+#include <Q3SimpleRichText>
+#include <QDesktopWidget>
+#include <QCloseEvent>
+#define KviTalSimpleRichText Q3SimpleRichText
+#else
 #include <qsimplerichtext.h>
+#define KviTalSimpleRichText QSimpleRichText
+#endif
+
 #include <qfont.h>
 #include <qtextcodec.h>
 #include <qpainter.h>
@@ -54,7 +64,11 @@ KviTipFrame::KviTipFrame(QWidget * par)
 	KviStr buffer;
 	g_pApp->findImage(buffer,"kvi_tip.png");
 	m_pTipPixmap = new QPixmap(buffer.ptr());
+#ifdef COMPILE_USE_QT4
+	setBackgroundMode(Qt::NoBackground);
+#else
 	setBackgroundMode(QWidget::NoBackground);
+#endif
 	setFrameStyle(QFrame::Sunken | QFrame::WinPanel);
 }
 
@@ -79,7 +93,8 @@ void KviTipFrame::drawContents(QPainter *p)
 	QFont f = QFont();
 	f.setStyleHint(QFont::SansSerif);
 	f.setPointSize(12);
-	QSimpleRichText doc(m_szText,f);
+
+	KviTalSimpleRichText doc(m_szText,f);
 	doc.setWidth(width() - 80);
 
 	QRegion reg(0,0,1000,20000);
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 9cff780f8..2f595c658 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -144,7 +144,11 @@ UrlDialog::UrlDialog(KviPtrList<KviUrl> *g_pList)
 	connect(m_pUrlList,SIGNAL(rightButtonPressed(KviTalListViewItem *, const QPoint &, int)),SLOT(popup(KviTalListViewItem *, const QPoint &, int)));
 
 //	setFocusHandlerNoChildren(m_pUrlList);
+#ifdef COMPILE_USE_QT4
+	m_pUrlList->setFocusPolicy(Qt::StrongFocus);
+#else
 	m_pUrlList->setFocusPolicy(QWidget::StrongFocus);
+#endif
 	m_pUrlList->setFocus();
 }
 
@@ -518,7 +522,12 @@ void loadUrlList()
 	QFile file;
 	file.setName(QString::fromUtf8(urllist.ptr()));
 	if (!file.open(IO_ReadOnly))return;
+#ifdef COMPILE_USE_QT4
+	Q3TextStream stream(&file);
+#else
 	QTextStream stream(&file);
+#endif
+
 
 	g_pList->clear();
 
@@ -577,8 +586,11 @@ void loadBanList()
 	QFile file;
 	file.setName(QString::fromUtf8(banlist.ptr()));
 	if (!file.open(IO_ReadOnly))return;
+#ifdef COMPILE_USE_QT4
+	Q3TextStream stream(&file);
+#else
 	QTextStream stream(&file);
-
+#endif
 	g_pBanList->clear();
 
 	int i=0;
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index 80e39697c..c1e1ad940 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -27,7 +27,11 @@
 #include <qstring.h>
 #include <qpushbutton.h>
 #include <qfile.h>
+#ifdef COMPILE_USE_QT4
+#include <Q3TextStream>
+#else
 #include <qtextstream.h>
+#endif
 #include <qcheckbox.h>
 #include "kvi_tal_listbox.h"
 #include <qmenubar.h>