From ae5a348b50fdd3d4be6a7ad742c33750dd9c35d5 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Mon, 4 Apr 2022 14:39:24 +0200 Subject: [PATCH] spelling aligned with Qt checkboxes ( triState -> tristate ) --- examples/gallery/button/ButtonPage.cpp | 2 +- src/controls/QskCheckBox.cpp | 18 ++++----- src/controls/QskCheckBox.h | 14 +++---- tests/checkboxes/main.cpp | 52 ++++++++++++++++---------- tests/checkboxes/main.h | 2 +- 5 files changed, 51 insertions(+), 37 deletions(-) diff --git a/examples/gallery/button/ButtonPage.cpp b/examples/gallery/button/ButtonPage.cpp index d4610b43..e6cb217d 100644 --- a/examples/gallery/button/ButtonPage.cpp +++ b/examples/gallery/button/ButtonPage.cpp @@ -92,7 +92,7 @@ namespace for ( auto state : { Qt::Unchecked, Qt::PartiallyChecked, Qt::Checked } ) { auto button = new QskCheckBox( this ); - button->setTriState( true ); + button->setTristate( true ); button->setCheckState( state ); } } diff --git a/src/controls/QskCheckBox.cpp b/src/controls/QskCheckBox.cpp index 32bfbbb7..5a5cdbee 100644 --- a/src/controls/QskCheckBox.cpp +++ b/src/controls/QskCheckBox.cpp @@ -20,7 +20,7 @@ class QskCheckBox::PrivateData : checkState( Qt::Unchecked ) , checkStateChanging( false ) , toggleChanging( false ) - , triState( false ) + , tristate( false ) { } @@ -31,7 +31,7 @@ class QskCheckBox::PrivateData int checkState : 2; bool checkStateChanging : 1; bool toggleChanging : 1; - bool triState : 1; + bool tristate : 1; }; QskCheckBox::QskCheckBox( QQuickItem* parent ) @@ -81,7 +81,7 @@ void QskCheckBox::setCheckState( Qt::CheckState checkState ) if( checkState == Qt::PartiallyChecked ) { setChecked( true ); - setTriState( true ); + setTristate( true ); } else { @@ -93,17 +93,17 @@ void QskCheckBox::setCheckState( Qt::CheckState checkState ) setCheckStateInternal( checkState ); } -bool QskCheckBox::isTriState() const +bool QskCheckBox::isTristate() const { - return m_data->triState; + return m_data->tristate; } -void QskCheckBox::setTriState( bool triState ) +void QskCheckBox::setTristate( bool tristate ) { - if( m_data->triState != triState ) + if( m_data->tristate != tristate ) { - m_data->triState = triState; - Q_EMIT isTriStateChanged( triState ); + m_data->tristate = tristate; + Q_EMIT tristateChanged( tristate ); } } diff --git a/src/controls/QskCheckBox.h b/src/controls/QskCheckBox.h index 2c273ca5..b1443c1d 100644 --- a/src/controls/QskCheckBox.h +++ b/src/controls/QskCheckBox.h @@ -15,8 +15,8 @@ class QSK_EXPORT QskCheckBox : public QskAbstractButton Q_PROPERTY( Qt::CheckState checkState READ checkState WRITE setCheckState NOTIFY checkStateChanged FINAL ) - Q_PROPERTY( bool isTriState READ isTriState - WRITE setTriState NOTIFY isTriStateChanged FINAL ) + Q_PROPERTY( bool tristate READ isTristate + WRITE setTristate NOTIFY tristateChanged FINAL ) using Inherited = QskAbstractButton; @@ -28,19 +28,19 @@ class QSK_EXPORT QskCheckBox : public QskAbstractButton ~QskCheckBox() override; Qt::CheckState checkState() const; - bool isTriState() const; + bool isTristate() const; bool isCheckable() const override final; - void addToGroup( QskCheckBox* groupItem ); - void removeFromGroup( QskCheckBox* groupItem ); + void addToGroup( QskCheckBox* ); + void removeFromGroup( QskCheckBox* ); public Q_SLOTS: void setCheckState( Qt::CheckState ); - void setTriState( bool triState = true ); + void setTristate( bool triState = true ); Q_SIGNALS: void checkStateChanged( Qt::CheckState ); - void isTriStateChanged( bool ); + void tristateChanged( bool ); void removeFromAllGroupsRequested(); private: diff --git a/tests/checkboxes/main.cpp b/tests/checkboxes/main.cpp index 234753c0..711a9d4a 100644 --- a/tests/checkboxes/main.cpp +++ b/tests/checkboxes/main.cpp @@ -2,20 +2,25 @@ #include -void CheckBoxTests::init() { +void CheckBoxTests::init() +{ root = new QskControl(); } -void CheckBoxTests::cleanup() { + +void CheckBoxTests::cleanup() +{ delete root; } -void CheckBoxTests::checkbox() { +void CheckBoxTests::checkbox() +{ auto t = new QskCheckBox( root ); QVERIFY( t->isCheckable() ); } -void CheckBoxTests::click() { +void CheckBoxTests::click() +{ auto t = new QskCheckBox( root ); QVERIFY( t->isChecked() == false ); @@ -23,7 +28,8 @@ void CheckBoxTests::click() { QVERIFY( t->isChecked() ); } -void CheckBoxTests::toggle() { +void CheckBoxTests::toggle() +{ auto t = new QskCheckBox( root ); QVERIFY( t->isChecked() == false ); @@ -34,19 +40,21 @@ void CheckBoxTests::toggle() { QVERIFY( t->isChecked() == false ); } -void CheckBoxTests::triState() { +void CheckBoxTests::tristate() +{ auto t = new QskCheckBox( root ); QVERIFY( t->isChecked() == false ); - QVERIFY( t->isTriState() == false ); + QVERIFY( t->isTristate() == false ); t->setCheckState( Qt::CheckState::PartiallyChecked ); QVERIFY( t->isChecked() == true ); - QVERIFY( t->isTriState() == true ); + QVERIFY( t->isTristate() == true ); } -void CheckBoxTests::higherGroupUpdatesLower() { +void CheckBoxTests::higherGroupUpdatesLower() +{ auto t = new QskCheckBox( root ); auto t1 = new QskCheckBox( root ); auto t2 = new QskCheckBox( root ); @@ -74,7 +82,9 @@ void CheckBoxTests::higherGroupUpdatesLower() { QVERIFY( t3->isChecked() == false ); } -void CheckBoxTests::lowerGroupUpdatesHigher() { + +void CheckBoxTests::lowerGroupUpdatesHigher() +{ auto t = new QskCheckBox( root ); auto t1 = new QskCheckBox( root ); @@ -85,7 +95,7 @@ void CheckBoxTests::lowerGroupUpdatesHigher() { t1->setChecked( true ); QVERIFY( t->isChecked() ); - QVERIFY( t->isTriState() ); + QVERIFY( t->isTristate() ); QVERIFY( t->checkState() == Qt::CheckState::PartiallyChecked ); QVERIFY( t1->isChecked() == true ); QVERIFY( t2->isChecked() == false ); @@ -93,27 +103,28 @@ void CheckBoxTests::lowerGroupUpdatesHigher() { t2->setChecked( true ); QVERIFY( t->isChecked() ); - QVERIFY( t->isTriState() ); + QVERIFY( t->isTristate() ); QVERIFY( t->checkState() == Qt::CheckState::Checked ); QVERIFY( t1->isChecked() == true ); QVERIFY( t2->isChecked() == true ); t1->setChecked( false ); QVERIFY( t->isChecked() ); - QVERIFY( t->isTriState() ); + QVERIFY( t->isTristate() ); QVERIFY( t->checkState() == Qt::CheckState::PartiallyChecked ); QVERIFY( t1->isChecked() == false ); QVERIFY( t2->isChecked() == true ); t2->setChecked( false ); QVERIFY( t->isChecked() == false ); - QVERIFY( t->isTriState() ); + QVERIFY( t->isTristate() ); QVERIFY( t->checkState() == Qt::CheckState::Unchecked ); QVERIFY( t1->isChecked() == false ); QVERIFY( t2->isChecked() == false ); } -void CheckBoxTests::addToGroup() { +void CheckBoxTests::addToGroup() +{ auto t = new QskCheckBox( root ); auto t1 = new QskCheckBox( root ); @@ -157,8 +168,8 @@ void CheckBoxTests::addPartlyToGroup() { QVERIFY( t1->checkState() == Qt::CheckState::PartiallyChecked ); } - -void CheckBoxTests::removeFromGroup() { +void CheckBoxTests::removeFromGroup() +{ auto t = new QskCheckBox( root ); auto t1 = new QskCheckBox( root ); @@ -174,7 +185,8 @@ void CheckBoxTests::removeFromGroup() { QVERIFY( t->isChecked() == false ); } -void CheckBoxTests::groupMemberGetsDeleted() { +void CheckBoxTests::groupMemberGetsDeleted() +{ auto t = new QskCheckBox( root ); auto t1 = new QskCheckBox( root ); auto t2 = new QskCheckBox( root ); @@ -189,7 +201,8 @@ void CheckBoxTests::groupMemberGetsDeleted() { QVERIFY( t->isChecked() == false ); } -void CheckBoxTests::addTwiceToSameGroup() { +void CheckBoxTests::addTwiceToSameGroup() +{ auto t = new QskCheckBox( root ); auto t1 = new QskCheckBox( root ); @@ -205,5 +218,6 @@ void CheckBoxTests::addTwiceToSameGroup() { QVERIFY( t->checkState() == Qt::CheckState::Checked ); } + #include "moc_main.cpp" diff --git a/tests/checkboxes/main.h b/tests/checkboxes/main.h index 5f5b5e93..f657b6c8 100644 --- a/tests/checkboxes/main.h +++ b/tests/checkboxes/main.h @@ -16,7 +16,7 @@ class CheckBoxTests : public QObject void checkbox(); void click(); void toggle(); - void triState(); + void tristate(); void higherGroupUpdatesLower(); void lowerGroupUpdatesHigher(); void addToGroup();