| -rw-r--r-- | kabc/vcard/ContentLine.cpp | 10 | ||||
| -rw-r--r-- | kabc/vcard/VCardv.cpp | 12 | ||||
| -rw-r--r-- | kabc/vcard/include/VCardDefines.h | 3 |
3 files changed, 18 insertions, 7 deletions
diff --git a/kabc/vcard/ContentLine.cpp b/kabc/vcard/ContentLine.cpp index 0fb5b5d..f7e04a9 100644 --- a/kabc/vcard/ContentLine.cpp +++ b/kabc/vcard/ContentLine.cpp @@ -61,17 +61,20 @@ #include <VCardEntity.h> #include <VCardEnum.h> #include <VCardDefines.h> using namespace VCARD; ContentLine::ContentLine() : Entity(), - value_(0) + value_(0), + paramType_( ParamUnknown ), + valueType_( ValueUnknown ), + entityType_( EntityUnknown ) { paramList_.setAutoDelete( TRUE ); } ContentLine::ContentLine(const ContentLine & x) : Entity(x), group_ (x.group_), name_ (x.name_), @@ -92,17 +95,20 @@ ContentLine::ContentLine(const ContentLine & x) p->setValue( it.current()->value() ); paramList_.append(p); } } ContentLine::ContentLine(const QCString & s) : Entity(s), - value_(0) + value_(0), + paramType_( ParamUnknown ), + valueType_( ValueUnknown ), + entityType_( EntityUnknown ) { paramList_.setAutoDelete( TRUE ); } ContentLine & ContentLine::operator = (ContentLine & x) { if (*this == x) return *this; diff --git a/kabc/vcard/VCardv.cpp b/kabc/vcard/VCardv.cpp index 391a69e..d19a004 100644 --- a/kabc/vcard/VCardv.cpp +++ b/kabc/vcard/VCardv.cpp @@ -183,23 +183,27 @@ VCard::_parse() --it; refolded.append(cur); } QStrListIterator it2(refolded); for (; it2.current(); ++it2) { - - vDebug("New contentline using \"" + QCString(it2.current()) + "\""); + vDebug("New contentline using \"" + QCString(it2.current()) + "\""); ContentLine * cl = new ContentLine(it2.current()); cl->parse(); - - contentLineList_.append(cl); + if (cl->value() == 0) + { + qDebug("Content line could not be parsed. Discarded: %s" + QCString(it2.current())); + delete cl; + } + else + contentLineList_.append(cl); } /////////////////////////////////////////////////////////////// // LAST LINE split = endLine.find(':'); if (split == -1) // invalid, no END diff --git a/kabc/vcard/include/VCardDefines.h b/kabc/vcard/include/VCardDefines.h index dd38ae2..557410f 100644 --- a/kabc/vcard/include/VCardDefines.h +++ b/kabc/vcard/include/VCardDefines.h @@ -22,17 +22,18 @@ */ #ifndef VCARD_DEFINES_H #define VCARD_DEFINES_H #include <kdebug.h> #ifdef VCARD_DEBUG -#define vDebug(a) kdDebug(5710) << a << endl; +//US #define vDebug(a) kdDebug(5710) << a << endl; +#define vDebug(a) qDebug(a); #else #define vDebug(a) #endif #if 0 #ifndef NDEBUG # include <qcstring.h> # include <iostream> |