← Back to branch summary

~ubuntu-branches/ubuntu/raring/kdepimlibs/raring-proposed

« back to all changes in this revision

Viewing changes to kabc/vcardtool.cpp

  • Committer: Package Import Robot
  • Author(s): Jonathan Riddell
  • Date: 2012-07-26 17:13:11 UTC
  • mfrom: (1.1.81)
  • Revision ID: package-import@ubuntu.com-20120726171311-j2heoxylb6lbhg4w
Tags: 4:4.9.0-0ubuntu1
* New upstream release
* Use direct build-depends versions rather than kde-sc-dev-latest

Show diffs side-by-side

added added

removed removed

Lines of Context:
kabc/vcardtool.cpp
506
506
        // N
507
507
        else if ( identifier == QLatin1String( "n" ) ) {
508
508
          const QStringList nameParts = splitString( semicolonSep, (*lineIt).value().toString() );
509
 
          if ( nameParts.count() > 0 ) {
 
509
          const int numberOfParts(nameParts.count());
 
510
          if ( numberOfParts > 0 ) {
510
511
            addr.setFamilyName( nameParts[ 0 ] );
511
512
          }
512
 
          if ( nameParts.count() > 1 ) {
 
513
          if ( numberOfParts > 1 ) {
513
514
            addr.setGivenName( nameParts[ 1 ] );
514
515
          }
515
 
          if ( nameParts.count() > 2 ) {
 
516
          if ( numberOfParts > 2 ) {
516
517
            addr.setAdditionalName( nameParts[ 2 ] );
517
518
          }
518
 
          if ( nameParts.count() > 3 ) {
 
519
          if ( numberOfParts > 3 ) {
519
520
            addr.setPrefix( nameParts[ 3 ] );
520
521
          }
521
 
          if ( nameParts.count() > 4 ) {
 
522
          if ( numberOfParts > 4 ) {
522
523
            addr.setSuffix( nameParts[ 4 ] );
523
524
          }
524
525
        }
587
588
          PhoneNumber::Type type;
588
589
 
589
590
          const QStringList types = (*lineIt).parameters( QLatin1String( "type" ) );
590
 
          for ( QStringList::ConstIterator it = types.begin(); it != types.end(); ++it ) {
 
591
          QStringList::ConstIterator typeEnd(types.end());
 
592
          for ( QStringList::ConstIterator it = types.begin(); it != typeEnd; ++it ) {
591
593
            type |= mPhoneTypeMap[(*it).toUpper()];
592
594
          }
593
595