run pre-commit

editors/QtCreator/templates/wizards/qgis/qgis_test/file.cpp

@@ -23,39 +23,38 @@
 #include <QObject>
 #include <qgsapplication.h>
 
-class %{CN}: public QObject
+class % { CN } : public QObject
 {
-
   Q_OBJECT
 
 private slots:
-  void initTestCase(); // will be called before the first testfunction is executed.
+  void initTestCase();    // will be called before the first testfunction is executed.
   void cleanupTestCase(); // will be called after the last testfunction was executed.
-  void init(); // will be called before each testfunction is executed.
-  void cleanup(); // will be called after every testfunction.
+  void init();            // will be called before each testfunction is executed.
+  void cleanup();         // will be called after every testfunction.
 
   // Add your test methods here
 };
 
-void %{CN}::initTestCase()
+void % { CN }
+::initTestCase()
 {
-
 }
 
-void %{CN}::cleanupTestCase()
+void % { CN }
+::cleanupTestCase()
 {
-
 }
 
-void %{CN}::init()
+void % { CN }
+::init()
 {
-
 }
 
-void %{CN}::cleanup()
+void % { CN }
+::cleanup()
 {
-
 }
 
-QGSTEST_MAIN( %{CN} )
+QGSTEST_MAIN( % { CN } )
 #include "%{JS: Cpp.classToFileName('%{Class}', '.moc')}"

src/3d/chunks/qgschunkedentity.cpp

@@ -73,8 +73,7 @@ QgsChunkedEntity::QgsChunkedEntity( Qgs3DMapSettings *mapSettings, float tau, Qg
   mReplacementQueue = new QgsChunkList;
 
   // in case the chunk loader factory supports fetching of hierarchy in background (to avoid GUI freezes)
-  connect( loaderFactory, &QgsChunkLoaderFactory::childrenPrepared, this, [this]
-  {
+  connect( loaderFactory, &QgsChunkLoaderFactory::childrenPrepared, this, [this] {
     setNeedsUpdate( true );
     emit pendingJobsCountChanged();
   } );
@@ -99,7 +98,7 @@ QgsChunkedEntity::~QgsChunkedEntity()
     else if ( node->state() == QgsChunkNode::QueuedForUpdate )
       node->cancelQueuedForUpdate();
     else
-      Q_ASSERT( false );  // impossible!
+      Q_ASSERT( false ); // impossible!
   }
 
   delete mChunkLoaderQueue;
@@ -211,19 +210,12 @@ void QgsChunkedEntity::handleSceneUpdate( const SceneContext &sceneContext )
   // start a job from queue if there is anything waiting
   startJobs();
 
-  mNeedsUpdate = false;  // just updated
+  mNeedsUpdate = false; // just updated
 
   if ( pendingJobsCount() != oldJobsCount )
     emit pendingJobsCountChanged();
 
-  QgsDebugMsgLevel( QStringLiteral( "update: active %1 enabled %2 disabled %3 | culled %4 | loading %5 loaded %6 | unloaded %7 elapsed %8ms" ).arg( mActiveNodes.count() )
-                    .arg( enabled )
-                    .arg( disabled )
-                    .arg( mFrustumCulled )
-                    .arg( mChunkLoaderQueue->count() )
-                    .arg( mReplacementQueue->count() )
-                    .arg( unloaded )
-                    .arg( t.elapsed() ), 2 );
+  QgsDebugMsgLevel( QStringLiteral( "update: active %1 enabled %2 disabled %3 | culled %4 | loading %5 loaded %6 | unloaded %7 elapsed %8ms" ).arg( mActiveNodes.count() ).arg( enabled ).arg( disabled ).arg( mFrustumCulled ).arg( mChunkLoaderQueue->count() ).arg( mReplacementQueue->count() ).arg( unloaded ).arg( t.elapsed() ), 2 );
 }
 
 
@@ -255,7 +247,7 @@ int QgsChunkedEntity::unloadNodes()
       mReplacementQueue->takeEntry( entry );
       usedGpuMemory -= Qgs3DUtils::calculateEntityGpuMemorySize( entry->chunk->entity() );
       mActiveNodes.removeOne( entry->chunk );
-      entry->chunk->unloadChunk();  // also deletes the entry
+      entry->chunk->unloadChunk(); // also deletes the entry
       ++unloaded;
       entry = entryPrev;
     }
@@ -370,7 +362,7 @@ void QgsChunkedEntity::pruneLoaderQueue( const SceneContext &sceneContext )
     {
       n->cancelQueuedForLoad();
     }
-    else  // queued for update
+    else // queued for update
     {
       n->cancelQueuedForUpdate();
       mReplacementQueue->takeEntry( n->replacementQueueEntry() );
@@ -392,28 +384,29 @@ int QgsChunkedEntity::pendingJobsCount() const
 
 struct ResidencyRequest
 {
-  QgsChunkNode *node = nullptr;
-  float dist = 0.0;
-  int level = -1;
-  ResidencyRequest() = default;
-  ResidencyRequest(
-    QgsChunkNode *n,
-    float d,
-    int l )
-    : node( n )
-    , dist( d )
-    , level( l )
-  {}
+    QgsChunkNode *node = nullptr;
+    float dist = 0.0;
+    int level = -1;
+    ResidencyRequest() = default;
+    ResidencyRequest(
+      QgsChunkNode *n,
+      float d,
+      int l
+    )
+      : node( n )
+      , dist( d )
+      , level( l )
+    {}
 };
 
 struct
 {
-  bool operator()( const ResidencyRequest &request, const ResidencyRequest &otherRequest ) const
-  {
-    if ( request.level == otherRequest.level )
-      return request.dist > otherRequest.dist;
-    return request.level > otherRequest.level;
-  }
+    bool operator()( const ResidencyRequest &request, const ResidencyRequest &otherRequest ) const
+    {
+      if ( request.level == otherRequest.level )
+        return request.dist > otherRequest.dist;
+      return request.level > otherRequest.level;
+    }
 } ResidencyRequestSorter;
 
 void QgsChunkedEntity::update( QgsChunkNode *root, const SceneContext &sceneContext )
@@ -422,8 +415,7 @@ void QgsChunkedEntity::update( QgsChunkNode *root, const SceneContext &sceneCont
   QVector<ResidencyRequest> residencyRequests;
 
   using slotItem = std::pair<QgsChunkNode *, float>;
-  auto cmp_funct = []( const slotItem & p1, const slotItem & p2 )
-  {
+  auto cmp_funct = []( const slotItem &p1, const slotItem &p2 ) {
     return p1.second <= p2.second;
   };
   int renderedCount = 0;
@@ -598,7 +590,7 @@ void QgsChunkedEntity::requestResidency( QgsChunkNode *node )
   else if ( node->state() == QgsChunkNode::Skeleton )
   {
     if ( !node->hasData() )
-      return;   // no need to load (we already tried but got nothing back)
+      return; // no need to load (we already tried but got nothing back)
 
     // add to the loading queue
     QgsChunkListEntry *entry = new QgsChunkListEntry( node );
@@ -712,7 +704,7 @@ QgsChunkQueueJob *QgsChunkedEntity::startJob( QgsChunkNode *node )
   }
   else
   {
-    Q_ASSERT( false );  // not possible
+    Q_ASSERT( false ); // not possible
     return nullptr;
   }
 }

src/3d/chunks/qgschunkedentity.h

@@ -45,7 +45,7 @@ namespace QgsRayCastingUtils
   class Ray3D;
   struct RayCastContext;
   struct RayHit;
-}
+} // namespace QgsRayCastingUtils
 
 #include <QVector3D>
 #include <QMatrix4x4>
@@ -65,9 +65,7 @@ class QgsChunkedEntity : public Qgs3DMapSceneEntity
     Q_OBJECT
   public:
     //! Constructs a chunked entity
-    QgsChunkedEntity( Qgs3DMapSettings *mapSettings, float tau, QgsChunkLoaderFactory *loaderFactory, bool ownsFactory,
-                      int primitivesBudget = std::numeric_limits<int>::max(),
-                      Qt3DCore::QNode *parent = nullptr );
+    QgsChunkedEntity( Qgs3DMapSettings *mapSettings, float tau, QgsChunkLoaderFactory *loaderFactory, bool ownsFactory, int primitivesBudget = std::numeric_limits<int>::max(), Qt3DCore::QNode *parent = nullptr );
     ~QgsChunkedEntity() override;
 
     //! Called when e.g. camera changes and entity may need updated

src/3d/chunks/qgschunklist_p.cpp

@@ -53,7 +53,7 @@ void QgsChunkList::insertEntry( QgsChunkListEntry *entry, QgsChunkListEntry *nex
       next->prev = entry;
     }
     if ( next == mHead )
-      mHead = entry;   // update head if "entry" we was head before
+      mHead = entry; // update head if "entry" we was head before
   }
   ++mCount;
 }

src/3d/chunks/qgschunklist_p.h

@@ -40,15 +40,15 @@ class QgsChunkNode;
  */
 struct QgsChunkListEntry
 {
-  //! Constructs entry for a particular node
-  QgsChunkListEntry( QgsChunkNode *node )
-    : chunk( node )
-  {
-  }
-
-  QgsChunkListEntry *prev = nullptr;
-  QgsChunkListEntry *next = nullptr;
-  QgsChunkNode *chunk;   //!< TODO: shared pointer
+    //! Constructs entry for a particular node
+    QgsChunkListEntry( QgsChunkNode *node )
+      : chunk( node )
+    {
+    }
+
+    QgsChunkListEntry *prev = nullptr;
+    QgsChunkListEntry *next = nullptr;
+    QgsChunkNode *chunk; //!< TODO: shared pointer
 };
 
 

src/3d/chunks/qgschunkloader.h

@@ -45,7 +45,8 @@ class QgsChunkLoader : public QgsChunkQueueJob
     Q_OBJECT
   public:
     //! Construct chunk loader for a node
-    QgsChunkLoader( QgsChunkNode *node ) : QgsChunkQueueJob( node ) { }
+    QgsChunkLoader( QgsChunkNode *node )
+      : QgsChunkQueueJob( node ) {}
 
     /**
      * Run in main thread to use loaded data.
@@ -59,7 +60,7 @@ class QgsChunkLoader : public QgsChunkQueueJob
  * \ingroup 3d
  * \brief Factory for chunk loaders for a particular type of entity
  */
-class QgsChunkLoaderFactory  : public QObject
+class QgsChunkLoaderFactory : public QObject
 {
     Q_OBJECT
   public:
@@ -91,7 +92,11 @@ class QgsChunkLoaderFactory  : public QObject
      * \see prepareChildren()
      * \see createChildren()
      */
-    virtual bool canCreateChildren( QgsChunkNode *node ) { Q_UNUSED( node ); return true; }
+    virtual bool canCreateChildren( QgsChunkNode *node )
+    {
+      Q_UNUSED( node );
+      return true;
+    }
 
     /**
      * Requests that node has enough hierarchy information to create children in createChildren().
@@ -137,7 +142,6 @@ class _3D_EXPORT QgsQuadtreeChunkLoaderFactory : public QgsChunkLoaderFactory
     float mRootError = 0;
     //! maximum allowed depth of quad tree
     int mMaxLevel = 0;
-
 };
 
 /// @endcond

src/3d/chunks/qgschunknode.cpp

@@ -15,7 +15,7 @@
 
 #include "qgschunknode.h"
 
-#include "qgschunkedentity.h"  // for ChunkLoader destructor
+#include "qgschunkedentity.h" // for ChunkLoader destructor
 #include "qgschunklist_p.h"
 #include "qgschunkloader.h"
 #include <Qt3DCore/QEntity>
@@ -56,7 +56,7 @@ bool QgsChunkNode::allChildChunksResident( QTime currentTime ) const
   for ( int i = 0; i < childCount(); ++i )
   {
     if ( mChildren[i]->mHasData && !mChildren[i]->mEntity )
-      return false;  // no there yet
+      return false;         // no there yet
     Q_UNUSED( currentTime ) // seems we do not need this extra time (it just brings extra problems)
     //if (children[i]->entityCreatedTime.msecsTo(currentTime) < 100)
     //  return false;  // allow some time for upload of stuff within Qt3D (TODO: better way to check it is ready?)
@@ -136,7 +136,7 @@ void QgsChunkNode::cancelLoading()
   Q_ASSERT( !mEntity );
   Q_ASSERT( !mReplacementQueueEntry );
 
-  mLoader = nullptr;  // not owned by chunk node
+  mLoader = nullptr; // not owned by chunk node
 
   mState = QgsChunkNode::Skeleton;
 }
@@ -151,7 +151,7 @@ void QgsChunkNode::setLoaded( Qt3DCore::QEntity *newEntity )
   mEntity = newEntity;
   mEntityCreatedTime = QTime::currentTime();
 
-  mLoader = nullptr;  // not owned by chunk node
+  mLoader = nullptr; // not owned by chunk node
 
   mState = QgsChunkNode::Loaded;
   mReplacementQueueEntry = new QgsChunkListEntry( this );
@@ -194,7 +194,7 @@ void QgsChunkNode::cancelQueuedForUpdate()
   Q_ASSERT( !mUpdater );
 
   mState = Loaded;
-  mUpdaterFactory = nullptr;  // not owned by the node
+  mUpdaterFactory = nullptr; // not owned by the node
 
   delete mLoaderQueueEntry;
   mLoaderQueueEntry = nullptr;
@@ -211,7 +211,7 @@ void QgsChunkNode::setUpdating()
 
   mState = Updating;
   mUpdater = mUpdaterFactory->createJob( this );
-  mUpdaterFactory = nullptr;  // not owned by the node
+  mUpdaterFactory = nullptr; // not owned by the node
   mLoaderQueueEntry = nullptr;
 }
 
@@ -221,7 +221,7 @@ void QgsChunkNode::cancelUpdating()
   Q_ASSERT( mUpdater );
   Q_ASSERT( !mLoaderQueueEntry );
 
-  mUpdater = nullptr;  // not owned by chunk node
+  mUpdater = nullptr; // not owned by chunk node
 
   mState = Loaded;
 }
@@ -233,7 +233,7 @@ void QgsChunkNode::setUpdated()
   Q_ASSERT( !mLoaderQueueEntry );
   Q_ASSERT( mReplacementQueueEntry );
 
-  mUpdater = nullptr;   // not owned by chunk node
+  mUpdater = nullptr; // not owned by chunk node
 
   mState = QgsChunkNode::Loaded;
 }
@@ -251,12 +251,12 @@ void QgsChunkNode::updateParentBoundingBoxesRecursively() const
   while ( currentNode )
   {
     QgsChunkNode *const *currentNodeChildren = currentNode->children();
-    double xMin = std::numeric_limits< double >::max();
-    double xMax = -std::numeric_limits< double >::max();
-    double yMin = std::numeric_limits< double >::max();
-    double yMax = -std::numeric_limits< double >::max();
-    double zMin = std::numeric_limits< double >::max();
-    double zMax = -std::numeric_limits< double >::max();
+    double xMin = std::numeric_limits<double>::max();
+    double xMax = -std::numeric_limits<double>::max();
+    double yMin = std::numeric_limits<double>::max();
+    double yMax = -std::numeric_limits<double>::max();
+    double zMin = std::numeric_limits<double>::max();
+    double zMax = -std::numeric_limits<double>::max();
 
     for ( int i = 0; i < currentNode->childCount(); ++i )
     {