From e5cb155350164f4db88a6e8ea3b44ce1157e5563 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Sun, 9 Aug 2020 11:50:34 +0200 Subject: [PATCH] beautified --- src/controls/QskAnimator.cpp | 2 +- src/controls/QskBoundedControl.cpp | 2 +- src/controls/QskBoundedControl.h | 2 +- src/controls/QskBoundedInput.cpp | 12 ++++++------ src/controls/QskBoundedRangeInput.cpp | 14 +++++++------- src/controls/QskBoundedRangeInput.h | 4 ++-- src/controls/QskBoundedValueInput.h | 2 +- src/controls/QskFocusIndicator.cpp | 2 +- src/controls/QskProgressBar.cpp | 2 +- src/controls/QskProgressBar.h | 10 +++++----- src/controls/QskProgressBarSkinlet.cpp | 4 ++-- src/controls/QskScrollBox.h | 2 +- src/controls/QskShortcutMap.h | 6 +++--- src/controls/QskSkinlet.cpp | 4 ++-- src/controls/QskSkinnable.cpp | 6 +++--- src/controls/QskSkinnable.h | 2 +- src/controls/QskTabBar.cpp | 2 +- src/controls/QskWindow.cpp | 4 ++-- src/controls/QskWindow.h | 2 +- 19 files changed, 42 insertions(+), 42 deletions(-) diff --git a/src/controls/QskAnimator.cpp b/src/controls/QskAnimator.cpp index 0d663dee..2df292a9 100644 --- a/src/controls/QskAnimator.cpp +++ b/src/controls/QskAnimator.cpp @@ -349,7 +349,7 @@ void QskAnimator::update() if ( m_autoRepeat ) { - double progress = std::fmod(( driverTime - m_startTime ), m_duration ); + double progress = std::fmod( driverTime - m_startTime, m_duration ); progress /= m_duration; advance( m_easingCurve.valueForProgress( progress ) ); diff --git a/src/controls/QskBoundedControl.cpp b/src/controls/QskBoundedControl.cpp index 881f99d2..74ac7e7f 100644 --- a/src/controls/QskBoundedControl.cpp +++ b/src/controls/QskBoundedControl.cpp @@ -136,7 +136,7 @@ qreal QskBoundedControl::boundedValue( qreal value ) const } qreal QskBoundedControl::valueAsRatio( qreal value ) const -{ +{ return ( value - m_minimum ) / ( m_maximum - m_minimum ); } diff --git a/src/controls/QskBoundedControl.h b/src/controls/QskBoundedControl.h index 5d353020..1b771094 100644 --- a/src/controls/QskBoundedControl.h +++ b/src/controls/QskBoundedControl.h @@ -17,7 +17,7 @@ class QSK_EXPORT QskBoundedControl : public QskControl Q_PROPERTY( qreal minimum READ minimum WRITE setMinimum NOTIFY minimumChanged ) Q_PROPERTY( qreal maximum READ maximum WRITE setMaximum NOTIFY maximumChanged ) Q_PROPERTY( QskIntervalF boundaries READ boundaries - WRITE setBoundaries NOTIFY boundariesChanged ) + WRITE setBoundaries NOTIFY boundariesChanged ) using Inherited = QskControl; diff --git a/src/controls/QskBoundedInput.cpp b/src/controls/QskBoundedInput.cpp index 77db2bdc..23cd98a1 100644 --- a/src/controls/QskBoundedInput.cpp +++ b/src/controls/QskBoundedInput.cpp @@ -72,18 +72,18 @@ int QskBoundedInput::pageSize() const void QskBoundedInput::stepUp() { increment( m_stepSize ); -} +} void QskBoundedInput::stepDown() { increment( -m_stepSize ); -} - +} + void QskBoundedInput::pageUp() { increment( m_pageSize * m_stepSize ); -} - +} + void QskBoundedInput::pageDown() { increment( -m_pageSize * m_stepSize ); @@ -128,7 +128,7 @@ qreal QskBoundedInput::alignedValue( qreal value ) const if ( const auto step = m_stepSize ) value = qRound( value / step ) * step; } - + return boundedValue( value ); } diff --git a/src/controls/QskBoundedRangeInput.cpp b/src/controls/QskBoundedRangeInput.cpp index 3d6dd9cb..ccd88ecb 100644 --- a/src/controls/QskBoundedRangeInput.cpp +++ b/src/controls/QskBoundedRangeInput.cpp @@ -29,7 +29,7 @@ void QskBoundedRangeInput::setLowerValueAsRatio( qreal ratio ) setLowerValue( minimum() + ratio * boundaryLength() ); } -qreal QskBoundedRangeInput::lowerValueAsRatio() const +qreal QskBoundedRangeInput::lowerValueAsRatio() const { return ( lowerValue() - minimum() ) / boundaryLength(); } @@ -41,7 +41,7 @@ void QskBoundedRangeInput::setUpperValueAsRatio( qreal ratio ) } qreal QskBoundedRangeInput::upperValueAsRatio() const -{ +{ return ( upperValue() - minimum() ) / boundaryLength(); } @@ -70,7 +70,7 @@ void QskBoundedRangeInput::setUpperValue( qreal value ) } setRange( QskIntervalF( m_range.lowerBound(), value ) ); -} +} qreal QskBoundedRangeInput::upperValue() const { @@ -93,8 +93,8 @@ void QskBoundedRangeInput::setRange( const QskIntervalF& range ) } setRangeInternal( range ); -} - +} + void QskBoundedRangeInput::resetRange() { if ( m_range.isValid() ) @@ -122,9 +122,9 @@ void QskBoundedRangeInput::setRangeInternal( const QskIntervalF& range ) } QskIntervalF QskBoundedRangeInput::range() const -{ +{ return m_range; -} +} void QskBoundedRangeInput::alignInput() { diff --git a/src/controls/QskBoundedRangeInput.h b/src/controls/QskBoundedRangeInput.h index a945c878..fcc726d4 100644 --- a/src/controls/QskBoundedRangeInput.h +++ b/src/controls/QskBoundedRangeInput.h @@ -38,8 +38,8 @@ class QSK_EXPORT QskBoundedRangeInput : public QskBoundedInput qreal upperValue() const; // [0.0, 1.0] - qreal lowerValueAsRatio() const; - qreal upperValueAsRatio() const; + qreal lowerValueAsRatio() const; + qreal upperValueAsRatio() const; public Q_SLOTS: void setRange( const QskIntervalF& ); diff --git a/src/controls/QskBoundedValueInput.h b/src/controls/QskBoundedValueInput.h index 71d9f213..60909ce1 100644 --- a/src/controls/QskBoundedValueInput.h +++ b/src/controls/QskBoundedValueInput.h @@ -25,7 +25,7 @@ class QSK_EXPORT QskBoundedValueInput : public QskBoundedInput qreal value() const; // [0.0, 1.0] - qreal valueAsRatio() const; + qreal valueAsRatio() const; using QskBoundedInput::valueAsRatio; public Q_SLOTS: diff --git a/src/controls/QskFocusIndicator.cpp b/src/controls/QskFocusIndicator.cpp index b1c428a9..100fd825 100644 --- a/src/controls/QskFocusIndicator.cpp +++ b/src/controls/QskFocusIndicator.cpp @@ -153,7 +153,7 @@ void QskFocusIndicator::updateFocusFrame() { QRectF clipRect( 0, 0, w->width(), w->height() ); clipRect = parentItem()->mapRectFromScene( clipRect ); - + r = r.intersected( clipRect ); } diff --git a/src/controls/QskProgressBar.cpp b/src/controls/QskProgressBar.cpp index fe00c77b..5a67565e 100644 --- a/src/controls/QskProgressBar.cpp +++ b/src/controls/QskProgressBar.cpp @@ -93,7 +93,7 @@ QskProgressBar::QskProgressBar( Qt::Orientation orientation, initSizePolicy( QskSizePolicy::Fixed, QskSizePolicy::MinimumExpanding ); connect( this, &QskBoundedControl::boundariesChanged, - this, &QskProgressBar::adjustValue ); + this, &QskProgressBar::adjustValue ); } QskProgressBar::QskProgressBar( Qt::Orientation orientation, QQuickItem* parent ) diff --git a/src/controls/QskProgressBar.h b/src/controls/QskProgressBar.h index 4fe72504..5565152f 100644 --- a/src/controls/QskProgressBar.h +++ b/src/controls/QskProgressBar.h @@ -15,17 +15,17 @@ class QSK_EXPORT QskProgressBar : public QskBoundedControl Q_OBJECT Q_PROPERTY( Qt::Orientation orientation READ orientation - WRITE setOrientation NOTIFY orientationChanged ) + WRITE setOrientation NOTIFY orientationChanged ) Q_PROPERTY( bool indeterminate READ isIndeterminate - WRITE setIndeterminate NOTIFY indeterminateChanged ) + WRITE setIndeterminate NOTIFY indeterminateChanged ) Q_PROPERTY( qreal origin READ origin - WRITE setOrigin RESET resetOrigin NOTIFY originChanged ) + WRITE setOrigin RESET resetOrigin NOTIFY originChanged ) Q_PROPERTY( qreal value READ value WRITE setValue NOTIFY valueChanged ) Q_PROPERTY( qreal valueAsRatio READ valueAsRatio - WRITE setValueAsRatio NOTIFY valueChanged ) + WRITE setValueAsRatio NOTIFY valueChanged ) using Inherited = QskBoundedControl; @@ -48,7 +48,7 @@ class QSK_EXPORT QskProgressBar : public QskBoundedControl QskAspect::Placement effectivePlacement() const override; - void setBarGradient( const QskGradient & ); + void setBarGradient( const QskGradient& ); void resetBarGradient(); QskGradient barGradient() const; diff --git a/src/controls/QskProgressBarSkinlet.cpp b/src/controls/QskProgressBarSkinlet.cpp index 856bb2e1..7eda5c40 100644 --- a/src/controls/QskProgressBarSkinlet.cpp +++ b/src/controls/QskProgressBarSkinlet.cpp @@ -66,7 +66,7 @@ QRectF QskProgressBarSkinlet::subControlRect( if( ( subControl == QskProgressBar::Groove ) ) { const auto dim = bar->thickness(); - + auto rect = contentsRect; if ( bar->orientation() == Qt::Horizontal ) { @@ -119,7 +119,7 @@ QSGNode* QskProgressBarSkinlet::updateBarNode( const auto rect = bar->subControlRect( subControl ); if ( rect.isEmpty() ) return nullptr; - + auto gradient = bar->gradientHint( subControl ); if ( !gradient.isVisible() ) return nullptr; diff --git a/src/controls/QskScrollBox.h b/src/controls/QskScrollBox.h index c8a7899b..73fd0a64 100644 --- a/src/controls/QskScrollBox.h +++ b/src/controls/QskScrollBox.h @@ -18,7 +18,7 @@ class QSK_EXPORT QskScrollBox : public QskControl Q_PROPERTY( Qt::Orientations flickableOrientations READ flickableOrientations WRITE setFlickableOrientations NOTIFY flickableOrientationsChanged FINAL ) - Q_PROPERTY( bool autoScrollFocusedItem READ autoScrollFocusItem + Q_PROPERTY( bool autoScrollFocusedItem READ autoScrollFocusItem WRITE setAutoScrollFocusedItem NOTIFY autoScrollFocusedItemChanged FINAL ) using Inherited = QskControl; diff --git a/src/controls/QskShortcutMap.h b/src/controls/QskShortcutMap.h index 633f42c8..e22675a0 100644 --- a/src/controls/QskShortcutMap.h +++ b/src/controls/QskShortcutMap.h @@ -73,15 +73,15 @@ class QSK_EXPORT QskShortcutMap template< typename T > static int addFunctionT( - QQuickItem* item, const QKeySequence&, bool autoRepeat, + QQuickItem*, const QKeySequence&, bool autoRepeat, const QObject* receiver, T ); static int addFunction( - QQuickItem* item, const QKeySequence&, bool autoRepeat, + QQuickItem*, const QKeySequence&, bool autoRepeat, const QObject* receiver, const QskMetaFunction& ); static int addMethod( - QQuickItem* item, const QKeySequence&, bool autoRepeat, + QQuickItem*, const QKeySequence&, bool autoRepeat, const QObject* receiver, const char* ); }; diff --git a/src/controls/QskSkinlet.cpp b/src/controls/QskSkinlet.cpp index 0b1a9c36..22af51df 100644 --- a/src/controls/QskSkinlet.cpp +++ b/src/controls/QskSkinlet.cpp @@ -385,8 +385,8 @@ void QskSkinlet::removeTraillingNodes( QSGNode* node, QSGNode* child ) { node->removeChildNode( sibling ); delete sibling; - } - } + } + } } void QskSkinlet::setNodeRole( QSGNode* node, quint8 nodeRole ) diff --git a/src/controls/QskSkinnable.cpp b/src/controls/QskSkinnable.cpp index d904ad32..daca078c 100644 --- a/src/controls/QskSkinnable.cpp +++ b/src/controls/QskSkinnable.cpp @@ -452,7 +452,7 @@ bool QskSkinnable::resetHint( QskAspect::Aspect aspect ) if ( a.state() == QskAspect::NoState ) a = a | skinState(); - + const auto oldHint = storedHint( a ); m_data->hintTable.removeHint( aspect ); @@ -566,7 +566,7 @@ const QVariant& QskSkinnable::storedHint( // clearing all state bits not being handled from the skin aspect.clearState( ~skin->stateMask() ); - + QskAspect::Aspect resolvedAspect; const auto& localTable = m_data->hintTable; @@ -714,7 +714,7 @@ static inline QMarginsF qskEffectivePadding( const QskSkinnable* skinnable, qMax( padding.top(), paddingHint.top() ), qMax( padding.right(), paddingHint.right() ), qMax( padding.bottom(), paddingHint.bottom() ) - ); + ); } QMarginsF QskSkinnable::innerPadding( diff --git a/src/controls/QskSkinnable.h b/src/controls/QskSkinnable.h index 1465ff94..e38b93ba 100644 --- a/src/controls/QskSkinnable.h +++ b/src/controls/QskSkinnable.h @@ -95,7 +95,7 @@ class QSK_EXPORT QskSkinnable void setBoxBorderColorsHint( QskAspect::Aspect, const QskBoxBorderColors& ); QskBoxBorderColors boxBorderColorsHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const; - void setIntervalHint( QskAspect::Aspect, const QskIntervalF & ); + void setIntervalHint( QskAspect::Aspect, const QskIntervalF& ); QskIntervalF intervalHint( QskAspect::Aspect, QskSkinHintStatus* = nullptr ) const; void setFlagHint( QskAspect::Aspect, int flag ); diff --git a/src/controls/QskTabBar.cpp b/src/controls/QskTabBar.cpp index d17ada07..39727568 100644 --- a/src/controls/QskTabBar.cpp +++ b/src/controls/QskTabBar.cpp @@ -76,7 +76,7 @@ namespace setFocusPolicy( Qt::NoFocus ); connect( this, &ScrollBox::scrollPosChanged, - this, &QskControl::focusIndicatorRectChanged ); + this, &QskControl::focusIndicatorRectChanged ); } QRectF focusIndicatorClipRect() const override diff --git a/src/controls/QskWindow.cpp b/src/controls/QskWindow.cpp index d6a874fd..c062edc8 100644 --- a/src/controls/QskWindow.cpp +++ b/src/controls/QskWindow.cpp @@ -31,7 +31,7 @@ QSK_QT_PRIVATE_END #include #include Q_LOGGING_CATEGORY( logTiming, "qsk.window.timing", QtCriticalMsg ) - + #if QT_VERSION >= QT_VERSION_CHECK( 5, 12, 0 ) QSK_QT_PRIVATE_BEGIN #include @@ -358,7 +358,7 @@ bool QskWindow::event( QEvent* event ) { const int updateTimerId = qskUpdateTimerId( this ); - if ( static_cast( event )->timerId() == updateTimerId ) + if ( static_cast< QTimerEvent* >( event )->timerId() == updateTimerId ) { if ( !d->renderInterval.isValid() ) d->renderInterval.start(); diff --git a/src/controls/QskWindow.h b/src/controls/QskWindow.h index f1693c2d..dc8b5b8f 100644 --- a/src/controls/QskWindow.h +++ b/src/controls/QskWindow.h @@ -40,7 +40,7 @@ class QSK_EXPORT QskWindow : public QQuickWindow ~QskWindow() override; using Inherited::setScreen; - void setScreen( const QString& ); + void setScreen( const QString& ); bool deleteOnClose() const; void setDeleteOnClose( bool );