Git commit 0ceed9303ed93a68826f7aac7340b3f949fa12ee by Allen Winter. Committed on 01/02/2012 at 00:29. Pushed by winterz into branch 'master'. GIT_SILENT: minor coding style MERGE: none M +4 -3 kabc/ldifconverter.cpp M +4 -2 kabc/ldifconverter.h http://commits.kde.org/kdepimlibs/0ceed9303ed93a68826f7aac7340b3f949fa12ee diff --git a/kabc/ldifconverter.cpp b/kabc/ldifconverter.cpp index 527a567..b425ce2 100644 --- a/kabc/ldifconverter.cpp +++ b/kabc/ldifconverter.cpp @@ -224,7 +224,7 @@ bool LDIFConverter::LDIFToAddressee( const QString &str= , AddresseeList &addrList { QString fieldname =3D ldif.attr().toLower(); QString value =3D QString::fromUtf8( ldif.value(), ldif.value().si= ze() ); - evaluatePair( a, homeAddr, workAddr, fieldname, value, birthday, b= irthmonth,birthyear ); + evaluatePair( a, homeAddr, workAddr, fieldname, value, birthday, b= irthmonth, birthyear ); break; } case Ldif::EndEntry: @@ -271,7 +271,8 @@ bool LDIFConverter::LDIFToAddressee( const QString &str= , AddresseeList &addrList = bool LDIFConverter::evaluatePair( Addressee &a, Address &homeAddr, Address &workAddr, - QString &fieldname, QString &value, int = &birthday, int &birthmonth, int &birthyear ) + QString &fieldname, QString &value, + int &birthday, int &birthmonth, int &bir= thyear ) { if ( fieldname =3D=3D QLatin1String( "dn" ) ) { // ignore & return false! return false; @@ -357,7 +358,7 @@ addComment: = if ( fieldname =3D=3D QLatin1String( "homeurl" ) || fieldname =3D=3D QLatin1String( "workurl" ) || - fieldname =3D=3D QLatin1String( "mozillahomeurl" )) { + fieldname =3D=3D QLatin1String( "mozillahomeurl" ) ) { if ( a.url().isEmpty() ) { a.setUrl( KUrl( value ) ); return true; diff --git a/kabc/ldifconverter.h b/kabc/ldifconverter.h index 54787e3..975d8dd 100644 --- a/kabc/ldifconverter.h +++ b/kabc/ldifconverter.h @@ -76,8 +76,10 @@ namespace KABC { @param fieldname LDIF field name to evaluate @param value The value of the field addressed by @p fieldname */ - KABC_EXPORT bool evaluatePair( Addressee &a, Address &homeAddr, Address = &workAddr, - QString &fieldname, QString &value, int &= birthday, int &birthmonth, int &birthyear ); + KABC_EXPORT bool evaluatePair( Addressee &a, Address &homeAddr, + Address &workAddr, + QString &fieldname, QString &value, + int &birthday, int &birthmonth, int &birt= hyear ); = } =20