diff options
| author |  Fabio Bas | 2011-07-12 16:17:31 +0000 |
|---|---|---|
| committer | Fabio Bas | 2011-07-12 16:17:31 +0000 |
| commit | ebf9d99b94239a365b112d09e29f449ee5c5d62d (patch) | |
| tree | a75889ce1ede7087d0d8fa4c7429db958ef927ce | |
| parent | trunk/: updated pt_BR translation (ticket #1159, thanks to Rafael_C_V) (diff) | |
| download | KVIrc-ebf9d99b94239a365b112d09e29f449ee5c5d62d.tar.gz KVIrc-ebf9d99b94239a365b112d09e29f449ee5c5d62d.tar.bz2 KVIrc-ebf9d99b94239a365b112d09e29f449ee5c5d62d.zip | |
$escape should not throw an error on empty strings (+ small compilation fix)
git-svn-id: https://svn.kvirc.de/svn/trunk/kvirc@5897 17fca916-40b9-46aa-a4ea-0a15b648b75c
| -rw-r--r-- | src/kvirc/kvs/KviKvsCoreFunctions_af.cpp | 5 | ||||
| -rw-r--r-- | src/modules/objects/KvsObject_pixmap.cpp | 4 |
2 files changed, 5 insertions, 4 deletions
diff --git a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp index 2fae654bc..bcbed4dbb 100644 --- a/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp +++ b/src/kvirc/kvs/KviKvsCoreFunctions_af.cpp @@ -1178,10 +1178,11 @@ namespace KviKvsCoreFunctions { QString szData; KVSCF_PARAMETERS_BEGIN - KVSCF_PARAMETER("text",KVS_PT_NONEMPTYSTRING,0,szData) + KVSCF_PARAMETER("text",KVS_PT_STRING,KVS_PF_OPTIONAL,szData) KVSCF_PARAMETERS_END - KviQString::escapeKvs(&szData); + if(!szData.isEmpty()) + KviQString::escapeKvs(&szData); KVSCF_pRetBuffer->setString(szData); return true; diff --git a/src/modules/objects/KvsObject_pixmap.cpp b/src/modules/objects/KvsObject_pixmap.cpp index 65f091c50..9f858686a 100644 --- a/src/modules/objects/KvsObject_pixmap.cpp +++ b/src/modules/objects/KvsObject_pixmap.cpp @@ -315,8 +315,8 @@ KVSO_CLASS_FUNCTION(pixmap,pixel) c->error(__tr2qs_ctx("The pixmap is null","objects")); return false; } else if(m_currentType==Pixmap) { - qDebug("mpimage %i",m_pImage); - qDebug("pixmap %i %i",m_pPixmap->width(),m_pPixmap->height()); +// qDebug("mpimage %i",m_pImage); +// qDebug("pixmap %i %i",m_pPixmap->width(),m_pPixmap->height()); if(m_pImage) delete m_pImage; else m_pImage = new QImage(); |