From 9418a51b844c587db96f8c7d27c2b37dffadf5a6 Mon Sep 17 00:00:00 2001
From: Szymon Tomasz Stefanek
Date: Tue, 20 Feb 2007 04:10:04 +0000
Subject: More Qt4 port and some small fixes

git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@351 17fca916-40b9-46aa-a4ea-0a15b648b75c
---
 src/modules/editor/scripteditor.h | 19 +++++++++++++++----
 1 file changed, 15 insertions(+), 4 deletions(-)

(limited to 'src/modules/editor/scripteditor.h')

diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 44f96ac19..8a6147ef6 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -28,13 +28,15 @@
 #include "kvi_scripteditor.h"
 
 #include <qlabel.h>
-#include <qcstring.h>
 #include <kvi_tal_textedit.h>
 #include <qsyntaxhighlighter.h>
 #include <qdialog.h>
 #include <qcheckbox.h>
 #include "kvi_tal_listbox.h"
 #include <qevent.h> 
+#include "kvi_qcstring.h"
+
+#include "kvi_tal_popupmenu.h"
 
 #include "kvi_list.h"
 #include "kvi_selectors.h"
@@ -79,13 +81,22 @@ signals:
 protected:
 	virtual void keyPressEvent(QKeyEvent * e);
 	void contentsMousePressEvent(QMouseEvent *);
+#ifdef COMPILE_USE_QT4
+	Q3PopupMenu *createPopupMenu( const QPoint& pos );
+#else
 	QPopupMenu *createPopupMenu( const QPoint& pos );
+#endif
 	QWidget *m_pParent;
 	QString m_szHelp;
 
 };
 
-
+#ifdef COMPILE_USE_QT4
+	#include <q3syntaxhighlighter.h>
+	#define QSyntaxHighlighter Q3SyntaxHighlighter
+#else
+	#include <qobjectlist.h>
+#endif
 class KviScriptSyntaxHighlighter : public QSyntaxHighlighter
 {
 public:
@@ -125,8 +136,8 @@ protected:
 public:
 	virtual void setText(const QString &txt);
 	virtual void getText(QString &txt);
-	virtual void setText(const QCString &txt);
-	virtual void getText(QCString &txt);
+	virtual void setText(const KviQCString &txt);
+	virtual void getText(KviQCString &txt);
 	virtual void setFindText(const QString & text);
 	virtual void setEnabled(bool bEnabled);
 	virtual void setFocus();
-- 
cgit v1.3.1-10-gc9f91