diff --git a/designsystems/fluent2/QskFluent2Theme.cpp b/designsystems/fluent2/QskFluent2Theme.cpp index 490bf2e0..fac62efe 100644 --- a/designsystems/fluent2/QskFluent2Theme.cpp +++ b/designsystems/fluent2/QskFluent2Theme.cpp @@ -117,7 +117,7 @@ QskFluent2Theme::QskFluent2Theme( QskSkin::ColorScheme colorScheme, colors.control.defaultColor = rgbGray( 0, 0.0578 ); colors.control.secondary = rgbGray( 0, 0.1622 ); - colors.control.onAccentDefault = rgbGray( 255.08 ); + colors.control.onAccentDefault = rgbGray( 255, 0.08 ); colors.control.onAccentSecondary = rgbGray( 0, 0.40 ); colors.control.onAccentTertiary = rgbGray( 0, 0.2169 ); colors.control.onAccentDisabled = rgbGray( 0, 0.0578 ); diff --git a/examples/iotdashboard/main.cpp b/examples/iotdashboard/main.cpp index f0b2c681..3031aaa6 100644 --- a/examples/iotdashboard/main.cpp +++ b/examples/iotdashboard/main.cpp @@ -45,7 +45,7 @@ int main( int argc, char* argv[] ) { if( argv[i] == QStringLiteral( "--screenshot" ) && i + 1 < argc ) { - QTimer::singleShot( 500, &window, [&app, &window, filename = QString(argv[i + 1])]() + QTimer::singleShot( 500, &window, [ &window, filename = QString(argv[i + 1])]() { auto image = window.grabWindow(); image.save(filename); } ); break; diff --git a/playground/plots/QskPlotView.cpp b/playground/plots/QskPlotView.cpp index dc808b45..ca0e7e3a 100644 --- a/playground/plots/QskPlotView.cpp +++ b/playground/plots/QskPlotView.cpp @@ -28,29 +28,6 @@ static inline bool qskIsXAxis( int axis ) return axis == QskPlot::XBottom; } -static inline QTransform qskScaleTransform( Qt::Orientation orientation, - qreal s1, qreal s2, qreal p1, qreal p2 ) -{ - const auto ratio = ( p2 - p1 ) / ( s2 - s1 ); - - if ( orientation == Qt::Horizontal ) - { - auto transform = QTransform::fromTranslate( -s1, 0.0 ); - transform *= QTransform::fromScale( ratio, 1.0 ); - transform *= QTransform::fromTranslate( p1, 0.0 ); - - return transform; - } - else - { - auto transform = QTransform::fromTranslate( 0.0, -s1 ); - transform *= QTransform::fromScale( 1.0, -ratio ); - transform *= QTransform::fromTranslate( 0.0, p2 ); - - return transform; - } -} - class QskPlotView::PrivateData { public: diff --git a/src/controls/QskListViewSkinlet.cpp b/src/controls/QskListViewSkinlet.cpp index 2017da67..361551b3 100644 --- a/src/controls/QskListViewSkinlet.cpp +++ b/src/controls/QskListViewSkinlet.cpp @@ -166,11 +166,6 @@ static inline ListViewNode* qskListViewNode( const QskListView* listView ) return nullptr; } -static inline ListViewNode* qskListViewNode( const QskSkinnable* skinnable ) -{ - return qskListViewNode( static_cast< const QskListView* >( skinnable ) ); -} - QskListViewSkinlet::QskListViewSkinlet( QskSkin* skin ) : Inherited( skin ) {