fix ci build

qgis · Jan 12, 2022 · 0381373 · 0381373
1 parent fb9084f
commit 0381373
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 12 deletions.
diff --git a/python/core/auto_generated/3d/qgs3dviewsmanager.sip.in b/python/core/auto_generated/3d/qgs3dviewsmanager.sip.in
@@ -53,7 +53,7 @@ Returns a DOM element representing the state of the manager.
 Removes and deletes all 3D views from the manager.
 %End
 
-    QDomElement get3DViewSettings( const QString &name );
+    QDomElement get3DViewSettings( const QString &name ) const;
 %Docstring
 Returns the DOM element representing the settings of the 3D view named ``name``
 %End
@@ -63,12 +63,12 @@ Returns the DOM element representing the settings of the 3D view named ``name``
 Adds a new 3D view named ``name`` to the manager with the configuration DOM ``dom``
 %End
 
-    QStringList get3DViewsNames();
+    QStringList get3DViewsNames() const;
 %Docstring
 Returns the names of all 3D views added to the manager
 %End
 
-    QList<QDomElement> get3DViews();
+    QList<QDomElement> get3DViews() const;
 %Docstring
 Returns the list of configurations of 3D views added to the manager
 %End

diff --git a/python/core/auto_generated/project/qgsproject.sip.in b/python/core/auto_generated/project/qgsproject.sip.in
@@ -745,6 +745,7 @@ the project.
 %End
 
 
+
     Qgs3DViewsManager *views3DManager();
 %Docstring
 Returns the project's 3D views manager, which manages 3D views

diff --git a/src/app/3d/qgs3dviewsmanagerdialog.h b/src/app/3d/qgs3dviewsmanagerdialog.h
@@ -46,4 +46,4 @@ class Qgs3DViewsManagerDialog : public QDialog, private Ui::Qgs3DViewsManagerDia
     QString askUserForATitle( QString oldTitle, QString action, bool allowExistingTitle );
 };
 
-#endif // QGS3DVIEWSMANAGER_H
+#endif // QGS3DVIEWSMANAGERDIALOG_H
diff --git a/src/core/3d/qgs3dviewsmanager.cpp b/src/core/3d/qgs3dviewsmanager.cpp
@@ -25,6 +25,7 @@ Qgs3DViewsManager::Qgs3DViewsManager( QgsProject *project )
 
 bool Qgs3DViewsManager::readXml( const QDomElement &element, const QDomDocument &doc )
 {
+  Q_UNUSED( doc );
   clear();
 
   QgsReadWriteContext readWriteContext;
@@ -59,12 +60,12 @@ void Qgs3DViewsManager::clear()
   emit viewsListChanged();
 }
 
-QDomElement Qgs3DViewsManager::get3DViewSettings( const QString &name )
+QDomElement Qgs3DViewsManager::get3DViewSettings( const QString &name ) const
 {
   return m3DMapViewsDom.value( name, QDomElement() );
 }
 
-QList<QDomElement> Qgs3DViewsManager::get3DViews()
+QList<QDomElement> Qgs3DViewsManager::get3DViews() const
 {
   return m3DMapViewsDom.values();
 }
@@ -75,7 +76,7 @@ void Qgs3DViewsManager::register3DViewSettings( const QString &name, const QDomE
   emit viewsListChanged();
 }
 
-QStringList Qgs3DViewsManager::get3DViewsNames()
+QStringList Qgs3DViewsManager::get3DViewsNames() const
 {
   return m3DMapViewsDom.keys();
 }

diff --git a/src/core/3d/qgs3dviewsmanager.h b/src/core/3d/qgs3dviewsmanager.h
@@ -66,16 +66,16 @@ class CORE_EXPORT Qgs3DViewsManager : public QObject
     void clear();
 
     //! Returns the DOM element representing the settings of the 3D view named \a name
-    QDomElement get3DViewSettings( const QString &name );
+    QDomElement get3DViewSettings( const QString &name ) const;
 
     //! Adds a new 3D view named \a name to the manager with the configuration DOM \a dom
     void register3DViewSettings( const QString &name, const QDomElement &dom );
 
     //! Returns the names of all 3D views added to the manager
-    QStringList get3DViewsNames();
+    QStringList get3DViewsNames() const;
 
     //! Returns the list of configurations of 3D views added to the manager
-    QList<QDomElement> get3DViews();
+    QList<QDomElement> get3DViews() const;
 
     //! Removes the configuration of the 3D view named \a name
     void remove3DView( const QString &name );

diff --git a/src/core/project/qgsproject.cpp b/src/core/project/qgsproject.cpp
@@ -66,9 +66,7 @@
 #include "qgspointcloudlayer.h"
 #include "qgsattributeeditorcontainer.h"
 #include "qgsgrouplayer.h"
-#ifdef HAVE_3D
 #include "qgs3dviewsmanager.h"
-#endif
 
 #include <algorithm>
 #include <QApplication>