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

8 files changed, 170 insertions, 170 deletions

diff --git a/src/modules/reguser/CMakeLists.txt b/src/modules/reguser/CMakeLists.txt
index 8a4e16f24..aed8d44ba 100644
--- a/src/modules/reguser/CMakeLists.txt
+++ b/src/modules/reguser/CMakeLists.txt
@@ -1,15 +1,15 @@
 # CMakeLists for src/modules/reguser
 
 SET(kvireguser_MOC_HDRS
-	edituser.h
-	wizard.h
+	RegisteredUserEntryDialog.h
+	RegistrationWizard.h
 	dialog.h
 )
 
 SET(kvireguser_SRCS
 	libkvireguser.cpp
-	edituser.cpp
-	wizard.cpp
+	RegisteredUserEntryDialog.cpp
+	RegistrationWizard.cpp
 	dialog.cpp
 )
 
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/RegisteredUserEntryDialog.cpp
index fe033f14f..cd49e6e86 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/RegisteredUserEntryDialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : edituser.cpp
+//   File : RegisteredUserEntryDialog.cpp
 //   Creation date : Tue Dec 26 2000 12:24:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,8 +24,8 @@
 #define _WANT_OPTION_FLAGS_
 #define _EDITUSER_CPP_
 
-#include "edituser.h"
-#include "wizard.h"
+#include "RegisteredUserEntryDialog.h"
+#include "RegistrationWizard.h"
 #include "dialog.h"
 
 #include "KviRegisteredUserDataBase.h"
@@ -63,12 +63,12 @@
 #include <QCloseEvent>
 
 // KviApplication.cpp
-extern KviRegisteredUsersDialog * g_pRegisteredUsersDialog;
+extern RegisteredUsersDialog * g_pRegisteredUsersDialog;
 
 KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; // local copy!
 
 
-KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHashTable<QString,QString> * dict)
+RegisteredUserPropertiesDialog::RegisteredUserPropertiesDialog(QWidget * p,KviPointerHashTable<QString,QString> * dict)
 : QDialog(p)
 {
 	setObjectName("property_editor");
@@ -125,17 +125,17 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas
 	fillData();
 }
 
-KviReguserPropertiesDialog::~KviReguserPropertiesDialog()
+RegisteredUserPropertiesDialog::~RegisteredUserPropertiesDialog()
 {
 }
 
-void KviReguserPropertiesDialog::closeEvent(QCloseEvent *e)
+void RegisteredUserPropertiesDialog::closeEvent(QCloseEvent *e)
 {
 	e->accept();
 	//delete this;
 }
 
-void KviReguserPropertiesDialog::fillData()
+void RegisteredUserPropertiesDialog::fillData()
 {
 	m_pTable->setRowCount(m_pPropertyDict->count());
 	KviPointerHashTableIterator<QString,QString> it(*m_pPropertyDict);
@@ -156,7 +156,7 @@ void KviReguserPropertiesDialog::fillData()
 	if(m_pTable->rowCount() == 0)m_pDelButton->setEnabled(false);
 }
 
-void KviReguserPropertiesDialog::okClicked()
+void RegisteredUserPropertiesDialog::okClicked()
 {
 	m_pPropertyDict->clear();
 
@@ -174,7 +174,7 @@ void KviReguserPropertiesDialog::okClicked()
 	accept();
 }
 
-void KviReguserPropertiesDialog::addClicked()
+void RegisteredUserPropertiesDialog::addClicked()
 {
 	m_pTable->setRowCount(m_pTable->rowCount() + 1);
 
@@ -189,7 +189,7 @@ void KviReguserPropertiesDialog::addClicked()
 	m_pDelButton->setEnabled(true);
 }
 
-void KviReguserPropertiesDialog::delClicked()
+void RegisteredUserPropertiesDialog::delClicked()
 {
 	int i = m_pTable->currentRow();
 
@@ -202,7 +202,7 @@ void KviReguserPropertiesDialog::delClicked()
 }
 
 
-KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m)
+RegisteredUserMaskDialog::RegisteredUserMaskDialog(QWidget * p,KviIrcMask * m)
 : QDialog(p)
 {
 	setObjectName("reguser_mask_editor");
@@ -271,17 +271,17 @@ KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m)
 	m_pHostEdit->setText(m->host());
 }
 
-KviReguserMaskDialog::~KviReguserMaskDialog()
+RegisteredUserMaskDialog::~RegisteredUserMaskDialog()
 {
 }
 
-void KviReguserMaskDialog::closeEvent(QCloseEvent *e)
+void RegisteredUserMaskDialog::closeEvent(QCloseEvent *e)
 {
 	e->accept();
 	//delete this;
 }
 
-void KviReguserMaskDialog::okClicked()
+void RegisteredUserMaskDialog::okClicked()
 {
 	KviCString szTmp = m_pNickEdit->text();
 	if(szTmp.isEmpty())szTmp = "*";
@@ -299,7 +299,7 @@ void KviReguserMaskDialog::okClicked()
 }
 
 
-KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegisteredUser * r,bool bModal)
+RegisteredUserEntryDialog::RegisteredUserEntryDialog(QWidget *p,KviRegisteredUser * r,bool bModal)
 : KviTalTabDialog(p,"reguser_entry_editor",bModal)
 {
 	m_pUser = r;
@@ -522,21 +522,21 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 	}
 }
 
-void KviRegisteredUserEntryDialog::closeEvent(QCloseEvent *e)
+void RegisteredUserEntryDialog::closeEvent(QCloseEvent *e)
 {
 	e->accept();
 	okClicked();
 	//delete this;
 }
 
-KviRegisteredUserEntryDialog::~KviRegisteredUserEntryDialog()
+RegisteredUserEntryDialog::~RegisteredUserEntryDialog()
 {
 	delete m_pAvatar;
 	delete m_pPropertyDict;
 	delete m_pCustomColor;
 }
 
-void KviRegisteredUserEntryDialog::notifyCheckClicked(bool bChecked)
+void RegisteredUserEntryDialog::notifyCheckClicked(bool bChecked)
 {
 	m_pNotifyNick->setEnabled(bChecked);
 	m_pNotifyLabel->setEnabled(bChecked);
@@ -568,7 +568,7 @@ void KviRegisteredUserEntryDialog::notifyCheckClicked(bool bChecked)
 	}
 }
 
-void KviRegisteredUserEntryDialog::maskCurrentChanged()
+void RegisteredUserEntryDialog::maskCurrentChanged()
 {
 	bool bHaveSelected = !m_pMaskListBox->selectedItems().empty();
 
@@ -576,7 +576,7 @@ void KviRegisteredUserEntryDialog::maskCurrentChanged()
 	m_pEditMaskButton->setEnabled(bHaveSelected);
 }
 
-void KviRegisteredUserEntryDialog::okClicked()
+void RegisteredUserEntryDialog::okClicked()
 {
 	QString szGroup;
 	if(m_pUser)
@@ -690,10 +690,10 @@ void KviRegisteredUserEntryDialog::okClicked()
 	g_pApp->optionResetUpdate(KviOption_resetUpdateGui);
 }
 
-void KviRegisteredUserEntryDialog::addMaskClicked()
+void RegisteredUserEntryDialog::addMaskClicked()
 {
 	KviIrcMask mk;
-	KviReguserMaskDialog * dlg = new KviReguserMaskDialog(this,&mk);
+	RegisteredUserMaskDialog * dlg = new RegisteredUserMaskDialog(this,&mk);
 	if(dlg->exec() == QDialog::Accepted)
 	{
 		QString m = mk.nick();
@@ -706,21 +706,21 @@ void KviRegisteredUserEntryDialog::addMaskClicked()
 	delete dlg;
 }
 
-void KviRegisteredUserEntryDialog::delMaskClicked()
+void RegisteredUserEntryDialog::delMaskClicked()
 {
 	if(m_pMaskListBox->currentItem()) {
 		delete m_pMaskListBox->currentItem();
 	}
 }
 
-void KviRegisteredUserEntryDialog::editMaskClicked()
+void RegisteredUserEntryDialog::editMaskClicked()
 {
 	if(!m_pMaskListBox->currentItem())return;
 	QString szM = m_pMaskListBox->currentItem()->text();
 	if(szM.isEmpty())return;
 
 	KviIrcMask mk(szM);
-	KviReguserMaskDialog * dlg = new KviReguserMaskDialog(this,&mk);
+	RegisteredUserMaskDialog * dlg = new RegisteredUserMaskDialog(this,&mk);
 	if(dlg->exec() == QDialog::Accepted)
 	{
 		QString m = mk.nick();
@@ -733,7 +733,7 @@ void KviRegisteredUserEntryDialog::editMaskClicked()
 	delete dlg;
 }
 
-void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
+void RegisteredUserEntryDialog::editAllPropertiesClicked()
 {
 	m_pAvatarSelector->commit();
 
@@ -761,7 +761,7 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 	}
 
 
-	KviReguserPropertiesDialog * dlg = new KviReguserPropertiesDialog(this,m_pPropertyDict);
+	RegisteredUserPropertiesDialog * dlg = new RegisteredUserPropertiesDialog(this,m_pPropertyDict);
 	if(dlg->exec() != QDialog::Accepted)
 	{
 		delete dlg;
@@ -794,5 +794,5 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "edituser.moc"
+#include "RegisteredUserEntryDialog.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/RegisteredUserEntryDialog.h
index 5fa608b9b..04dc745cd 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/RegisteredUserEntryDialog.h
@@ -2,7 +2,7 @@
 #define _EDITUSER_H_
 //=============================================================================
 //
-//   File : edituser.h
+//   File : RegisteredUserEntryDialog.h
 //   Creation date : Sun Dec 24 2000 15:16:17 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -45,12 +45,12 @@ class KviRegisteredUser;
 	extern KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase;
 #endif
 
-class KviReguserPropertiesDialog : public QDialog
+class RegisteredUserPropertiesDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviReguserPropertiesDialog(QWidget *p,KviPointerHashTable<QString,QString> * dict);
-	~KviReguserPropertiesDialog();
+	RegisteredUserPropertiesDialog(QWidget *p,KviPointerHashTable<QString,QString> * dict);
+	~RegisteredUserPropertiesDialog();
 protected:
 	QTableWidget *m_pTable;
 
@@ -67,12 +67,12 @@ protected slots:
 };
 
 
-class KviReguserMaskDialog : public QDialog
+class RegisteredUserMaskDialog : public QDialog
 {
 	Q_OBJECT
 public:
-	KviReguserMaskDialog(QWidget * p,KviIrcMask * m);
-	~KviReguserMaskDialog();
+	RegisteredUserMaskDialog(QWidget * p,KviIrcMask * m);
+	~RegisteredUserMaskDialog();
 protected:
 	KviIrcMask * m_pMask;
 
@@ -86,12 +86,12 @@ protected slots:
 };
 
 
-class KviRegisteredUserEntryDialog : public KviTalTabDialog
+class RegisteredUserEntryDialog : public KviTalTabDialog
 {
 	Q_OBJECT
 public:
-	KviRegisteredUserEntryDialog(QWidget * p,KviRegisteredUser * r,bool bModal = true);
-	virtual ~KviRegisteredUserEntryDialog();
+	RegisteredUserEntryDialog(QWidget * p,KviRegisteredUser * r,bool bModal = true);
+	virtual ~RegisteredUserEntryDialog();
 protected:
 	KviRegisteredUser  * m_pUser;
 
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/RegistrationWizard.cpp
index cdb89f566..0c4cc6a38 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/RegistrationWizard.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : wizard.cpp
+//   File : RegistrationWizard.cpp
 //   Creation date : Fri Jun 26 2002 21:21:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -23,7 +23,7 @@
 //=============================================================================
 
 
-#include "wizard.h"
+#include "RegistrationWizard.h"
 
 #include "KviLocale.h"
 #include "KviPointerList.h"
@@ -45,9 +45,9 @@
 
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
-extern KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList;
+extern KviPointerList<RegistrationWizard> * g_pRegistrationWizardList;
 
-KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal)
+RegistrationWizard::RegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal)
 : KviTalWizard(par)
 {
 	m_pDb = db;
@@ -268,7 +268,7 @@ KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegiste
 	// signals and slots connections
 }
 
-KviRegistrationWizard::~KviRegistrationWizard()
+RegistrationWizard::~RegistrationWizard()
 {
 	delete m_pAvatar;
 	g_pRegistrationWizardList->setAutoDelete(false);
@@ -276,7 +276,7 @@ KviRegistrationWizard::~KviRegistrationWizard()
 	g_pRegistrationWizardList->setAutoDelete(true);
 }
 
-void KviRegistrationWizard::reject()
+void RegistrationWizard::reject()
 {
 	KviTalWizard::reject();
 	if(!m_bModal)delete this;
@@ -284,7 +284,7 @@ void KviRegistrationWizard::reject()
 //	g_pApp->collectGarbage(this);
 }
 
-void KviRegistrationWizard::accept()
+void RegistrationWizard::accept()
 {
 	bool bLocalDb = true;
 	if(!m_pDb)
@@ -394,7 +394,7 @@ void KviRegistrationWizard::accept()
 }
 
 
-void KviRegistrationWizard::showEvent(QShowEvent *e)
+void RegistrationWizard::showEvent(QShowEvent *e)
 {
 	if(height() < 420)resize(width(),420);
 
@@ -403,7 +403,7 @@ void KviRegistrationWizard::showEvent(QShowEvent *e)
 	KviTalWizard::showEvent(e);
 }
 
-void KviRegistrationWizard::maskChanged(const QString &)
+void RegistrationWizard::maskChanged(const QString &)
 {
 	KviCString tmp1 = m_pNicknameEdit1->text();
 	KviCString tmp2 = m_pUsernameEdit1->text();
@@ -434,13 +434,13 @@ void KviRegistrationWizard::maskChanged(const QString &)
 	setNextEnabled(m_pPage2,mask!="*!*@*");
 }
 
-void KviRegistrationWizard::realNameChanged(const QString &)
+void RegistrationWizard::realNameChanged(const QString &)
 {
 	QString tmp = m_pEditRealName->text();
 	setNextEnabled(m_pPage1,!(tmp.isEmpty() || tmp.isNull()));
 }
 
-void KviRegistrationWizard::notifyNickChanged(const QString &)
+void RegistrationWizard::notifyNickChanged(const QString &)
 {
 	bool bYes = !m_pNotifyCheck->isChecked();
 
@@ -460,7 +460,7 @@ void KviRegistrationWizard::notifyNickChanged(const QString &)
 	setNextEnabled(m_pPage4,bYes);
 }
 
-void KviRegistrationWizard::notifyCheckToggled(bool)
+void RegistrationWizard::notifyCheckToggled(bool)
 {
 	bool bYes = m_pNotifyCheck->isChecked();
 
@@ -474,5 +474,5 @@ void KviRegistrationWizard::notifyCheckToggled(bool)
 }
 
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
-#include "wizard.moc"
+#include "RegistrationWizard.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/RegistrationWizard.h
index 10b1a5d2b..8047840c7 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/RegistrationWizard.h
@@ -2,7 +2,7 @@
 #define _WIZARD_H_
 //=============================================================================
 //
-//   File : wizard.h
+//   File : RegistrationWizard.h
 //   Creation date : Fri Jun 26 2002 21:21:21 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -39,12 +39,12 @@ class KviTalVBoxLayout;
 class KviTalHBoxLayout;
 class KviRegisteredUserDataBase;
 
-class KviRegistrationWizard : public KviTalWizard
+class RegistrationWizard : public KviTalWizard
 {
 	Q_OBJECT
 public:
-	KviRegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false);
-	~KviRegistrationWizard();
+	RegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false);
+	~RegistrationWizard();
 
 	KviRegisteredUserDataBase * m_pDb;
 
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index bfa4c89df..774275414 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -1,6 +1,6 @@
 //=============================================================================
 //
-//   File : edituser.cpp
+//   File : RegisteredUserEntryDialog.cpp
 //   Creation date : Tue Dec 26 2000 12:24:12 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -24,8 +24,8 @@
 
 #define _WANT_OPTION_FLAGS_
 
-#include "edituser.h"
-#include "wizard.h"
+#include "RegisteredUserEntryDialog.h"
+#include "RegistrationWizard.h"
 #include "dialog.h"
 
 #include "KviRegisteredUserDataBase.h"
@@ -70,7 +70,7 @@
 #define LVI_MINIMUM_CELL_WIDTH (LVI_MINIMUM_TEXT_WIDTH + LVI_BORDER + LVI_ICON_SIZE + LVI_SPACING + LVI_BORDER)
 
 
-extern KviRegisteredUsersDialog * g_pRegisteredUsersDialog;
+extern RegisteredUsersDialog * g_pRegisteredUsersDialog;
 
 KviRegisteredUsersListView::KviRegisteredUsersListView(QWidget * par)
 : QTreeWidget(par)
@@ -107,8 +107,8 @@ void KviRegisteredUsersListView::mousePressEvent (QMouseEvent *e)
 	QTreeWidget::mousePressEvent(e);
 }
 
-KviRegisteredUsersDialogItem::KviRegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u)
-: KviRegisteredUsersDialogItemBase(User,par), m_pUser(u)
+RegisteredUsersDialogItem::RegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u)
+: RegisteredUsersDialogItemBase(User,par), m_pUser(u)
 {
 	QString szTmp;
 	QString t = "<nobr><b>";
@@ -141,21 +141,21 @@ KviRegisteredUsersDialogItem::KviRegisteredUsersDialogItem(QTreeWidgetItem * par
 // 	setText(0,t);
 }
 
-KviRegisteredUsersDialogItem::~KviRegisteredUsersDialogItem()
+RegisteredUsersDialogItem::~RegisteredUsersDialogItem()
 {
 }
 
-QString KviRegisteredUsersDialogItem::key(int,bool) const
+QString RegisteredUsersDialogItem::key(int,bool) const
 {
 	return m_pUser->name();
 }
 
-void KviRegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const
+void RegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOptionViewItem & option, const QModelIndex & index ) const
 {
 
-	KviRegisteredUsersDialogItemBase *item=static_cast<KviRegisteredUsersDialogItemBase *>(index.internalPointer());
+	RegisteredUsersDialogItemBase *item=static_cast<RegisteredUsersDialogItemBase *>(index.internalPointer());
 
-	if(item->type()==KviRegisteredUsersDialogItemBase::Group)
+	if(item->type()==RegisteredUsersDialogItemBase::Group)
 	{
 		//groups
 		QStyledItemDelegate::paint(p, option, index);
@@ -166,7 +166,7 @@ void KviRegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOpti
 		if (opt.state & QStyle::State_Selected)
 			QApplication::style()->drawPrimitive(QStyle::PE_PanelItemViewItem,&opt, p);
 
-		KviRegisteredUsersDialogItem *it=(KviRegisteredUsersDialogItem*)item;
+		RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item;
 
 		if(index.column()==0)
 		{
@@ -195,23 +195,23 @@ void KviRegisteredUsersDialogItemDelegate::paint( QPainter * p, const QStyleOpti
 	}
 }
 
-QSize KviRegisteredUsersDialogItemDelegate::sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const
+QSize RegisteredUsersDialogItemDelegate::sizeHint( const QStyleOptionViewItem & option, const QModelIndex & index ) const
 {
-	KviRegisteredUsersDialogItemBase *item=static_cast<KviRegisteredUsersDialogItemBase *>(index.internalPointer());
+	RegisteredUsersDialogItemBase *item=static_cast<RegisteredUsersDialogItemBase *>(index.internalPointer());
 
-	if(item->type()==KviRegisteredUsersDialogItemBase::Group)
+	if(item->type()==RegisteredUsersDialogItemBase::Group)
 	{
 		//groups
 		return QStyledItemDelegate::sizeHint(option, index);
 	} else {
 		//users
-// 		KviRegisteredUsersDialogItem *it=(KviRegisteredUsersDialogItem*)item;
+// 		RegisteredUsersDialogItem *it=(RegisteredUsersDialogItem*)item;
 
 		return QSize(300, LVI_ICON_SIZE+2*LVI_BORDER);
 	}
 }
 
-KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
+RegisteredUsersDialog::RegisteredUsersDialog(QWidget * par)
 : QWidget(par)
 {
 	g_pRegisteredUsersDialog = this;
@@ -226,7 +226,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 
 
 	m_pListView = new KviRegisteredUsersListView(this);
-	m_pListView->setItemDelegate(new KviRegisteredUsersDialogItemDelegate());
+	m_pListView->setItemDelegate(new RegisteredUsersDialogItemDelegate());
 
 	connect(m_pListView,SIGNAL(itemPressed(QTreeWidgetItem *,int)),this,SLOT(itemPressed(QTreeWidgetItem *,int)));
 	connect(m_pListView,SIGNAL(itemDoubleClicked(QTreeWidgetItem *, int)),this,SLOT(itemDoubleClicked(QTreeWidgetItem *, int)));
@@ -327,7 +327,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 	}
 }
 
-KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
+RegisteredUsersDialog::~RegisteredUsersDialog()
 {
 #ifndef COMPILE_ON_MAC
 	if(!parent())KVI_OPTION_RECT(KviOption_rectRegisteredUsersDialogGeometry) = QRect(pos().x(),pos().y(),size().width(),size().height());
@@ -341,13 +341,13 @@ KviRegisteredUsersDialog::~KviRegisteredUsersDialog()
 	g_pLocalRegisteredUserDataBase = 0;
 }
 
-void KviRegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
+void RegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
 {
 	if(!it)return;
-	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)it;
-	if(b->type()==KviRegisteredUsersDialogItemBase::User)
+	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
+	if(b->type()==RegisteredUsersDialogItemBase::User)
 	{
-		KviRegisteredUsersDialogItem *i = (KviRegisteredUsersDialogItem *)it;
+		RegisteredUsersDialogItem *i = (RegisteredUsersDialogItem *)it;
 
 		QRect r = m_pListView->visualItemRect(i);
 		int daw = m_pListView->columnWidth(0);
@@ -391,20 +391,20 @@ void KviRegisteredUsersDialog::itemPressed(QTreeWidgetItem *it,int c)
 	}
 }
 
-void KviRegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem *it, int)
+void RegisteredUsersDialog::itemDoubleClicked(QTreeWidgetItem *it, int)
 {
 	if(!it)return;
-	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)it;
-	if(b->type()==KviRegisteredUsersDialogItemBase::User)
+	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
+	if(b->type()==RegisteredUsersDialogItemBase::User)
 	{
-		editItem((KviRegisteredUsersDialogItem *)it);
+		editItem((RegisteredUsersDialogItem *)it);
 	} else	{
-		KviRegisteredUsersGroupItem *i = (KviRegisteredUsersGroupItem *)b;
+		RegisteredUsersGroupItem *i = (RegisteredUsersGroupItem *)b;
 		editGroup(i->group());
 	}
 }
 
-void KviRegisteredUsersDialog::addGroupClicked()
+void RegisteredUsersDialog::addGroupClicked()
 {
 	bool ok;
 	QString text = QInputDialog::getText( this,
@@ -416,7 +416,7 @@ void KviRegisteredUsersDialog::addGroupClicked()
 	}
 }
 
-void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
+void RegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
 {
 	bool ok;
 
@@ -456,12 +456,12 @@ void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
 }
 
 
-void KviRegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPoint pnt)
+void RegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPoint pnt)
 {
 	if(pItem)
 	{
-		KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)pItem;
-		if(b->type()==KviRegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)pItem;
+		if(b->type()==RegisteredUsersDialogItemBase::User)
 		{
 			KviTalPopupMenu *groups = new KviTalPopupMenu;
 
@@ -482,51 +482,51 @@ void KviRegisteredUsersDialog::rightButtonPressed ( QTreeWidgetItem * pItem, QPo
 	}
 }
 
-void KviRegisteredUsersDialog::moveToGroupMenuClicked(int id)
+void RegisteredUsersDialog::moveToGroupMenuClicked(int id)
 {
 	QString szGroup=(*(m_TmpDict.find(id)))->name();
 	QList<QTreeWidgetItem *> list = m_pListView->selectedItems();
 	for(int i=0; i<list.count(); i++)
 	{
-		KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)(list.at(i));
-		if(b->type()==KviRegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(list.at(i));
+		if(b->type()==RegisteredUsersDialogItemBase::User)
 		{
-			((KviRegisteredUsersDialogItem *)list.at(i))->user()->setGroup(szGroup);
+			((RegisteredUsersDialogItem *)list.at(i))->user()->setGroup(szGroup);
 		}
 	}
 	fillList();
 }
 
-void KviRegisteredUsersDialog::fillList()
+void RegisteredUsersDialog::fillList()
 {
 	m_pListView->clear();
-	KviPointerHashTable<QString,KviRegisteredUsersGroupItem> groupItems(5,false);
+	KviPointerHashTable<QString,RegisteredUsersGroupItem> groupItems(5,false);
 	groupItems.setAutoDelete(false);
 
 	KviPointerHashTable<QString,KviRegisteredUserGroup> * pGroups = g_pLocalRegisteredUserDataBase->groupDict();
 	for(KviRegisteredUserGroup * g = pGroups->first();g;g = pGroups->next())
 	{
-		KviRegisteredUsersGroupItem* pCur = new KviRegisteredUsersGroupItem(m_pListView,g);
+		RegisteredUsersGroupItem* pCur = new RegisteredUsersGroupItem(m_pListView,g);
 		groupItems.insert(g->name(),pCur);
 		pCur->setExpanded(TRUE);
 	}
 
 	KviPointerHashTable<QString,KviRegisteredUser> * d = g_pLocalRegisteredUserDataBase->userDict();
-	KviRegisteredUsersDialogItem * item;
+	RegisteredUsersDialogItem * item;
 
 	for(KviRegisteredUser * u = d->first();u;u = d->next())
 	{
 		if(u->group().isEmpty())
 			u->setGroup(__tr2qs_ctx("Default","register"));
 		if(groupItems.find(u->group()))
-			item = new KviRegisteredUsersDialogItem(groupItems.find(u->group()),u);
+			item = new RegisteredUsersDialogItem(groupItems.find(u->group()),u);
 		else if(groupItems.find(__tr2qs_ctx("Default","register")))
-			item = new KviRegisteredUsersDialogItem(groupItems.find(__tr2qs_ctx("Default","register")),u);
+			item = new RegisteredUsersDialogItem(groupItems.find(__tr2qs_ctx("Default","register")),u);
 		else { //should never be called
 			KviRegisteredUserGroup* pGroup = g_pLocalRegisteredUserDataBase->addGroup(__tr2qs_ctx("Default","register"));
-			KviRegisteredUsersGroupItem* pCur = new KviRegisteredUsersGroupItem(m_pListView,pGroup);
+			RegisteredUsersGroupItem* pCur = new RegisteredUsersGroupItem(m_pListView,pGroup);
 			groupItems.insert(__tr2qs_ctx("Default","register"),pCur);
-			item = new KviRegisteredUsersDialogItem(pCur,u);
+			item = new RegisteredUsersDialogItem(pCur,u);
 		}
 	}
 	if(m_pListView->topLevelItem(0))
@@ -536,7 +536,7 @@ void KviRegisteredUsersDialog::fillList()
 	}
 }
 
-void KviRegisteredUsersDialog::closeEvent(QCloseEvent *e)
+void RegisteredUsersDialog::closeEvent(QCloseEvent *e)
 {
 	m_pListView->clear();
 	e->accept();
@@ -544,7 +544,7 @@ void KviRegisteredUsersDialog::closeEvent(QCloseEvent *e)
 	//delete this;
 }
 
-void KviRegisteredUsersDialog::okClicked()
+void RegisteredUsersDialog::okClicked()
 {
 	m_pListView->clear();
 	g_pRegisteredUserDataBase->copyFrom(g_pLocalRegisteredUserDataBase);
@@ -552,15 +552,15 @@ void KviRegisteredUsersDialog::okClicked()
 	delete this;
 }
 
-void KviRegisteredUsersDialog::cancelClicked()
+void RegisteredUsersDialog::cancelClicked()
 {
 	m_pListView->clear();
 	delete this;
 }
 
-void KviRegisteredUsersDialog::addClicked()
+void RegisteredUsersDialog::addClicked()
 {
-	KviRegisteredUserEntryDialog * dlg = new KviRegisteredUserEntryDialog(this,0);
+	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this,0);
 	int ret = dlg->exec();
 	delete dlg;
 
@@ -572,9 +572,9 @@ void KviRegisteredUsersDialog::addClicked()
 	}
 }
 
-void KviRegisteredUsersDialog::addWizardClicked()
+void RegisteredUsersDialog::addWizardClicked()
 {
-	KviRegistrationWizard * w = new KviRegistrationWizard("",g_pLocalRegisteredUserDataBase,this,true);
+	RegistrationWizard * w = new RegistrationWizard("",g_pLocalRegisteredUserDataBase,this,true);
 	int ret = w->exec();
 	delete w;
 	if(!g_pRegisteredUsersDialog)return; // we have been deleted!
@@ -584,33 +584,33 @@ void KviRegisteredUsersDialog::addWizardClicked()
 	}
 }
 
-void KviRegisteredUsersDialog::removeClicked()
+void RegisteredUsersDialog::removeClicked()
 {
 	QList<QTreeWidgetItem *> list = m_pListView->selectedItems();
 	for(int i=0; i<list.count(); i++)
 	{
-		KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)(list.at(i));
-		if(b->type()==KviRegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(list.at(i));
+		if(b->type()==RegisteredUsersDialogItemBase::User)
 		{
-			g_pLocalRegisteredUserDataBase->removeUser(((KviRegisteredUsersDialogItem *)list.at(i))->user()->name());
+			g_pLocalRegisteredUserDataBase->removeUser(((RegisteredUsersDialogItem *)list.at(i))->user()->name());
 		} else {
-			g_pLocalRegisteredUserDataBase->removeGroup(((KviRegisteredUsersGroupItem *)list.at(i))->group()->name());
+			g_pLocalRegisteredUserDataBase->removeGroup(((RegisteredUsersGroupItem *)list.at(i))->group()->name());
 		}
 	}
 	fillList();
-// 	KviRegisteredUsersDialogItem *it = (KviRegisteredUsersDialogItem *)m_pListView->firstChild();
-// 	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)it;
-// 	if(b->type()==KviRegisteredUsersDialogItemBase::User)
+// 	RegisteredUsersDialogItem *it = (RegisteredUsersDialogItem *)m_pListView->firstChild();
+// 	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)it;
+// 	if(b->type()==RegisteredUsersDialogItemBase::User)
 // 	{
-// 		KviPointerList<KviRegisteredUsersDialogItem> l;
+// 		KviPointerList<RegisteredUsersDialogItem> l;
 // 		l.setAutoDelete(false);
 // 		while(it)
 // 		{
 // 			if(it->isSelected())l.append(it);
-// 			it = (KviRegisteredUsersDialogItem *)it->nextSibling();
+// 			it = (RegisteredUsersDialogItem *)it->nextSibling();
 // 		}
 //
-// 		for(KviRegisteredUsersDialogItem * i = l.first();i;i = l.next())
+// 		for(RegisteredUsersDialogItem * i = l.first();i;i = l.next())
 // 		{
 // 			//g_pLocalRegisteredUserDataBase->removeUser(i->user()->name());
 // 			delete i;
@@ -620,21 +620,21 @@ void KviRegisteredUsersDialog::removeClicked()
 // 	}
 }
 
-void KviRegisteredUsersDialog::editClicked()
+void RegisteredUsersDialog::editClicked()
 {
-	KviRegisteredUsersDialogItemBase* b=(KviRegisteredUsersDialogItemBase*)(m_pListView->currentItem());
+	RegisteredUsersDialogItemBase* b=(RegisteredUsersDialogItemBase*)(m_pListView->currentItem());
 	if(!b)return;
-	if(b->type()==KviRegisteredUsersDialogItemBase::User)
+	if(b->type()==RegisteredUsersDialogItemBase::User)
 	{
-		KviRegisteredUsersDialogItem *i = (KviRegisteredUsersDialogItem *)b;
+		RegisteredUsersDialogItem *i = (RegisteredUsersDialogItem *)b;
 		editItem(i);
 	} else {
-		KviRegisteredUsersGroupItem *i = (KviRegisteredUsersGroupItem *)b;
+		RegisteredUsersGroupItem *i = (RegisteredUsersGroupItem *)b;
 		editGroup(i->group());
 	}
 }
 
-void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
+void RegisteredUsersDialog::editItem(RegisteredUsersDialogItem * i)
 {
 	KviRegisteredUser * u = i->user();
 
@@ -642,7 +642,7 @@ void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
 
 	QString szName = u->name();
 
-	KviRegisteredUserEntryDialog * dlg = new KviRegisteredUserEntryDialog(this,u);
+	RegisteredUserEntryDialog * dlg = new RegisteredUserEntryDialog(this,u);
 	int res = dlg->exec();
 	delete dlg;
 
@@ -658,7 +658,7 @@ void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
 			QTreeWidgetItem * pGroup = m_pListView->topLevelItem(c);
 			for(int d=0;d<pGroup->childCount();d++)
 			{
-				KviRegisteredUsersDialogItem * pUser = (KviRegisteredUsersDialogItem*) pGroup->child(d);
+				RegisteredUsersDialogItem * pUser = (RegisteredUsersDialogItem*) pGroup->child(d);
 				if(KviQString::equalCI(pUser->user()->name(),szName))
 				{
 					pUser->setSelected(true);
@@ -675,7 +675,7 @@ void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
 	m_pListView->update();
 }
 
-void KviRegisteredUsersDialog::selectionChanged()
+void RegisteredUsersDialog::selectionChanged()
 {
 	bool bHaveSelected = !m_pListView->selectedItems().empty();
 
@@ -695,7 +695,7 @@ typedef struct _KviReguserDbFileHeader
 	kvi_u32_t nentries;
 } KviReguserDbFileHeader;
 
-void KviRegisteredUsersDialog::exportClicked()
+void RegisteredUsersDialog::exportClicked()
 {
 	unsigned int nEntries = 0;
 
@@ -704,7 +704,7 @@ void KviRegisteredUsersDialog::exportClicked()
 	//only "user" entries matters, discard groups from count
 	for(int i=0; i<list.count(); i++)
 	{
-		if(((KviRegisteredUsersDialogItemBase *)list.at(i))->type() == KviRegisteredUsersDialogItemBase::User)
+		if(((RegisteredUsersDialogItemBase *)list.at(i))->type() == RegisteredUsersDialogItemBase::User)
 			nEntries++;
 	}
 
@@ -736,11 +736,11 @@ void KviRegisteredUsersDialog::exportClicked()
 
 	for(int i=0; i<list.count(); i++)
 	{
-		KviRegisteredUsersDialogItemBase *pBase = (KviRegisteredUsersDialogItemBase *)list.at(i);
-		if(pBase->type()!=KviRegisteredUsersDialogItemBase::User)
+		RegisteredUsersDialogItemBase *pBase = (RegisteredUsersDialogItemBase *)list.at(i);
+		if(pBase->type()!=RegisteredUsersDialogItemBase::User)
 			continue;
 
-		KviRegisteredUser * u = ((KviRegisteredUsersDialogItem *)list.at(i))->user();
+		KviRegisteredUser * u = ((RegisteredUsersDialogItem *)list.at(i))->user();
 		if(u)
 		{
 			if(!f.save(u->name()))goto write_error;
@@ -810,12 +810,12 @@ succesfull_export:
 	f.close();
 }
 
-void KviRegisteredUsersDialog::selectAllClicked()
+void RegisteredUsersDialog::selectAllClicked()
 {
 	m_pListView->selectAll();
 }
 
-void KviRegisteredUsersDialog::importClicked()
+void RegisteredUsersDialog::importClicked()
 {
 	//KviCString buffer;
 	QString buffer;
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index cc06049ce..d511560dd 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -2,7 +2,7 @@
 #define _DIALOG_H_
 //=============================================================================
 //
-//   File : edituser.h
+//   File : RegisteredUserEntryDialog.h
 //   Creation date : Sun Dec 24 2000 15:16:17 CEST by Szymon Stefanek
 //
 //   This file is part of the KVIrc irc client distribution
@@ -51,77 +51,77 @@ signals:
 	void rightButtonPressed(QTreeWidgetItem *,QPoint);
 };
 
-class KviRegisteredUsersDialogItemDelegate : public QStyledItemDelegate
+class RegisteredUsersDialogItemDelegate : public QStyledItemDelegate
 {
 public:
-	KviRegisteredUsersDialogItemDelegate(KviRegisteredUsersListView * pWidget=0)
+	RegisteredUsersDialogItemDelegate(KviRegisteredUsersListView * pWidget=0)
 		: QStyledItemDelegate(pWidget) {};
-	~KviRegisteredUsersDialogItemDelegate(){};
+	~RegisteredUsersDialogItemDelegate(){};
 	QSize sizeHint(const QStyleOptionViewItem &option,const QModelIndex &index) const;
 	void paint( QPainter * painter, const QStyleOptionViewItem & option, const QModelIndex & index ) const;
 
 };
 
-class KviRegisteredUsersDialogItemBase : public QTreeWidgetItem
+class RegisteredUsersDialogItemBase : public QTreeWidgetItem
 {
 public:
 	enum Types { User,Group };
 protected:
-	KviRegisteredUsersDialogItemBase(Types type,KviRegisteredUsersListView * par)
+	RegisteredUsersDialogItemBase(Types type,KviRegisteredUsersListView * par)
 	:QTreeWidgetItem(par),m_iType(type)
 	{
 	};
-	KviRegisteredUsersDialogItemBase(Types type,QTreeWidgetItem * par)
+	RegisteredUsersDialogItemBase(Types type,QTreeWidgetItem * par)
 	:QTreeWidgetItem(par),m_iType(type)
 	{
 	};
-	~KviRegisteredUsersDialogItemBase()
+	~RegisteredUsersDialogItemBase()
 	{
 	};
 
 private:
-	KviRegisteredUsersDialogItemBase::Types m_iType;
+	RegisteredUsersDialogItemBase::Types m_iType;
 public:
-	KviRegisteredUsersDialogItemBase::Types type() { return m_iType; };
+	RegisteredUsersDialogItemBase::Types type() { return m_iType; };
 };
 
-class KviRegisteredUsersGroupItem : public KviRegisteredUsersDialogItemBase
+class RegisteredUsersGroupItem : public RegisteredUsersDialogItemBase
 {
 protected:
 	KviRegisteredUserGroup * m_pGroup;
 public:
-	KviRegisteredUsersGroupItem(KviRegisteredUsersListView * par,KviRegisteredUserGroup * g)
-	:KviRegisteredUsersDialogItemBase(Group,par), m_pGroup(g)
+	RegisteredUsersGroupItem(KviRegisteredUsersListView * par,KviRegisteredUserGroup * g)
+	:RegisteredUsersDialogItemBase(Group,par), m_pGroup(g)
 	{
 		setText(0,m_pGroup->name());
 	}
-	~KviRegisteredUsersGroupItem()
+	~RegisteredUsersGroupItem()
 	{
 	}
 	KviRegisteredUserGroup * group() { return m_pGroup; };
 };
 
-class KviRegisteredUsersDialogItem : public KviRegisteredUsersDialogItemBase
+class RegisteredUsersDialogItem : public RegisteredUsersDialogItemBase
 {
-	friend class KviRegisteredUsersDialogItemDelegate;
+	friend class RegisteredUsersDialogItemDelegate;
 protected:
 	KviRegisteredUser * m_pUser;
 	QTextDocument       m_pText;
 public:
-	KviRegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u);
-	~KviRegisteredUsersDialogItem();
+	RegisteredUsersDialogItem(QTreeWidgetItem * par,KviRegisteredUser * u);
+	~RegisteredUsersDialogItem();
 public:
 	KviRegisteredUser * user(){ return m_pUser; };
 	void setUser(KviRegisteredUser * u){ m_pUser = u; };
 	virtual QString key(int,bool) const;
 };
 
-class KviRegisteredUsersDialog : public QWidget
+class RegisteredUsersDialog : public QWidget
 {
 	Q_OBJECT
 public:
-	KviRegisteredUsersDialog(QWidget * par = 0);
-	~KviRegisteredUsersDialog();
+	RegisteredUsersDialog(QWidget * par = 0);
+	~RegisteredUsersDialog();
 public:
 	KviRegisteredUsersListView   * m_pListView;
 	QPushButton * m_pAddButton;
@@ -135,7 +135,7 @@ public:
 	QMultiHash<int, KviRegisteredUserGroup*> m_TmpDict;
 protected:
 	void fillList();
-	void editItem(KviRegisteredUsersDialogItem * i);
+	void editItem(RegisteredUsersDialogItem * i);
 	void editGroup(KviRegisteredUserGroup* group);
 	virtual void closeEvent(QCloseEvent *);
 protected slots:
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 0c94650c3..b5a57a788 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -22,8 +22,8 @@
 //
 //=============================================================================
 
-#include "edituser.h"
-#include "wizard.h"
+#include "RegisteredUserEntryDialog.h"
+#include "RegistrationWizard.h"
 #include "KviIrcConnection.h"
 #include "dialog.h"
 
@@ -51,9 +51,9 @@
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
 
-KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList = 0;
+KviPointerList<RegistrationWizard> * g_pRegistrationWizardList = 0;
 
-KviRegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
+RegisteredUsersDialog * g_pRegisteredUsersDialog = 0;
 
 /*
 	@doc: reguser
@@ -127,9 +127,9 @@ static bool reguser_kvs_cmd_edit(KviKvsModuleCommandCall * c)
 	} else {
 		if(c->hasSwitch('t',"toplevel"))
 		{
-			g_pRegisteredUsersDialog = new KviRegisteredUsersDialog(0);
+			g_pRegisteredUsersDialog = new RegisteredUsersDialog(0);
 		} else {
-			g_pRegisteredUsersDialog = new KviRegisteredUsersDialog(c->window()->frame()->splitter());
+			g_pRegisteredUsersDialog = new RegisteredUsersDialog(c->window()->frame()->splitter());
 		}
 	}
 	g_pRegisteredUsersDialog->show();
@@ -1170,7 +1170,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
 		KVSM_PARAMETER("mask",KVS_PT_STRING,KVS_PF_OPTIONAL,szMask)
 	KVSM_PARAMETERS_END(c)
 
-	KviRegistrationWizard * w = new KviRegistrationWizard(szMask);
+	RegistrationWizard * w = new RegistrationWizard(szMask);
 	w->show();
 	return true;
 }
@@ -1178,7 +1178,7 @@ static bool reguser_kvs_cmd_wizard(KviKvsModuleCommandCall * c)
 static bool reguser_module_init(KviModule * m)
 {
 	g_pLocalRegisteredUserDataBase = 0;
-	g_pRegistrationWizardList = new KviPointerList<KviRegistrationWizard>;
+	g_pRegistrationWizardList = new KviPointerList<RegistrationWizard>;
 	g_pRegistrationWizardList->setAutoDelete(true);
 
 	KVSM_REGISTER_SIMPLE_COMMAND(m,"add",reguser_kvs_cmd_add);
@@ -1209,7 +1209,7 @@ static bool reguser_module_cleanup(KviModule *)
 	if(g_pRegisteredUsersDialog)delete g_pRegisteredUsersDialog;
 	g_pRegisteredUsersDialog = 0;
 
-	while(KviRegistrationWizard * w = g_pRegistrationWizardList->first())delete w;
+	while(RegistrationWizard * w = g_pRegistrationWizardList->first())delete w;
 	delete g_pRegistrationWizardList;
 	g_pRegistrationWizardList = 0;