From: Ivailo Monev Date: Fri, 7 Jun 2019 13:47:50 +0000 (+0000) Subject: QLineEditPrivate cleanup X-Git-Tag: 4.12.0~5854 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=b4cad06d07f32c48c811cbb36b5b642bc3a27eee;p=kde%2FKatie.git QLineEditPrivate cleanup Signed-off-by: Ivailo Monev --- diff --git a/src/gui/widgets/qlineedit_p.cpp b/src/gui/widgets/qlineedit_p.cpp index d1257d712..d47930c37 100644 --- a/src/gui/widgets/qlineedit_p.cpp +++ b/src/gui/widgets/qlineedit_p.cpp @@ -210,7 +210,7 @@ QRect QLineEditPrivate::adjustedContentsRect() const void QLineEditPrivate::setCursorVisible(bool visible) { Q_Q(QLineEdit); - if ((bool)cursorVisible == visible) + if (cursorVisible == visible) return; cursorVisible = visible; if (control->inputMask().isEmpty()) diff --git a/src/gui/widgets/qlineedit_p.h b/src/gui/widgets/qlineedit_p.h index e49767aa5..c399cc7af 100644 --- a/src/gui/widgets/qlineedit_p.h +++ b/src/gui/widgets/qlineedit_p.h @@ -66,8 +66,8 @@ class QLineEditPrivate : public QWidgetPrivate public: QLineEditPrivate() - : control(0), frame(1), contextMenuEnabled(1), cursorVisible(0), - dragEnabled(0), clickCausedFocus(0), hscroll(0), vscroll(0), + : control(0), frame(true), contextMenuEnabled(true), cursorVisible(false), + dragEnabled(false), clickCausedFocus(false), hscroll(0), vscroll(0), alignment(Qt::AlignLeading | Qt::AlignVCenter), leftTextMargin(0), topTextMargin(0), rightTextMargin(0), bottomTextMargin(0) { @@ -94,11 +94,11 @@ public: QPoint tripleClick; QBasicTimer tripleClickTimer; - uint frame : 1; - uint contextMenuEnabled : 1; - uint cursorVisible : 1; - uint dragEnabled : 1; - uint clickCausedFocus : 1; + bool frame; + bool contextMenuEnabled; + bool cursorVisible; + bool dragEnabled; + bool clickCausedFocus; int hscroll; int vscroll; uint alignment;