diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-02-21 11:03:45 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2026-02-21 20:54:51 +0900 |
| commit | 4d13f1a2267c6864b98c5a46631b1e2bbe3c024a (patch) | |
| tree | 72d524c66325b2c554bafcf86225d26664373444 /src/modules/reguser | |
| parent | f14a1c5c8c988ef6901545040aabedf8027ecc18 (diff) | |
| download | kvirc-feat/more-fixes-for-cmake.tar.gz kvirc-feat/more-fixes-for-cmake.zip | |
Fix conversion of TQString to const char* (modules)feat/more-fixes-for-cmake
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
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; |