summaryrefslogtreecommitdiffstats
path: root/src/widgets/widgets/qwidgetlinecontrol_p.h
diff options
context:
space:
mode:
authorPekka Vuorela <pekka.ta.vuorela@nokia.com>2012-03-16 14:08:13 +0200
committerQt by Nokia <qt-info@nokia.com>2012-03-26 11:41:07 +0200
commitbc0b37d6b61fc8ab83026d6a5e515666e58d7938 (patch)
tree60d2fde70fe599e9ff8789b56440a384eb91f131 /src/widgets/widgets/qwidgetlinecontrol_p.h
parent083052933fefacbc91930bc2cb6505ecf592adaa (diff)
Password editor mask delay stylable by platform plugin
Replaced hard coding as QT_GUI_PASSWORD_ECHO_DELAY with a style hint. Change-Id: I0b78ebad723dbe19d9b9496583203e31545874e2 Reviewed-by: Andrew den Exter <andrew.den-exter@nokia.com> Reviewed-by: Lars Knoll <lars.knoll@nokia.com>
Diffstat (limited to 'src/widgets/widgets/qwidgetlinecontrol_p.h')
-rw-r--r--src/widgets/widgets/qwidgetlinecontrol_p.h8
1 files changed, 0 insertions, 8 deletions
diff --git a/src/widgets/widgets/qwidgetlinecontrol_p.h b/src/widgets/widgets/qwidgetlinecontrol_p.h
index 72f25e9068..62184a27bb 100644
--- a/src/widgets/widgets/qwidgetlinecontrol_p.h
+++ b/src/widgets/widgets/qwidgetlinecontrol_p.h
@@ -93,9 +93,7 @@ public:
m_ascent(0), m_maxLength(32767), m_lastCursorPos(-1),
m_tripleClickTimer(0), m_maskData(0), m_modifiedState(0), m_undoState(0),
m_selstart(0), m_selend(0), m_passwordEchoEditing(false)
-#ifdef QT_GUI_PASSWORD_ECHO_DELAY
, m_passwordEchoTimer(0)
-#endif
#if defined(Q_WS_MAC)
, m_threadChecks(false)
, m_textLayoutThread(0)
@@ -306,10 +304,8 @@ public:
void updatePasswordEchoEditing(bool editing);
bool passwordEchoEditing() const {
-#ifdef QT_GUI_PASSWORD_ECHO_DELAY
if (m_passwordEchoTimer != 0)
return true;
-#endif
return m_passwordEchoEditing ;
}
@@ -484,17 +480,13 @@ private:
bool m_passwordEchoEditing;
QChar m_passwordCharacter;
-#ifdef QT_GUI_PASSWORD_ECHO_DELAY
int m_passwordEchoTimer;
-#endif
void cancelPasswordEchoTimer()
{
-#ifdef QT_GUI_PASSWORD_ECHO_DELAY
if (m_passwordEchoTimer != 0) {
killTimer(m_passwordEchoTimer);
m_passwordEchoTimer = 0;
}
-#endif
}
int redoTextLayout() const;