diff options
Diffstat (limited to 'src/modules/reguser')
| -rw-r--r-- | src/modules/reguser/edituser.cpp | 7 | ||||
| -rw-r--r-- | src/modules/reguser/wizard.cpp | 4 | ||||
| -rw-r--r-- | src/modules/reguser/wizard.h | 2 |
3 files changed, 5 insertions, 8 deletions
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; |