From 5bd66a27a8b752368e9dedfed8fda9f6887d17fd Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Sat, 15 Aug 2020 13:29:17 +0200 Subject: [PATCH] QskRgbValue -> QskRgb --- examples/boxes/main.cpp | 8 ++--- examples/gallery/Page.cpp | 2 +- examples/gallery/label/LabelPage.cpp | 2 +- .../gallery/progressbar/ProgressBarPage.cpp | 2 +- examples/gallery/slider/CustomSlider.cpp | 8 ++--- .../gallery/slider/CustomSliderSkinlet.cpp | 2 +- examples/gallery/slider/OtherSlider.cpp | 2 +- examples/gallery/slider/SliderPage.cpp | 2 +- examples/layouts/DynamicConstraintsPage.cpp | 2 +- examples/layouts/FlowLayoutPage.cpp | 2 +- examples/layouts/GridLayoutPage.cpp | 2 +- examples/layouts/LinearLayoutPage.cpp | 2 +- examples/layouts/StackLayoutPage.cpp | 2 +- examples/mycontrols/MySkin.cpp | 14 ++++----- examples/qvgviewer/MainWindow.cpp | 2 +- skins/material/QskMaterialSkin.cpp | 30 +++++++++---------- skins/squiek/QskSquiekSkin.cpp | 30 ++++++++++--------- src/common/QskBoxBorderColors.cpp | 2 +- src/common/QskGradient.cpp | 14 ++++----- src/common/QskRgbPalette.cpp | 2 +- src/common/QskRgbValue.cpp | 12 ++++---- src/common/QskRgbValue.h | 2 +- src/common/QskTextColors.cpp | 6 ++-- src/graphic/QskColorFilter.cpp | 10 +++---- 24 files changed, 82 insertions(+), 80 deletions(-) diff --git a/examples/boxes/main.cpp b/examples/boxes/main.cpp index bfdad1ee..7b057dc7 100644 --- a/examples/boxes/main.cpp +++ b/examples/boxes/main.cpp @@ -90,7 +90,7 @@ static void addRectangles2( QskLinearBox* parent ) static void addRectangles3( QskLinearBox* parent ) { - using namespace QskRgbValue; + using namespace QskRgb; const auto borderTheme = QskRgbPalette::Grey; const auto fillTheme = QskRgbPalette::Blue; @@ -141,7 +141,7 @@ static void addRectangles5( QskLinearBox* parent ) static void addRectangles6( QskLinearBox* parent ) { - using namespace QskRgbValue; + using namespace QskRgb; const auto borderTheme = QskRgbPalette::Grey; const auto fillTheme = QskRgbPalette::Lime; @@ -192,7 +192,7 @@ static void addRectangles8( QskLinearBox* parent ) static void addRectangles9( QskLinearBox* parent ) { - using namespace QskRgbValue; + using namespace QskRgb; const auto borderTheme = QskRgbPalette::Grey; const auto fillTheme = QskRgbPalette::Lime; @@ -350,7 +350,7 @@ static void addRectanglesRest( QskLinearBox* parent ) box->setShape( 20, Qt::AbsoluteSize ); box->setBorderWidth( 2, 10, 40, 2 ); box->setBorderColor( "Crimson" ); - box->setGradient( QskRgbValue::WhiteSmoke ); + box->setGradient( QskRgb::WhiteSmoke ); box = new Box( parent ); box->setShape( 100, Qt::RelativeSize ); diff --git a/examples/gallery/Page.cpp b/examples/gallery/Page.cpp index 5fea28e0..312bd7d1 100644 --- a/examples/gallery/Page.cpp +++ b/examples/gallery/Page.cpp @@ -15,7 +15,7 @@ Page::Page( Qt::Orientation orientation, QQuickItem* parent ) setPanel( true ); setBoxShapeHint( QskBox::Panel, 8 ); - setGradient( QskRgbValue::GhostWhite ); + setGradient( QskRgb::GhostWhite ); setMargins( 5 ); setPadding( 10 ); diff --git a/examples/gallery/label/LabelPage.cpp b/examples/gallery/label/LabelPage.cpp index b646df07..84f2c438 100644 --- a/examples/gallery/label/LabelPage.cpp +++ b/examples/gallery/label/LabelPage.cpp @@ -67,7 +67,7 @@ namespace LabelPage::LabelPage( QQuickItem* parent ) : Page( Qt::Vertical, parent ) { - setGradient( QskRgbValue::AliceBlue ); + setGradient( QskRgb::AliceBlue ); setSpacing( 40 ); (void) new TextBox( this ); diff --git a/examples/gallery/progressbar/ProgressBarPage.cpp b/examples/gallery/progressbar/ProgressBarPage.cpp index 5c32d19a..ce4e352c 100644 --- a/examples/gallery/progressbar/ProgressBarPage.cpp +++ b/examples/gallery/progressbar/ProgressBarPage.cpp @@ -45,7 +45,7 @@ namespace ProgressBarPage::ProgressBarPage( QQuickItem* parent ) : Page( Qt::Horizontal, parent ) { - setGradient( QskRgbValue::AliceBlue ); + setGradient( QskRgb::AliceBlue ); setSpacing( 40 ); populate(); diff --git a/examples/gallery/slider/CustomSlider.cpp b/examples/gallery/slider/CustomSlider.cpp index 1b3ba66e..b1dd3cfa 100644 --- a/examples/gallery/slider/CustomSlider.cpp +++ b/examples/gallery/slider/CustomSlider.cpp @@ -24,19 +24,19 @@ CustomSlider::CustomSlider( QQuickItem* parentItem ) #if 0 const QskGradient fillGradient( QskGradient::Horizontal, - QskRgbValue::Grey700, QskRgbValue::Grey500 ); + QskRgb::Grey700, QskRgb::Grey500 ); #else - const QskGradient fillGradient( QskRgbValue::Grey700 ); + const QskGradient fillGradient( QskRgb::Grey700 ); #endif setBoxShapeHint( Fill, 0 ); setGradientHint( Fill, fillGradient ); setColor( Scale, qRgb( 178, 178, 178 ) ); // for the ticks - setColor( QskSlider::Handle, QskRgbValue::Grey800 ); + setColor( QskSlider::Handle, QskRgb::Grey800 ); for ( auto state : { Pressed, Focused | Hovered, Hovered, Focused } ) - setColor( QskSlider::Handle | Color | state, QskRgbValue::Orange600 ); + setColor( QskSlider::Handle | Color | state, QskRgb::Orange600 ); setAnimation( QskSlider::Handle | Color, 1000 ); for ( auto state : { Focused | Hovered, Hovered, Focused } ) diff --git a/examples/gallery/slider/CustomSliderSkinlet.cpp b/examples/gallery/slider/CustomSliderSkinlet.cpp index b35aff2c..2c223af8 100644 --- a/examples/gallery/slider/CustomSliderSkinlet.cpp +++ b/examples/gallery/slider/CustomSliderSkinlet.cpp @@ -301,7 +301,7 @@ QSGNode* CustomSliderSkinlet::updateDecorationNode( auto labelText = QString::number( slider->minimum() + slider->stepSize() * i, 'f', 0 ); labelNode->setTextData( slider, labelText, QRectF( x, y, 0, 0 ), - qskLabelFont, QskTextOptions(), QskTextColors( QskRgbValue::Grey700 ), + qskLabelFont, QskTextOptions(), QskTextColors( QskRgb::Grey700 ), Qt::AlignHCenter, Qsk::Normal ); labelNode = static_cast< decltype( labelNode ) >( labelNode->nextSibling() ); diff --git a/examples/gallery/slider/OtherSlider.cpp b/examples/gallery/slider/OtherSlider.cpp index 31c8e580..53a1afc0 100644 --- a/examples/gallery/slider/OtherSlider.cpp +++ b/examples/gallery/slider/OtherSlider.cpp @@ -17,7 +17,7 @@ OtherSlider::OtherSlider( QQuickItem* parentItem ) : QskSlider( parentItem ) { using namespace QskAspect; - using namespace QskRgbValue; + using namespace QskRgb; const qreal h = 30; const qreal w = 2.0 * h; diff --git a/examples/gallery/slider/SliderPage.cpp b/examples/gallery/slider/SliderPage.cpp index e5b3c61d..30450698 100644 --- a/examples/gallery/slider/SliderPage.cpp +++ b/examples/gallery/slider/SliderPage.cpp @@ -12,7 +12,7 @@ SliderPage::SliderPage( QQuickItem* parentItem ) : Page( Qt::Vertical, parentItem ) { - setGradient( QskRgbValue::PeachPuff ); + setGradient( QskRgb::PeachPuff ); setMargins( 10 ); setSpacing( 20 ); diff --git a/examples/layouts/DynamicConstraintsPage.cpp b/examples/layouts/DynamicConstraintsPage.cpp index 4acd25d1..94b03126 100644 --- a/examples/layouts/DynamicConstraintsPage.cpp +++ b/examples/layouts/DynamicConstraintsPage.cpp @@ -129,7 +129,7 @@ DynamicConstraintsPage::DynamicConstraintsPage( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, parent ) { setMargins( 10 ); - setBackgroundColor( QskRgbValue::LightSteelBlue ); + setBackgroundColor( QskRgb::LightSteelBlue ); auto box = new Box(); diff --git a/examples/layouts/FlowLayoutPage.cpp b/examples/layouts/FlowLayoutPage.cpp index 0e97a80e..b3863654 100644 --- a/examples/layouts/FlowLayoutPage.cpp +++ b/examples/layouts/FlowLayoutPage.cpp @@ -89,7 +89,7 @@ FlowLayoutPage::FlowLayoutPage( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, parent ) { setMargins( 10 ); - setBackgroundColor( QskRgbValue::LightSteelBlue ); + setBackgroundColor( QskRgb::LightSteelBlue ); auto box = new Box(); diff --git a/examples/layouts/GridLayoutPage.cpp b/examples/layouts/GridLayoutPage.cpp index 97b0861b..5d696abb 100644 --- a/examples/layouts/GridLayoutPage.cpp +++ b/examples/layouts/GridLayoutPage.cpp @@ -67,7 +67,7 @@ GridLayoutPage::GridLayoutPage( QQuickItem* parent ) : QskControl( parent ) { setMargins( 10 ); - setBackgroundColor( QskRgbValue::LightSteelBlue ); + setBackgroundColor( QskRgb::LightSteelBlue ); setAutoLayoutChildren( true ); diff --git a/examples/layouts/LinearLayoutPage.cpp b/examples/layouts/LinearLayoutPage.cpp index 2b4ed739..e10737e6 100644 --- a/examples/layouts/LinearLayoutPage.cpp +++ b/examples/layouts/LinearLayoutPage.cpp @@ -82,7 +82,7 @@ LinearLayoutPage::LinearLayoutPage( QQuickItem* parent ) : QskLinearBox( Qt::Vertical, parent ) { setMargins( 10 ); - setBackgroundColor( QskRgbValue::LightSteelBlue ); + setBackgroundColor( QskRgb::LightSteelBlue ); auto box = new Box(); diff --git a/examples/layouts/StackLayoutPage.cpp b/examples/layouts/StackLayoutPage.cpp index 0a62ef52..3e49d351 100644 --- a/examples/layouts/StackLayoutPage.cpp +++ b/examples/layouts/StackLayoutPage.cpp @@ -160,7 +160,7 @@ StackLayoutPage::StackLayoutPage( QQuickItem* parent ) setObjectName( "StackLayoutPage" ); setMargins( 10 ); - setBackgroundColor( QskRgbValue::LightSteelBlue ); + setBackgroundColor( QskRgb::LightSteelBlue ); auto box = new StackBox(); diff --git a/examples/mycontrols/MySkin.cpp b/examples/mycontrols/MySkin.cpp index 88f2d599..a9e724f2 100644 --- a/examples/mycontrols/MySkin.cpp +++ b/examples/mycontrols/MySkin.cpp @@ -161,7 +161,7 @@ class MySkin : public QskSkin void setGraphicFilter( int role, QRgb rgb ) { QskColorFilter filter; - filter.addColorSubstitution( QskRgbValue::Khaki, rgb ); + filter.addColorSubstitution( QskRgb::Khaki, rgb ); QskSkin::setGraphicFilter( role, filter ); } @@ -176,10 +176,10 @@ class MySkin1 : public MySkin public: MySkin1() { - using namespace QskRgbValue; + using namespace QskRgb; - setGraphicFilter( GraphicRoleNormal, QskRgbValue::Crimson ); - setGraphicFilter( GraphicRoleInverted, QskRgbValue::Gold ); + setGraphicFilter( GraphicRoleNormal, Crimson ); + setGraphicFilter( GraphicRoleInverted, Gold ); initFocusIndicatorHints( 2, 3, 6, DarkBlue ); initBoxHints( 2, 8, DarkCyan, LightCyan ); @@ -198,10 +198,10 @@ class MySkin2 : public MySkin public: MySkin2() { - using namespace QskRgbValue; + using namespace QskRgb; - setGraphicFilter( GraphicRoleNormal, QskRgbValue::HotPink ); - setGraphicFilter( GraphicRoleInverted, QskRgbValue::White ); + setGraphicFilter( GraphicRoleNormal, HotPink ); + setGraphicFilter( GraphicRoleInverted, White ); initFocusIndicatorHints( 2, 6, 6, Crimson ); initBoxHints( 4, 30, LightPink, MistyRose ); diff --git a/examples/qvgviewer/MainWindow.cpp b/examples/qvgviewer/MainWindow.cpp index cd821a77..e4d8a44c 100644 --- a/examples/qvgviewer/MainWindow.cpp +++ b/examples/qvgviewer/MainWindow.cpp @@ -54,7 +54,7 @@ class GraphicLabel : public QskGraphicLabel } else { - gradient.setColor( QskRgbValue::Wheat ); + gradient.setColor( QskRgb::Wheat ); setGraphicRole( Normal ); } diff --git a/skins/material/QskMaterialSkin.cpp b/skins/material/QskMaterialSkin.cpp index 32e8f7e7..358ffedb 100644 --- a/skins/material/QskMaterialSkin.cpp +++ b/skins/material/QskMaterialSkin.cpp @@ -58,9 +58,9 @@ namespace class ColorPalette { public: - ColorPalette( const QColor base = QColor::fromRgba( QskRgbValue::Grey100 ), - const QColor& accent = QColor::fromRgba( QskRgbValue::Blue500 ), - const QColor& contrast = QColor::fromRgba( QskRgbValue::White ) ) + ColorPalette( const QColor base = QColor::fromRgba( QskRgb::Grey100 ), + const QColor& accent = QColor::fromRgba( QskRgb::Blue500 ), + const QColor& contrast = QColor::fromRgba( QskRgb::White ) ) { baseColor = base; accentColor = accent; @@ -75,7 +75,7 @@ namespace lighter200 = baseColor.lighter( 200 ); textColor = ( baseColor.value() > 128 ) - ? QskRgbValue::Black : QskRgbValue::White; + ? QskRgb::Black : QskRgb::White; } QColor accentColor; @@ -105,8 +105,8 @@ QskMaterialSkin::QskMaterialSkin( QObject* parent ) : Inherited( parent ) , m_data( new PrivateData() ) { - m_data->palette = ColorPalette( QskRgbValue::Grey100, - QskRgbValue::Blue500, QskRgbValue::White ); + m_data->palette = ColorPalette( QskRgb::Grey100, + QskRgb::Blue500, QskRgb::White ); // Default theme colors setupFonts( "Roboto" ); @@ -239,7 +239,7 @@ void QskMaterialSkin::initTextInputHints() void QskMaterialSkin::initProgressBarHints() { using namespace QskAspect; - using namespace QskRgbValue; + using namespace QskRgb; using Q = QskProgressBar; const auto& pal = m_data->palette; @@ -322,7 +322,7 @@ void QskMaterialSkin::initPageIndicatorHints() void QskMaterialSkin::initPushButtonHints() { using namespace QskAspect; - using namespace QskRgbValue; + using namespace QskRgb; using Q = QskPushButton; const auto& pal = m_data->palette; @@ -383,7 +383,7 @@ void QskMaterialSkin::initPushButtonHints() void QskMaterialSkin::initDialogButtonHints() { using namespace QskAspect; - using namespace QskRgbValue; + using namespace QskRgb; using Q = QskDialogButton; const auto& pal = m_data->palette; @@ -449,7 +449,7 @@ void QskMaterialSkin::initDialogButtonBoxHints() void QskMaterialSkin::initSliderHints() { using namespace QskAspect; - using namespace QskRgbValue; + using namespace QskRgb; using Q = QskSlider; const auto& pal = m_data->palette; @@ -556,7 +556,7 @@ void QskMaterialSkin::initTabButtonHints() edge = Qt::Edge( 0 ); // making gcc4 happy } - setGradient( aspect, QskRgbValue::White ); + setGradient( aspect, QskRgb::White ); // The highlighted button has a accented bar at one edge setBoxShape( aspect, 0 ); @@ -565,7 +565,7 @@ void QskMaterialSkin::initTabButtonHints() border.setWidthAt( edge, 3 ); setBoxBorderMetrics( aspect, border ); - QskBoxBorderColors borderColors( QskRgbValue::White ); + QskBoxBorderColors borderColors( QskRgb::White ); setBoxBorderColors( aspect, borderColors ); borderColors.setColorsAt( edge, pal.accentColor ); @@ -581,7 +581,7 @@ void QskMaterialSkin::initTabButtonHints() setColor( Q::Text, pal.textColor ); setColor( Q::Text | Q::Checkable | Q::Disabled, qskShadedColor( pal.textColor, 0.6 ) ); - setColor( Q::Text | Q::Disabled, QskRgbValue::Grey600 ); + setColor( Q::Text | Q::Disabled, QskRgb::Grey600 ); } void QskMaterialSkin::initTabBarHints() @@ -665,7 +665,7 @@ void QskMaterialSkin::initScrollViewHints() setBoxShape( Q::Viewport, 5 ); setBoxBorderMetrics( Q::Viewport, 1 ); - setGradient( Q::Viewport, QskRgbValue::White ); + setGradient( Q::Viewport, QskRgb::White ); setBoxBorderColors( Q::Viewport, Qt::black ); for ( auto subControl : { Q::HorizontalScrollBar, Q::VerticalScrollBar } ) @@ -682,7 +682,7 @@ void QskMaterialSkin::initScrollViewHints() setBoxShape( subControl, 3 ); setBoxBorderMetrics( subControl, 1 ); setGradient( subControl, pal.accentColor ); - setBoxBorderColors( subControl, QskRgbValue::White ); + setBoxBorderColors( subControl, QskRgb::White ); setAnimation( subControl | Color, qskDuration ); } diff --git a/skins/squiek/QskSquiekSkin.cpp b/skins/squiek/QskSquiekSkin.cpp index 5581ac3b..865414f6 100644 --- a/skins/squiek/QskSquiekSkin.cpp +++ b/skins/squiek/QskSquiekSkin.cpp @@ -46,7 +46,7 @@ namespace class ColorPalette { public: - ColorPalette( const QColor& themeColor = QskRgbValue::Silver ) + ColorPalette( const QColor& themeColor = QskRgb::Silver ) { const bool isBright = themeColor.value() > 128; @@ -61,30 +61,32 @@ namespace darker150 = themeColor.darker( 150 ); darker200 = themeColor.darker( 200 ); + using namespace QskRgb; + if ( isBright ) { - themeForeground = QskRgbValue::Black; + themeForeground = Black; - contrasted = QskRgbValue::Gainsboro; - contrastedText = QskRgbValue::Black; + contrasted = Gainsboro; + contrastedText = Black; - highlighted = QskRgbValue::RoyalBlue; - highlightedText = QskRgbValue::White; + highlighted = RoyalBlue; + highlightedText = White; - base = QskRgbValue::White; - baseActive = QskRgbValue::Beige; + base = White; + baseActive = Beige; } else { - themeForeground = QskRgbValue::White; + themeForeground = White; - contrasted = QskRgbValue::DarkGrey; - contrastedText = QskRgbValue::White; + contrasted = DarkGrey; + contrastedText = White; - highlighted = QskRgbValue::BlueGrey500; - highlightedText = QskRgbValue::White; + highlighted = BlueGrey500; + highlightedText = White; - base = QskRgbValue::Black; + base = Black; baseActive = base.lighter( 110 ); } } diff --git a/src/common/QskBoxBorderColors.cpp b/src/common/QskBoxBorderColors.cpp index d4e110e0..1b940215 100644 --- a/src/common/QskBoxBorderColors.cpp +++ b/src/common/QskBoxBorderColors.cpp @@ -166,7 +166,7 @@ QskBoxBorderColors QskBoxBorderColors::interpolated( for ( size_t i = 0; i < 4; i++ ) { - colors.m_colors[ i ] = QskRgbValue::interpolated( + colors.m_colors[ i ] = QskRgb::interpolated( m_colors[ i ], to.m_colors[ i ], ratio ); } diff --git a/src/common/QskGradient.cpp b/src/common/QskGradient.cpp index c59acb1b..61a98190 100644 --- a/src/common/QskGradient.cpp +++ b/src/common/QskGradient.cpp @@ -68,7 +68,7 @@ static inline QColor qskInterpolated( return s1.color(); const qreal ratio = ( pos - s1.position() ) / ( s2.position() - s1.position() ); - return QskRgbValue::interpolated( s1.color(), s2.color(), ratio ); + return QskRgb::interpolated( s1.color(), s2.color(), ratio ); } static inline bool qskComparePositions( @@ -216,7 +216,7 @@ QColor QskGradientStop::interpolated( return max->color(); const qreal r = ( position - min->position() ) / ( max->position() - min->position() ); - return QskRgbValue::interpolated( min->color(), max->color(), r ); + return QskRgb::interpolated( min->color(), max->color(), r ); } QskGradient::QskGradient() @@ -507,7 +507,7 @@ QskGradient QskGradient::interpolated( QVector< QskGradientStop > s2 = to.m_stops; for ( int i = 0; i < s2.count(); i++ ) { - const QColor c2 = QskRgbValue::interpolated( + const QColor c2 = QskRgb::interpolated( c, s2[ i ].color(), value ); s2[ i ].setColor( c2 ); @@ -525,7 +525,7 @@ QskGradient QskGradient::interpolated( QVector< QskGradientStop > s2 = m_stops; for ( int i = 0; i < s2.count(); i++ ) { - const QColor c2 = QskRgbValue::interpolated( + const QColor c2 = QskRgb::interpolated( s2[ i ].color(), c, value ); s2[ i ].setColor( c2 ); @@ -546,7 +546,7 @@ QskGradient QskGradient::interpolated( for ( int i = 0; i < s1.count(); i++ ) { - const QColor c2 = QskRgbValue::interpolated( + const QColor c2 = QskRgb::interpolated( s1[ i ].color(), s2[ i ].color(), value ); s2[ i ].setColor( c2 ); @@ -571,7 +571,7 @@ QskGradient QskGradient::interpolated( for ( int i = 0; i < s2.count(); i++ ) { - const QColor c2 = QskRgbValue::interpolated( + const QColor c2 = QskRgb::interpolated( s2[ i ].color(), c, 2 * value ); s2[ i ].setColor( c2 ); @@ -585,7 +585,7 @@ QskGradient QskGradient::interpolated( for ( int i = 0; i < s2.count(); i++ ) { - const QColor c2 = QskRgbValue::interpolated( + const QColor c2 = QskRgb::interpolated( c, s2[ i ].color(), 2 * ( value - 0.5 ) ); s2[ i ].setColor( c2 ); diff --git a/src/common/QskRgbPalette.cpp b/src/common/QskRgbPalette.cpp index 7b41cdfb..15cb417e 100644 --- a/src/common/QskRgbPalette.cpp +++ b/src/common/QskRgbPalette.cpp @@ -22,7 +22,7 @@ namespace public: Palette( int index ) { - using namespace QskRgbValue; + using namespace QskRgb; static constexpr QRgb table[][ Palette::NumWeights ] = { diff --git a/src/common/QskRgbValue.cpp b/src/common/QskRgbValue.cpp index 0b76f42f..9d34b705 100644 --- a/src/common/QskRgbValue.cpp +++ b/src/common/QskRgbValue.cpp @@ -78,7 +78,7 @@ static inline QColor qskInterpolatedColor( return c2; } -QRgb QskRgbValue::interpolated( QRgb rgb1, QRgb rgb2, qreal ratio ) +QRgb QskRgb::interpolated( QRgb rgb1, QRgb rgb2, qreal ratio ) { // interpolating in HSV usually provides better results !! @@ -93,7 +93,7 @@ QRgb QskRgbValue::interpolated( QRgb rgb1, QRgb rgb2, qreal ratio ) return qRgba( r, g, b, a ); } -QColor QskRgbValue::interpolated( const QColor& c1, const QColor& c2, qreal ratio ) +QColor QskRgb::interpolated( const QColor& c1, const QColor& c2, qreal ratio ) { if ( c1 == c2 ) return c2; @@ -123,9 +123,9 @@ QColor QskRgbValue::interpolated( const QColor& c1, const QColor& c2, qreal rati return qskInterpolatedColor( c1.convertTo( c2.spec() ), c2, ratio ); } -QRgb QskRgbValue::rgb( Qt::GlobalColor color ) +QRgb QskRgb::rgb( Qt::GlobalColor color ) { - using namespace QskRgbValue; + using namespace QskRgb; static constexpr QRgb rgbValues[] = { @@ -154,7 +154,7 @@ QRgb QskRgbValue::rgb( Qt::GlobalColor color ) return rgbValues[ color ]; } -QRgb QskRgbValue::lighter( QRgb rgb, int factor ) noexcept +QRgb QskRgb::lighter( QRgb rgb, int factor ) noexcept { if ( factor <= 0 ) return rgb; @@ -163,7 +163,7 @@ QRgb QskRgbValue::lighter( QRgb rgb, int factor ) noexcept return QColor::fromRgba( rgb ).lighter( factor ).rgba(); } -QRgb QskRgbValue::darker( QRgb rgb, int factor ) noexcept +QRgb QskRgb::darker( QRgb rgb, int factor ) noexcept { if ( factor <= 0 ) return rgb; diff --git a/src/common/QskRgbValue.h b/src/common/QskRgbValue.h index 48e4e7b5..55d9a86c 100644 --- a/src/common/QskRgbValue.h +++ b/src/common/QskRgbValue.h @@ -435,7 +435,7 @@ RGB( AlphaMask, 0xff000000 ) \ RGB( ColorMask, 0x00ffffff ) -namespace QskRgbValue +namespace QskRgb { #define RGB( name, value ) static constexpr const QRgb name = value; QSK_RGB_VALUES diff --git a/src/common/QskTextColors.cpp b/src/common/QskTextColors.cpp index 7857b7b2..10378fa7 100644 --- a/src/common/QskTextColors.cpp +++ b/src/common/QskTextColors.cpp @@ -19,9 +19,9 @@ QskTextColors QskTextColors::interpolated( const QskTextColors& to, qreal ratio ) const { QskTextColors colors; - colors.textColor = QskRgbValue::interpolated( textColor, to.textColor, ratio ); - colors.styleColor = QskRgbValue::interpolated( styleColor, to.styleColor, ratio ); - colors.linkColor = QskRgbValue::interpolated( linkColor, to.linkColor, ratio ); + colors.textColor = QskRgb::interpolated( textColor, to.textColor, ratio ); + colors.styleColor = QskRgb::interpolated( styleColor, to.styleColor, ratio ); + colors.linkColor = QskRgb::interpolated( linkColor, to.linkColor, ratio ); return colors; } diff --git a/src/graphic/QskColorFilter.cpp b/src/graphic/QskColorFilter.cpp index ac1db0b1..85c26fb2 100644 --- a/src/graphic/QskColorFilter.cpp +++ b/src/graphic/QskColorFilter.cpp @@ -16,14 +16,14 @@ static inline QRgb qskSubstitutedRgb( // usually we have 2-3 substitutions, so we can simply iterate // and don't need to introduce some sort of sorting or search index - const QRgb rgb = rgba | QskRgbValue::AlphaMask; + const QRgb rgb = rgba | QskRgb::AlphaMask; for ( const auto& s : substitions ) { if ( rgb == s.first ) { - return ( s.second & QskRgbValue::ColorMask ) | - ( rgba & QskRgbValue::AlphaMask ); + return ( s.second & QskRgb::ColorMask ) | + ( rgba & QskRgb::AlphaMask ); } } @@ -105,7 +105,7 @@ static inline QskColorFilter qskInterpolatedFilter( } } - rgb = QskRgbValue::interpolated( rgb, pairTo.second, progress ); + rgb = QskRgb::interpolated( rgb, pairTo.second, progress ); if ( rgb != pairTo.first ) interpolated.addColorSubstitution( pairTo.first, rgb ); @@ -132,7 +132,7 @@ static inline QskColorFilter qskInterpolatedFilter( if ( !hasRgb ) { - const auto rgb = QskRgbValue::interpolated( + const auto rgb = QskRgb::interpolated( pairFrom.second, pairFrom.first, progress ); if ( rgb != pairFrom.first )