From cc29364f06178f8f6b457384f2ec37a042bd9d43 Mon Sep 17 00:00:00 2001 From: tpearson Date: Wed, 1 Sep 2010 00:37:02 +0000 Subject: * Massive set of changes to bring in all fixes and enhancements from the Enterprise PIM branch * Ensured that the Trinity changes were applied on top of those enhancements, and any redundancy removed * Added journal read support to the CalDAV resource * Fixed CalDAV resource to use events URL for tasks and journals when separate URL checkbox unchecked git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdepim@1170461 283d02a7-25f6-0310-bc7c-ecb5cbfe19da --- libkdepim/distributionlist.cpp | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) (limited to 'libkdepim/distributionlist.cpp') diff --git a/libkdepim/distributionlist.cpp b/libkdepim/distributionlist.cpp index e70b77b5..2ccdeb52 100644 --- a/libkdepim/distributionlist.cpp +++ b/libkdepim/distributionlist.cpp @@ -37,15 +37,13 @@ static ParseList parseCustom( const TQString& str ) if ( (*it).isEmpty() ) continue; // parse "uid,email" - TQStringList helpList = TQStringList::split( ',', (*it) ); + TQStringList helpList = TQStringList::split( ',', (*it), true ); Q_ASSERT( !helpList.isEmpty() ); if ( helpList.isEmpty() ) continue; - const TQString uid = helpList.first(); - TQString email; Q_ASSERT( helpList.count() < 3 ); // 1 or 2 items, but not more - if ( helpList.count() == 2 ) - email = helpList.last(); + const TQString uid = helpList.first(); + const TQString email = helpList.last(); res.append( qMakePair( uid, email ) ); } return res; -- cgit v1.2.3