From 281ab9bff0ed99efdc1fe2e5955a719a35238c45 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 10 Mar 2023 16:31:26 +0100 Subject: [PATCH] Qt5 issues fixed --- skins/material3/QskMaterial3Skin.cpp | 7 ++----- src/common/QskLabelData.cpp | 2 +- src/common/QskLabelData.h | 3 ++- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/skins/material3/QskMaterial3Skin.cpp b/skins/material3/QskMaterial3Skin.cpp index ddf89869..9907088f 100644 --- a/skins/material3/QskMaterial3Skin.cpp +++ b/skins/material3/QskMaterial3Skin.cpp @@ -71,10 +71,8 @@ namespace class Editor : private QskSkinHintTableEditor { public: - Editor( const QskSkin* skin, QskSkinHintTable* table, - const QskMaterial3Theme& palette ) + Editor( QskSkinHintTable* table, const QskMaterial3Theme& palette ) : QskSkinHintTableEditor( table ) - , m_skin( skin ) , m_pal( palette ) { } @@ -123,7 +121,6 @@ namespace setSymbol( aspect, QskStandardSymbol::graphic( symbolType ) ); } - const QskSkin* m_skin; const QskMaterial3Theme& m_pal; }; @@ -1335,7 +1332,7 @@ QskMaterial3Skin::QskMaterial3Skin( const QskMaterial3Theme& palette, QObject* p setupFonts(); setupGraphicFilters( palette ); - Editor editor( this, &hintTable(), palette ); + Editor editor( &hintTable(), palette ); editor.setup(); } diff --git a/src/common/QskLabelData.cpp b/src/common/QskLabelData.cpp index ef710063..1bd6fd15 100644 --- a/src/common/QskLabelData.cpp +++ b/src/common/QskLabelData.cpp @@ -68,7 +68,7 @@ QskHashValue QskLabelData::hash( QskHashValue seed ) const return m_icon.hash( hash ); } -QVector< QskLabelData > qskCreateLabelData( const QVector< QString >& list ) +QVector< QskLabelData > qskCreateLabelData( const QStringList& list ) { QVector< QskLabelData > labelData; labelData.reserve( list.size() ); diff --git a/src/common/QskLabelData.h b/src/common/QskLabelData.h index e85f58f7..b6ba4bbf 100644 --- a/src/common/QskLabelData.h +++ b/src/common/QskLabelData.h @@ -10,6 +10,7 @@ #include "QskIcon.h" #include +#include #include #include #include @@ -70,7 +71,7 @@ inline bool QskLabelData::operator!=( const QskLabelData& other ) const noexcept return ( !( *this == other ) ); } -QSK_EXPORT QVector< QskLabelData > qskCreateLabelData( const QVector< QString >& ); +QSK_EXPORT QVector< QskLabelData > qskCreateLabelData( const QStringList& ); #ifndef QT_NO_DEBUG_STREAM