From 94c56513f257e7968c5f1df7942ee43de48303f3 Mon Sep 17 00:00:00 2001 From: J-P Nurmi Date: Fri, 1 Mar 2013 17:15:11 +0100 Subject: CheckBox: prefix internals with underscores Change-Id: Ib455682425cdfde6239071c8ab0e6d86ca85715b Reviewed-by: Mitch Curtis --- src/controls/CheckBox.qml | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'src/controls/CheckBox.qml') diff --git a/src/controls/CheckBox.qml b/src/controls/CheckBox.qml index e9c03073..c79fc356 100644 --- a/src/controls/CheckBox.qml +++ b/src/controls/CheckBox.qml @@ -108,34 +108,35 @@ AbstractCheckable { property bool partiallyCheckedEnabled: false /*! + \internal True if onCheckedChanged should be ignored because we were reacting to onCheckedStateChanged. */ - property bool ignoreChecked: false + property bool __ignoreChecked: false style: Qt.createComponent(Settings.THEME_PATH + "/CheckBoxStyle.qml", checkBox) Accessible.role: Accessible.CheckBox Accessible.name: text - __cycleStatesHandler: cycleCheckBoxStates + __cycleStatesHandler: __cycleCheckBoxStates /*! \internal */ onCheckedChanged: { - if (!ignoreChecked) + if (!__ignoreChecked) checkedState = checked ? Qt.Checked : Qt.Unchecked; } /*! \internal */ onCheckedStateChanged: { - ignoreChecked = true; + __ignoreChecked = true; if (checkedState === Qt.PartiallyChecked) { partiallyCheckedEnabled = true; checked = false; } else { checked = checkedState === Qt.Checked; } - ignoreChecked = false; + __ignoreChecked = false; } /*! \internal */ @@ -153,7 +154,7 @@ AbstractCheckable { } /*! \internal */ - function cycleCheckBoxStates() { + function __cycleCheckBoxStates() { if (!partiallyCheckedEnabled) { checked = !checked; } else { -- cgit v1.2.1