| -rw-r--r-- | kabc/vcardparser/vcard.cpp | 84 |
1 files changed, 29 insertions, 55 deletions
diff --git a/kabc/vcardparser/vcard.cpp b/kabc/vcardparser/vcard.cpp index da97ec2..24fd498 100644 --- a/kabc/vcardparser/vcard.cpp +++ b/kabc/vcardparser/vcard.cpp @@ -25,3 +25,2 @@ using namespace KABC; VCard::VCard() - : mLineMap( 0 ) { @@ -30,13 +29,4 @@ VCard::VCard() VCard::VCard( const VCard& vcard ) - : mLineMap( 0 ) { - if ( vcard.mLineMap ) { - if ( !mLineMap ) - mLineMap = new QMap<QString, QValueList<VCardLine> >; - - *mLineMap = *(vcard.mLineMap); - } else { - delete mLineMap; - mLineMap = 0; - } + mLineMap = vcard.mLineMap; } @@ -45,4 +35,2 @@ VCard::~VCard() { - delete mLineMap; - mLineMap = 0; } @@ -54,11 +42,3 @@ VCard& VCard::operator=( const VCard& vcard ) - if ( vcard.mLineMap ) { - if ( !mLineMap ) - mLineMap = new QMap<QString, QValueList<VCardLine> >; - - *mLineMap = *(vcard.mLineMap); - } else { - delete mLineMap; - mLineMap = 0; - } + mLineMap = vcard.mLineMap; @@ -69,4 +49,3 @@ void VCard::clear() { - if ( mLineMap ) - mLineMap->clear(); + mLineMap.clear(); } @@ -75,12 +54,9 @@ QStringList VCard::identifiers() const { - if ( !mLineMap ) - return QStringList(); - else { -//US method QMap::keys() not available yet. SO collect the data manually -//US return mLineMap->keys(); - + //return mLineMap.keys(); +//PP re: US method QMap::keys() not available yet. SO collect the data manually + QStringList result; - - QMap< QString, VCardLine::List >::ConstIterator it; - for( it = mLineMap->begin(); it != mLineMap->end(); ++it ) { + + QMap<QString, VCardLine::List>::ConstIterator it; + for( it = mLineMap.begin(); it != mLineMap.end(); ++it ) { result << it.key().latin1(); @@ -88,3 +64,2 @@ QStringList VCard::identifiers() const return result; - } } @@ -93,22 +68,24 @@ void VCard::addLine( const VCardLine& line ) { - if ( !mLineMap ) - mLineMap = new QMap<QString, QValueList<VCardLine> >; - - (*mLineMap)[ line.identifier() ].append( line ); + mLineMap[ line.identifier() ].append( line ); } -VCardLine::List VCard::lines( const QString& identifier ) +VCardLine::List VCard::lines( const QString& identifier ) const { - if ( !mLineMap ) + LineMap::ConstIterator it = mLineMap.find( identifier ); + if ( it == mLineMap.end() ) return VCardLine::List(); - else - return (*mLineMap)[ identifier ]; + + return *it; } -VCardLine VCard::line( const QString& identifier ) +VCardLine VCard::line( const QString& identifier ) const { - if ( !mLineMap ) + LineMap::ConstIterator it = mLineMap.find( identifier ); + if ( it == mLineMap.end() ) + return VCardLine(); + + if ( (*it).isEmpty() ) return VCardLine(); else - return (*mLineMap)[ identifier ][ 0 ]; + return (*it).first(); } @@ -117,8 +94,4 @@ void VCard::setVersion( Version version ) { - if ( !mLineMap ) - mLineMap = new QMap<QString, QValueList<VCardLine> >; - else { -//US mLineMap->erase( "VERSION" ); - mLineMap->remove( "VERSION" ); - } + mLineMap.remove( "VERSION" ); + VCardLine line; @@ -127,6 +100,6 @@ void VCard::setVersion( Version version ) line.setIdentifier( "2.1" ); - if ( version == v3_0 ) + else if ( version == v3_0 ) line.setIdentifier( "3.0" ); - (*mLineMap)[ "VERSION" ].append( line ); + mLineMap[ "VERSION" ].append( line ); } @@ -135,6 +108,7 @@ VCard::Version VCard::version() const { - if ( !mLineMap ) + LineMap::ConstIterator versionEntry = mLineMap.find( "VERSION" ); + if ( versionEntry == mLineMap.end() ) return v3_0; - VCardLine line = (*mLineMap)[ "VERSION" ][ 0 ]; + VCardLine line = ( *versionEntry )[ 0 ]; if ( line.value() == "2.1" ) |