diff options
| author |  Szymon Tomasz Stefanek | 2008-04-28 17:20:23 +0000 |
|---|---|---|
| committer | Szymon Tomasz Stefanek | 2008-04-28 17:20:23 +0000 |
| commit | 7504fa8dea3cd118a5de11030f84385e95039595 (patch) | |
| tree | 39ccb0c9a70e01ef85d9dcb71cd87ced63838477 /src/modules/reguser | |
| parent | commented subversion module; fix to KviTalTabDialog (diff) | |
| download | KVIrc-7504fa8dea3cd118a5de11030f84385e95039595.tar.gz KVIrc-7504fa8dea3cd118a5de11030f84385e95039595.tar.bz2 KVIrc-7504fa8dea3cd118a5de11030f84385e95039595.zip | |
Preliminary KDE4 support. Now compiles and runs.
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@1616 17fca916-40b9-46aa-a4ea-0a15b648b75c
Diffstat (limited to 'src/modules/reguser')
| -rw-r--r-- | src/modules/reguser/edituser.cpp | 6 | ||||
| -rw-r--r-- | src/modules/reguser/wizard.cpp | 4 | ||||
| -rw-r--r-- | src/modules/reguser/wizard.h | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/modules/reguser/edituser.cpp b/src/modules/reguser/edituser.cpp index 731bf5d92..203748675 100644 --- a/src/modules/reguser/edituser.cpp +++ b/src/modules/reguser/edituser.cpp @@ -410,10 +410,10 @@ KviRegisteredUserEntryDialog::KviRegisteredUserEntryDialog(QWidget *p,KviRegiste m_pAvatar = 0;
if(r)
{
- const char * av = r->getProperty("avatar");
- if(av)
+ const QString av = r->getProperty("avatar");
+ if(!av.isEmpty())
{
- m_pAvatar = new KviPixmap(av);
+ m_pAvatar = new KviPixmap(av.toUtf8().data());
}
}
if(!m_pAvatar)m_pAvatar = new KviPixmap();
diff --git a/src/modules/reguser/wizard.cpp b/src/modules/reguser/wizard.cpp index 6d5638926..206a75856 100644 --- a/src/modules/reguser/wizard.cpp +++ b/src/modules/reguser/wizard.cpp @@ -46,7 +46,7 @@ extern KVIRC_API KviRegisteredUserDataBase * g_pRegisteredUserDataBase; extern KviPointerList<KviRegistrationWizard> * g_pRegistrationWizardList; -KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal) +KviRegistrationWizard::KviRegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db,QWidget * par,bool bModal) : KviTalWizard(par) { m_pDb = db; @@ -55,7 +55,7 @@ KviRegistrationWizard::KviRegistrationWizard(const char * startMask,KviRegistere m_bModal = bModal; - KviIrcMask mask(startMask ? startMask : "*!*@*"); + KviIrcMask mask(!startMask.isEmpty() ? startMask.toUtf8().data() : "*!*@*"); g_pRegistrationWizardList->append(this); diff --git a/src/modules/reguser/wizard.h b/src/modules/reguser/wizard.h index cc5b8c1b2..9d34aa667 100644 --- a/src/modules/reguser/wizard.h +++ b/src/modules/reguser/wizard.h @@ -40,7 +40,7 @@ class KviRegistrationWizard : public KviTalWizard { Q_OBJECT public: - KviRegistrationWizard(const char * startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false); + KviRegistrationWizard(const QString &startMask,KviRegisteredUserDataBase * db = 0,QWidget * par = 0,bool bModal = false); ~KviRegistrationWizard(); KviRegisteredUserDataBase * m_pDb; |