3 files changed, 34 insertions, 47 deletions

diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index 7b217d6e4..859cd303e 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -20,11 +20,12 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 
+#include "raweditor.h"
+
 #include "kvi_module.h"
 #include "kvi_locale.h"
 #include "kvi_frame.h"
 
-#include "raweditor.h"
 
 KviRawEditorWindow * g_pRawEditorWindow = 0;
 
@@ -44,7 +45,7 @@ KviRawEditorWindow * g_pRawEditorWindow = 0;
 */
 
 static bool raweditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
-{ 
+{
 	if(!g_pRawEditorWindow)
 	{
 		g_pRawEditorWindow = new KviRawEditorWindow(c->window()->frame());
@@ -54,10 +55,8 @@ static bool raweditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 	return true;
 }
 
-
 static bool raweditor_module_init(KviModule * m)
 {
-
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"open",raweditor_kvs_cmd_open);
 	g_pRawEditorWindow = 0;
 	return true;
@@ -71,13 +70,13 @@ static bool raweditor_module_can_unload(KviModule * m)
 static bool raweditor_module_cleanup(KviModule *m)
 {
 	if(g_pRawEditorWindow)delete g_pRawEditorWindow;
-    g_pRawEditorWindow = 0;
+	g_pRawEditorWindow = 0;
 	return true;
 }
 
 KVIRC_MODULE(
 	"RawEditor",                                                 // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Editor for the script raw events",
 	raweditor_module_init,
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/raweditor.cpp
index 6601a7004..2a4f5d649 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/raweditor.cpp
@@ -35,18 +35,17 @@
 #include "kvi_cmdformatter.h"
 #include "kvi_kvs_eventmanager.h"
 #include "kvi_kvs_eventhandler.h"
-
-#include <qmessagebox.h>
-#include <qsplitter.h>
-#include <qlayout.h>
 #include "kvi_tal_vbox.h"
 #include "kvi_tal_popupmenu.h"
-#include <qtooltip.h>
-#include <qinputdialog.h>
-#include <qpushbutton.h>
 
-extern KviRawEditorWindow * g_pRawEditorWindow;
+#include <QMessageBox>
+#include <QSplitter>
+#include <QLayout>
+#include <QToolTip>
+#include <QInputDialog>
+#include <QPushButton>
 
+extern KviRawEditorWindow * g_pRawEditorWindow;
 
 
 KviRawListViewItem::KviRawListViewItem(KviTalListView *par,int idx)
@@ -69,17 +68,12 @@ const QPixmap * KviRawHandlerListViewItem::pixmap(int col) const
 }
 
 
-
 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");
 	spl->setOpaqueResize(false);
-#else
-	QSplitter * spl = new QSplitter(QSplitter::Horizontal,this);
-#endif
 	l->addWidget(spl,0,0);
 
 	KviTalVBox * boxi = new KviTalVBox(spl);
@@ -443,8 +437,6 @@ void KviRawEditor::exportAllEvents()
 }
 
 
-
-
 KviRawEditorWindow::KviRawEditorWindow(KviFrame * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"raweditor",0)
 {
@@ -494,7 +486,6 @@ void KviRawEditorWindow::cancelClicked()
 	close();
 }
 
-
 QPixmap * KviRawEditorWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT);
@@ -529,35 +520,33 @@ void KviRawEditorWindow::fillCaptionBuffers()
 
 }
 
-
 void KviRawEditorWindow::getConfigGroupName(KviStr &szName)
 {
 	szName = "raweditor";
 }
 
-
 void KviRawEditorWindow::saveProperties(KviConfig *cfg)
 {
-/*
-#ifdef COMPILE_SCRIPTTOOLBAR
-	cfg->writeEntry("Sizes",m_pEditor->sizes());
-	cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr());
-	//debug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr());
-#endif // COMPILE_SCRIPTTOOLBAR
-*/
+	/*
+	#ifdef COMPILE_SCRIPTTOOLBAR
+		cfg->writeEntry("Sizes",m_pEditor->sizes());
+		cfg->writeEntry("LastRaw",m_pEditor->lastEditedRaw().ptr());
+		//debug("LAST EDITED=%s",m_pEditor->lastEditedRaw().ptr());
+	#endif // COMPILE_SCRIPTTOOLBAR
+	*/
 }
 
 void KviRawEditorWindow::loadProperties(KviConfig *cfg)
 {
-/*
-#ifdef COMPILE_SCRIPTTOOLBAR
-	QValueList<int> def;
-	def.append(20);
-	def.append(80);
-	m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
-	KviStr tmp = cfg->readEntry("LastRaw","");
-	m_pEditor->editRaw(tmp);
-	//debug("LAST EDITED WAS %s",tmp.ptr());
-#endif // COMPILE_SCRIPTTOOLBAR
-*/
+	/*
+	#ifdef COMPILE_SCRIPTTOOLBAR
+		QValueList<int> def;
+		def.append(20);
+		def.append(80);
+		m_pEditor->setSizes(cfg->readIntListEntry("Sizes",def));
+		KviStr tmp = cfg->readEntry("LastRaw","");
+		m_pEditor->editRaw(tmp);
+		//debug("LAST EDITED WAS %s",tmp.ptr());
+	#endif // COMPILE_SCRIPTTOOLBAR
+	*/
 }
diff --git a/src/modules/raweditor/raweditor.h b/src/modules/raweditor/raweditor.h
index a228ab17b..6d1a20472 100644
--- a/src/modules/raweditor/raweditor.h
+++ b/src/modules/raweditor/raweditor.h
@@ -24,12 +24,13 @@
 
 #include "kvi_window.h"
 #include "kvi_qstring.h"
-
-#include <qwidget.h>
 #include "kvi_tal_listview.h"
-#include <qlineedit.h>
+
+#include <QWidget>
+#include <QLineEdit>
 
 class KviScriptEditor;
+class KviTalPopupMenu;
 
 class KviRawListViewItem : public KviTalListViewItem
 {
@@ -58,8 +59,6 @@ public:
 	virtual const QPixmap * pixmap(int col) const;
 };
 
-class KviTalPopupMenu;
-
 class KviRawEditor : public QWidget
 {
 	Q_OBJECT