The big rename for modules. Still some details remaining.

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

4 files changed, 91 insertions, 91 deletions

diff --git a/src/modules/eventeditor/CMakeLists.txt b/src/modules/eventeditor/CMakeLists.txt
index fa063255f..24d672a1d 100644
--- a/src/modules/eventeditor/CMakeLists.txt
+++ b/src/modules/eventeditor/CMakeLists.txt
@@ -1,11 +1,11 @@
 # CMakeLists for src/modules/eventeditor
 
 SET(kvieventeditor_MOC_HDRS
-	eventeditor.h
+	EventEditorWindow.h
 )
 
 SET(kvieventeditor_SRCS
-	eventeditor.cpp
+	EventEditorWindow.cpp
 	libkvieventeditor.cpp
 )
 
diff --git a/src/modules/eventeditor/eventeditor.cpp b/src/modules/eventeditor/EventEditorWindow.cpp
index 1b5be86e6..f8467e5b1 100644
--- a/src/modules/eventeditor/eventeditor.cpp
+++ b/src/modules/eventeditor/EventEditorWindow.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : eventeditor.cpp
+//   File : EventEditorWindow.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 "eventeditor.h"
+#include "EventEditorWindow.h"
 
 #include "KviIconManager.h"
 #include "KviOptions.h"
@@ -49,21 +49,21 @@
 #include <QPushButton>
 #include <QMouseEvent>
 
-extern KviEventEditorWindow * g_pEventEditorWindow;
+extern EventEditorWindow * g_pEventEditorWindow;
 
-KviEventTreeWidgetItem::KviEventTreeWidgetItem(QTreeWidget * par,unsigned int uEvIdx,const QString &name,const QString &params)
+EventEditorEventTreeWidgetItem::EventEditorEventTreeWidgetItem(QTreeWidget * par,unsigned int uEvIdx,const QString &name,const QString &params)
 : QTreeWidgetItem(par), m_uEventIdx(uEvIdx), m_szParams(params)
 {
 	setName(name);
 }
 
-void KviEventTreeWidgetItem::setName(const QString &szName)
+void EventEditorEventTreeWidgetItem::setName(const QString &szName)
 {
 	m_szName = szName;
 	setText(0,m_szName);
 }
 
-KviEventHandlerTreeWidgetItem::KviEventHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString &name,const QString &buffer,bool bEnabled)
+EventEditorHandlerTreeWidgetItem::EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString &name,const QString &buffer,bool bEnabled)
 : QTreeWidgetItem(par), m_szBuffer(buffer)
 {
 	m_cPos=0;
@@ -71,19 +71,19 @@ KviEventHandlerTreeWidgetItem::KviEventHandlerTreeWidgetItem(QTreeWidgetItem * p
 	setName(name);
 }
 
-void KviEventHandlerTreeWidgetItem::setName(const QString &szName)
+void EventEditorHandlerTreeWidgetItem::setName(const QString &szName)
 {
 	m_szName = szName;
 	setText(0,m_szName);
 }
 
-void KviEventHandlerTreeWidgetItem::setEnabled(const bool bEnabled)
+void EventEditorHandlerTreeWidgetItem::setEnabled(const bool bEnabled)
 {
 	m_bEnabled = bEnabled;
 	setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(m_bEnabled ? KVI_SMALLICON_HANDLER : KVI_SMALLICON_HANDLERDISABLED))));
 }
 
-KviEventEditor::KviEventEditor(QWidget * par)
+EventEditor::EventEditor(QWidget * par)
 : QWidget(par)
 {
 	setObjectName("event_editor");
@@ -99,7 +99,7 @@ KviEventEditor::KviEventEditor(QWidget * par)
 	vbox->setSpacing(0);
 	vbox->setMargin(0);
 
-	m_pTreeWidget = new KviEventEditorTreeWidget(vbox);
+	m_pTreeWidget = new EventEditorTreeWidget(vbox);
 
 	QPushButton * pb = new QPushButton(__tr2qs_ctx("&Export All To...","editor"),vbox);
 	connect(pb,SIGNAL(clicked()),this,SLOT(exportAllEvents()));
@@ -120,30 +120,30 @@ KviEventEditor::KviEventEditor(QWidget * par)
 	m_pLastEditedItem = 0;
 }
 
-KviEventEditor::~KviEventEditor()
+EventEditor::~EventEditor()
 {
 	KviScriptEditor::destroyInstance(m_pEditor);
 }
 
-void KviEventEditor::oneTimeSetup()
+void EventEditor::oneTimeSetup()
 {
 	if(m_bOneTimeSetupDone)return;
 	m_bOneTimeSetupDone = true;
 
-	KviEventTreeWidgetItem * it;
+	EventEditorEventTreeWidgetItem * it;
 
 	for(unsigned int i = 0;i < KVI_KVS_NUM_APP_EVENTS;i++)
 	{
 		KviKvsEvent * e = KviKvsEventManager::instance()->appEvent(i);
 
-		it = new KviEventTreeWidgetItem(m_pTreeWidget,i,e->name(),e->parameterDescription());
+		it = new EventEditorEventTreeWidgetItem(m_pTreeWidget,i,e->name(),e->parameterDescription());
 		if(KviPointerList<KviKvsEventHandler> * l = e->handlers())
 		{
 			for(KviKvsEventHandler * s = l->first();s;s = l->next())
 			{
 				if(s->type() == KviKvsEventHandler::Script)
 				{
-					new KviEventHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(),
+					new EventEditorHandlerTreeWidgetItem(it,((KviKvsScriptEventHandler *)s)->name(),
 					((KviKvsScriptEventHandler *)s)->code(),((KviKvsScriptEventHandler *)s)->isEnabled());
 				}
 			}
@@ -158,20 +158,20 @@ void KviEventEditor::oneTimeSetup()
 	m_pContextPopup = new KviTalPopupMenu(this);
 	m_pTreeWidget->sortItems(0,Qt::AscendingOrder);
 }
-void KviEventEditor::eventHandlerDisabled(const QString &szHandler)
+void EventEditor::eventHandlerDisabled(const QString &szHandler)
 {
     QString szEventName=szHandler.split("::")[0];
     QString szHandlerName=szHandler.split("::")[1];
     qDebug("Handler %s of event %s : disabled",szHandlerName.toUtf8().data(),szEventName.toUtf8().data());
     for(int i=0;i<m_pTreeWidget->topLevelItemCount();i++)
     {
-        KviEventTreeWidgetItem *pItem=(KviEventTreeWidgetItem*)m_pTreeWidget->topLevelItem(i);
+        EventEditorEventTreeWidgetItem *pItem=(EventEditorEventTreeWidgetItem*)m_pTreeWidget->topLevelItem(i);
         if(!KviQString::equalCI(szEventName,pItem->name())) continue;
         for(int j=0;j<pItem->childCount();j++)
         {
-            if(KviQString::equalCI(szHandlerName,((KviEventHandlerTreeWidgetItem *)pItem->child(j))->name()))
+            if(KviQString::equalCI(szHandlerName,((EventEditorHandlerTreeWidgetItem *)pItem->child(j))->name()))
             {
-                ((KviEventHandlerTreeWidgetItem *)pItem->child(j))->setEnabled(false);
+                ((EventEditorHandlerTreeWidgetItem *)pItem->child(j))->setEnabled(false);
                 return;
             }
 
@@ -180,7 +180,7 @@ void KviEventEditor::eventHandlerDisabled(const QString &szHandler)
 
 }
 
-KviEventEditorTreeWidget::KviEventEditorTreeWidget(QWidget * par)
+EventEditorTreeWidget::EventEditorTreeWidget(QWidget * par)
 : QTreeWidget(par)
 {
 	setColumnCount (1);
@@ -191,7 +191,7 @@ KviEventEditorTreeWidget::KviEventEditorTreeWidget(QWidget * par)
 	setAnimated(true);
 }
 
-void KviEventEditorTreeWidget::mousePressEvent (QMouseEvent *e)
+void EventEditorTreeWidget::mousePressEvent (QMouseEvent *e)
 {
 	if (e->button() == Qt::RightButton)
 	{
@@ -201,7 +201,7 @@ void KviEventEditorTreeWidget::mousePressEvent (QMouseEvent *e)
 	QTreeWidget::mousePressEvent(e);
 }
 
-void KviEventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
+void EventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
@@ -211,7 +211,7 @@ void KviEventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
 		if(it->parent())
 		{
 			QString tmp;
-			if(!(((KviEventHandlerTreeWidgetItem *)it)->m_bEnabled))
+			if(!(((EventEditorHandlerTreeWidgetItem *)it)->m_bEnabled))
 				m_pContextPopup->insertItem(
 					*(g_pIconManager->getSmallIcon(KVI_SMALLICON_HANDLER)),
 					__tr2qs_ctx("&Enable Handler","editor"),this,SLOT(toggleCurrentHandlerEnabled()));
@@ -239,7 +239,7 @@ void KviEventEditor::itemPressed(QTreeWidgetItem *it,const QPoint &pnt)
 	}
 }
 
-void KviEventEditor::getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &buffer)
+void EventEditor::getUniqueHandlerName(EventEditorEventTreeWidgetItem *it,QString &buffer)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
@@ -254,9 +254,9 @@ void KviEventEditor::getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &bu
 		bFound = false;
 
 		for(int i=0;i<it->childCount();i++)
-		//for(KviEventHandlerTreeWidgetItem * ch = (KviEventHandlerTreeWidgetItem *)(it->firstChild());ch;ch = (KviEventHandlerTreeWidgetItem *)ch->nextSibling())
+		//for(EventEditorHandlerTreeWidgetItem * ch = (EventEditorHandlerTreeWidgetItem *)(it->firstChild());ch;ch = (EventEditorHandlerTreeWidgetItem *)ch->nextSibling())
 		{
-			if(KviQString::equalCI(newName,((KviEventHandlerTreeWidgetItem *)it->child(i))->m_szName))
+			if(KviQString::equalCI(newName,((EventEditorHandlerTreeWidgetItem *)it->child(i))->m_szName))
 			{
 				bFound = true;
 				KviQString::sprintf(newName,"%Q_%d",&buffer,idx);
@@ -269,7 +269,7 @@ void KviEventEditor::getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &bu
 	buffer = newName;
 }
 
-void KviEventEditor::addHandlerForCurrentEvent()
+void EventEditor::addHandlerForCurrentEvent()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 
@@ -283,15 +283,15 @@ void KviEventEditor::addHandlerForCurrentEvent()
 				it->setIcon(0,QIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_EVENT))));
 
 			QString buffer = __tr2qs_ctx("default","editor");
-			getUniqueHandlerName((KviEventTreeWidgetItem *)it,buffer);
-			QTreeWidgetItem * ch = new KviEventHandlerTreeWidgetItem(it,buffer,"",true);
+			getUniqueHandlerName((EventEditorEventTreeWidgetItem *)it,buffer);
+			QTreeWidgetItem * ch = new EventEditorHandlerTreeWidgetItem(it,buffer,"",true);
 			it->setExpanded(true);
 			ch->setSelected(true);
 		}
 	}
 }
 
-void KviEventEditor::removeCurrentHandler()
+void EventEditor::removeCurrentHandler()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(m_pLastEditedItem)
@@ -312,7 +312,7 @@ void KviEventEditor::removeCurrentHandler()
 	}
 }
 
-void KviEventEditor::toggleCurrentHandlerEnabled()
+void EventEditor::toggleCurrentHandlerEnabled()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(m_pLastEditedItem)
@@ -323,7 +323,7 @@ void KviEventEditor::toggleCurrentHandlerEnabled()
 	}
 }
 
-void KviEventEditor::commit()
+void EventEditor::commit()
 {
 	if(!m_bOneTimeSetupDone)return; // nothing to commit
 
@@ -342,15 +342,15 @@ void KviEventEditor::commit()
 			for(int j=0;j<ccount;j++)
 			{
 				QTreeWidgetItem * ch = it->child(j);
-				KviQString::sprintf(szContext,"%Q::%Q",&(((KviEventTreeWidgetItem *)it)->m_szName),&(((KviEventHandlerTreeWidgetItem *)ch)->m_szName));
+				KviQString::sprintf(szContext,"%Q::%Q",&(((EventEditorEventTreeWidgetItem *)it)->m_szName),&(((EventEditorHandlerTreeWidgetItem *)ch)->m_szName));
 				KviKvsScriptEventHandler * s = KviKvsScriptEventHandler::createInstance( // msvc workaround
-						((KviEventHandlerTreeWidgetItem *)ch)->m_szName,
+						((EventEditorHandlerTreeWidgetItem *)ch)->m_szName,
 						szContext,
-						((KviEventHandlerTreeWidgetItem *)ch)->m_szBuffer,
-						((KviEventHandlerTreeWidgetItem *)ch)->m_bEnabled
+						((EventEditorHandlerTreeWidgetItem *)ch)->m_szBuffer,
+						((EventEditorHandlerTreeWidgetItem *)ch)->m_bEnabled
 					);
 
-				KviKvsEventManager::instance()->addAppHandler(((KviEventTreeWidgetItem *)it)->m_uEventIdx,s);
+				KviKvsEventManager::instance()->addAppHandler(((EventEditorEventTreeWidgetItem *)it)->m_uEventIdx,s);
 			}
 		}
 	}
@@ -358,17 +358,17 @@ void KviEventEditor::commit()
 	g_pApp->saveAppEvents();
 }
 
-void KviEventEditor::saveLastEditedItem()
+void EventEditor::saveLastEditedItem()
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	if(!m_pLastEditedItem)return;
-	((KviEventHandlerTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
+	((EventEditorHandlerTreeWidgetItem *)m_pLastEditedItem)->setCursorPosition(m_pEditor->getCursor());
 	QString buffer = m_pNameEditor->text();
 	//not-so elaborate fix for #218, we'd better rework this
 	buffer.replace(QRegExp("[^A-Za-z0-9_]"), "");
 	if(!KviQString::equalCI(buffer,m_pLastEditedItem->m_szName))
 	{
-		getUniqueHandlerName((KviEventTreeWidgetItem *)(m_pLastEditedItem->parent()),buffer);
+		getUniqueHandlerName((EventEditorEventTreeWidgetItem *)(m_pLastEditedItem->parent()),buffer);
 	}
 
 	m_pLastEditedItem->setName(buffer);
@@ -378,7 +378,7 @@ void KviEventEditor::saveLastEditedItem()
 	m_pLastEditedItem->m_szBuffer = tmp;
 }
 
-void KviEventEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
+void EventEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 {
 	KVI_ASSERT(m_bOneTimeSetupDone);
 	saveLastEditedItem();
@@ -393,36 +393,36 @@ void KviEventEditor::currentItemChanged(QTreeWidgetItem * it,QTreeWidgetItem *)
 
 	if(it->parent())
 	{
-		m_pLastEditedItem = (KviEventHandlerTreeWidgetItem *)it;
+		m_pLastEditedItem = (EventEditorHandlerTreeWidgetItem *)it;
 		m_pNameEditor->setEnabled(true);
 		m_pNameEditor->setText(m_pLastEditedItem->name());
 		m_pEditor->setEnabled(true);
 		m_pEditor->setFocus();
 		m_pEditor->setText(m_pLastEditedItem->m_szBuffer);
-		m_pEditor->setCursorPosition(((KviEventHandlerTreeWidgetItem *)it)->cursorPosition());
+		m_pEditor->setCursorPosition(((EventEditorHandlerTreeWidgetItem *)it)->cursorPosition());
 	} else {
 		m_pLastEditedItem = 0;
 		m_pNameEditor->setEnabled(false);
 		m_pNameEditor->setText("");
 		m_pEditor->setEnabled(false);
-		QString parms = ((KviEventTreeWidgetItem *)it)->m_szParams;
+		QString parms = ((EventEditorEventTreeWidgetItem *)it)->m_szParams;
 		if(parms.isEmpty())parms = __tr2qs_ctx("none","editor");
 		KviCommandFormatter::indent(parms);
 		KviCommandFormatter::indent(parms);
 		QString tmp;
 		KviQString::sprintf(tmp,__tr2qs_ctx("\n\nEvent:\n%s\n\nParameters:\n%s","editor"),
-			((KviEventTreeWidgetItem *)it)->m_szName.toUtf8().data(),parms.toUtf8().data());
+			((EventEditorEventTreeWidgetItem *)it)->m_szName.toUtf8().data(),parms.toUtf8().data());
 		m_pEditor->setText(tmp);
 	}
 }
 
-void KviEventEditor::showEvent(QShowEvent *e)
+void EventEditor::showEvent(QShowEvent *e)
 {
 	oneTimeSetup();
 	QWidget::showEvent(e);
 }
 
-void KviEventEditor::getExportEventBuffer(QString &buffer,KviEventHandlerTreeWidgetItem * it)
+void EventEditor::getExportEventBuffer(QString &buffer,EventEditorHandlerTreeWidgetItem * it)
 {
 	if(!it->parent())return;
 
@@ -431,7 +431,7 @@ void KviEventEditor::getExportEventBuffer(QString &buffer,KviEventHandlerTreeWid
 	KviCommandFormatter::blockFromBuffer(szBuf);
 
 	buffer = "event(";
-	buffer += ((KviEventTreeWidgetItem *)(it->parent()))->m_szName;
+	buffer += ((EventEditorEventTreeWidgetItem *)(it->parent()))->m_szName;
 	buffer += ",";
 	buffer += it->m_szName;
 	buffer += ")\n";
@@ -442,13 +442,13 @@ void KviEventEditor::getExportEventBuffer(QString &buffer,KviEventHandlerTreeWid
 	{
 		buffer += "\n";
 		buffer += "eventctl -d ";
-		buffer += ((KviEventTreeWidgetItem *)(it->parent()))->m_szName;
+		buffer += ((EventEditorEventTreeWidgetItem *)(it->parent()))->m_szName;
 		buffer += " ";
 		buffer += it->m_szName;
 	}
 }
 
-void KviEventEditor::exportCurrentHandler()
+void EventEditor::exportCurrentHandler()
 {
 	if(!m_pLastEditedItem)return;
 	saveLastEditedItem();
@@ -456,7 +456,7 @@ void KviEventEditor::exportCurrentHandler()
 
 	QString szName = QDir::homePath();
 	if(!szName.endsWith(QString(KVI_PATH_SEPARATOR)))szName += KVI_PATH_SEPARATOR;
-	szName += ((KviEventTreeWidgetItem *)(m_pLastEditedItem->parent()))->m_szName;
+	szName += ((EventEditorEventTreeWidgetItem *)(m_pLastEditedItem->parent()))->m_szName;
 	szName += ".";
 	szName += m_pLastEditedItem->m_szName;
 	szName += ".kvs";
@@ -474,7 +474,7 @@ void KviEventEditor::exportCurrentHandler()
 	}
 }
 
-void KviEventEditor::exportAllEvents()
+void EventEditor::exportAllEvents()
 {
 	saveLastEditedItem();
 
@@ -483,13 +483,13 @@ void KviEventEditor::exportAllEvents()
 	int count=m_pTreeWidget->topLevelItemCount();
 	for (int i=0;i<count;i++)
 	{
-		KviEventTreeWidgetItem * it = (KviEventTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
+		EventEditorEventTreeWidgetItem * it = (EventEditorEventTreeWidgetItem *)m_pTreeWidget->topLevelItem(i);
 
 		int ccount = it->childCount();
 
 		for(int j=0;j<ccount;j++)
 		{
-			KviEventHandlerTreeWidgetItem * item = (KviEventHandlerTreeWidgetItem *) it->child(j);
+			EventEditorHandlerTreeWidgetItem * item = (EventEditorHandlerTreeWidgetItem *) it->child(j);
 
 			QString tmp;
 			getExportEventBuffer(tmp,item);
@@ -513,13 +513,13 @@ void KviEventEditor::exportAllEvents()
 }
 
 
-KviEventEditorWindow::KviEventEditorWindow(KviMainWindow * lpFrm)
+EventEditorWindow::EventEditorWindow(KviMainWindow * lpFrm)
 : KviWindow(KVI_WINDOW_TYPE_SCRIPTEDITOR,lpFrm,"eventeditor",0)
 {
 	g_pEventEditorWindow = this;
 
 	QGridLayout * g = new QGridLayout();
-	m_pEditor = new KviEventEditor(this);
+	m_pEditor = new EventEditor(this);
 	g->addWidget(m_pEditor,0,0,1,4);
 
 	QPushButton * btn = new QPushButton(__tr2qs_ctx("&OK","editor"),this);
@@ -542,43 +542,43 @@ KviEventEditorWindow::KviEventEditorWindow(KviMainWindow * lpFrm)
 	setLayout(g);
 }
 
-KviEventEditorWindow::~KviEventEditorWindow()
+EventEditorWindow::~EventEditorWindow()
 {
 	g_pEventEditorWindow = 0;
 }
 
-void KviEventEditorWindow::okClicked()
+void EventEditorWindow::okClicked()
 {
 	m_pEditor->commit();
 	close();
 }
 
-void KviEventEditorWindow::applyClicked()
+void EventEditorWindow::applyClicked()
 {
 	m_pEditor->commit();
 }
 
-void KviEventEditorWindow::cancelClicked()
+void EventEditorWindow::cancelClicked()
 {
 	close();
 }
 
-QPixmap * KviEventEditorWindow::myIconPtr()
+QPixmap * EventEditorWindow::myIconPtr()
 {
 	return g_pIconManager->getSmallIcon(KVI_SMALLICON_EVENT);
 }
 
-void KviEventEditorWindow::fillCaptionBuffers()
+void EventEditorWindow::fillCaptionBuffers()
 {
 	m_szPlainTextCaption = __tr2qs_ctx("Event Editor","editor");
 }
 
-void KviEventEditorWindow::getConfigGroupName(QString &szName)
+void EventEditorWindow::getConfigGroupName(QString &szName)
 {
 	szName = "eventeditor";
 }
 
-void KviEventEditorWindow::saveProperties(KviConfigurationFile *) //cfg
+void EventEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
@@ -589,7 +589,7 @@ void KviEventEditorWindow::saveProperties(KviConfigurationFile *) //cfg
 */
 }
 
-void KviEventEditorWindow::loadProperties(KviConfigurationFile *) //cfg
+void EventEditorWindow::loadProperties(KviConfigurationFile *) //cfg
 {
 /*
 #ifdef COMPILE_SCRIPTTOOLBAR
diff --git a/src/modules/eventeditor/eventeditor.h b/src/modules/eventeditor/EventEditorWindow.h
index 1916247da..cd0b0f105 100644
--- a/src/modules/eventeditor/eventeditor.h
+++ b/src/modules/eventeditor/EventEditorWindow.h
@@ -2,7 +2,7 @@
 #define _EVENTEDITOR_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
@@ -34,21 +34,21 @@
 
 class KviScriptEditor;
 
-class KviEventTreeWidgetItem : public QTreeWidgetItem
+class EventEditorEventTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	unsigned int m_uEventIdx;
 	QString m_szName;
 	QString m_szParams;
 public:
-	KviEventTreeWidgetItem(QTreeWidget * par,unsigned int uEvIdx,const QString &name,const QString &params);
-	~KviEventTreeWidgetItem() {};
+	EventEditorEventTreeWidgetItem(QTreeWidget * par,unsigned int uEvIdx,const QString &name,const QString &params);
+	~EventEditorEventTreeWidgetItem() {};
 public:
 	void setName(const QString &szName);
 	QString name() const { return m_szName; };
 };
 
-class KviEventHandlerTreeWidgetItem : public QTreeWidgetItem
+class EventEditorHandlerTreeWidgetItem : public QTreeWidgetItem
 {
 public:
 	QString m_szName;
@@ -56,8 +56,8 @@ public:
 	bool   m_bEnabled;
 	int m_cPos;
 public:
-	KviEventHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString &name,const QString &buffer,bool bEnabled);
-	~KviEventHandlerTreeWidgetItem() {};
+	EventEditorHandlerTreeWidgetItem(QTreeWidgetItem * par,const QString &name,const QString &buffer,bool bEnabled);
+	~EventEditorHandlerTreeWidgetItem() {};
 public:
 	const int & cursorPosition(){return m_cPos; };
 	void setCursorPosition(const int &cPos){qDebug("set cursor to %d",cPos); m_cPos = cPos; };
@@ -67,12 +67,12 @@ public:
 	void setEnabled(const bool bEnabled);
 };
 
-class KviEventEditorTreeWidget : public QTreeWidget
+class EventEditorTreeWidget : public QTreeWidget
 {
 	Q_OBJECT
 public:
-	KviEventEditorTreeWidget(QWidget*);
-	~KviEventEditorTreeWidget(){};
+	EventEditorTreeWidget(QWidget*);
+	~EventEditorTreeWidget(){};
 protected:
 
 	void mousePressEvent (QMouseEvent *e);
@@ -80,24 +80,24 @@ signals:
 	void rightButtonPressed(QTreeWidgetItem *,QPoint);
 };
 
-class KviEventEditor : public QWidget
+class EventEditor : public QWidget
 {
 	Q_OBJECT
 public:
-	KviEventEditor(QWidget * par);
-	~KviEventEditor();
+	EventEditor(QWidget * par);
+	~EventEditor();
 public:
 	KviScriptEditor * m_pEditor;
-	KviEventEditorTreeWidget       * m_pTreeWidget;
+	EventEditorTreeWidget       * m_pTreeWidget;
 	QLineEdit       * m_pNameEditor;
 	KviTalPopupMenu      * m_pContextPopup;
-	KviEventHandlerTreeWidgetItem * m_pLastEditedItem;
+	EventEditorHandlerTreeWidgetItem * m_pLastEditedItem;
 	bool              m_bOneTimeSetupDone;
 public:
 	void commit();
 	void saveLastEditedItem();
-	void getUniqueHandlerName(KviEventTreeWidgetItem *it,QString &buffer);
-	void getExportEventBuffer(QString &szBuffer,KviEventHandlerTreeWidgetItem * it);
+	void getUniqueHandlerName(EventEditorEventTreeWidgetItem *it,QString &buffer);
+	void getExportEventBuffer(QString &szBuffer,EventEditorHandlerTreeWidgetItem * it);
 protected slots:
 	void currentItemChanged(QTreeWidgetItem *it,QTreeWidgetItem *);
 	void itemPressed(QTreeWidgetItem *it,const QPoint &pnt);
@@ -113,14 +113,14 @@ private:
 	void oneTimeSetup();
 };
 
-class KviEventEditorWindow : public KviWindow
+class EventEditorWindow : public KviWindow
 {
 	Q_OBJECT
 public:
-	KviEventEditorWindow(KviMainWindow * lpFrm);
-	~KviEventEditorWindow();
+	EventEditorWindow(KviMainWindow * lpFrm);
+	~EventEditorWindow();
 protected:
-	KviEventEditor * m_pEditor;
+	EventEditor * m_pEditor;
 protected:
 	virtual QPixmap * myIconPtr();
 	virtual void fillCaptionBuffers();
diff --git a/src/modules/eventeditor/libkvieventeditor.cpp b/src/modules/eventeditor/libkvieventeditor.cpp
index 61fce5f16..5f69b618f 100644
--- a/src/modules/eventeditor/libkvieventeditor.cpp
+++ b/src/modules/eventeditor/libkvieventeditor.cpp
@@ -22,13 +22,13 @@
 //
 //=============================================================================
 
-#include "eventeditor.h"
+#include "EventEditorWindow.h"
 
 #include "KviModule.h"
 #include "KviLocale.h"
 #include "KviMainWindow.h"
 
-KviEventEditorWindow * g_pEventEditorWindow = 0;
+EventEditorWindow * g_pEventEditorWindow = 0;
 
 
 /*
@@ -49,7 +49,7 @@ static bool eventeditor_kvs_cmd_open(KviKvsModuleCommandCall * c)
 {
 	if(!g_pEventEditorWindow)
 	{
-		g_pEventEditorWindow = new KviEventEditorWindow(c->window()->frame());
+		g_pEventEditorWindow = new EventEditorWindow(c->window()->frame());
 		c->window()->frame()->addWindow(g_pEventEditorWindow);
 	}