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/widgets/widgets/qtextedit.cpp | |
| 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/widgets/widgets/qtextedit.cpp')
| -rw-r--r-- | src/widgets/widgets/qtextedit.cpp | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/src/widgets/widgets/qtextedit.cpp b/src/widgets/widgets/qtextedit.cpp index 2670089133..550db2d2b0 100644 --- a/src/widgets/widgets/qtextedit.cpp +++ b/src/widgets/widgets/qtextedit.cpp @@ -58,7 +58,7 @@ #include "qtextdocument.h" #include "private/qtextdocument_p.h" #include "qtextlist.h" -#include "private/qtextcontrol_p.h" +#include "private/qwidgettextcontrol_p.h" #include <qtextformat.h> #include <qdatetime.h> @@ -79,27 +79,27 @@ static inline bool shouldEnableInputMethod(QTextEdit *textedit) return !textedit->isReadOnly(); } -class QTextEditControl : public QTextControl +class QTextEditControl : public QWidgetTextControl { public: - inline QTextEditControl(QObject *parent) : QTextControl(parent) {} + inline QTextEditControl(QObject *parent) : QWidgetTextControl(parent) {} virtual QMimeData *createMimeDataFromSelection() const { QTextEdit *ed = qobject_cast<QTextEdit *>(parent()); if (!ed) - return QTextControl::createMimeDataFromSelection(); + return QWidgetTextControl::createMimeDataFromSelection(); return ed->createMimeDataFromSelection(); } virtual bool canInsertFromMimeData(const QMimeData *source) const { QTextEdit *ed = qobject_cast<QTextEdit *>(parent()); if (!ed) - return QTextControl::canInsertFromMimeData(source); + return QWidgetTextControl::canInsertFromMimeData(source); return ed->canInsertFromMimeData(source); } virtual void insertFromMimeData(const QMimeData *source) { QTextEdit *ed = qobject_cast<QTextEdit *>(parent()); if (!ed) - QTextControl::insertFromMimeData(source); + QWidgetTextControl::insertFromMimeData(source); else ed->insertFromMimeData(source); } @@ -235,7 +235,7 @@ void QTextEditPrivate::pageUpDown(QTextCursor::MoveOperation op, QTextCursor::Mo } #ifndef QT_NO_SCROLLBAR -static QSize documentSize(QTextControl *control) +static QSize documentSize(QWidgetTextControl *control) { QTextDocument *doc = control->document(); QAbstractTextDocumentLayout *layout = doc->documentLayout(); @@ -2019,7 +2019,7 @@ QList<QTextEdit::ExtraSelection> QTextEdit::extraSelections() const QMimeData *QTextEdit::createMimeDataFromSelection() const { Q_D(const QTextEdit); - return d->control->QTextControl::createMimeDataFromSelection(); + return d->control->QWidgetTextControl::createMimeDataFromSelection(); } /*! @@ -2034,7 +2034,7 @@ QMimeData *QTextEdit::createMimeDataFromSelection() const bool QTextEdit::canInsertFromMimeData(const QMimeData *source) const { Q_D(const QTextEdit); - return d->control->QTextControl::canInsertFromMimeData(source); + return d->control->QWidgetTextControl::canInsertFromMimeData(source); } /*! @@ -2049,7 +2049,7 @@ bool QTextEdit::canInsertFromMimeData(const QMimeData *source) const void QTextEdit::insertFromMimeData(const QMimeData *source) { Q_D(QTextEdit); - d->control->QTextControl::insertFromMimeData(source); + d->control->QWidgetTextControl::insertFromMimeData(source); } /*! |