Merge pull request #42517 from m-kuhn/forward_declaration

[qt6] Code shuffling
qgis · Mar 27, 2021 · 5be4bcf · 5be4bcf
2 parents 90a4902 + 14a20da
commit 5be4bcf
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 6 deletions.
diff --git a/src/core/layertree/qgslayertreeutils.h b/src/core/layertree/qgslayertreeutils.h
@@ -24,7 +24,6 @@
 
 class QDomElement;
 class QDomDocument;
-class QStringList;
 
 class QgsLayerTreeNode;
 class QgsLayerTreeGroup;

diff --git a/src/core/project/qgsproject.h b/src/core/project/qgsproject.h
@@ -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;

diff --git a/src/core/qgsactionmanager.cpp b/src/core/qgsactionmanager.cpp
@@ -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;

diff --git a/src/core/qgstilecache.cpp b/src/core/qgstilecache.cpp
@@ -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();
+}
diff --git a/src/core/qgstilecache.h b/src/core/qgstilecache.h
@@ -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