From 1a7b2668dc1e341b493990b99e9a0cc4530d32cd Mon Sep 17 00:00:00 2001 From: Adriaan de Groot Date: Mon, 17 Aug 2020 14:08:59 +0200 Subject: [PATCH] [users] Emit password status changes --- src/modules/users/Config.cpp | 12 ++++++++---- src/modules/users/Config.h | 4 ++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/modules/users/Config.cpp b/src/modules/users/Config.cpp index 2176f3dad..61746275e 100644 --- a/src/modules/users/Config.cpp +++ b/src/modules/users/Config.cpp @@ -386,7 +386,8 @@ Config::setUserPassword( const QString& s ) if ( s != m_userPassword ) { m_userPassword = s; - // TODO: check new password status + const auto p = passwordStatus( m_userPassword, m_userPasswordSecondary ); + emit userPasswordStatusChanged( p.first, p.second ); emit userPasswordChanged( s ); } } @@ -397,7 +398,8 @@ Config::setUserPasswordSecondary( const QString& s ) if ( s != m_userPasswordSecondary ) { m_userPasswordSecondary = s; - // TODO: check new password status + const auto p = passwordStatus( m_userPassword, m_userPasswordSecondary ); + emit userPasswordStatusChanged( p.first, p.second ); emit userPasswordSecondaryChanged( s ); } } @@ -446,7 +448,8 @@ Config::setRootPassword( const QString& s ) if ( writeRootPassword() && s != m_rootPassword ) { m_rootPassword = s; - // TODO: check new password status + const auto p = passwordStatus( m_rootPassword, m_rootPasswordSecondary ); + emit rootPasswordStatusChanged( p.first, p.second ); emit rootPasswordChanged( s ); } } @@ -457,7 +460,8 @@ Config::setRootPasswordSecondary( const QString& s ) if ( writeRootPassword() && s != m_rootPasswordSecondary ) { m_rootPasswordSecondary = s; - // TODO: check new password status + const auto p = passwordStatus( m_rootPassword, m_rootPasswordSecondary ); + emit rootPasswordStatusChanged( p.first, p.second ); emit rootPasswordSecondaryChanged( s ); } } diff --git a/src/modules/users/Config.h b/src/modules/users/Config.h index d9a14795b..a785fb3ae 100644 --- a/src/modules/users/Config.h +++ b/src/modules/users/Config.h @@ -213,10 +213,10 @@ signals: void requireStrongPasswordsChanged( bool ); void userPasswordChanged( const QString& ); void userPasswordSecondaryChanged( const QString& ); - void userPasswordStatusChanged( int, QString& ); + void userPasswordStatusChanged( int, const QString& ); void rootPasswordChanged( const QString& ); void rootPasswordSecondaryChanged( const QString& ); - void rootPasswordStatusChanged( int, QString& ); + void rootPasswordStatusChanged( int, const QString& ); private: