From 086599b47adfac8b264112665d6ed0a8f6fb3934 Mon Sep 17 00:00:00 2001 From: Dawit Alemayehu Date: Mon, 8 Nov 2010 18:14:17 +0000 Subject: [PATCH] Fixed compile errors when using QT_USE_FAST_CONCATENATION and QT_USE_FAST_OPERATOR_PLUS to compile kdelibs... svn path=/trunk/KDE/kdelibs/; revision=1194330 --- datacontainer.cpp | 2 +- widgets/declarativewidget.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/datacontainer.cpp b/datacontainer.cpp index 2d50620d3..ede4843de 100644 --- a/datacontainer.cpp +++ b/datacontainer.cpp @@ -215,7 +215,7 @@ void DataContainerPrivate::store() QByteArray b; QDataStream ds(&b, QIODevice::WriteOnly); ds << it.value(); - op.writeEntry("key", "base64-" + it.key()); + op.writeEntry("key", QString(QLatin1String("base64-") + it.key())); op.writeEntry("data", b.toBase64()); } ++it; diff --git a/widgets/declarativewidget.cpp b/widgets/declarativewidget.cpp index 33fa88fcd..803b95e67 100644 --- a/widgets/declarativewidget.cpp +++ b/widgets/declarativewidget.cpp @@ -74,7 +74,7 @@ void DeclarativeWidgetPrivate::errorPrint() if(component->isError()){ QList errors = component->errors(); foreach (const QDeclarativeError &error, errors) { - errorStr += (error.line()>0?QString::number(error.line()) + ": ":"") + errorStr += (error.line()>0?QString(QString::number(error.line()) + QLatin1String(": ")):QLatin1String("")) + error.description() + '\n'; } }