From fbddf793e94b851219fd1c7e71f857099db1cd33 Mon Sep 17 00:00:00 2001 From: Friedemann Kleint Date: Wed, 15 Feb 2012 10:23:33 +0100 Subject: QtDeclarative/Quick: Fix warnings. Change-Id: I71bd638fcc41356e0b76df27ec76ad3ed5ef90d9 Reviewed-by: Michael Brasser --- src/quick/items/context2d/qquickcanvasitem.cpp | 2 +- src/quick/util/qdeclarativestyledtext.cpp | 4 ++-- src/quick/util/qdeclarativetransition.cpp | 1 - 3 files changed, 3 insertions(+), 4 deletions(-) (limited to 'src/quick') diff --git a/src/quick/items/context2d/qquickcanvasitem.cpp b/src/quick/items/context2d/qquickcanvasitem.cpp index 53550b0b01..783fedf9fc 100644 --- a/src/quick/items/context2d/qquickcanvasitem.cpp +++ b/src/quick/items/context2d/qquickcanvasitem.cpp @@ -910,7 +910,7 @@ bool QQuickCanvasItem::createContext(const QString &contextType) Q_D(QQuickCanvasItem); if (contextType == QLatin1String("2d")) { - if (d->contextType.compare("2d", Qt::CaseInsensitive) != 0) { + if (d->contextType.compare(QLatin1String("2d"), Qt::CaseInsensitive) != 0) { d->contextType = QLatin1String("2d"); emit contextTypeChanged(); // XXX: can't be in setContextType() } diff --git a/src/quick/util/qdeclarativestyledtext.cpp b/src/quick/util/qdeclarativestyledtext.cpp index 8c26194968..164e33cec1 100644 --- a/src/quick/util/qdeclarativestyledtext.cpp +++ b/src/quick/util/qdeclarativestyledtext.cpp @@ -690,9 +690,9 @@ void QDeclarativeStyledTextPrivate::parseImageAttributes(const QChar *&ch, const QFontMetricsF fm(layout.font()); QString padding(qFloor(imgWidth / fm.width(QChar::Nbsp)), QChar::Nbsp); - textOut += QChar(' '); + textOut += QLatin1Char(' '); textOut += padding; - textOut += QChar(' '); + textOut += QLatin1Char(' '); } QPair QDeclarativeStyledTextPrivate::parseAttribute(const QChar *&ch, const QString &textIn) diff --git a/src/quick/util/qdeclarativetransition.cpp b/src/quick/util/qdeclarativetransition.cpp index c52ce92ec6..96e870df82 100644 --- a/src/quick/util/qdeclarativetransition.cpp +++ b/src/quick/util/qdeclarativetransition.cpp @@ -206,7 +206,6 @@ QDeclarativeTransition::QDeclarativeTransition(QObject *parent) QDeclarativeTransition::~QDeclarativeTransition() { - Q_D(QDeclarativeTransition); } void QDeclarativeTransition::setReversed(bool r) -- cgit v1.2.3