[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdepimlibs/frameworks] kabc/src: Make it compile with -DQT_NO_CAST_FROM_BYTEARRAY
From: Montel Laurent <montel () kde ! org>
Date: 2014-04-15 5:30:48
Message-ID: E1WZvxI-000135-Sv () scm ! kde ! org
[Download RAW message or body]
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 = strbuf.indexOf( searchStr ) ) != -1 ) {
file.close();
- return i18n( strbuf.left( pos ).toUtf8() );
+ return i18n( strbuf.left( pos ).toUtf8().constData() );
}
strbuf = 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, QString &oid, bool &critical,
critical = false;
bool url = splitLine( line, tmp, value );
- qDebug() << "value:" << QString::fromUtf8( value, value.size() );
+ qDebug() << "value:" << QString::fromUtf8( value );
if ( tmp.isEmpty() ) {
- tmp = QString::fromUtf8( value, value.size() );
+ tmp = QString::fromUtf8( value );
value.resize( 0 );
}
if ( tmp.endsWith( QLatin1String( "true" ) ) ) {
@@ -220,15 +220,15 @@ Ldif::ParseValue Ldif::processLine()
retval = Err;
}
} else if ( attrLower == QLatin1String( "dn" ) ) {
- qDebug() << "ldapentry dn:" << QString::fromUtf8( d->mValue, d->mValue.size() );
- d->mDn = LdapDN( QString::fromUtf8( d->mValue, d->mValue.size() ) );
+ qDebug() << "ldapentry dn:" << QString::fromUtf8( d->mValue );
+ d->mDn = LdapDN( QString::fromUtf8( d->mValue ));
d->mModType = Mod_None;
retval = NewEntry;
} else if ( attrLower == QLatin1String( "changetype" ) ) {
if ( d->mDn.isEmpty() ) {
retval = Err;
} else {
- QString tmpval = QString::fromUtf8( d->mValue, d->mValue.size() );
+ QString tmpval = QString::fromUtf8( d->mValue );
qDebug() << "changetype:" << tmpval;
if ( tmpval == QLatin1String( "add" ) ) {
d->mEntryType = Entry_Add;
@@ -276,12 +276,12 @@ Ldif::ParseValue Ldif::processLine()
d->mModType = Mod_Add;
} else if ( attrLower == QLatin1String( "replace" ) ) {
d->mModType = Mod_Replace;
- d->mAttr = QString::fromUtf8( d->mValue, d->mValue.size() );
+ d->mAttr = QString::fromUtf8( d->mValue );
d->mValue = QByteArray();
retval = Item;
} else if ( attrLower == QLatin1String( "delete" ) ) {
d->mModType = Mod_Del;
- d->mAttr = QString::fromUtf8( d->mValue, d->mValue.size() );
+ d->mAttr = QString::fromUtf8( d->mValue );
d->mValue = QByteArray();
retval = Item;
} else {
@@ -289,7 +289,7 @@ Ldif::ParseValue Ldif::processLine()
}
} else {
if ( d->mAttr.isEmpty() ) {
- if ( QString::fromUtf8( d->mValue, d->mValue.size() ) == QLatin1String( "-" ) ) {
+ if ( QString::fromUtf8( d->mValue ) == QLatin1String( "-" ) ) {
d->mModType = Mod_None;
} else if ( d->mValue.size() == 0 ) {
retval = EndEntry;
@@ -305,9 +305,9 @@ Ldif::ParseValue Ldif::processLine()
if ( d->mAttr.isEmpty() && d->mValue.size() == 0 ) {
retval = EndEntry;
} else if ( attrLower == QLatin1String( "newrdn" ) ) {
- d->mNewRdn = QString::fromUtf8( d->mValue, d->mValue.size() );
+ d->mNewRdn = QString::fromUtf8( d->mValue);
} else if ( attrLower == QLatin1String( "newsuperior" ) ) {
- d->mNewSuperior = QString::fromUtf8( d->mValue, d->mValue.size() );
+ d->mNewSuperior = QString::fromUtf8( d->mValue );
} else if ( attrLower == QLatin1String( "deleteoldrdn" ) ) {
if ( d->mValue.size() > 0 && d->mValue[0] == '0' ) {
d->mDelOldRdn = 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 = ldif.attr().toLower();
- QString value = QString::fromUtf8( ldif.value(), ldif.value().size() );
+ QString value = QString::fromUtf8( ldif.value() );
evaluatePair( a, homeAddr, workAddr, fieldname, value, birthday, birthmonth, 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 = ::link( QFile::encodeName( d->mLockUniqueName ),
- QFile::encodeName( lockName ) );
+ int result = ::link( QFile::encodeName( d->mLockUniqueName ).constData(),
+ QFile::encodeName( lockName ).constData() );
if ( result == 0 ) {
d->mError.clear();
diff --git a/kabc/src/vcardparser/vcardparser.cpp b/kabc/src/vcardparser/vcardparser.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 = QString::fromLatin1(value, value.size());
+ QString string = QString::fromLatin1(value);
m_values.insert(value, string);
return string;
}
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic