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

Qt5 issues fixed

Browse Source
This commit is contained in:
Uwe Rathmann 2023-03-10 16:31:26 +01:00
parent 560cc607c9
commit 281ab9bff0
3 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
skins/material3/QskMaterial3Skin.cpp
View File

@ -71,10 +71,8 @@ namespace
class Editor : private QskSkinHintTableEditor class Editor : private QskSkinHintTableEditor
{ {
public: public:
Editor( const QskSkin* skin, QskSkinHintTable* table, Editor( QskSkinHintTable* table, const QskMaterial3Theme& palette )
const QskMaterial3Theme& palette )
: QskSkinHintTableEditor( table ) : QskSkinHintTableEditor( table )
, m_skin( skin )
, m_pal( palette ) , m_pal( palette )
{ {
} }
@ -123,7 +121,6 @@ namespace
setSymbol( aspect, QskStandardSymbol::graphic( symbolType ) ); setSymbol( aspect, QskStandardSymbol::graphic( symbolType ) );
} }
const QskSkin* m_skin;
const QskMaterial3Theme& m_pal; const QskMaterial3Theme& m_pal;
}; };
@ -1335,7 +1332,7 @@ QskMaterial3Skin::QskMaterial3Skin( const QskMaterial3Theme& palette, QObject* p
setupFonts(); setupFonts();
setupGraphicFilters( palette ); setupGraphicFilters( palette );
Editor editor( this, &hintTable(), palette ); Editor editor( &hintTable(), palette );
editor.setup(); editor.setup();
} }

2
src/common/QskLabelData.cpp
View File

@ -68,7 +68,7 @@ QskHashValue QskLabelData::hash( QskHashValue seed ) const
return m_icon.hash( hash ); return m_icon.hash( hash );
} }
QVector< QskLabelData > qskCreateLabelData( const QVector< QString >& list ) QVector< QskLabelData > qskCreateLabelData( const QStringList& list )
{ {
QVector< QskLabelData > labelData; QVector< QskLabelData > labelData;
labelData.reserve( list.size() ); labelData.reserve( list.size() );

3
src/common/QskLabelData.h
View File

@ -10,6 +10,7 @@
#include "QskIcon.h" #include "QskIcon.h"
#include <qstring.h> #include <qstring.h>
#include <qstringlist.h>
#include <qvector.h> #include <qvector.h>
#include <qmetatype.h> #include <qmetatype.h>
#include <qdebug.h> #include <qdebug.h>
@ -70,7 +71,7 @@ inline bool QskLabelData::operator!=( const QskLabelData& other ) const noexcept
return ( !( *this == other ) ); return ( !( *this == other ) );
} }
QSK_EXPORT QVector< QskLabelData > qskCreateLabelData( const QVector< QString >& ); QSK_EXPORT QVector< QskLabelData > qskCreateLabelData( const QStringList& );
#ifndef QT_NO_DEBUG_STREAM #ifndef QT_NO_DEBUG_STREAM