peranger/qskinny
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

local type definition removed

Browse Source
This commit is contained in:
Uwe Rathmann 2019-09-01 13:12:41 +02:00
parent a93c263c87
commit 83efc6afe7
1 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/controls/QskControl.cpp
View File

@ -36,8 +36,6 @@ QSK_SYSTEM_STATE( QskControl, Focused, QskAspect::LastSystemState )
static QSizeF qskDefaultSizeHints[] = static QSizeF qskDefaultSizeHints[] =
{ { 0, 0 }, { -1, -1 }, { QskLayoutConstraint::unlimited, QskLayoutConstraint::unlimited } }; { { 0, 0 }, { -1, -1 }, { QskLayoutConstraint::unlimited, QskLayoutConstraint::unlimited } };
typedef quint16 controlFlags_t;
void qskResolveLocale( QskControl* ); // not static as being used from outside ! void qskResolveLocale( QskControl* ); // not static as being used from outside !
static void qskUpdateControlFlags( QskControl::Flags, QskControl* ); static void qskUpdateControlFlags( QskControl::Flags, QskControl* );
@ -47,10 +45,10 @@ static inline void qskSendEventTo( QObject* object, QEvent::Type type )
QCoreApplication::sendEvent( object, &event ); QCoreApplication::sendEvent( object, &event );
} }
static inline controlFlags_t qskControlFlags() static inline quint16 qskControlFlags()
{ {
// we are only interested in the first 8 bits // we are only interested in the first 8 bits
return static_cast< controlFlags_t >( qskSetup->controlFlags() ); return static_cast< quint16 >( qskSetup->controlFlags() );
} }
static inline void qskFilterWindow( QQuickWindow* window ) static inline void qskFilterWindow( QQuickWindow* window )
@ -499,7 +497,7 @@ void QskControlPrivate::updateControlFlags( QskControl::Flags flags )
Q_Q( QskControl ); Q_Q( QskControl );
const auto oldFlags = controlFlags; const auto oldFlags = controlFlags;
const auto newFlags = static_cast< controlFlags_t >( flags ); const auto newFlags = static_cast< quint16 >( flags );
if ( oldFlags != newFlags ) if ( oldFlags != newFlags )
{ {
@ -788,7 +786,7 @@ void QskControl::setControlFlags( Flags flags )
Q_D( QskControl ); Q_D( QskControl );
// set all bits in the mask // set all bits in the mask
d->controlFlagsMask = std::numeric_limits< controlFlags_t >::max(); d->controlFlagsMask = std::numeric_limits< quint16 >::max();
d->updateControlFlags( flags ); d->updateControlFlags( flags );
} }
@ -838,7 +836,7 @@ void QskControl::updateControlFlag( uint flag, bool on )
{ {
Q_D( QskControl ); Q_D( QskControl );
if ( ( flag > std::numeric_limits< controlFlags_t >::max() ) || if ( ( flag > std::numeric_limits< quint16 >::max() ) ||
( bool( d->controlFlags & flag ) == on ) ) ( bool( d->controlFlags & flag ) == on ) )
{ {
return; return;