From 11ec67108d56dc29631ddbd90be840021d83f6c1 Mon Sep 17 00:00:00 2001
From: Michael Brasser <michael.brasser@nokia.com>
Date: Wed, 15 Jul 2009 15:45:46 +1000
Subject: Fix warnings.

---
 src/declarative/fx/qfxitem.cpp     | 3 ---
 src/declarative/fx/qfxtextedit.cpp | 2 +-
 src/declarative/fx/qfxtextedit_p.h | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)

diff --git a/src/declarative/fx/qfxitem.cpp b/src/declarative/fx/qfxitem.cpp
index 4650212..3386faf 100644
--- a/src/declarative/fx/qfxitem.cpp
+++ b/src/declarative/fx/qfxitem.cpp
@@ -2178,13 +2178,11 @@ QPointF QFxItem::transformOriginPoint() const
 
 qreal QFxItem::z() const
 {
-    Q_D(const QFxItem);
     return zValue();
 }
 
 void QFxItem::setX(qreal x)
 {
-    Q_D(QFxItem);
     if (x == this->x())
         return;
 
@@ -2517,7 +2515,6 @@ void QFxItem::setOptions(Options options, bool set)
  */
 void QFxItem::setParent(QFxItem *p)
 {
-    Q_D(QFxItem);
     if (p == parent() || !p) return;
 
     QObject::setParent(p);
diff --git a/src/declarative/fx/qfxtextedit.cpp b/src/declarative/fx/qfxtextedit.cpp
index 6d05e72..5a62727 100644
--- a/src/declarative/fx/qfxtextedit.cpp
+++ b/src/declarative/fx/qfxtextedit.cpp
@@ -535,7 +535,7 @@ void QFxTextEdit::loadCursorDelegate()
         d->cursor->setHeight(QFontMetrics(d->font.font()).height());
         moveCursorDelegate();
     }else{
-        qWarning() << "Error loading cursor delegate for TextEdit:" + objectName();
+        qWarning() << QLatin1String("Error loading cursor delegate for TextEdit:") + objectName();
     }
 }
 
diff --git a/src/declarative/fx/qfxtextedit_p.h b/src/declarative/fx/qfxtextedit_p.h
index 267e48b..45a8a60 100644
--- a/src/declarative/fx/qfxtextedit_p.h
+++ b/src/declarative/fx/qfxtextedit_p.h
@@ -71,7 +71,7 @@ public:
       : font(0), color("black"), imgDirty(true), hAlign(QFxTextEdit::AlignLeft), vAlign(QFxTextEdit::AlignTop),
       dirty(false), wrap(false), richText(false), cursorVisible(false), focusOnPress(false),
       preserveSelection(true), textMargin(0.0), lastSelectionStart(0), lastSelectionEnd(0),
-      cursor(0), cursorComponent(0), format(QFxTextEdit::AutoText), document(0)
+      cursorComponent(0), cursor(0), format(QFxTextEdit::AutoText), document(0)
     {
     }
 
-- 
cgit v0.12