4 files changed, 92 insertions, 92 deletions

diff --git a/src/modules/raweditor/CMakeLists.txt b/src/modules/raweditor/CMakeLists.txt
index 1c02c2457..12eb3710d 100644
--- a/src/modules/raweditor/CMakeLists.txt
+++ b/src/modules/raweditor/CMakeLists.txt
@@ -1,12 +1,12 @@
 # CMakeLists for src/modules/raweditor
 
 SET(kviraweditor_MOC_HDRS
-	raweditor.h
+	RawEditorWindow.h
 )
 
 SET(kviraweditor_SRCS
 	libkviraweditor.cpp
-	raweditor.cpp
+	RawEditorWindow.cpp
 )
 
 # After this call, files will be moc'ed to moc_kvi_*.cpp
diff --git a/src/modules/raweditor/raweditor.cpp b/src/modules/raweditor/RawEditorWindow.cpp
index 5534f2c19..234472c8d 100644
--- a/src/modules/raweditor/raweditor.cpp
+++ b/src/modules/raweditor/RawEditorWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : raweditor.cpp
+//   File : RawEditorWindow.cpp
 //   Creation date : Mon Dec 23 2002 20:28:18 by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -22,7 +22,7 @@
 //
 //=============================================================================
 
-#include "raweditor.h"
+#include "RawEditorWindow.h"
 
 #include "KviIconManager.h"
 #include "KviIconManager.h"
@@ -49,10 +49,10 @@
 #include <QInputDialog>
 #include <QPushButton>
 
-extern KviRawEditorWindow * g_pRawEditorWindow;
+extern RawEditorWindow * g_pRawEditorWindow;
 
 
-KviRawTreeWidgetItem::KviRawTreeWidgetItem(QTreeWidget *par,int idx,bool bEnabled)
+RawTreeWidgetItem::RawTreeWidgetItem(QTreeWidget *par,int idx,bool bEnabled)
 : QTreeWidgetItem(par)
 {
 	m_iIdx = idx;
@@ -62,12 +62,12 @@ KviRawTreeWidgetItem::KviRawTreeWidgetItem(QTreeWidget *par,int idx,bool bEnable
 	setEnabled(bEnabled);
 }
 
-void KviRawHandlerTreeWidgetItem::setName(const QString &szName)
+void RawHandlerTreeWidgetItem::setName(const QString &szName)
 {
 	setText(0,szName);
 }
 
-KviRawEditor::KviRawEditor(QWidget * par)
+RawEditorWidget::RawEditorWidget(QWidget * par)
 : QWidget(par)
 {
 	setObjectName("raw_event_editor");
@@ -80,7 +80,7 @@ KviRawEditor::KviRawEditor(QWidget * par)
 
 	KviTalVBox * boxi = new KviTalVBox(spl);
 	boxi->setMaximumWidth(200);
-	m_pTreeWidget = new KviRawTreeWidget(boxi);
+	m_pTreeWidget = new RawTreeWidget(boxi);
 
 
 
@@ -109,29 +109,29 @@ KviRawEditor::KviRawEditor(QWidget * par)
 	m_pLastEditedItem = 0;
 }
 
-KviRawEditor::~KviRawEditor()
+RawEditorWidget::~RawEditorWidget()
 {
 	KviScriptEditor::destroyInstance(m_pEditor);
 }
 
-void KviRawEditor::oneTimeSetup()
+void RawEditorWidget::oneTimeSetup()
 {
 	if(m_bOneTimeSetupDone)return;
 	m_bOneTimeSetupDone = true;
 
-	KviRawTreeWidgetItem * it;
+	RawTreeWidgetItem * it;
 
 	for(unsigned int i = 0;i < 999;i++)
 	{
 		KviPointerList<KviKvsEventHandler> * l = KviKvsEventManager::instance()->rawHandlers(i);
 		if(l)
 		{
-			it = new KviRawTreeWidgetItem(m_pTreeWidget,i,true);
+			it = new RawTreeWidgetItem(m_pTreeWidget,i,true);
 			for(KviKvsEventHandler * s = l->first();s;s = l->next())
 			{
 				if(s->type() == KviKvsEventHandler::Script)
 				{
-					new KviRawHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(),
+					new RawHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(),
 					((KviKvsScriptEventHandler *)s)->code(),((KviKvsScriptEventHandler *)s)->isEnabled());
 				}
 			}
@@ -140,7 +140,7 @@ void KviRawEditor::oneTimeSetup()
 	}
 }
 
-void KviRawEditor::customContextMenuRequested(const QPoint &pos)
+void RawEditorWidget::customContextMenuRequested(const QPoint &pos)
 {
 	QTreeWidgetItem *it;
 	it=(QTreeWidgetItem *)m_pTreeWidget->itemAt(pos);
@@ -150,7 +150,7 @@ void KviRawEditor::customContextMenuRequested(const QPoint &pos)
 	{
 		if(it->parent())
 		{
-			if(!(((KviRawHandlerTreeWidgetItem *)it)->m_bEnabled))
+			if(!(((RawHandlerTreeWidgetItem *)it)->m_bEnabled))
 				m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)),
 					__tr2qs_ctx("&Enable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled()));
@@ -183,7 +183,7 @@ void KviRawEditor::customContextMenuRequested(const QPoint &pos)
         m_pContextPopup->popup(mapToGlobal(QPoint(pos.x()+15,pos.y())));
 }
 
-void KviRawEditor::getUniqueHandlerName(KviRawTreeWidgetItem *it,QString &buffer)
+void RawEditorWidget::getUniqueHandlerName(RawTreeWidgetItem *it,QString &buffer)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
@@ -199,7 +199,7 @@ void KviRawEditor::getUniqueHandlerName(KviRawTreeWidgetItem *it,QString &buffer
 
 		for (int i=0;i<it->childCount();i++)
 		{
-			KviRawHandlerTreeWidgetItem * ch =(KviRawHandlerTreeWidgetItem *) it->child(i);
+			RawHandlerTreeWidgetItem * ch =(RawHandlerTreeWidgetItem *) it->child(i);
 			if(KviQString::equalCI(newName,ch->text(0)))
 			{
 				bFound = true;
@@ -214,7 +214,7 @@ void KviRawEditor::getUniqueHandlerName(KviRawTreeWidgetItem *it,QString &buffer
 	buffer = newName;
 }
 
-void KviRawEditor::addRaw()
+void RawEditorWidget::addRaw()
 {
 	bool bOk = false;
 
@@ -222,11 +222,11 @@ void KviRawEditor::addRaw()
 
 	if(!bOk)return;
 
-	KviRawTreeWidgetItem * it;
+	RawTreeWidgetItem * it;
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviRawTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
-		if(((KviRawTreeWidgetItem *)it)->m_iIdx == iIdx)
+		it=(RawTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		if(((RawTreeWidgetItem *)it)->m_iIdx == iIdx)
 		{
 			m_pTreeWidget->setCurrentItem(it);
 			m_pTreeWidget->clearSelection();
@@ -235,7 +235,7 @@ void KviRawEditor::addRaw()
 		}
 	}
 
-	it = new KviRawTreeWidgetItem(m_pTreeWidget,iIdx,true);
+	it = new RawTreeWidgetItem(m_pTreeWidget,iIdx,true);
 	m_pTreeWidget->setCurrentItem(it);
 	m_pTreeWidget->clearSelection();
 	it->setSelected(true);
@@ -245,18 +245,18 @@ add_handler:
 
 }
 
-void KviRawEditor::addHandlerForCurrentRaw()
+void RawEditorWidget::addHandlerForCurrentRaw()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
-	KviRawTreeWidgetItem * it = (KviRawTreeWidgetItem *) m_pTreeWidget->currentItem();
+	RawTreeWidgetItem * it = (RawTreeWidgetItem *) m_pTreeWidget->currentItem();
 	if(it)
 	{
 		if(it->parent() == 0)
 		{
 			QString buffer = __tr2qs_ctx("default","editor");
-			getUniqueHandlerName((KviRawTreeWidgetItem *)it,buffer);
-			QTreeWidgetItem * ch = new KviRawHandlerTreeWidgetItem(it,buffer,"",true);
+			getUniqueHandlerName((RawTreeWidgetItem *)it,buffer);
+			QTreeWidgetItem * ch = new RawHandlerTreeWidgetItem(it,buffer,"",true);
 			it->setEnabled(true);
 			it->setExpanded(true);
 			m_pTreeWidget->setCurrentItem(ch);
@@ -266,13 +266,13 @@ void KviRawEditor::addHandlerForCurrentRaw()
 	}
 }
 
-void KviRawEditor::removeCurrentHandler()
+void RawEditorWidget::removeCurrentHandler()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(m_pLastEditedItem)
 	{
 		QTreeWidgetItem * it = m_pLastEditedItem;
-		KviRawTreeWidgetItem * parent=(KviRawTreeWidgetItem *)it->parent();
+		RawTreeWidgetItem * parent=(RawTreeWidgetItem *)it->parent();
 		m_pLastEditedItem = 0;
 		delete it;
 		m_pEditor->setEnabled(false);
@@ -281,7 +281,7 @@ void KviRawEditor::removeCurrentHandler()
 	}
 }
 
-void KviRawEditor::toggleCurrentHandlerEnabled()
+void RawEditorWidget::toggleCurrentHandlerEnabled()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(m_pLastEditedItem)
@@ -292,7 +292,7 @@ void KviRawEditor::toggleCurrentHandlerEnabled()
 	}
 }
 
-void KviRawEditor::commit()
+void RawEditorWidget::commit()
 {
 	if(!m_bOneTimeSetupDone)return; // nothing to commit
 
@@ -309,17 +309,17 @@ void KviRawEditor::commit()
 			for (int j=0;j<it->childCount();j++)
 			{
 				ch=(QTreeWidgetItem *)it->child(j);
-				qDebug("Commit handler %s",((KviRawHandlerTreeWidgetItem *)ch)->text(0).toUtf8().data());
-				//int a=(KviRawTreeWidgetItem *)it)->m_iIdx;
-				KviQString::sprintf(szContext,"RawEvent%d::%s",&(((KviRawTreeWidgetItem *)it)->m_iIdx),(((KviRawHandlerTreeWidgetItem *)ch)->text(0)).toUtf8().data());
+				qDebug("Commit handler %s",((RawHandlerTreeWidgetItem *)ch)->text(0).toUtf8().data());
+				//int a=(RawTreeWidgetItem *)it)->m_iIdx;
+				KviQString::sprintf(szContext,"RawEvent%d::%s",&(((RawTreeWidgetItem *)it)->m_iIdx),(((RawHandlerTreeWidgetItem *)ch)->text(0)).toUtf8().data());
 				KviKvsScriptEventHandler * s = new KviKvsScriptEventHandler(
-						((KviRawHandlerTreeWidgetItem *)ch)->text(0),
+						((RawHandlerTreeWidgetItem *)ch)->text(0),
 						szContext,
-						((KviRawHandlerTreeWidgetItem *)ch)->m_szBuffer,
-						((KviRawHandlerTreeWidgetItem *)ch)->m_bEnabled
+						((RawHandlerTreeWidgetItem *)ch)->m_szBuffer,
+						((RawHandlerTreeWidgetItem *)ch)->m_bEnabled
 					);
 
-				KviKvsEventManager::instance()->addRawHandler(((KviRawTreeWidgetItem *)it)->m_iIdx,s);
+				KviKvsEventManager::instance()->addRawHandler(((RawTreeWidgetItem *)it)->m_iIdx,s);
 			}
 		}
 	}
@@ -327,7 +327,7 @@ void KviRawEditor::commit()
 	g_pApp->saveRawEvents(); // otherwise this page has never been shown
 }
 
-void KviRawEditor::saveLastEditedItem()
+void RawEditorWidget::saveLastEditedItem()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(!m_pLastEditedItem)return;
@@ -336,7 +336,7 @@ void KviRawEditor::saveLastEditedItem()
 	qDebug("Check lineedit name %s and internal %s",buffer.toUtf8().data(),m_pLastEditedItem->text(0).toUtf8().data());
 	if(!KviQString::equalCI(buffer,m_pLastEditedItem->text(0)))
 	{
-		getUniqueHandlerName((KviRawTreeWidgetItem *)(m_pLastEditedItem->parent()),buffer);
+		getUniqueHandlerName((RawTreeWidgetItem *)(m_pLastEditedItem->parent()),buffer);
 		qDebug("Change name %s",buffer.toUtf8().data());
 	}
 
@@ -347,17 +347,17 @@ void KviRawEditor::saveLastEditedItem()
 	m_pLastEditedItem->m_szBuffer = tmp;
 }
 
-void KviRawEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
+void RawEditorWidget::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	saveLastEditedItem();
 	if(it->parent())
 	{
-		m_pLastEditedItem = (KviRawHandlerTreeWidgetItem *)it;
+		m_pLastEditedItem = (RawHandlerTreeWidgetItem *)it;
 		m_pNameEditor->setEnabled(true);
 		m_pNameEditor->setText(it->text(0));
 		m_pEditor->setEnabled(true);
-		m_pEditor->setText(((KviRawHandlerTreeWidgetItem *)it)->m_szBuffer);
+		m_pEditor->setText(((RawHandlerTreeWidgetItem *)it)->m_szBuffer);
 	} else {
 		m_pLastEditedItem = 0;
 		m_pNameEditor->setEnabled(false);
@@ -365,18 +365,18 @@ void KviRawEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 		m_pEditor->setEnabled(false);
 		QString tmp;
 		KviQString::sprintf(tmp,__tr2qs_ctx("\n\nRaw Event:\n%s","editor"),
-			((KviRawHandlerTreeWidgetItem *)it)->text(0).toUtf8().data());
+			((RawHandlerTreeWidgetItem *)it)->text(0).toUtf8().data());
 		m_pEditor->setText(tmp);
 	}
 }
 
-void KviRawEditor::showEvent(QShowEvent *e)
+void RawEditorWidget::showEvent(QShowEvent *e)
 {
 	oneTimeSetup();
 	QWidget::showEvent(e);
 }
 
-void KviRawEditor::getExportEventBuffer(QString &buffer,KviRawHandlerTreeWidgetItem * it)
+void RawEditorWidget::getExportEventBuffer(QString &buffer,RawHandlerTreeWidgetItem * it)
 {
 	if(!it->parent())return;
 
@@ -385,7 +385,7 @@ void KviRawEditor::getExportEventBuffer(QString &buffer,KviRawHandlerTreeWidgetI
 	KviCommandFormatter::blockFromBuffer(szBuf);
 
 	buffer = "event(";
-	buffer += ((KviRawTreeWidgetItem *)(it->parent()))->text(0);
+	buffer += ((RawTreeWidgetItem *)(it->parent()))->text(0);
 	buffer += ",";
 	buffer += it->text(0);
 	buffer += ")\n";
@@ -396,13 +396,13 @@ void KviRawEditor::getExportEventBuffer(QString &buffer,KviRawHandlerTreeWidgetI
 	{
 		buffer += "\n";
 		buffer += "eventctl -d ";
-		buffer += ((KviRawTreeWidgetItem *)(it->parent()))->text(0);
+		buffer += ((RawTreeWidgetItem *)(it->parent()))->text(0);
 		buffer += " ";
 		buffer += it->text(0);
 	}
 }
 
-void KviRawEditor::exportCurrentHandler()
+void RawEditorWidget::exportCurrentHandler()
 {
 	if(!m_pLastEditedItem)return;
 	saveLastEditedItem();
@@ -411,7 +411,7 @@ void KviRawEditor::exportCurrentHandler()
 	QString szName = QDir::homePath();
 	if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
 	szName += "raw";
-	szName += ((KviRawTreeWidgetItem *)(m_pLastEditedItem->parent()))->text(0);
+	szName += ((RawTreeWidgetItem *)(m_pLastEditedItem->parent()))->text(0);
 	szName += ".";
 	szName += m_pLastEditedItem->text(0);
 	szName += ".kvs";
@@ -429,21 +429,21 @@ void KviRawEditor::exportCurrentHandler()
 	}
 }
 
-void KviRawEditor::exportAllEvents()
+void RawEditorWidget::exportAllEvents()
 {
 	saveLastEditedItem();
 
-	KviRawTreeWidgetItem * it;
+	RawTreeWidgetItem * it;
 	QString out;
 
 	for (int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
 	{
-		it=(KviRawTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
-		KviRawHandlerTreeWidgetItem * item;
+		it=(RawTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		RawHandlerTreeWidgetItem * item;
 		for (int j=0;j<it->childCount();j++)
 		{
 			QString tmp;
-			item=(KviRawHandlerTreeWidgetItem *)it->child(j);
+			item=(RawHandlerTreeWidgetItem *)it->child(j);
 			getExportEventBuffer(tmp,item);
 			out += tmp;
 			out += "\n";
@@ -465,14 +465,14 @@ void KviRawEditor::exportAllEvents()
 }
 
 
-KviRawEditorWindow::KviRawEditorWindow(KviMainWindow * lpFrm)
+RawEditorWindow::RawEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"raweditor",0)
 {
 	g_pRawEditorWindow = this;
 
 	QGridLayout * g = new QGridLayout();
 
-	m_pEditor = new KviRawEditor(this);
+	m_pEditor = new RawEditorWidget(this);
 	g->addWidget(m_pEditor,0,0,1,4);
 
 	QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this);
@@ -495,43 +495,43 @@ KviRawEditorWindow::KviRawEditorWindow(KviMainWindow * lpFrm)
 	setLayout(g);
 }
 
-KviRawEditorWindow::~KviRawEditorWindow()
+RawEditorWindow::~RawEditorWindow()
 {
 	g_pRawEditorWindow = 0;
 }
 
-void KviRawEditorWindow::okClicked()
+void RawEditorWindow::okClicked()
 {
 	m_pEditor->commit();
 	close();
 }
 
-void KviRawEditorWindow::applyClicked()
+void RawEditorWindow::applyClicked()
 {
 	m_pEditor->commit();
 }
 
-void KviRawEditorWindow::cancelClicked()
+void RawEditorWindow::cancelClicked()
 {
 	close();
 }
 
-QPixmap * KviRawEditorWindow::myIconPtr()
+QPixmap * RawEditorWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT);
 }
 
-void KviRawEditorWindow::fillCaptionBuffers()
+void RawEditorWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Raw Editor","editor");
 }
 
-void KviRawEditorWindow::getConfigGroupName(QString &szName)
+void RawEditorWindow::getConfigGroupName(QString &szName)
 {
 	szName = "raweditor";
 }
 
-void KviRawEditorWindow::saveProperties(KviConfigurationFile *)
+void RawEditorWindow::saveProperties(KviConfigurationFile *)
 {
 	/*
 	#ifdef COMPILE_SCRIPTTOOLBAR
@@ -542,7 +542,7 @@ void KviRawEditorWindow::saveProperties(KviConfigurationFile *)
 	*/
 }
 
-void KviRawEditorWindow::loadProperties(KviConfigurationFile *)
+void RawEditorWindow::loadProperties(KviConfigurationFile *)
 {
 	/*
 	#ifdef COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/raweditor/raweditor.h b/src/modules/raweditor/RawEditorWindow.h
index 69926be00..d0d689496 100644
--- a/src/modules/raweditor/raweditor.h
+++ b/src/modules/raweditor/RawEditorWindow.h
@@ -2,7 +2,7 @@
 #define _RAWEDITOR_H_
 //=============================================================================
 //
-//   File : eventeditor.h
+//   File : EventEditorWindow.h
 //   Creation date : Mon Dec 23 2002 20:24:55 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -35,74 +35,74 @@
 class KviScriptEditor;
 class KviTalPopupMenu;
 
-class KviRawTreeWidget : public QTreeWidget
+class RawTreeWidget : public QTreeWidget
 {
 	public:
-	KviRawTreeWidget(QWidget *par)
+	RawTreeWidget(QWidget *par)
 		: QTreeWidget(par){};
 	void updateItem(QTreeWidgetItem *item)
 	{
 		update(indexFromItem(item,0));
 	};
-	~KviRawTreeWidget() {};
+	~RawTreeWidget() {};
 };
 
-class KviRawTreeWidgetItem : public QTreeWidgetItem
+class RawTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	int m_iIdx;
 public:
-	KviRawTreeWidgetItem(QTreeWidget * par,int idx,bool bEnabled);
-	~KviRawTreeWidgetItem() {};
+	RawTreeWidgetItem(QTreeWidget * par,int idx,bool bEnabled);
+	~RawTreeWidgetItem() {};
 public:
 	void setEnabled(bool bEnabled)
 	{
 		if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENT)));
 			else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_RAWEVENTNOHANDLERS)));
-			((KviRawTreeWidget*)treeWidget())->updateItem(this);
+			((RawTreeWidget*)treeWidget())->updateItem(this);
 	};
 };
 
-class KviRawHandlerTreeWidgetItem : public QTreeWidgetItem
+class RawHandlerTreeWidgetItem : public QTreeWidgetItem
 {
 public:
-	KviRawHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString & name,const QString & buffer,bool bEnabled)
+	RawHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString & name,const QString & buffer,bool bEnabled)
 	: QTreeWidgetItem(par), m_szBuffer(buffer), m_bEnabled(bEnabled)
 	{
 		setText(0,name);
 		setEnabled(bEnabled);
 	};
-	~KviRawHandlerTreeWidgetItem() {};
+	~RawHandlerTreeWidgetItem() {};
 public:
 	void setEnabled(bool bEnabled)
 	{
 		if (bEnabled) setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)));
 			else setIcon(0,QIcon(*g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLERDISABLED)));
-			((KviRawTreeWidget*)treeWidget())->updateItem(this);
+			((RawTreeWidget*)treeWidget())->updateItem(this);
 	};
 	QString m_szBuffer;
 	bool   m_bEnabled;
 	void setName(const QString &szName);
 };
 
-class KviRawEditor : public QWidget
+class RawEditorWidget : public QWidget
 {
 	Q_OBJECT
 public:
-	KviRawEditor(QWidget * par);
-	~KviRawEditor();
+	RawEditorWidget(QWidget * par);
+	~RawEditorWidget();
 public:
 	KviScriptEditor * m_pEditor;
-	KviRawTreeWidget       * m_pTreeWidget;
+	RawTreeWidget       * m_pTreeWidget;
 	QLineEdit       * m_pNameEditor;
 	KviTalPopupMenu      * m_pContextPopup;
-	KviRawHandlerTreeWidgetItem * m_pLastEditedItem;
+	RawHandlerTreeWidgetItem * m_pLastEditedItem;
 	bool              m_bOneTimeSetupDone;
 public:
 	void commit();
 	void saveLastEditedItem();
-	void getUniqueHandlerName(KviRawTreeWidgetItem *it,QString &buffer);
-	void getExportEventBuffer(QString &szBuffer,KviRawHandlerTreeWidgetItem * it);
+	void getUniqueHandlerName(RawTreeWidgetItem *it,QString &buffer);
+	void getExportEventBuffer(QString &szBuffer,RawHandlerTreeWidgetItem * it);
 protected slots:
 	void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *);
 	void customContextMenuRequested(const QPoint &pnt);
@@ -118,14 +118,14 @@ private:
 	void oneTimeSetup();
 };
 
-class KviRawEditorWindow : public KviWindow
+class RawEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviRawEditorWindow(KviMainWindow * lpFrm);
-	~KviRawEditorWindow();
+	RawEditorWindow(KviMainWindow * lpFrm);
+	~RawEditorWindow();
 protected:
-	KviRawEditor * m_pEditor;
+	RawEditorWidget * m_pEditor;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/modules/raweditor/libkviraweditor.cpp b/src/modules/raweditor/libkviraweditor.cpp
index d79c5e424..2ebf9ebf1 100644
--- a/src/modules/raweditor/libkviraweditor.cpp
+++ b/src/modules/raweditor/libkviraweditor.cpp
@@ -22,14 +22,14 @@
 //
 //=============================================================================
 
-#include "raweditor.h"
+#include "RawEditorWindow.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
 
-KviRawEditorWindow * g_pRawEditorWindow = 0;
+RawEditorWindow * g_pRawEditorWindow = 0;
 
 
 /*
@@ -50,7 +50,7 @@ static bool raweditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	if(!g_pRawEditorWindow)
 	{
-		g_pRawEditorWindow = new KviRawEditorWindow(c->window()->frame());
+		g_pRawEditorWindow = new RawEditorWindow(c->window()->frame());
 		c->window()->frame()->addWindow(g_pRawEditorWindow);
 	}
 	g_pRawEditorWindow->setFocus();