diff options
| author | Marc Mutz <marc.mutz@kdab.com> | 2014-09-22 20:42:53 +0200 |
|---|---|---|
| committer | Marc Mutz <marc.mutz@kdab.com> | 2014-09-26 00:39:48 +0200 |
| commit | 55fbf1db19fbe9dba60cd11d2fdccc85b4bab7ac (patch) | |
| tree | cf8bf558b91dbf1ebbc7de84b7bf5ab3d7c593fd /src/widgets/widgets/qlineedit_p.cpp | |
| parent | 10e5bcf9d0428992c29d8822671933fa49f0ae37 (diff) | |
Widgets: remove references to QStyleOptionFrameV<n>
They're gone since Qt 5.0 and only exist as typedefs for QStyleOptionFrame.
Change-Id: Icff45cbd3a47db8618a7f7a80f7252651969237c
Reviewed-by: Friedemann Kleint <Friedemann.Kleint@digia.com>
Diffstat (limited to 'src/widgets/widgets/qlineedit_p.cpp')
| -rw-r--r-- | src/widgets/widgets/qlineedit_p.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/widgets/widgets/qlineedit_p.cpp b/src/widgets/widgets/qlineedit_p.cpp index 2daccc345d..0731c89094 100644 --- a/src/widgets/widgets/qlineedit_p.cpp +++ b/src/widgets/widgets/qlineedit_p.cpp @@ -135,7 +135,7 @@ void QLineEditPrivate::_q_selectionChanged() { Q_Q(QLineEdit); if (control->preeditAreaText().isEmpty()) { - QStyleOptionFrameV2 opt; + QStyleOptionFrame opt; q->initStyleOption(&opt); bool showCursor = control->hasSelectedText() ? q->style()->styleHint(QStyle::SH_BlinkCursorWhenTextSelected, &opt, q): @@ -194,7 +194,7 @@ void QLineEditPrivate::init(const QString& txt) QObject::connect(control, SIGNAL(updateNeeded(QRect)), q, SLOT(_q_updateNeeded(QRect))); - QStyleOptionFrameV2 opt; + QStyleOptionFrame opt; q->initStyleOption(&opt); control->setPasswordCharacter(q->style()->styleHint(QStyle::SH_LineEdit_PasswordCharacter, &opt, q)); control->setPasswordMaskDelay(q->style()->styleHint(QStyle::SH_LineEdit_PasswordMaskDelay, &opt, q)); @@ -217,7 +217,7 @@ void QLineEditPrivate::init(const QString& txt) QRect QLineEditPrivate::adjustedContentsRect() const { Q_Q(const QLineEdit); - QStyleOptionFrameV2 opt; + QStyleOptionFrame opt; q->initStyleOption(&opt); QRect r = q->style()->subElementRect(QStyle::SE_LineEditContents, &opt, q); r.setX(r.x() + effectiveLeftTextMargin()); @@ -387,7 +387,7 @@ QSize QLineEditPrivate::iconSize() const QIcon QLineEditPrivate::clearButtonIcon() const { Q_Q(const QLineEdit); - QStyleOptionFrameV2 styleOption; + QStyleOptionFrame styleOption; q->initStyleOption(&styleOption); return QIcon(q->style()->standardPixmap(QStyle::SP_LineEditClearButton, &styleOption, q)); } |