Git commit f688078a6b4fdf0759583fdd74dd66b117dc6f0e by Montel Laurent. Committed on 15/04/2014 at 05:30. Pushed by mlaurent into branch 'frameworks'. Make it compile with -DQT_NO_CAST_FROM_BYTEARRAY M +0 -3 kabc/src/CMakeLists.txt M +1 -1 kabc/src/address.cpp M +10 -10 kabc/src/ldif.cpp M +1 -1 kabc/src/ldifconverter.cpp M +2 -2 kabc/src/lock.cpp M +1 -1 kabc/src/vcardparser/vcardparser.cpp http://commits.kde.org/kdepimlibs/f688078a6b4fdf0759583fdd74dd66b117dc6f0e diff --git a/kabc/src/CMakeLists.txt b/kabc/src/CMakeLists.txt index a96deaf..78aab37 100644 --- a/kabc/src/CMakeLists.txt +++ b/kabc/src/CMakeLists.txt @@ -1,6 +1,3 @@ -# FIXME: Make it build with this flag -remove_definitions(-DQT_NO_CAST_FROM_BYTEARRAY) - set(vcardparser_SRCS vcardparser/vcard.cpp vcardparser/vcardline.cpp diff --git a/kabc/src/address.cpp b/kabc/src/address.cpp index e8e6bfb..5e9592e 100644 --- a/kabc/src/address.cpp +++ b/kabc/src/address.cpp @@ -668,7 +668,7 @@ QString Address::ISOtoCountry( const QString &ISOname ) while ( !strbuf.isEmpty() ) { if ( ( pos =3D strbuf.indexOf( searchStr ) ) !=3D -1 ) { file.close(); - return i18n( strbuf.left( pos ).toUtf8() ); + return i18n( strbuf.left( pos ).toUtf8().constData() ); } strbuf =3D s.readLine(); } diff --git a/kabc/src/ldif.cpp b/kabc/src/ldif.cpp index 5f6d5d0..03f2dac 100644 --- a/kabc/src/ldif.cpp +++ b/kabc/src/ldif.cpp @@ -181,9 +181,9 @@ bool Ldif::splitControl( const QByteArray &line, QStrin= g &oid, bool &critical, critical =3D false; bool url =3D splitLine( line, tmp, value ); = - qDebug() << "value:" << QString::fromUtf8( value, value.size() ); + qDebug() << "value:" << QString::fromUtf8( value ); if ( tmp.isEmpty() ) { - tmp =3D QString::fromUtf8( value, value.size() ); + tmp =3D QString::fromUtf8( value ); value.resize( 0 ); } if ( tmp.endsWith( QLatin1String( "true" ) ) ) { @@ -220,15 +220,15 @@ Ldif::ParseValue Ldif::processLine() retval =3D Err; } } else if ( attrLower =3D=3D QLatin1String( "dn" ) ) { - qDebug() << "ldapentry dn:" << QString::fromUtf8( d->mValue, d->mVal= ue.size() ); - d->mDn =3D LdapDN( QString::fromUtf8( d->mValue, d->mValue.size() ) = ); + qDebug() << "ldapentry dn:" << QString::fromUtf8( d->mValue ); + d->mDn =3D LdapDN( QString::fromUtf8( d->mValue )); d->mModType =3D Mod_None; retval =3D NewEntry; } else if ( attrLower =3D=3D QLatin1String( "changetype" ) ) { if ( d->mDn.isEmpty() ) { retval =3D Err; } else { - QString tmpval =3D QString::fromUtf8( d->mValue, d->mValue.size() = ); + QString tmpval =3D QString::fromUtf8( d->mValue ); qDebug() << "changetype:" << tmpval; if ( tmpval =3D=3D QLatin1String( "add" ) ) { d->mEntryType =3D Entry_Add; @@ -276,12 +276,12 @@ Ldif::ParseValue Ldif::processLine() d->mModType =3D Mod_Add; } else if ( attrLower =3D=3D QLatin1String( "replace" ) ) { d->mModType =3D Mod_Replace; - d->mAttr =3D QString::fromUtf8( d->mValue, d->mValue.size() ); + d->mAttr =3D QString::fromUtf8( d->mValue ); d->mValue =3D QByteArray(); retval =3D Item; } else if ( attrLower =3D=3D QLatin1String( "delete" ) ) { d->mModType =3D Mod_Del; - d->mAttr =3D QString::fromUtf8( d->mValue, d->mValue.size() ); + d->mAttr =3D QString::fromUtf8( d->mValue ); d->mValue =3D QByteArray(); retval =3D Item; } else { @@ -289,7 +289,7 @@ Ldif::ParseValue Ldif::processLine() } } else { if ( d->mAttr.isEmpty() ) { - if ( QString::fromUtf8( d->mValue, d->mValue.size() ) =3D=3D QLati= n1String( "-" ) ) { + if ( QString::fromUtf8( d->mValue ) =3D=3D QLatin1String( "-" ) ) { d->mModType =3D Mod_None; } else if ( d->mValue.size() =3D=3D 0 ) { retval =3D EndEntry; @@ -305,9 +305,9 @@ Ldif::ParseValue Ldif::processLine() if ( d->mAttr.isEmpty() && d->mValue.size() =3D=3D 0 ) { retval =3D EndEntry; } else if ( attrLower =3D=3D QLatin1String( "newrdn" ) ) { - d->mNewRdn =3D QString::fromUtf8( d->mValue, d->mValue.size() ); + d->mNewRdn =3D QString::fromUtf8( d->mValue); } else if ( attrLower =3D=3D QLatin1String( "newsuperior" ) ) { - d->mNewSuperior =3D QString::fromUtf8( d->mValue, d->mValue.size() ); + d->mNewSuperior =3D QString::fromUtf8( d->mValue ); } else if ( attrLower =3D=3D QLatin1String( "deleteoldrdn" ) ) { if ( d->mValue.size() > 0 && d->mValue[0] =3D=3D '0' ) { d->mDelOldRdn =3D false; diff --git a/kabc/src/ldifconverter.cpp b/kabc/src/ldifconverter.cpp index 73d63d7..775212e 100644 --- a/kabc/src/ldifconverter.cpp +++ b/kabc/src/ldifconverter.cpp @@ -224,7 +224,7 @@ bool LDIFConverter::LDIFToAddressee( const QString &str= , AddresseeList &addrList case Ldif::Item: { QString fieldname =3D ldif.attr().toLower(); - QString value =3D QString::fromUtf8( ldif.value(), ldif.value().si= ze() ); + QString value =3D QString::fromUtf8( ldif.value() ); evaluatePair( a, homeAddr, workAddr, fieldname, value, birthday, b= irthmonth, birthyear ); break; } diff --git a/kabc/src/lock.cpp b/kabc/src/lock.cpp index 6d9d48a..050c4e7 100644 --- a/kabc/src/lock.cpp +++ b/kabc/src/lock.cpp @@ -141,8 +141,8 @@ bool Lock::lock() writeLockFile( d->mLockUniqueName ); = // Create lock file - int result =3D ::link( QFile::encodeName( d->mLockUniqueName ), - QFile::encodeName( lockName ) ); + int result =3D ::link( QFile::encodeName( d->mLockUniqueName ).constData= (), + QFile::encodeName( lockName ).constData() ); = if ( result =3D=3D 0 ) { d->mError.clear(); diff --git a/kabc/src/vcardparser/vcardparser.cpp b/kabc/src/vcardparser/vc= ardparser.cpp index 4d1f1ea..067b46f 100644 --- a/kabc/src/vcardparser/vcardparser.cpp +++ b/kabc/src/vcardparser/vcardparser.cpp @@ -37,7 +37,7 @@ public: return it.value(); } = - QString string =3D QString::fromLatin1(value, value.size()); + QString string =3D QString::fromLatin1(value); m_values.insert(value, string); return string; }