5 files changed, 10 insertions, 13 deletions
diff --git a/src/modules/reguser/Makefile.am b/src/modules/reguser/Makefile.am
index 93aea872..0dbeb866 100644
--- a/src/modules/reguser/Makefile.am
+++ b/src/modules/reguser/Makefile.am
@@ -10,16 +10,14 @@ pluglib_LTLIBRARIES      = libkvireguser.la
 libkvireguser_la_LDFLAGS = -module -avoid-version $(SS_LDFLAGS) $(SS_LIBDIRS)
 
 libkvireguser_la_SOURCES = libkvireguser.cpp edituser.cpp wizard.cpp dialog.cpp
-libkvireguser_la_LIBADD  = $(SS_LIBLINK) ../../kvilib/build/libkvilib.la
+
+libkvireguser_la_LIBADD  = $(SS_LIBLINK) ../../kvirc/build/libkvirc.la
 
 noinst_HEADERS= edituser.h wizard.h dialog.h
-nodist_libkvireguser_la_SOURCES = moc_dialog.cpp 
 
 %.moc: %.h
 	$(SS_QT_MOC) $< -o $@
 	
-moc_dialog.cpp: dialog.h
-	$(SS_QT_MOC) $< -o $@
-
+dialog.cpp: dialog.moc
 edituser.cpp: edituser.moc
 wizard.cpp: wizard.moc
diff --git a/src/modules/reguser/dialog.cpp b/src/modules/reguser/dialog.cpp
index 876740d6..2cc18b1f 100644
--- a/src/modules/reguser/dialog.cpp
+++ b/src/modules/reguser/dialog.cpp
@@ -874,3 +874,5 @@ succesfull_import:
 	f.close();
 	fillList();
 }
+
+#include "dialog.moc"
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp
index 2da4c6f9..0d4b21d1 100644
--- a/src/modules/reguser/edituser.cpp
+++ b/src/modules/reguser/edituser.cpp
@@ -405,8 +405,8 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(TQWidget *p,KviRegist
 	m_pAvatar = 0;
 	if(r)
 	{
-		const char * av = r->getProperty("avatar");
-		if(av)
+		const TQString &av = r->getProperty("avatar");
+		if(!av.isEmpty())
 		{
 			m_pAvatar = new KviPixmap(av);
 		}
@@ -761,7 +761,4 @@ void KviRegisteredUserEntryDialog::editAllPropertiesClicked()
 
 }
 
-
-
-
 #include "edituser.moc"
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp
index fa453b0a..a2da7c52 100644
--- a/src/modules/reguser/wizard.cpp
+++ b/src/modules/reguser/wizard.cpp
@@ -45,7 +45,7 @@
 extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase;
 extern KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList;
 
-KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db,TQWidget * par,bool bModal)
+KviRegistrationWizard::KviRegistrationWizard(const TQString &startMask,KviRegisteredUserDataBase * db,TQWidget * par,bool bModal)
 : KviTalWizard(par)
 {
 	m_pDb = db;
@@ -54,7 +54,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere
 	
 	m_bModal = bModal;
 
-	KviIrcMask mask(startMask ? startMask : "*!*@*");
+	KviIrcMask mask(!startMask.isEmpty() ? startMask : "*!*@*");
 
 	g_pRegistrationWizardList->append(this);
 
diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h
index 7fd954b4..078676c1 100644
--- a/src/modules/reguser/wizard.h
+++ b/src/modules/reguser/wizard.h
@@ -42,7 +42,7 @@ class KviRegistrationWizard : public KviTalWizard
     TQ_OBJECT
   
 public:
-    KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db = 0,TQWidget * par = 0,bool bModal = false);
+    KviRegistrationWizard(const TQString &startMask,KviRegisteredUserDataBase * db = 0,TQWidget * par = 0,bool bModal = false);
     ~KviRegistrationWizard();
 
 	KviRegisteredUserDataBase * m_pDb;