From 371d398f70e10408e0eaba7b5f05e638a0048599 Mon Sep 17 00:00:00 2001
From: Lars Knoll <lars.knoll@nokia.com>
Date: Mon, 27 Jun 2011 09:21:59 +0200
Subject: Renamed QLine/TextControl to QWidgetLine/TextControl
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Renamed them to free up the QTextControl and QLineControl
class names for a new API in QtGui.

Reviewed-by: Jørgen Lind
---
 src/widgets/graphicsview/qgraphicsitem.cpp | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

(limited to 'src/widgets/graphicsview/qgraphicsitem.cpp')

diff --git a/src/widgets/graphicsview/qgraphicsitem.cpp b/src/widgets/graphicsview/qgraphicsitem.cpp
index d49ab01214..7070d49579 100644
--- a/src/widgets/graphicsview/qgraphicsitem.cpp
+++ b/src/widgets/graphicsview/qgraphicsitem.cpp
@@ -750,7 +750,7 @@
 
 #include <private/qgraphicsitem_p.h>
 #include <private/qgraphicswidget_p.h>
-#include <private/qtextcontrol_p.h>
+#include <private/qwidgettextcontrol_p.h>
 #include <private/qtextdocumentlayout_p.h>
 #include <private/qtextengine_p.h>
 #include <private/qwidget_p.h>
@@ -9854,8 +9854,8 @@ public:
         : control(0), pageNumber(0), useDefaultImpl(false), tabChangesFocus(false), clickCausedFocus(0)
     { }
 
-    mutable QTextControl *control;
-    QTextControl *textControl() const;
+    mutable QWidgetTextControl *control;
+    QWidgetTextControl *textControl() const;
 
     inline QPointF controlOffset() const
     { return QPointF(0., pageNumber * control->document()->pageSize().height()); }
@@ -10005,7 +10005,7 @@ void QGraphicsTextItem::setFont(const QFont &font)
 */
 void QGraphicsTextItem::setDefaultTextColor(const QColor &col)
 {
-    QTextControl *c = dd->textControl();
+    QWidgetTextControl *c = dd->textControl();
     QPalette pal = c->palette();
     QColor old = pal.color(QPalette::Text);
     pal.setColor(QPalette::Text, col);
@@ -10502,11 +10502,11 @@ void QGraphicsTextItemPrivate::_q_ensureVisible(QRectF rect)
     }
 }
 
-QTextControl *QGraphicsTextItemPrivate::textControl() const
+QWidgetTextControl *QGraphicsTextItemPrivate::textControl() const
 {
     if (!control) {
         QGraphicsTextItem *that = const_cast<QGraphicsTextItem *>(qq);
-        control = new QTextControl(that);
+        control = new QWidgetTextControl(that);
         control->setTextInteractionFlags(Qt::NoTextInteraction);
 
         QObject::connect(control, SIGNAL(updateRequest(QRectF)),
-- 
cgit v1.2.3