initial port for reguser module

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

7 files changed, 276 insertions, 343 deletions

diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 2de526118..580e8c85c 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -24,8 +24,10 @@
 #define _WANT_OPTION_FLAGS_
 
 #include "edituser.h"
-#include "kvi_regusersdb.h"
+#include "wizard.h"
+#include "dialog.h"
 
+#include "kvi_regusersdb.h"
 #include "kvi_locale.h"
 #include "kvi_ircmask.h"
 #include "kvi_debug.h"
@@ -39,38 +41,23 @@
 #include "kvi_settings.h"
 #include "kvi_stringconversion.h"
 #include "kvi_options.h"
-
-#include <qlayout.h>
-#include <qlabel.h>
-#ifdef COMPILE_USE_QT4
-#include <q3header.h>
-#include <qevent.h>
-#include <QImageWriter>
-#include <QImageReader>
-
-#else
-#include <qheader.h>
-#endif
 #include "kvi_pointerhashtable.h"
-#include <qimage.h>
-#include <qstring.h>
-#include <qcombobox.h>
-
-
-#include <qstyle.h>
-#include <qpainter.h>
 #include "kvi_tal_hbox.h"
 #include "kvi_tal_vbox.h"
-#include <qinputdialog.h>
-
-#include "wizard.h"
-#include "dialog.h"
-
-
-#ifdef COMPILE_INFO_TIPS
-	#include <qtooltip.h>
-#endif // COMPILE_INFO_TIPS
 
+#include <QLayout>
+#include <QLabel>
+#include <QImageWriter>
+#include <QImageReader>
+#include <QImage>
+#include <QString>
+#include <QComboBox>
+#include <QToolTip>
+#include <QStyle>
+#include <QPainter>
+#include <QInputDialog>
+#include <QEvent>
+#include <QCloseEvent>
 
 #define LVI_ICON_SIZE 32
 #define LVI_BORDER 4
@@ -281,9 +268,7 @@ KviRegisteredUsersDialog::KviRegisteredUsersDialog(QWidget * par)
 	b->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));
 	//b->setMinimumWidth(120);
 
-
 	g->addRowSpacing(2,15);
-
 	g->setColStretch(0,1);
 	g->setRowStretch(1,1);
 
@@ -391,6 +376,7 @@ void KviRegisteredUsersDialog::addGroupClicked()
 		fillList();
 	}
 }
+
 void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
 {
 	bool ok;
@@ -414,7 +400,6 @@ void KviRegisteredUsersDialog::editGroup(KviRegisteredUserGroup* group)
 				u->setGroup(text);
 		}
 		
-		
 		fillList();
 	}
 }
@@ -636,7 +621,6 @@ void KviRegisteredUsersDialog::editItem(KviRegisteredUsersDialogItem * i)
 	m_pListView->update();
 }
 
-
 void KviRegisteredUsersDialog::selectionChanged()
 {
 	bool bHaveSelected = !m_pListView->selectedItem();
@@ -663,11 +647,11 @@ void KviRegisteredUsersDialog::exportClicked()
 
 	KviTalListViewItemIterator it( m_pListView, KviTalListViewItemIterator::Selected );
 	KviTalListViewItemIterator cit( m_pListView, KviTalListViewItemIterator::Selected );
-    while ( cit.current() ) {
+	while ( cit.current() ) {
 		if(((KviRegisteredUsersDialogItemBase *)(cit.current()))->type() == KviRegisteredUsersDialogItemBase::User)
 			nEntries++;
-        ++cit;
-    }
+		++cit;
+	}
 
 	if(nEntries < 1)
 	{
@@ -695,7 +679,7 @@ void KviRegisteredUsersDialog::exportClicked()
 
 	if(f.writeBlock((const char *)&hf,sizeof(KviReguserDbFileHeader)) != sizeof(KviReguserDbFileHeader))goto write_error;
 
-    while ( it.current() ) {
+	while ( it.current() ) {
 		KviRegisteredUsersDialogItemBase *pBase = (KviRegisteredUsersDialogItemBase *)(it.current());
 		if(pBase->type()!=KviRegisteredUsersDialogItemBase::User) continue;
 		QString szName = it.current()->text(0);
@@ -740,18 +724,10 @@ void KviRegisteredUsersDialog::exportClicked()
 					if(!av->pixmap()->isNull())
 					{
 						if(!f.save(1))goto write_error;
-#ifdef COMPILE_USE_QT4
 						QImageWriter io;
 						io.setDevice(&f);
 						io.setFormat("PNG");						
 						if(!io.write(av->pixmap()->convertToImage()))goto write_error;
-#else
-						QImageIO io;
-						io.setImage(av->pixmap()->convertToImage());
-						io.setIODevice(&f);
-						io.setFormat("PNG");
-						if(!io.write())goto write_error;
-#endif	
 					} else {
 						if(!f.save(0))goto write_error;
 					}
@@ -813,8 +789,6 @@ void KviRegisteredUsersDialog::importClicked()
 		return;
 	}
 
-
-
 	for(idx = 0;idx < hf.nentries;idx++)
 	{
 		QString szName;
@@ -845,23 +819,12 @@ void KviRegisteredUsersDialog::importClicked()
 		{
 			// there is an avatar
 			QImage img;
-#ifdef COMPILE_USE_QT4
 			QImageReader io;
 			io.setDevice(&f);
 			io.setFormat("PNG");
 			img=io.read();
 //			if(io.read())goto read_error;
 
-#else
-			QImageIO io;
-			io.setImage(img);
-			io.setIODevice(&f);
-			io.setFormat("PNG");
-
-			if(!io.read())goto read_error;
-
-			img = io.image();
-#endif
 			if(img.isNull())debug("Ops.. readed a null image ?");
 
 			KviStr fName = u->name();
@@ -898,6 +861,7 @@ succesfull_import:
 	f.close();
 	fillList();
 }
-#if defined(COMPILE_USE_QT4) && defined(COMPILE_ON_WINDOWS) 
-#include "dialog.moc"
+
+#ifdef COMPILE_ON_WINDOWS
+	#include "dialog.moc"
 #endif
diff --git a/src/modules/reguser/dialog.h b/src/modules/reguser/dialog.h
index ef9bee676..d8714509f 100644
--- a/src/modules/reguser/dialog.h
+++ b/src/modules/reguser/dialog.h
@@ -23,27 +23,25 @@
 //   Inc. ,59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
 //
 //=============================================================================
+
 #include "kvi_string.h"
 #include "kvi_regusersdb.h"
 #include "kvi_selectors.h"
-
-#include <qwidget.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include "kvi_pointerhashtable.h"
 #include "kvi_tal_listview.h"
 #include "kvi_tal_listbox.h"
-#include "kvi_pointerhashtable.h"
 #include "kvi_tal_popupmenu.h"
-#ifdef COMPILE_USE_QT4
-	#include <q3intdict.h>
-	#include <q3simplerichtext.h>
-	#define QSimpleRichText Q3SimpleRichText
-#else
-	#include <qsimplerichtext.h>
-	#include <qintdict.h>
 
+#include <QWidget>
+#include <QLineEdit>
+#include <QPushButton>
 
-#endif
+// FIXME: Qt4 #include <QMultiHash>
+#include <q3intdict.h>
+
+// FIXME: Qt4 #include <QTextDocument>
+#include <q3simplerichtext.h>
+#define QSimpleRichText Q3SimpleRichText
 
 class KviRegisteredUsersDialogItemBase : public KviTalListViewItem
 {
@@ -115,13 +113,8 @@ public:
 	QPushButton * m_pImportButton;
 	QPushButton * m_pExportButton;
 	QPushButton * m_pAddGroupButton;
-#ifdef COMPILE_USE_QT4
 	Q3IntDict<KviRegisteredUserGroup> m_TmpDict;
-#else
-	QIntDict<KviRegisteredUserGroup> m_TmpDict;
-#endif
-
-	protected slots:
+protected slots:
 	void itemPressed(KviTalListViewItem *it,const QPoint &pnt,int c);
 	void itemDoubleClicked(KviTalListViewItem *it);
 protected:
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index b3684fff0..471b211c4 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -25,8 +25,10 @@
 #define _EDITUSER_CPP_

 

 #include "edituser.h"

-#include "kvi_regusersdb.h"

+#include "wizard.h"

+#include "dialog.h"

 

+#include "kvi_regusersdb.h"

 #include "kvi_locale.h"

 #include "kvi_ircmask.h"

 #include "kvi_debug.h"

@@ -40,36 +42,25 @@
 #include "kvi_settings.h"

 #include "kvi_stringconversion.h"

 #include "kvi_options.h"

-

-#include <qlayout.h>

-#include <qlabel.h>

-#include <qgroupbox.h>

-#ifdef COMPILE_USE_QT4

-#include <qevent.h>

-#include <q3header.h>

-#include <q3vbox.h>

-#else

-#include <qheader.h>

-#endif

 #include "kvi_pointerhashtable.h"

-#include <qimage.h>

-#include <qstring.h>

-#include <qcombobox.h>

-

-

-#include <qstyle.h>

-#include <qpainter.h>

 #include "kvi_tal_hbox.h"

 #include "kvi_tal_vbox.h"

-#include <qinputdialog.h>

 

-#include "wizard.h"

-#include "dialog.h"

-

-

-#ifdef COMPILE_INFO_TIPS

-	#include <qtooltip.h>

-#endif // COMPILE_INFO_TIPS

+#include <QLayout>

+#include <QLabel>

+#include <QGroupBox>

+#include <QStyle>

+#include <QPainter>

+#include <QInputDialog>

+#include <QImage>

+#include <QString>

+#include <QComboBox>

+#include <QToolTip>

+#include <QTableWidgetItem>

+#include <QStringList>

+#include <QHeaderView>

+#include <QEvent>

+#include <QCloseEvent>

 

 // kvi_app.cpp

 extern KviRegisteredUsersDialog * g_pRegisteredUsersDialog;

@@ -77,7 +68,6 @@ extern KviRegisteredUsersDialog * g_pRegisteredUsersDialog;
 KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase; // local copy!

 

 

-

 KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHashTable<QString,QString> * dict)

 : QDialog(p,"property_editor",true)

 {

@@ -88,18 +78,16 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas
 

 	QGridLayout * g = new QGridLayout(this,3,3,4,4);

 

-#ifdef COMPILE_USE_QT4

-	m_pTable = new Q3Table(this);

-#else

-	m_pTable = new QTable(this);

-#endif

+	m_pTable = new QTableWidget(this);

 	g->addMultiCellWidget(m_pTable,0,1,0,1);

 

-	m_pTable->setNumCols(2);

-	m_pTable->setSelectionMode(Kvi_Tal_Table::NoSelection);

+	m_pTable->setColumnCount(2);

+	m_pTable->setSelectionMode(QTableWidget::NoSelection);

 

-	m_pTable->horizontalHeader()->setLabel(0,__tr2qs("Property"));

-	m_pTable->horizontalHeader()->setLabel(1,__tr2qs("Value"));

+	QStringList header;

+	header.append(__tr2qs("Property"));

+	header.append(__tr2qs("Value"));

+	m_pTable->setHorizontalHeaderLabels(header);

 

 	m_pTable->setMinimumSize(250,250);

 	//connect(m_pTable,SIGNAL(valueChanged(int,int)),this,SLOT(propertyValueChanged(int,int)));

@@ -124,7 +112,6 @@ KviReguserPropertiesDialog::KviReguserPropertiesDialog(QWidget * p,KviPointerHas
 	connect(pb,SIGNAL(clicked()),this,SLOT(okClicked()));

 	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_ACCEPT)));

 

-

 	pb = new QPushButton(__tr2qs("Cancel"),b);

 	connect(pb,SIGNAL(clicked()),this,SLOT(reject()));

 	pb->setIconSet(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_DISCARD)));

@@ -147,28 +134,34 @@ void KviReguserPropertiesDialog::closeEvent(QCloseEvent *e)
 

 void KviReguserPropertiesDialog::fillData()

 {

-	m_pTable->setNumRows(m_pPropertyDict->count());

+	m_pTable->setRowCount(m_pPropertyDict->count());

 	KviPointerHashTableIterator<QString,QString> it(*m_pPropertyDict);

 	int row = 0;

 	while(it.current())

 	{

-		m_pTable->setItem(row,0,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,it.currentKey()));

-		m_pTable->setItem(row,1,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,*(it.current())));

+		QTableWidgetItem * m_pTableItem1 = new QTableWidgetItem(it.currentKey(),QTableWidgetItem::Type);

+		m_pTableItem1->setFlags(Qt::ItemIsEditable);

+

+		QTableWidgetItem * m_pTableItem2 = new QTableWidgetItem(*(it.current()),QTableWidgetItem::Type);

+		m_pTableItem2->setFlags(Qt::ItemIsEditable);

+

+		m_pTable->setItem(row,0,m_pTableItem1);

+		m_pTable->setItem(row,1,m_pTableItem2);

 		++row;

 		++it;

 	}

-	if(m_pTable->numRows() == 0)m_pDelButton->setEnabled(false);

+	if(m_pTable->rowCount() == 0)m_pDelButton->setEnabled(false);

 }

 

 void KviReguserPropertiesDialog::okClicked()

 {

 	m_pPropertyDict->clear();

 

-	int n = m_pTable->numRows();

+	int n = m_pTable->rowCount();

 	for(int i=0;i<n;i++)

 	{

-		QString szName = m_pTable->text(i,0);

-		QString szValue = m_pTable->text(i,1);

+		QString szName = m_pTable->item(i,0)->text();

+		QString szValue = m_pTable->item(i,1)->text();

 		if((!szName.isEmpty()) && (!szValue.isEmpty()))

 		{

 			m_pPropertyDict->replace(szName,new QString(szValue));

@@ -178,12 +171,18 @@ void KviReguserPropertiesDialog::okClicked()
 	accept();

 }

 

-

 void KviReguserPropertiesDialog::addClicked()

 {

-	m_pTable->setNumRows(m_pTable->numRows() + 1);

-	m_pTable->setItem(m_pTable->numRows() - 1,0,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,""));

-	m_pTable->setItem(m_pTable->numRows() - 1,1,new Kvi_Tal_TableItem(m_pTable,Kvi_Tal_TableItem::OnTyping,""));

+	m_pTable->setRowCount(m_pTable->rowCount() + 1);

+

+	QTableWidgetItem * m_pTableItem1 = new QTableWidgetItem("",QTableWidgetItem::Type);

+	m_pTableItem1->setFlags(Qt::ItemIsEditable);

+

+	QTableWidgetItem * m_pTableItem2 = new QTableWidgetItem("",QTableWidgetItem::Type);

+	m_pTableItem2->setFlags(Qt::ItemIsEditable);

+

+	m_pTable->setItem(m_pTable->rowCount() - 1,0,m_pTableItem1);

+	m_pTable->setItem(m_pTable->rowCount() - 1,1,m_pTableItem2);

 	m_pDelButton->setEnabled(true);

 }

 

@@ -191,18 +190,28 @@ void KviReguserPropertiesDialog::delClicked()
 {

 	int i = m_pTable->currentRow();

 

-	if((i > -1) && (i < m_pTable->numRows()))

+	if((i > -1) && (i < m_pTable->rowCount()))

 	{

 		// remove row i

-		m_pTable->clearCell(i,0);

-		m_pTable->clearCell(i,1);

+		m_pTable->takeItem(i,0);

+		m_pTable->takeItem(i,1);

 

-		for(;i < (m_pTable->numRows() - 1);i++)

+		for(;i < (m_pTable->rowCount() - 1);i++)

 		{

-			m_pTable->swapRows(i,i+1);

+			// Get first row's data

+			QString cellText1 = m_pTable->item(i,0)->text();

+			QString cellText2 = m_pTable->item(i,1)->text();

+

+			// Copy second row's data into the first one

+			m_pTable->item(i,0)->setText(m_pTable->item(i+1,0)->text());

+			m_pTable->item(i,1)->setText(m_pTable->item(i+1,1)->text());

+

+			// Set first row's data into the second one

+			m_pTable->item(i+1,0)->setText(cellText1);

+			m_pTable->item(i+1,1)->setText(cellText2);

 		}

-		m_pTable->setNumRows(m_pTable->numRows() - 1);

-		if(m_pTable->numRows() == 0)m_pDelButton->setEnabled(false);

+		m_pTable->setRowCount(m_pTable->rowCount() - 1);

+		if(m_pTable->rowCount() == 0)m_pDelButton->setEnabled(false);

 	}

 }

 

@@ -272,8 +281,6 @@ KviReguserMaskDialog::KviReguserMaskDialog(QWidget * p,KviIrcMask * m)
 	connect(pb,SIGNAL(clicked()),this,SLOT(reject()));

 	//pb->setMinimumWidth(120);

 

-

-

 	g->setColStretch(0,1);

 	g->setRowStretch(0,1);

 

@@ -310,8 +317,6 @@ void KviReguserMaskDialog::okClicked()
 }

 

 

-

-

 KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegisteredUser * r,bool bModal)

 : KviTalTabDialog(p,"reguser_entry_editor",bModal)

 {

@@ -384,8 +389,6 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 

 	addTab(p1,__tr2qs("Identity"));

 

-

-

 	QWidget * p2 = new QWidget(this);

 

 	g = new QGridLayout(p2,6,3,5,2);

@@ -448,11 +451,7 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste
 	addTab(p2,__tr2qs("Properties"));

 

 	// Ignore TAB

-#ifdef COMPILE_USE_QT4

-	Q3VBox * vb = new Q3VBox(this);

-#else

-	QVBox * vb = new QVBox(this);

-#endif

+	KviTalVBox * vb = new KviTalVBox(this);

 	vb->setMargin(10);

 

 	m_pIgnoreEnabled = new KviStyledCheckBox(__tr2qs("Enable ignore for this user"),vb);

@@ -670,7 +669,6 @@ void KviRegisteredUserEntryDialog::okClicked()
 	g_pApp->optionResetUpdate(KviOption_resetUpdateGui);

 }

 

-

 void KviRegisteredUserEntryDialog::addMaskClicked()

 {

 	KviIrcMask mk;

@@ -775,10 +773,6 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 

 }

 

-

-

-

 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES

 #include "edituser.moc"

 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES

-

diff --git a/src/modules/reguser/edituser.h b/src/modules/reguser/edituser.h
index 566322e89..00308e215 100644
--- a/src/modules/reguser/edituser.h
+++ b/src/modules/reguser/edituser.h
@@ -27,33 +27,23 @@
 #include "kvi_string.h"
 #include "kvi_regusersdb.h"
 #include "kvi_selectors.h"
-
-#include <qwidget.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
+#include "kvi_pointerhashtable.h"
 #include "kvi_tal_listview.h"
 #include "kvi_tal_listbox.h"
-#include "kvi_pointerhashtable.h"
+#include "kvi_tal_popupmenu.h"
 #include <kvi_tal_tabdialog.h>
-#ifdef COMPILE_USE_QT4
-#include <q3table.h>
-#define Kvi_Tal_Table Q3Table
-#define Kvi_Tal_TableItem Q3TableItem
 
-#else
-#include <qtable.h>
-#define Kvi_Tal_Table QTable
-#define Kvi_Tal_TableItem QTableItem
+#include <QWidget>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QTableWidget>
 
-#endif
-#include "kvi_tal_popupmenu.h"
+class KviRegisteredUser;
 
 #ifndef _EDITUSER_CPP_
 	extern KviRegisteredUserDataBase * g_pLocalRegisteredUserDataBase;
 #endif
 
-class KviRegisteredUser;
-
 class KviReguserPropertiesDialog : public QDialog
 {
 	Q_OBJECT
@@ -61,11 +51,8 @@ public:
 	KviReguserPropertiesDialog(QWidget *p,KviPointerHashTable<QString,QString> * dict);
 	~KviReguserPropertiesDialog();
 protected:
-#ifdef COMPILE_USE_QT4
-	Q3Table *m_pTable;
-#else
-	QTable             * m_pTable;
-#endif
+	QTableWidget *m_pTable;
+
 	KviPointerHashTable<QString,QString>     * m_pPropertyDict;
 	QPushButton        * m_pDelButton;
 	QPushButton        * m_pAddButton;
@@ -110,7 +97,7 @@ protected:
 	QLineEdit          * m_pNameEdit;
 	QLineEdit          * m_pCommentEdit;
 
-	KviTalListBox           * m_pMaskListBox;
+	KviTalListBox      * m_pMaskListBox;
 
 	QPushButton        * m_pDelMaskButton;
 	QPushButton        * m_pEditMaskButton;
@@ -125,7 +112,7 @@ protected:
 	KviPointerHashTable<QString,QString>     * m_pPropertyDict;
 	
 	QCheckBox          * m_pCustomColorCheck;
-	QColor		   * m_pCustomColor;
+	QColor             * m_pCustomColor;
 	KviColorSelector   * m_pCustomColorSelector;
 
 	//Ignore TAB
@@ -147,6 +134,4 @@ protected slots:
 	void maskCurrentChanged(KviTalListBoxItem *it);
 };
 
-
-
 #endif //_EDITUSER_H_
diff --git a/src/modules/reguser/libkvireguser.cpp b/src/modules/reguser/libkvireguser.cpp
index 87f24bf09..2e3a34680 100644
--- a/src/modules/reguser/libkvireguser.cpp
+++ b/src/modules/reguser/libkvireguser.cpp
@@ -22,8 +22,12 @@
 //
 //=============================================================================
 
-#include "kvi_module.h"
+#include "edituser.h"
+#include "wizard.h"
+#include "kvi_ircconnection.h"
+#include "dialog.h"
 
+#include "kvi_module.h"
 #include "kvi_regusersdb.h"
 #include "kvi_ircuserdb.h"
 #include "kvi_out.h"
@@ -33,14 +37,9 @@
 #include "kvi_app.h"
 #include "kvi_window.h"
 #include "kvi_frame.h"
-
-#include "edituser.h"
-#include "wizard.h"
-#include "kvi_ircconnection.h"
-#include "dialog.h"
-
 #include "kvi_pointerlist.h"
-#include <qsplitter.h> // FIXME: REmove this!
+
+#include <QSplitter> // FIXME: REmove this!
 
 //#warning "$reguser.matches..."
 //#warning "$reguser.clear"
@@ -572,7 +571,7 @@ static bool reguser_kvs_cmd_setIgnoreFlags(KviKvsModuleCommandCall * c)
 */
 
 static bool reguser_kvs_fnc_getIgnoreFlags(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szName;
 	QString szFlags;
 	KVSM_PARAMETERS_BEGIN(c)
@@ -627,7 +626,7 @@ static bool reguser_kvs_fnc_getIgnoreFlags(KviKvsModuleFunctionCall * c)
 */
 
 static bool reguser_kvs_fnc_isIgnoreEnabled(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szName;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
@@ -740,7 +739,7 @@ static bool reguser_kvs_cmd_setproperty(KviKvsModuleCommandCall * c)
 */
 
 static bool reguser_kvs_fnc_list(KviKvsModuleFunctionCall * c)
-{ 
+{
 	QString szMask; 
 	
 	KVSM_PARAMETERS_BEGIN(c)
@@ -874,14 +873,15 @@ static bool reguser_kvs_cmd_showlist(KviKvsModuleCommandCall * c)
 */
 
 static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
-{ 
-	QString szMask; 
+{
+	QString szMask;
 	
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
 	KVSM_PARAMETERS_END(c)
 	KviIrcMask mask(szMask);
-//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+	//FIXME: it crashes kvirc
+	//KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
 	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
 	if(u) c->returnValue()->setString(u->name());
 	return true;
@@ -911,8 +911,8 @@ static bool reguser_kvs_fnc_match(KviKvsModuleFunctionCall * c)
 */
 
 static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
-{ 
-	QString szMask; 
+{
+	QString szMask;
 	
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
@@ -1011,8 +1011,8 @@ static bool reguser_kvs_fnc_exactMatch(KviKvsModuleFunctionCall * c)
 */
 
 static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
-{ 
-	QString szName; 
+{
+	QString szName;
 	QString szN;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("name",KVS_PT_STRING,0,szName)
@@ -1074,8 +1074,8 @@ static bool reguser_kvs_fnc_mask(KviKvsModuleFunctionCall * c)
 */
 
 static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
-{ 
-	QString szName; 
+{
+	QString szName;
 	QString szProperty;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("user_name",KVS_PT_STRING,0,szName)
@@ -1127,8 +1127,8 @@ static bool reguser_kvs_fnc_property(KviKvsModuleFunctionCall * c)
 */
 
 static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
-{ 
-	QString szMask; 
+{
+	QString szMask;
 	QString szProperty;
 	KVSM_PARAMETERS_BEGIN(c)
 		KVSM_PARAMETER("user_mask",KVS_PT_STRING,0,szMask)
@@ -1136,7 +1136,8 @@ static bool reguser_kvs_fnc_matchProperty(KviKvsModuleFunctionCall * c)
 	KVSM_PARAMETERS_END(c)
 	
 	KviIrcMask mask(szMask);
-//FIXME: it crashes kvirc	KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
+	//FIXME: it crashes kvirc
+	//KviRegisteredUser * u = c->context()->connection()->userDataBase()->registeredUser(mask.nick(),mask.user(),mask.host());
 	KviRegisteredUser * u = g_pRegisteredUserDataBase->findMatchingUser(mask.nick(),mask.user(),mask.host());
 	if(u)
 	{
@@ -1229,7 +1230,7 @@ static bool reguser_module_can_unload(KviModule *)
 
 KVIRC_MODULE(
 	"Reguser",                                              // module name
-	"1.0.0",                                                // module version
+	"4.0.0",                                                // module version
 	"Copyright (C) 2002 Szymon Stefanek (pragma at kvirc dot net)", // author & (C)
 	"Script interface to the registered users database",
 	reguser_module_init,
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index a14ed1b2d..6dae150d5 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -31,18 +31,16 @@
 #include "kvi_pixmap.h"
 #include "kvi_regusersdb.h"
 #include "kvi_iconmanager.h"
-#ifdef COMPILE_USE_QT4
-#include <QDesktopWidget>
-#endif
 
-#include <qcheckbox.h>
-#include <qlabel.h>
-#include <qlineedit.h>
-#include <qpushbutton.h>
-#include <qwidget.h>
-#include <qlayout.h>
-#include <qvariant.h>
-#include <qframe.h>
+#include <QDesktopWidget>
+#include <QCheckBox>
+#include <QLabel>
+#include <QLineEdit>
+#include <QPushButton>
+#include <QWidget>
+#include <QLayout>
+#include <QVariant>
+#include <QFrame>
 
 
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
@@ -61,40 +59,40 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	g_pRegistrationWizardList->append(this);
 
-    QGridLayout* m_pPage1Layout;
-    QGridLayout* m_pPage2Layout;
-    QGridLayout* m_pPage3Layout;
-    QGridLayout* m_pPage4Layout;
-    QGridLayout* m_pPage5Layout;
+	QGridLayout* m_pPage1Layout;
+	QGridLayout* m_pPage2Layout;
+	QGridLayout* m_pPage3Layout;
+	QGridLayout* m_pPage4Layout;
+	QGridLayout* m_pPage5Layout;
 
-    QLabel* TextLabel10_2;
-    QLabel* TextLabel10;
-    QLabel* TextLabel10_3;
-    QLabel* TextLabel10_3_2;
+	QLabel* TextLabel10_2;
+	QLabel* TextLabel10;
+	QLabel* TextLabel10_3;
+	QLabel* TextLabel10_3_2;
 
 	QFrame * f;
 
 //    resize( 490, 456 ); 
-    setCaption(__tr2qs("User Registration Wizard - KVIrc"));
+	setCaption(__tr2qs("User Registration Wizard - KVIrc"));
 	setIcon(*(g_pIconManager->getSmallIcon(KVI_SMALLICON_LINUX)));
 
-    setSizeGripEnabled( TRUE );
+	setSizeGripEnabled( TRUE );
 
-    m_pPage1 = new QWidget(this);
-    m_pPage1Layout = new QGridLayout(m_pPage1); 
-    m_pPage1Layout->setSpacing(4);
-    m_pPage1Layout->setMargin(8);
+	m_pPage1 = new QWidget(this);
+	m_pPage1Layout = new QGridLayout(m_pPage1); 
+	m_pPage1Layout->setSpacing(4);
+	m_pPage1Layout->setMargin(8);
 
-    m_pLabel1 = new QLabel(m_pPage1);
-    m_pLabel1->setText(__tr2qs("<p>Welcome to the user registration wizard.<br>This process allows you to add an IRC user to the database and set properties for that user. KVIrc will be (hopefully) able to recognize the user, add him to the notify list, and display the associated avatar.<br><br>First of all, you must insert an <b>entry name or real name</b> for the user you're going to register. The name will be used to identify the database entry and has no specific requirements, it can be a given name, nickname, or just some text to remind you of the real person.<br>Examples: \"George W Bush\", \"Dubya\".\n</p>" ));
+	m_pLabel1 = new QLabel(m_pPage1);
+	m_pLabel1->setText(__tr2qs("<p>Welcome to the user registration wizard.<br>This process allows you to add an IRC user to the database and set properties for that user. KVIrc will be (hopefully) able to recognize the user, add him to the notify list, and display the associated avatar.<br><br>First of all, you must insert an <b>entry name or real name</b> for the user you're going to register. The name will be used to identify the database entry and has no specific requirements, it can be a given name, nickname, or just some text to remind you of the real person.<br>Examples: \"George W Bush\", \"Dubya\".\n</p>" ));
 
-    m_pPage1Layout->addWidget(m_pLabel1, 0, 0);
+	m_pPage1Layout->addWidget(m_pLabel1, 0, 0);
 
-    m_pEditRealName = new QLineEdit(m_pPage1);
-    //m_pEditRealName->setAlignment(int(QLineEdit::AlignHCenter));
+	m_pEditRealName = new QLineEdit(m_pPage1);
+	//m_pEditRealName->setAlignment(int(QLineEdit::AlignHCenter));
 
-    m_pPage1Layout->addWidget(m_pEditRealName,1,0);
-    addPage( m_pPage1,__tr2qs("Step 1: Entry Name"));
+	m_pPage1Layout->addWidget(m_pEditRealName,1,0);
+	addPage( m_pPage1,__tr2qs("Step 1: Entry Name"));
 
 	if(mask.nick() != "*")m_pEditRealName->setText(mask.nick());
 
@@ -103,15 +101,15 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 	// PAGE 2
 
 
-    m_pPage2 = new QWidget(this);
-    m_pPage2Layout = new QGridLayout( m_pPage2 ); 
-    m_pPage2Layout->setSpacing( 4 );
-    m_pPage2Layout->setMargin( 8 );
+	m_pPage2 = new QWidget(this);
+	m_pPage2Layout = new QGridLayout( m_pPage2 ); 
+	m_pPage2Layout->setSpacing( 4 );
+	m_pPage2Layout->setMargin( 8 );
 
-    m_pLabel2 = new QLabel( m_pPage2);
-    m_pLabel2->setText(__tr2qs("<p>A registered user is identified by one or more <b>IRC masks</b>.<br>A mask must be in the following form:<br><b>nickname!username@hostname</b><br>and can contain wildcard characters '*' and '?'. Be careful in choosing the masks, as they are the only way to verify the identity of a registered user.<br><br>You can enter at most two masks here, if you wish to add more masks, use the \"<b>Edit</b>\" button in the Registered Users dialog. You must enter at least one mask.</p>"));
+	m_pLabel2 = new QLabel( m_pPage2);
+	m_pLabel2->setText(__tr2qs("<p>A registered user is identified by one or more <b>IRC masks</b>.<br>A mask must be in the following form:<br><b>nickname!username@hostname</b><br>and can contain wildcard characters '*' and '?'. Be careful in choosing the masks, as they are the only way to verify the identity of a registered user.<br><br>You can enter at most two masks here, if you wish to add more masks, use the \"<b>Edit</b>\" button in the Registered Users dialog. You must enter at least one mask.</p>"));
 
-    m_pPage2Layout->addMultiCellWidget(m_pLabel2,0,0,0,4);
+	m_pPage2Layout->addMultiCellWidget(m_pLabel2,0,0,0,4);
 
 	//KviStr szMask;
 
@@ -119,68 +117,68 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	//KviIrcMask masktempl(szMask.ptr());
 
-    m_pNicknameEdit1 = new QLineEdit(m_pPage2);
-    m_pNicknameEdit1->setAlignment(Qt::AlignRight);
+	m_pNicknameEdit1 = new QLineEdit(m_pPage2);
+	m_pNicknameEdit1->setAlignment(Qt::AlignRight);
 	if(mask.nick() != "*")m_pNicknameEdit1->setText(mask.nick());
 	connect(m_pNicknameEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &)));
-    m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
+	m_pPage2Layout->addWidget( m_pNicknameEdit1, 1, 0 );
 
-    m_pUsernameEdit1 = new QLineEdit(m_pPage2);
-    m_pUsernameEdit1->setAlignment(Qt::AlignHCenter);
+	m_pUsernameEdit1 = new QLineEdit(m_pPage2);
+	m_pUsernameEdit1->setAlignment(Qt::AlignHCenter);
 	if(mask.hasUser())m_pUsernameEdit1->setText(mask.user());
 	connect(m_pUsernameEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &)));
-    m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
+	m_pPage2Layout->addWidget(m_pUsernameEdit1,1,2);
 
 	m_pHostEdit1 = new QLineEdit(m_pPage2);
 	if(mask.hasHost())m_pHostEdit1->setText(mask.host());
 	connect(m_pHostEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(maskChanged(const QString &)));
 	m_pPage2Layout->addWidget(m_pHostEdit1,1,4);
 
-    m_pNicknameEdit2 = new QLineEdit(m_pPage2);
-    m_pNicknameEdit2->setAlignment(Qt::AlignRight);
-    m_pPage2Layout->addWidget(m_pNicknameEdit2,2,0);
+	m_pNicknameEdit2 = new QLineEdit(m_pPage2);
+	m_pNicknameEdit2->setAlignment(Qt::AlignRight);
+	m_pPage2Layout->addWidget(m_pNicknameEdit2,2,0);
 
-    m_pUsernameEdit2 = new QLineEdit(m_pPage2);
-    m_pUsernameEdit2->setAlignment(Qt::AlignHCenter);
-    m_pPage2Layout->addWidget(m_pUsernameEdit2,2,2);
+	m_pUsernameEdit2 = new QLineEdit(m_pPage2);
+	m_pUsernameEdit2->setAlignment(Qt::AlignHCenter);
+	m_pPage2Layout->addWidget(m_pUsernameEdit2,2,2);
 
-    m_pHostEdit2 = new QLineEdit(m_pPage2);
-    m_pPage2Layout->addWidget(m_pHostEdit2,2,4);
+	m_pHostEdit2 = new QLineEdit(m_pPage2);
+	m_pPage2Layout->addWidget(m_pHostEdit2,2,4);
 
-    TextLabel10_2 = new QLabel(m_pPage2);
-    TextLabel10_2->setText("<center><b>!</b></center>");
-    TextLabel10_2->setAlignment(int(Qt::AlignCenter));
-    m_pPage2Layout->addWidget(TextLabel10_2,2,1);
+	TextLabel10_2 = new QLabel(m_pPage2);
+	TextLabel10_2->setText("<center><b>!</b></center>");
+	TextLabel10_2->setAlignment(int(Qt::AlignCenter));
+	m_pPage2Layout->addWidget(TextLabel10_2,2,1);
 
-    TextLabel10 = new QLabel(m_pPage2);
-    TextLabel10->setText("<center><b>!</b></center>");
-    TextLabel10->setAlignment(int(Qt::AlignCenter));
-    m_pPage2Layout->addWidget(TextLabel10,1,1);
+	TextLabel10 = new QLabel(m_pPage2);
+	TextLabel10->setText("<center><b>!</b></center>");
+	TextLabel10->setAlignment(int(Qt::AlignCenter));
+	m_pPage2Layout->addWidget(TextLabel10,1,1);
 
-    TextLabel10_3 = new QLabel(m_pPage2);
-    TextLabel10_3->setText("<center><b>@</b></center>");
-    TextLabel10_3->setAlignment(int(Qt::AlignCenter));
-    m_pPage2Layout->addWidget(TextLabel10_3,1,3);
+	TextLabel10_3 = new QLabel(m_pPage2);
+	TextLabel10_3->setText("<center><b>@</b></center>");
+	TextLabel10_3->setAlignment(int(Qt::AlignCenter));
+	m_pPage2Layout->addWidget(TextLabel10_3,1,3);
 
-    TextLabel10_3_2 = new QLabel(m_pPage2);
-    TextLabel10_3_2->setText("<center><b>@</b></center>");
-    TextLabel10_3_2->setAlignment(int(Qt::AlignCenter));
-    m_pPage2Layout->addWidget(TextLabel10_3_2,2,3);
+	TextLabel10_3_2 = new QLabel(m_pPage2);
+	TextLabel10_3_2->setText("<center><b>@</b></center>");
+	TextLabel10_3_2->setAlignment(int(Qt::AlignCenter));
+	m_pPage2Layout->addWidget(TextLabel10_3_2,2,3);
 
-    addPage(m_pPage2,__tr2qs("Step 2: Mask Selection"));
+	addPage(m_pPage2,__tr2qs("Step 2: Mask Selection"));
 
 
 
 
 
-    m_pPage3 = new QWidget(this);
-    m_pPage3Layout = new QGridLayout(m_pPage3); 
-    m_pPage3Layout->setSpacing(4);
-    m_pPage3Layout->setMargin(8);
+	m_pPage3 = new QWidget(this);
+	m_pPage3Layout = new QGridLayout(m_pPage3); 
+	m_pPage3Layout->setSpacing(4);
+	m_pPage3Layout->setMargin(8);
 
-    m_pLabel3 = new QLabel(m_pPage3);
-    m_pLabel3->setText(__tr2qs("<p>If you want to store an avatar image for this user, you can set it here. KVIrc will show the avatar in the userlist next to the user's nickname.<br>An avatar can be in any supported image format (PNG is recommended). Keep in mind that KVIrc stores avatars in memory and has to resize them to fit in the userlist, thus it's better to use small, low-resolution images.</p>"));
-    m_pPage3Layout->addWidget(m_pLabel3,0,0);
+	m_pLabel3 = new QLabel(m_pPage3);
+	m_pLabel3->setText(__tr2qs("<p>If you want to store an avatar image for this user, you can set it here. KVIrc will show the avatar in the userlist next to the user's nickname.<br>An avatar can be in any supported image format (PNG is recommended). Keep in mind that KVIrc stores avatars in memory and has to resize them to fit in the userlist, thus it's better to use small, low-resolution images.</p>"));
+	m_pPage3Layout->addWidget(m_pLabel3,0,0);
 
 	f = new QFrame(m_pPage3);
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
@@ -192,66 +190,66 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	m_pPage3Layout->setRowStretch(0,1);
 
-    addPage(m_pPage3,__tr2qs( "Step 3: Avatar Selection"));
+	addPage(m_pPage3,__tr2qs( "Step 3: Avatar Selection"));
 
 
 
 
-    m_pPage4 = new QWidget(this);
-    m_pPage4Layout = new QGridLayout(m_pPage4); 
-    m_pPage4Layout->setSpacing(4);
-    m_pPage4Layout->setMargin(8);
+	m_pPage4 = new QWidget(this);
+	m_pPage4Layout = new QGridLayout(m_pPage4); 
+	m_pPage4Layout->setSpacing(4);
+	m_pPage4Layout->setMargin(8);
 
-    m_pLabel4 = new QLabel(m_pPage4);
-    m_pLabel4->setText(__tr2qs("<p>If you want to be notified when this user is online or goes offline, you must specify the list of nicknames that KVIrc will look for.<br><br>You can enter at most two nicknames here, if you wish to add more nicknames, use the \"<b>Edit</b>\" button in the Registered Users dialog.</p>"));
-    m_pPage4Layout->addMultiCellWidget(m_pLabel4,0,0,0,1);
+	m_pLabel4 = new QLabel(m_pPage4);
+	m_pLabel4->setText(__tr2qs("<p>If you want to be notified when this user is online or goes offline, you must specify the list of nicknames that KVIrc will look for.<br><br>You can enter at most two nicknames here, if you wish to add more nicknames, use the \"<b>Edit</b>\" button in the Registered Users dialog.</p>"));
+	m_pPage4Layout->addMultiCellWidget(m_pLabel4,0,0,0,1);
 
 
 	f = new QFrame(m_pPage4);
 	f->setFrameStyle(QFrame::HLine | QFrame::Sunken);
 	m_pPage4Layout->addMultiCellWidget(f,1,1,0,1);
 
-    m_pNotifyCheck = new QCheckBox(m_pPage4);
-    m_pNotifyCheck->setText(__tr2qs("Add this user to the notify list"));
+	m_pNotifyCheck = new QCheckBox(m_pPage4);
+	m_pNotifyCheck->setText(__tr2qs("Add this user to the notify list"));
 	m_pNotifyCheck->setChecked(false);
 	connect(m_pNotifyCheck,SIGNAL(toggled(bool)),this,SLOT(notifyCheckToggled(bool)));
-    m_pPage4Layout->addMultiCellWidget(m_pNotifyCheck,2,2,0,1);
+	m_pPage4Layout->addMultiCellWidget(m_pNotifyCheck,2,2,0,1);
 
-    m_pNotifyNickLabel1 = new QLabel(m_pPage4);
-    m_pNotifyNickLabel1->setText(__tr2qs("Nickname:"));
-    m_pPage4Layout->addWidget(m_pNotifyNickLabel1,3,0);
+	m_pNotifyNickLabel1 = new QLabel(m_pPage4);
+	m_pNotifyNickLabel1->setText(__tr2qs("Nickname:"));
+	m_pPage4Layout->addWidget(m_pNotifyNickLabel1,3,0);
 
-    m_pNotifyNickLabel2 = new QLabel(m_pPage4);
-    m_pNotifyNickLabel2->setText(__tr2qs("Nickname 2:"));
-    m_pPage4Layout->addWidget(m_pNotifyNickLabel2,4,0);
+	m_pNotifyNickLabel2 = new QLabel(m_pPage4);
+	m_pNotifyNickLabel2->setText(__tr2qs("Nickname 2:"));
+	m_pPage4Layout->addWidget(m_pNotifyNickLabel2,4,0);
 
-    m_pNotifyNickEdit1 = new QLineEdit(m_pPage4);
+	m_pNotifyNickEdit1 = new QLineEdit(m_pPage4);
 	if(mask.nick() != "*")m_pNotifyNickEdit1->setText(mask.nick());
 	connect(m_pNotifyNickEdit1,SIGNAL(textChanged(const QString &)),this,SLOT(notifyNickChanged(const QString &)));
-    m_pPage4Layout->addWidget(m_pNotifyNickEdit1,3,1);
+	m_pPage4Layout->addWidget(m_pNotifyNickEdit1,3,1);
 
-    m_pNotifyNickEdit2 = new QLineEdit(m_pPage4);
+	m_pNotifyNickEdit2 = new QLineEdit(m_pPage4);
 	connect(m_pNotifyNickEdit2,SIGNAL(textChanged(const QString &)),this,SLOT(notifyNickChanged(const QString &)));
-    m_pPage4Layout->addWidget(m_pNotifyNickEdit2,4,1);
+	m_pPage4Layout->addWidget(m_pNotifyNickEdit2,4,1);
 
 	m_pPage4Layout->setRowStretch(0,1);
 
-    addPage(m_pPage4,__tr2qs("Step 4: Notify List"));
+	addPage(m_pPage4,__tr2qs("Step 4: Notify List"));
 
 
 
 
 
-    m_pPage5 = new QWidget(this);
-    m_pPage5Layout = new QGridLayout(m_pPage5); 
-    m_pPage5Layout->setSpacing(4);
-    m_pPage5Layout->setMargin(8);
+	m_pPage5 = new QWidget(this);
+	m_pPage5Layout = new QGridLayout(m_pPage5); 
+	m_pPage5Layout->setSpacing(4);
+	m_pPage5Layout->setMargin(8);
 
-    m_pTextLabel5 = new QLabel(m_pPage5);
-    m_pTextLabel5->setText(__tr2qs("<p>That's it. The user registration has been completed.<br><br>Click \"<b>Finish</b>\" to close this dialog.</p>"));
-    m_pPage5Layout->addWidget(m_pTextLabel5,0,0);
+	m_pTextLabel5 = new QLabel(m_pPage5);
+	m_pTextLabel5->setText(__tr2qs("<p>That's it. The user registration has been completed.<br><br>Click \"<b>Finish</b>\" to close this dialog.</p>"));
+	m_pPage5Layout->addWidget(m_pTextLabel5,0,0);
 
-    addPage(m_pPage5,__tr2qs("Registration Complete"));
+	addPage(m_pPage5,__tr2qs("Registration Complete"));
 
 	setFinishEnabled(m_pPage5,true);
 	QString dummy;
@@ -261,7 +259,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 
 	setMinimumSize(QSize(350,420));
 
-    // signals and slots connections
+	// signals and slots connections
 }
 
 KviRegistrationWizard::~KviRegistrationWizard()
@@ -321,7 +319,7 @@ void KviRegistrationWizard::accept()
 	{
 		// ops... no way
 		// FIXME: spit an error message ?
-		debug("Ops.. something wrong with the regusers db");
+		qDebug("Ops.. something wrong with the regusers db");
 		//delete this;
 		return;
 	}
@@ -464,4 +462,3 @@ void KviRegistrationWizard::notifyCheckToggled(bool)
 #ifndef COMPILE_USE_STANDALONE_MOC_SOURCES
 #include "wizard.moc"
 #endif //!COMPILE_USE_STANDALONE_MOC_SOURCES
-
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h
index 1ddbe0ba8..cc5b8c1b2 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/wizard.h
@@ -23,26 +23,25 @@
 //
 
 #include "kvi_string.h"
-
 #include <kvi_tal_wizard.h>
 
-class KviPixmap;
-class KviPixmapSelector;
-class KviTalVBoxLayout; 
-class KviTalHBoxLayout; 
 class QGridLayout; 
 class QCheckBox;
 class QLabel;
 class QLineEdit;
 class QWidget;
+class KviPixmap;
+class KviPixmapSelector;
+class KviTalVBoxLayout; 
+class KviTalHBoxLayout; 
 class KviRegisteredUserDataBase;
 
 class KviRegistrationWizard : public KviTalWizard
-{ 
-    Q_OBJECT
+{
+	Q_OBJECT
 public:
-    KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false);
-    ~KviRegistrationWizard();
+	KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false);
+	~KviRegistrationWizard();
 
 	KviRegisteredUserDataBase * m_pDb;
 
@@ -50,29 +49,29 @@ public:
 
 	bool m_bModal;
 
-    QWidget* m_pPage1;
-    QLabel* m_pLabel1;
-    QLineEdit* m_pEditRealName;
-    QWidget* m_pPage2;
-    QLabel* m_pLabel2;
-    QLineEdit* m_pNicknameEdit1;
-    QLineEdit* m_pNicknameEdit2;
-    QLineEdit* m_pHostEdit1;
-    QLineEdit* m_pHostEdit2;
-    QLineEdit* m_pUsernameEdit1;
-    QLineEdit* m_pUsernameEdit2;
-    QWidget* m_pPage3;
-    QLabel* m_pLabel3;
+	QWidget* m_pPage1;
+	QLabel* m_pLabel1;
+	QLineEdit* m_pEditRealName;
+	QWidget* m_pPage2;
+	QLabel* m_pLabel2;
+	QLineEdit* m_pNicknameEdit1;
+	QLineEdit* m_pNicknameEdit2;
+	QLineEdit* m_pHostEdit1;
+	QLineEdit* m_pHostEdit2;
+	QLineEdit* m_pUsernameEdit1;
+	QLineEdit* m_pUsernameEdit2;
+	QWidget* m_pPage3;
+	QLabel* m_pLabel3;
 	KviPixmapSelector * m_pAvatarSelector;
-    QWidget* m_pPage4;
-    QCheckBox* m_pNotifyCheck;
-    QLabel* m_pNotifyNickLabel1;
-    QLabel* m_pNotifyNickLabel2;
-    QLabel* m_pLabel4;
-    QLineEdit* m_pNotifyNickEdit1;
-    QLineEdit* m_pNotifyNickEdit2;
-    QWidget* m_pPage5;
-    QLabel* m_pTextLabel5;
+	QWidget* m_pPage4;
+	QCheckBox* m_pNotifyCheck;
+	QLabel* m_pNotifyNickLabel1;
+	QLabel* m_pNotifyNickLabel2;
+	QLabel* m_pLabel4;
+	QLineEdit* m_pNotifyNickEdit1;
+	QLineEdit* m_pNotifyNickEdit2;
+	QWidget* m_pPage5;
+	QLabel* m_pTextLabel5;
 
 	KviPixmap * m_pAvatar;
 protected: