More Qt4 tweaks

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

29 files changed, 84 insertions, 59 deletions

diff --git a/src/modules/logview/logviewmdiwindow.cpp b/src/modules/logview/logviewmdiwindow.cpp
index fd01b5830..da67b5088 100644
--- a/src/modules/logview/logviewmdiwindow.cpp
+++ b/src/modules/logview/logviewmdiwindow.cpp
@@ -33,13 +33,12 @@
 #include "kvi_app.h"

 #include "kvi_fileutils.h"

 #ifdef COMPILE_USE_QT4

-#include <Q3Accel>

-#include <Q3ValueList>

-#include <Q3ProgressDialog>

+	#include <q3progressdialog.h>

 #else

-#include <qaccel.h>

-#include <qprogressdialog.h> 

+	#include <qprogressdialog.h> 

 #endif

+#include "kvi_valuelist.h"
+#include "kvi_accel.h"
 #include <qpixmap.h>

 #include <qsplitter.h>

 #include <qtoolbutton.h>

@@ -159,11 +158,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 #else

 		m_pIrcView->setFocusPolicy(QWidget::ClickFocus);

 #endif

-#ifdef COMPILE_USE_QT4

-	Q3ValueList<int> li;

-#else

-	QValueList<int> li;

-#endif

+	KviValueList<int> li;

 	li.append(110);

 	li.append(width()-110);

 	m_pSplitter->setSizes(li);

@@ -173,12 +168,7 @@ KviLogViewMDIWindow::KviLogViewMDIWindow(KviModuleExtensionDescriptor * d,KviFra
 	

 	cacheFileList();

 	setupItemList();

-#ifdef COMPILE_USE_QT4

-

-	Q3Accel *a = new Q3Accel( this );

-#else

-	QAccel *a = new QAccel( this );

-#endif

+	KviAccel *a = new KviAccel( this );

         a->connectItem( a->insertItem(Qt::Key_F+Qt::CTRL),

                         m_pIrcView,

                         SLOT(toggleToolWidget()) );

diff --git a/src/modules/logview/logviewmdiwindow.h b/src/modules/logview/logviewmdiwindow.h
index de65c02d8..f0a196854 100644
--- a/src/modules/logview/logviewmdiwindow.h
+++ b/src/modules/logview/logviewmdiwindow.h
@@ -5,7 +5,7 @@
 //   Creation date : Tue Apr 23 2002 18:05:59 by Juanjo �varez
 //
 //   This file is part of the KVirc irc client distribution
-//   Copyright (C) 1999-2002 Szymon Stefanek (pragma at kvirc dot net)
+//   Copyright (C) 1999-2007 Szymon Stefanek (pragma at kvirc dot net)
 //
 //   This program is FREE software. You can redistribute it and/or
 //   modify it under the terms of the GNU General Public License
@@ -22,6 +22,7 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
+#include "kvi_settings.h"
 #include "kvi_window.h"
 #include "kvi_moduleextension.h"
 
diff --git a/src/modules/notifier/notifiermessage.h b/src/modules/notifier/notifiermessage.h
index f91f4097a..8a86fa6a4 100644
--- a/src/modules/notifier/notifiermessage.h
+++ b/src/modules/notifier/notifiermessage.h
@@ -33,7 +33,14 @@
 #include <qtimer.h>
 #include <qpixmap.h>
 #include <qimage.h>
-#include <qsimplerichtext.h>
+#ifdef COMPILE_USE_QT4
+	#include <q3simplerichtext.h>
+	#ifndef QSimpleRichText
+		#define QSimpleRichText Q3SimpleRichText
+	#endif
+#else
+	#include <qsimplerichtext.h>
+#endif
 #include <qfont.h>
 #include <qcolor.h>
 #include <qlineedit.h>
diff --git a/src/modules/notifier/notifierwindow.cpp b/src/modules/notifier/notifierwindow.cpp
index d6e1045e7..fdf99a2b6 100644
--- a/src/modules/notifier/notifierwindow.cpp
+++ b/src/modules/notifier/notifierwindow.cpp
@@ -115,12 +115,17 @@ KviNotifierWindow::KviNotifierWindow()
 	m_iInputHeight = cfg.readIntEntry("InputHeight",20);
 	if(m_iInputHeight < 10)m_iInputHeight = 10;
 
+#ifdef COMPILE_USE_QT4
+	setAttribute(Qt::WA_NoSystemBackground); // This disables automatic qt double buffering

+	setAutoFillBackground(false);
+	setFocusPolicy(Qt::NoFocus);
+#else
 	setBackgroundMode(QWidget::NoBackground);
 	setFocusPolicy(QWidget::NoFocus);
+#endif
 	setMouseTracking(true);
 	//setCursor(m_cursor);
 	
-	hide();
 	m_pLineEdit = new QLineEdit(this);
 	m_pLineEdit->setGeometry(0,0,0,0);
 	m_pLineEdit->hide();
@@ -173,6 +178,8 @@ KviNotifierWindow::KviNotifierWindow()
 	m_pWndBorder->centerTitle(titleFontMetrics.height());
 	
 	connect(g_pApp,SIGNAL(reloadImages()),this,SLOT(reloadImages()));
+
+	hide();
 }
 
 KviNotifierWindow::~KviNotifierWindow()
@@ -197,9 +204,12 @@ void KviNotifierWindow::reloadImages()
 	if((p = g_pIconManager->getPixmap("notifier_background.png")))
 		m_pixBckgrnd = *p;
 	
-	if ( p->mask() )
-	setMask( *p->mask() );
-
+#ifdef COMPILE_USE_QT4
+	setMask(p->mask());
+#else
+	if(p->mask())
+		setMask(*(p->mask()));
+#endif
 	m_pixBackground = m_pixBckgrnd;
 	m_pixBackgroundHighlighted = m_pixBckgrnd;
 	m_pWndBorder->resize(m_pixBackground.size());
@@ -1020,7 +1030,11 @@ void KviNotifierWindow::redrawWindow()
 void KviNotifierWindow::setCursor(int cur) {
 	if (m_cursor.shape()!=cur) {
 		if(QApplication::overrideCursor()) QApplication::restoreOverrideCursor();
+#ifdef COMPILE_USE_QT4
+		m_cursor.setShape((Qt::CursorShape)cur);
+#else
 		m_cursor.setShape(cur);
+#endif
 		QApplication::setOverrideCursor(m_cursor);
 	} else if (cur==-1)
 		if(QApplication::overrideCursor()) QApplication::restoreOverrideCursor();
diff --git a/src/modules/notifier/notifierwindow.h b/src/modules/notifier/notifierwindow.h
index 9cc04144a..f986393a7 100644
--- a/src/modules/notifier/notifierwindow.h
+++ b/src/modules/notifier/notifierwindow.h
@@ -31,7 +31,15 @@
 #include <qtimer.h>
 #include <qpixmap.h>
 #include <qimage.h>
-#include <qsimplerichtext.h>
+#ifdef COMPILE_USE_QT4
+	#include <q3simplerichtext.h>
+	#ifndef QSimpleRichText
+		#define QSimpleRichText Q3SimpleRichText
+	#endif
+#else
+	#include <qsimplerichtext.h>
+#endif
+
 #include <qfont.h>
 #include <qcolor.h>
 #include <qlineedit.h>
diff --git a/src/modules/notifier/notifierwindowtabs.cpp b/src/modules/notifier/notifierwindowtabs.cpp
index 698eac85c..21c1e0dfe 100644
--- a/src/modules/notifier/notifierwindowtabs.cpp
+++ b/src/modules/notifier/notifierwindowtabs.cpp
@@ -329,7 +329,7 @@ void KviNotifierWindowTabs::prev()
 	if(!m_pTabFocused)return;
 
 	KviNotifierWindowTab * tab;
-	QPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 
 	tab = m_tabMap[m_pTabFocused->wnd()];
 	tabIterator.atFirst();
@@ -350,7 +350,7 @@ void KviNotifierWindowTabs::next()
 	if(!m_pTabFocused)return;
 	
 	KviNotifierWindowTab * tab;
-	QPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 
 	tab = m_tabMap[m_pTabFocused->wnd()];
 	tabIterator.atFirst();
@@ -504,7 +504,7 @@ void KviNotifierWindowTabs::setFocusOn(KviNotifierWindowTab * tab)
 
 	//scrollTabsRight();
 
-	QPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 	
 	
 	tabIterator.toFirst();
@@ -520,7 +520,7 @@ void KviNotifierWindowTabs::setFocusOn(KviNotifierWindowTab * tab)
 		++tabIterator;
 	}
 	int iWidth = 0;
-	QPtrListIterator<KviNotifierWindowTab> startIterator (m_tabPtrList);
+	KviPtrListIterator<KviNotifierWindowTab> startIterator (m_tabPtrList);
 
 	i=0;
 	while(m_iTabToStartFrom!=i) {
@@ -558,7 +558,7 @@ void KviNotifierWindowTabs::contextPopup(KviTalPopupMenu *pPopup,const QPoint& p
 		QMap<KviWindow *, KviNotifierWindowTab *>::Iterator tab;
 		for (tab = m_tabMap.begin(); tab != m_tabMap.end(); tab++ ) {
 			if (tab.data()->rect().contains(pos)) {
-				int id = pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr2qs_ctx("Close tab","notifier"),g_pNotifierWindow,SLOT(hideTab(int)),0,0);
+				int id = pPopup->insertItem(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_CLOSE)),__tr2qs_ctx("Close tab","notifier"),g_pNotifierWindow,SLOT(hideTab(int)));
 				pPopup->setItemParameter(id,i);
 			}
 			i++;
@@ -593,7 +593,7 @@ void KviNotifierWindowTabs::draw(QPainter * p)
 	
 	int tmpTabsWidth = 0;
 
-	QPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
+	KviPtrListIterator<KviNotifierWindowTab> tabIterator (m_tabPtrList);
 	
 	//m_tabPtrList.findRef(m_tabMap[m_pTabFocused->wnd()]);
 
diff --git a/src/modules/notifier/notifierwindowtabs.h b/src/modules/notifier/notifierwindowtabs.h
index 488654156..ae828d98f 100644
--- a/src/modules/notifier/notifierwindowtabs.h
+++ b/src/modules/notifier/notifierwindowtabs.h
@@ -143,8 +143,8 @@ private:
 	QPoint	m_pnt;
 
 	QMap<KviWindow *, KviNotifierWindowTab *> m_tabMap;
-	QPtrList<KviNotifierWindowTab> m_tabPtrList;
-	QPtrList<KviNotifierWindowTab> m_lastVisitedTabPtrList;
+	KviPtrList<KviNotifierWindowTab> m_tabPtrList;
+	KviPtrList<KviNotifierWindowTab> m_lastVisitedTabPtrList;
 	
 	QFont * m_pFocusedFont;
 	QFont * m_pUnfocusedFont;
diff --git a/src/modules/objects/class_listview.cpp b/src/modules/objects/class_listview.cpp
index 2bc889a71..4a6d03924 100644
--- a/src/modules/objects/class_listview.cpp
+++ b/src/modules/objects/class_listview.cpp
@@ -27,8 +27,8 @@
 
 #include "kvi_tal_listview.h"
 #ifdef COMPILE_USE_QT4
-#include <Q3Header>
-#include <QDragEnterEvent>
+#include <q3header.h>
+#include <qevent.h>
 #else
 #include <qheader.h>
 #endif
diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index c9c7cebfb..8be51a018 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -33,7 +33,7 @@
 	#include <q3multilineedit.h>
 #include <QTextStream>
 
-#include <Q3StyleSheet>
+#include <q3stylesheet.h>
 #define KviTalMultiLineEdit Q3MultiLineEdit
 #define QTEXTEDIT_AUTO_ALL Q3TextEdit::AutoAll
 #define QTEXTEDIT_AUTO_NONE Q3TextEdit::AutoNone
diff --git a/src/modules/objects/class_process.cpp b/src/modules/objects/class_process.cpp
index 11cbacee6..e0951b14e 100644
--- a/src/modules/objects/class_process.cpp
+++ b/src/modules/objects/class_process.cpp
@@ -27,7 +27,7 @@
 #include "kvi_locale.h"
 #include <qtimer.h>
 #ifdef COMPILE_USE_QT4
-#include <Q3Process>
+#include <q3process.h>
 #else 
 #include <qprocess.h>
 #endif
diff --git a/src/modules/objects/class_process.h b/src/modules/objects/class_process.h
index 3259a6a2f..fe4be1c0e 100644
--- a/src/modules/objects/class_process.h
+++ b/src/modules/objects/class_process.h
@@ -29,7 +29,7 @@
 
 #include "object_macros.h"
 #ifdef COMPILE_USE_QT4
-#include <Q3Process>
+#include <q3process.h>
 #else
 #include <qprocess.h>
 #endif
diff --git a/src/modules/objects/class_progressbar.cpp b/src/modules/objects/class_progressbar.cpp
index 05dc045b7..7d106f4e2 100644
--- a/src/modules/objects/class_progressbar.cpp
+++ b/src/modules/objects/class_progressbar.cpp
@@ -28,7 +28,7 @@
 #include "kvi_locale.h"
 #include "kvi_iconmanager.h"
 #ifdef COMPILE_USE_QT4
-#include <Q3ProgressBar>
+#include <q3progressbar.h>
 #define KVI_PROGRESS_BAR Q3ProgressBar
 #else
 #include <qprogressbar.h>
diff --git a/src/modules/objects/class_wrapper.cpp b/src/modules/objects/class_wrapper.cpp
index 61a1cfef1..464f10f85 100644
--- a/src/modules/objects/class_wrapper.cpp
+++ b/src/modules/objects/class_wrapper.cpp
@@ -156,10 +156,10 @@ bool KviKvsObject_wrapper::init(KviKvsRunTimeContext * pContext,KviKvsVariantLis
 		} 		else {
 		if(pWidget) {
     pWidget = findWidgetToWrap(
-     !szClass.isEmpty() ? szClass : 0, !szName.isEmpty() ? szName : 0, pWidget
+     !szClass.isEmpty() ? szClass : KviQString::empty, !szName.isEmpty() ? szName : KviQString::empty, pWidget
     );
    } else {
-    pWidget = findTopLevelWidgetToWrap(szClass.isEmpty() ? szClass : 0, !szName.isEmpty() ? szName : 0);
+    pWidget = findTopLevelWidgetToWrap(szClass.isEmpty() ? szClass : KviQString::empty, !szName.isEmpty() ? szName : KviQString::empty);
    }
 		}
 		if( !pWidget )
diff --git a/src/modules/objects/libkviobjects.cpp b/src/modules/objects/libkviobjects.cpp
index 32e82b8f8..2bf81cb81 100644
--- a/src/modules/objects/libkviobjects.cpp
+++ b/src/modules/objects/libkviobjects.cpp
@@ -44,6 +44,8 @@
 	#include <qobjectlist.h>

 #endif

 

+#include <qdir.h>
+
 #include "class_button.h"

 #include "class_checkbox.h"

 #include "class_urllabel.h"

diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index d8cc18085..bdf5aa4e8 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -43,8 +43,8 @@
 #include <qlayout.h>
 #include <qlabel.h>
 #ifdef COMPILE_USE_QT4
-#include <Q3Header>
-#include <QCloseEvent>
+#include <q3header.h>
+#include <qevent.h>
 #include <QImageWriter>
 #include <QImageReader>
 
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index c5c933fc4..78631241d 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -35,9 +35,7 @@
 #include "kvi_dict.h"
 #include "kvi_tal_popupmenu.h"
 #ifdef COMPILE_USE_QT4
-	#include <Q3IntDict>
-
-
+	#include <q3intdict.h>
 	#include <q3simplerichtext.h>
 	#define QSimpleRichText Q3SimpleRichText
 #else
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index b366c4c3a..8b07a482f 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -44,9 +44,9 @@
 #include <qlayout.h>

 #include <qlabel.h>

 #ifdef COMPILE_USE_QT4

-#include <QCloseEvent>

-#include <Q3Header>

-#include <Q3Vbox>

+#include <qevent.h>

+#include <q3header.h>

+#include <q3vbox.h>

 #else

 #include <qheader.h>

 #endif

diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index 09be2913a..8e711d9e7 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -36,7 +36,7 @@
 #include "kvi_dict.h"
 #include <kvi_tal_tabdialog.h>
 #ifdef COMPILE_USE_QT4
-#include <Q3Table>
+#include <q3table.h>
 #define Kvi_Tal_Table Q3Table
 #define Kvi_Tal_TableItem Q3TableItem
 
diff --git a/src/modules/setup/setupwizard.h b/src/modules/setup/setupwizard.h
index f0229bf3d..a232ea6c6 100644
--- a/src/modules/setup/setupwizard.h
+++ b/src/modules/setup/setupwizard.h
@@ -31,7 +31,7 @@
 #include <qpixmap.h>
 #include <qlineedit.h>
 #ifdef COMPILE_USE_QT4
-#include <Q3VButtonGroup>
+#include <q3buttongroup.h>
 #define KviTalVButtonGroup Q3VButtonGroup
 #else
  #include <qvbuttongroup.h>
diff --git a/src/modules/sharedfileswindow/sharedfileswindow.h b/src/modules/sharedfileswindow/sharedfileswindow.h
index 23e941a3f..5a7d66b4a 100644
--- a/src/modules/sharedfileswindow/sharedfileswindow.h
+++ b/src/modules/sharedfileswindow/sharedfileswindow.h
@@ -30,6 +30,7 @@
 #include "kvi_console.h"
 #include "kvi_moduleextension.h"
 #include "kvi_sharedfiles.h"
+#include "kvi_styled_controls.h"
 
 #include "kvi_tal_listview.h"
 #include <qdialog.h>
@@ -39,7 +40,6 @@ class QDateTimeEdit;
 class QLabel;
 class QLineEdit;
 class QPushButton;
-class KviStyledCheckBox;
 
 class KviSharedFilesListViewItem : public KviTalListViewItem
 {
diff --git a/src/modules/spaste/controller.cpp b/src/modules/spaste/controller.cpp
index 7b308ca0c..4e6df0429 100644
--- a/src/modules/spaste/controller.cpp
+++ b/src/modules/spaste/controller.cpp
@@ -86,6 +86,7 @@ bool SPasteController::pasteClipboardInit(void)
 
 void SPasteController::pasteFile(void)
 {
+#ifndef COMPILE_USE_QT4
     QString line;
     if(m_pFile->readLine(line,999) != -1)
     {
@@ -100,6 +101,7 @@ void SPasteController::pasteFile(void)
         m_pFile->close();
         delete this;
     }
+#endif
 }
 
 void SPasteController::pasteClipboard(void)
diff --git a/src/modules/spaste/libkvispaste.cpp b/src/modules/spaste/libkvispaste.cpp
index 462b00369..14f40be7e 100644
--- a/src/modules/spaste/libkvispaste.cpp
+++ b/src/modules/spaste/libkvispaste.cpp
@@ -215,7 +215,8 @@ static bool spaste_kvs_cmd_stop(KviKvsModuleCommandCall * c)
         {
             if((c->window()->type() != KVI_WINDOW_TYPE_CHANNEL) && (c->window()->type() != KVI_WINDOW_TYPE_QUERY) && (c->window()->type() != KVI_WINDOW_TYPE_DCCCHAT))
             {
-                c->warning(__tr2qs("The specified window (%s) is not a channel/query/dcc"),&c->window()->id());
+				QString szWinId = c->window()->id();
+                c->warning(__tr2qs("The specified window (%Q) is not a channel/query/dcc"),&szWinId);
                 return false;
             } else 
             {
@@ -269,7 +270,8 @@ static bool spaste_kvs_cmd_list(KviKvsModuleCommandCall * c)
     while( (item = it.current()) != 0)
     {
         ++it;
-        c->window()->output(KVI_OUT_NONE,__tr2qs("Slow-paste ID:%d Window:%s"),item->getId(),&item->window()->id());
+		QString szWinId = item->window()->id();
+        c->window()->output(KVI_OUT_NONE,__tr2qs("Slow-paste ID:%d Window:%Q"),item->getId(),&szWinId);
     }
 	return true;
 }
diff --git a/src/modules/theme/managementdialog.h b/src/modules/theme/managementdialog.h
index c01096af0..54588b609 100644
--- a/src/modules/theme/managementdialog.h
+++ b/src/modules/theme/managementdialog.h
@@ -30,7 +30,7 @@
 
 #include <qdialog.h>
 #ifdef COMPILE_USE_QT4
-#include <Q3SimpleRichText>
+#include <q3simplerichtext.h>
 #define KviTalSimpleRichText Q3SimpleRichText
 #else
 #include <qsimplerichtext.h>
diff --git a/src/modules/theme/packthemedialog.cpp b/src/modules/theme/packthemedialog.cpp
index a9401f5c2..5b9a23428 100644
--- a/src/modules/theme/packthemedialog.cpp
+++ b/src/modules/theme/packthemedialog.cpp
@@ -37,7 +37,7 @@
 #include <qimage.h>
 #include <kvi_tal_textedit.h>
 #ifdef COMPILE_USE_QT4
-#include <Q3MultiLineEdit>
+#include <q3multilineedit.h>
 #include <QDateTime>
 #else
 #include <qmultilineedit.h>
diff --git a/src/modules/theme/savethemedialog.cpp b/src/modules/theme/savethemedialog.cpp
index 62ca0116e..a85be1fda 100644
--- a/src/modules/theme/savethemedialog.cpp
+++ b/src/modules/theme/savethemedialog.cpp
@@ -37,7 +37,7 @@
 #include <qimage.h>
 #include <kvi_tal_textedit.h>
 #ifdef COMPILE_USE_QT4
-#include <Q3MultiLineEdit>
+#include <q3multilineedit.h>
 #include <QDateTime>
 #else
 #include <qmultilineedit.h>
diff --git a/src/modules/theme/themefunctions.cpp b/src/modules/theme/themefunctions.cpp
index fb508c7a4..6b5993943 100644
--- a/src/modules/theme/themefunctions.cpp
+++ b/src/modules/theme/themefunctions.cpp
@@ -36,7 +36,7 @@
 #include "kvi_frame.h"
 #ifdef COMPILE_USE_QT4
 #define KviTalMimeSourceFactory Q3MimeSourceFactory
-#include <Q3MimeSourceFactory>
+#include <q3mimefactory.h>
 #else
 #define KviTalMimeSourceFactory QMimeSourceFactory
 #endif
diff --git a/src/modules/tip/libkvitip.cpp b/src/modules/tip/libkvitip.cpp
index aa78ad9b5..daa16d65a 100644
--- a/src/modules/tip/libkvitip.cpp
+++ b/src/modules/tip/libkvitip.cpp
@@ -34,7 +34,7 @@
 #include <qpushbutton.h>
 
 #ifdef COMPILE_USE_QT4
-#include <Q3SimpleRichText>
+#include <q3simplerichtext.h>
 #include <QDesktopWidget>
 #include <QCloseEvent>
 #define KviTalSimpleRichText Q3SimpleRichText
diff --git a/src/modules/url/libkviurl.cpp b/src/modules/url/libkviurl.cpp
index 2f595c658..f979da4fb 100644
--- a/src/modules/url/libkviurl.cpp
+++ b/src/modules/url/libkviurl.cpp
@@ -37,6 +37,7 @@
 #include <qfiledialog.h>
 #include <qmessagebox.h>
 #include <qcursor.h>
+#include <qdatetime.h>
 
 
 static QPixmap * g_pUrlIconPixmap = 0;
diff --git a/src/modules/url/libkviurl.h b/src/modules/url/libkviurl.h
index c1e1ad940..0dbfe8ba4 100644
--- a/src/modules/url/libkviurl.h
+++ b/src/modules/url/libkviurl.h
@@ -28,9 +28,9 @@
 #include <qpushbutton.h>
 #include <qfile.h>
 #ifdef COMPILE_USE_QT4
-#include <Q3TextStream>
+	#include <q3textstream.h>
 #else
-#include <qtextstream.h>
+	#include <qtextstream.h>
 #endif
 #include <qcheckbox.h>
 #include "kvi_tal_listbox.h"