From 3d14bfd7b140d24b021d8c5b8b64582b64a9496a Mon Sep 17 00:00:00 2001
From: Elvio Basello
Date: Fri, 4 Apr 2008 00:48:52 +0000
Subject: more code clean

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

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

diff --git a/src/modules/editor/scripteditor.h b/src/modules/editor/scripteditor.h
index 0d14ede29..605d2168a 100644
--- a/src/modules/editor/scripteditor.h
+++ b/src/modules/editor/scripteditor.h
@@ -26,20 +26,24 @@
 //=============================================================================
 
 #include "kvi_scripteditor.h"
-
-#include <qlabel.h>
+#include "kvi_pointerlist.h"
+#include "kvi_selectors.h"
+#include "kvi_qcstring.h"
 #include <kvi_tal_textedit.h>
-#include <qsyntaxhighlighter.h>
-#include <qdialog.h>
-#include <qcheckbox.h>
+#include "kvi_tal_popupmenu.h"
 #include "kvi_tal_listbox.h"
-#include <qevent.h> 
-#include "kvi_qcstring.h"
 
-#include "kvi_tal_popupmenu.h"
+#include <QLabel>
+#include <QDialog>
+#include <QCheckBox>
+#include <QEvent>
+
+// FIXME: Qt4 #include <QSyntaxHighlighter>
+#include <q3syntaxhighlighter.h>
+#define QSyntaxHighlighter Q3SyntaxHighlighter
+
+class QTimer;
 
-#include "kvi_pointerlist.h"
-#include "kvi_selectors.h"
 typedef KviPointerList<int> ColumnList;
 
 class KviCompletionBox: public KviTalListBox
@@ -81,22 +85,11 @@ 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:
@@ -121,8 +114,6 @@ protected slots:
 	void okClicked();
 };
 
-class QTimer;
-
 class KviScriptEditorImplementation : public KviScriptEditor
 {
 	Q_OBJECT
-- 
cgit v1.3.1-10-gc9f91