diff options
| author | Lars Knoll <lars.knoll@nokia.com> | 2011-06-27 09:21:59 +0200 |
|---|---|---|
| committer | Lars Knoll <lars.knoll@nokia.com> | 2011-06-27 10:16:09 +0200 |
| commit | 371d398f70e10408e0eaba7b5f05e638a0048599 (patch) | |
| tree | dc9a33c4dd8c0f8f0477fdd3a7e0d55cd94c7dfb /src/gui/text | |
| parent | 48b1322df382503d9b15c6a8e81ec83ac82893a0 (diff) | |
Renamed QLine/TextControl to QWidgetLine/TextControl
Renamed them to free up the QTextControl and QLineControl
class names for a new API in QtGui.
Reviewed-by: Jørgen Lind
Diffstat (limited to 'src/gui/text')
| -rw-r--r-- | src/gui/text/qabstracttextdocumentlayout.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextcursor.h | 2 | ||||
| -rw-r--r-- | src/gui/text/qtextdocument.cpp | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/gui/text/qabstracttextdocumentlayout.h b/src/gui/text/qabstracttextdocumentlayout.h index 12f3ed1217..9da2d80235 100644 --- a/src/gui/text/qabstracttextdocumentlayout.h +++ b/src/gui/text/qabstracttextdocumentlayout.h @@ -122,7 +122,7 @@ protected: QTextCharFormat format(int pos); private: - friend class QTextControl; + friend class QWidgetTextControl; friend class QTextDocument; friend class QTextDocumentPrivate; friend class QTextEngine; diff --git a/src/gui/text/qtextcursor.h b/src/gui/text/qtextcursor.h index 697899bcfa..61419b7979 100644 --- a/src/gui/text/qtextcursor.h +++ b/src/gui/text/qtextcursor.h @@ -230,7 +230,7 @@ private: QSharedDataPointer<QTextCursorPrivate> d; friend class QTextDocumentFragmentPrivate; friend class QTextCopyHelper; - friend class QTextControlPrivate; + friend class QWidgetTextControlPrivate; }; QT_END_NAMESPACE diff --git a/src/gui/text/qtextdocument.cpp b/src/gui/text/qtextdocument.cpp index 1b1db0d64d..3ca72bf14e 100644 --- a/src/gui/text/qtextdocument.cpp +++ b/src/gui/text/qtextdocument.cpp @@ -1978,7 +1978,7 @@ QVariant QTextDocument::loadResource(int type, const QUrl &name) } #endif #ifndef QT_NO_TEXTCONTROL - else if (QTextControl *control = qobject_cast<QTextControl *>(parent())) { + else if (QWidgetTextControl *control = qobject_cast<QWidgetTextControl *>(parent())) { r = control->loadResource(type, name); } #endif |