More QT4 work and removed QT3 unused code in objects module.

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

1 files changed, 1 insertions, 19 deletions

diff --git a/src/modules/objects/class_multilineedit.cpp b/src/modules/objects/class_multilineedit.cpp
index 8be51a018..2e4437e86 100644
--- a/src/modules/objects/class_multilineedit.cpp
+++ b/src/modules/objects/class_multilineedit.cpp
@@ -29,27 +29,14 @@
 #include "kvi_locale.h"
 #include "kvi_malloc.h"
 #include <qfile.h>
-#ifdef COMPILE_USE_QT4
-	#include <q3multilineedit.h>
+#include <q3multilineedit.h>
 #include <QTextStream>
-
 #include <q3stylesheet.h>
 #define KviTalMultiLineEdit Q3MultiLineEdit
 #define QTEXTEDIT_AUTO_ALL Q3TextEdit::AutoAll
 #define QTEXTEDIT_AUTO_NONE Q3TextEdit::AutoNone
 #define QTEXTEDIT_AUTO_BULLET_LIST Q3TextEdit::AutoBulletList
 
-#else
-	#include <qtextstream.h>
-
-	#include <qmultilineedit.h>
-	#define KviTalMultiLineEdit QMultiLineEdit
-	#define QTEXTEDIT_AUTO_ALL QTextEdit::AutoAll
-	#define QTEXTEDIT_AUTO_NONE QTextEdit::AutoNone
-	#define QTEXTEDIT_AUTO_BULLET_LIST QTextEdit::AutoBulletList
-
-#endif
-
 
 #include "class_multilineedit.h"
 
@@ -1081,13 +1068,8 @@ bool KviKvsObject_mledit::functionloadFile(KviKvsObjectFunctionCall *c)
 
 	QTextStream ts( &file );
     QString txt = ts.read();
-#ifdef COMPILE_USE_QT4
 	if ( !Q3StyleSheet::mightBeRichText( txt ) )
 	txt = Q3StyleSheet::convertFromPlainText( txt, Q3StyleSheetItem::WhiteSpacePre );
-#else
-	if ( !QStyleSheet::mightBeRichText( txt ) )
-	txt = QStyleSheet::convertFromPlainText( txt, QStyleSheetItem::WhiteSpacePre );
-#endif
 	((KviTalMultiLineEdit *)widget())->setText( txt );
 
 	file.close();