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

move make_unique; remove static constants

This commit is contained in:
Vogel, Rick 2023-08-03 11:39:38 +02:00
parent acd25223c0
commit 00d98fd1d0
1 changed files with 10 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
src/controls/private/QskLevelingSensor.cpp
View File

@ -41,13 +41,12 @@ namespace
bool compareExchange< QVector3D >( QVector3D& dst, const QVector3D& src ) bool compareExchange< QVector3D >( QVector3D& dst, const QVector3D& src )
{ {
auto dirty = false; auto dirty = false;
dirty |= compareExchange(dst[Qt::XAxis], src[Qt::XAxis]); dirty |= compareExchange( dst[ Qt::XAxis ], src[ Qt::XAxis ] );
dirty |= compareExchange(dst[Qt::YAxis], src[Qt::YAxis]); dirty |= compareExchange( dst[ Qt::YAxis ], src[ Qt::YAxis ] );
dirty |= compareExchange(dst[Qt::ZAxis], src[Qt::ZAxis]); dirty |= compareExchange( dst[ Qt::ZAxis ], src[ Qt::ZAxis ] );
return dirty; return dirty;
} }
inline bool isAxis( const Qt::Axis axis ) inline bool isAxis( const Qt::Axis axis )
{ {
return axis == Qt::XAxis || axis == Qt::YAxis || axis == Qt::ZAxis; return axis == Qt::XAxis || axis == Qt::YAxis || axis == Qt::ZAxis;
@ -78,7 +77,7 @@ class QskLevelingSensor::PrivateData
QskLevelingSensor::QskLevelingSensor( QQuickItem* const parent ) QskLevelingSensor::QskLevelingSensor( QQuickItem* const parent )
: Inherited( parent ) : Inherited( parent )
, m_data( std::make_unique< QskLevelingSensor::PrivateData >() ) , m_data( new QskLevelingSensor::PrivateData )
{ {
} }
@ -109,23 +108,13 @@ void QskLevelingSensor::setAngle( const QVector3D& degrees )
QskScaleTickmarks QskLevelingSensor::tickmarks( const Qt::Axis axis ) const QskScaleTickmarks QskLevelingSensor::tickmarks( const Qt::Axis axis ) const
{ {
if ( isAxis( axis ) ) return isAxis( axis ) ? m_data->m_tickmarks[ axis ] : QskScaleTickmarks{};
{
return m_data->m_tickmarks[ axis ];
}
static const QskScaleTickmarks invalid;
return invalid;
} }
QskLevelingSensor::TickmarksLabels QskLevelingSensor::tickmarkLabels( QskLevelingSensor::TickmarksLabels QskLevelingSensor::tickmarkLabels( const Qt::Axis axis ) const
const Qt::Axis axis ) const
{ {
if ( isAxis( axis ) ) return isAxis( axis ) ? m_data->m_tickmarksLabels[ axis ]
{ : QskLevelingSensor::TickmarksLabels{};
return m_data->m_tickmarksLabels[ axis ];
}
static const QskLevelingSensor::TickmarksLabels invalid;
return invalid;
} }
QVector3D QskLevelingSensor::angles() const QVector3D QskLevelingSensor::angles() const
@ -133,16 +122,10 @@ QVector3D QskLevelingSensor::angles() const
return m_data->m_angles; return m_data->m_angles;
} }
QVector3D QskLevelingSensor::subControlRotation( QVector3D QskLevelingSensor::subControlRotation( const QskAspect::Subcontrol subControl ) const
const QskAspect::Subcontrol subControl ) const
{ {
static const QVector3D notFound;
const auto found = m_data->m_subControlRotation.find( subControl ); const auto found = m_data->m_subControlRotation.find( subControl );
if ( found == m_data->m_subControlRotation.end() ) return found != m_data->m_subControlRotation.end() ? found->second : QVector3D{};
{
return notFound;
}
return found->second;
} }
void QskLevelingSensor::setSubControlRotation( void QskLevelingSensor::setSubControlRotation(