diff options
Diffstat (limited to 'src/controls/qquickabstracttextarea.cpp')
-rw-r--r-- | src/controls/qquickabstracttextarea.cpp | 71 |
1 files changed, 1 insertions, 70 deletions
diff --git a/src/controls/qquickabstracttextarea.cpp b/src/controls/qquickabstracttextarea.cpp index 0da6cdb1..8f4219d6 100644 --- a/src/controls/qquickabstracttextarea.cpp +++ b/src/controls/qquickabstracttextarea.cpp @@ -35,14 +35,10 @@ ****************************************************************************/ #include "qquickabstracttextarea_p.h" -#include "qquickabstractapplicationwindow_p.h" -#include "qquickstyle_p_p.h" -#include "qquickstyle_p.h" #include <QtQuick/private/qquickitem_p.h> #include <QtQuick/private/qquicktext_p.h> #include <QtQuick/private/qquickclipnode_p.h> -#include <QtCore/qcoreapplication.h> QT_BEGIN_NAMESPACE @@ -51,28 +47,13 @@ class QQuickAbstractTextAreaPrivate Q_DECLARE_PUBLIC(QQuickAbstractTextArea) public: - QQuickAbstractTextAreaPrivate() : hasStyle(false), style(Q_NULLPTR), - background(Q_NULLPTR), placeholder(Q_NULLPTR) { } + QQuickAbstractTextAreaPrivate() : background(Q_NULLPTR), placeholder(Q_NULLPTR) { } - void resolveStyle(QQuickStyle *other = 0); // TODO - - bool hasStyle; - QQuickStyle *style; QQuickItem *background; QQuickText *placeholder; QQuickAbstractTextArea *q_ptr; }; -void QQuickAbstractTextAreaPrivate::resolveStyle(QQuickStyle *res) -{ - Q_Q(QQuickAbstractTextArea); - res = QQuickStylePrivate::resolve(q, res); - if (style != res) { - style = res; - emit q->styleChanged(); - } -} - QQuickAbstractTextArea::QQuickAbstractTextArea(QQuickItem *parent) : QQuickTextEdit(parent), d_ptr(new QQuickAbstractTextAreaPrivate) { @@ -84,40 +65,6 @@ QQuickAbstractTextArea::~QQuickAbstractTextArea() { } -QQuickStyle *QQuickAbstractTextArea::style() const -{ - Q_D(const QQuickAbstractTextArea); - if (!d->style) - const_cast<QQuickAbstractTextArea *>(this)->d_func()->resolveStyle(); - return d->style; -} - -void QQuickAbstractTextArea::setStyle(QQuickStyle *style) -{ - Q_D(QQuickAbstractTextArea); - if (d->style != style) { - d->hasStyle = true; - d->resolveStyle(style); - - QEvent change(QEvent::StyleChange); - foreach (QObject *object, findChildren<QObject *>()) { - if (qobject_cast<QQuickStylable *>(object)) - QCoreApplication::sendEvent(object, &change); - } - } -} - -bool QQuickAbstractTextArea::hasStyle() const -{ - Q_D(const QQuickAbstractTextArea); - return d->hasStyle; -} - -void QQuickAbstractTextArea::resetStyle() -{ - setStyle(Q_NULLPTR); -} - QQuickItem *QQuickAbstractTextArea::background() const { Q_D(const QQuickAbstractTextArea); @@ -157,22 +104,6 @@ void QQuickAbstractTextArea::setPlaceholder(QQuickText *placeholder) } } -bool QQuickAbstractTextArea::event(QEvent *event) -{ - Q_D(QQuickAbstractTextArea); - if (event->type() == QEvent::StyleChange) - d->resolveStyle(); - return QQuickTextEdit::event(event); -} - -void QQuickAbstractTextArea::itemChange(ItemChange change, const ItemChangeData &data) -{ - Q_D(QQuickAbstractTextArea); - QQuickTextEdit::itemChange(change, data); - if (change == ItemSceneChange || change == ItemParentHasChanged) - d->resolveStyle(); -} - void QQuickAbstractTextArea::geometryChanged(const QRectF &newGeometry, const QRectF &oldGeometry) { Q_D(QQuickAbstractTextArea); |