Skip to content
Permalink
Browse files

Merge pull request #42517 from m-kuhn/forward_declaration

[qt6] Code shuffling
  • Loading branch information
m-kuhn committed Mar 27, 2021
2 parents 90a4902 + 14a20da commit 5be4bcfb895b18d65b652c914de6c2e6ff87c74f
@@ -24,7 +24,6 @@

class QDomElement;
class QDomDocument;
class QStringList;

class QgsLayerTreeNode;
class QgsLayerTreeGroup;
@@ -50,6 +50,8 @@
#include "qgssettings.h"
#include "qgspropertycollection.h"

#include "qgsrelationmanager.h"
#include "qgsmapthemecollection.h"

class QFileInfo;
class QDomDocument;
@@ -59,11 +61,9 @@ class QDomNode;
class QgsLayerTreeGroup;
class QgsLayerTreeRegistryBridge;
class QgsMapLayer;
class QgsMapThemeCollection;
class QgsPathResolver;
class QgsProjectBadLayerHandler;
class QgsProjectStorage;
class QgsRelationManager;
class QgsTolerance;
class QgsTransactionGroup;
class QgsVectorLayer;
@@ -262,7 +262,7 @@ bool QgsActionManager::readXml( const QDomNode &layer_node )
for ( int i = 0; i < defaultActionNodes.size(); ++i )
{
QDomElement defaultValueElem = defaultActionNodes.at( i ).toElement();
mDefaultActions.insert( defaultValueElem.attribute( QStringLiteral( "key" ) ), defaultValueElem.attribute( QStringLiteral( "value" ) ) );
mDefaultActions.insert( defaultValueElem.attribute( QStringLiteral( "key" ) ), QUuid( defaultValueElem.attribute( QStringLiteral( "value" ) ) ) );
}
}
return true;
@@ -60,3 +60,15 @@ bool QgsTileCache::tile( const QUrl &url, QImage &image )
}
return success;
}

int QgsTileCache::totalCost()
{
QMutexLocker locker( &sTileCacheMutex );
return sTileCache.totalCost();
}

int QgsTileCache::maxCost()
{
QMutexLocker locker( &sTileCacheMutex );
return sTileCache.maxCost();
}
@@ -51,9 +51,9 @@ class CORE_EXPORT QgsTileCache
static bool tile( const QUrl &url, QImage &image );

//! how many tiles are stored in the in-memory cache
static int totalCost() { QMutexLocker locker( &sTileCacheMutex ); return sTileCache.totalCost(); }
static int totalCost();
//! how many tiles can be stored in the in-memory cache
static int maxCost() { QMutexLocker locker( &sTileCacheMutex ); return sTileCache.maxCost(); }
static int maxCost();

private:
//! in-memory cache

0 comments on commit 5be4bcf

Please sign in to comment.