From 69f42d8214590075a4898037e9ea9b322aef2cf1 Mon Sep 17 00:00:00 2001 From: Uwe Rathmann Date: Fri, 2 Feb 2024 15:27:23 +0100 Subject: [PATCH] using Q_GLOBAL_STATIC --- src/graphic/QskGraphicProvider.cpp | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/src/graphic/QskGraphicProvider.cpp b/src/graphic/QskGraphicProvider.cpp index 36aa1283..0736e7b4 100644 --- a/src/graphic/QskGraphicProvider.cpp +++ b/src/graphic/QskGraphicProvider.cpp @@ -13,8 +13,9 @@ #include #include #include +#include -static QskGraphicProviderMap qskGraphicProviders; +Q_GLOBAL_STATIC( QskGraphicProviderMap, qskGraphicProviders ) class QskGraphicProvider::PrivateData { @@ -96,7 +97,8 @@ const QskGraphic* QskGraphicProvider::requestGraphic( const QString& id ) const void Qsk::addGraphicProvider( const QString& providerId, QskGraphicProvider* provider ) { - qskGraphicProviders.insert( providerId, provider ); + if ( qskGraphicProviders ) + qskGraphicProviders->insert( providerId, provider ); } QskGraphicProvider* Qsk::graphicProvider( const QString& providerId ) @@ -107,7 +109,10 @@ QskGraphicProvider* Qsk::graphicProvider( const QString& providerId ) return provider; } - return qskGraphicProviders.provider( providerId ); + if ( qskGraphicProviders ) + return qskGraphicProviders->provider( providerId ); + + return nullptr; } QskGraphic Qsk::loadGraphic( const char* source )