Correct SIP fix + add src/gui/vectortile to doxygen

qgis · Apr 5, 2020 · c738061 · c738061
1 parent a4a61e0
commit c738061
Show file tree

Hide file tree

Showing 8 changed files with 25 additions and 3 deletions.
diff --git a/doc/CMakeLists.txt b/doc/CMakeLists.txt
@@ -118,6 +118,7 @@ IF(WITH_APIDOC)
       ${CMAKE_SOURCE_DIR}/src/gui/processing/models
       ${CMAKE_SOURCE_DIR}/src/gui/raster
       ${CMAKE_SOURCE_DIR}/src/gui/symbology
+      ${CMAKE_SOURCE_DIR}/src/gui/vectortile
       ${CMAKE_SOURCE_DIR}/src/analysis
       ${CMAKE_SOURCE_DIR}/src/analysis/mesh
       ${CMAKE_SOURCE_DIR}/src/analysis/interpolation

diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
@@ -382,8 +382,5 @@
 %Include auto_generated/symbology/qgsvectorfieldsymbollayerwidget.sip
 %Include auto_generated/tableeditor/qgstableeditordialog.sip
 %Include auto_generated/tableeditor/qgstableeditorwidget.sip
-%Include auto_generated/vectortile/qgsvectortileconnectiondialog.sip
-%Include auto_generated/vectortile/qgsvectortiledataitemguiprovider.sip
-%Include auto_generated/vectortile/qgsvectortileproviderguimetadata.sip
 %Include auto_generated/editorwidgets/qgsqmlwidgetwrapper.sip
 %Include auto_generated/qgsadvanceddigitizingcanvasitem.sip
diff --git a/src/gui/vectortile/qgsvectortileconnectiondialog.cpp b/src/gui/vectortile/qgsvectortileconnectiondialog.cpp
@@ -18,6 +18,8 @@
 #include "qgsgui.h"
 #include <QMessageBox>
 
+///@cond PRIVATE
+
 QgsVectorTileConnectionDialog::QgsVectorTileConnectionDialog( QWidget *parent )
   : QDialog( parent )
 {
@@ -60,3 +62,5 @@ void QgsVectorTileConnectionDialog::accept()
   }
   QDialog::accept();
 }
+
+///@endcond
diff --git a/src/gui/vectortile/qgsvectortileconnectiondialog.h b/src/gui/vectortile/qgsvectortileconnectiondialog.h
@@ -16,6 +16,9 @@
 #ifndef QGSVECTORTILECONNECTIONDIALOG_H
 #define QGSVECTORTILECONNECTIONDIALOG_H
 
+///@cond PRIVATE
+#define SIP_NO_FILE
+
 #include <QDialog>
 
 #include "ui_qgsvectortileconnectiondialog.h"
@@ -42,4 +45,6 @@ class QgsVectorTileConnectionDialog : public QDialog, public Ui::QgsVectorTileCo
     QString mCredentialsBaseKey;
 };
 
+///@endcond
+
 #endif // QGSVECTORTILECONNECTIONDIALOG_H
diff --git a/src/gui/vectortile/qgsvectortiledataitemguiprovider.cpp b/src/gui/vectortile/qgsvectortiledataitemguiprovider.cpp
@@ -23,6 +23,7 @@
 #include <QFileDialog>
 #include <QMessageBox>
 
+///@cond PRIVATE
 
 void QgsVectorTileDataItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *menu, const QList<QgsDataItem *> &, QgsDataItemGuiContext )
 {
@@ -106,3 +107,5 @@ void QgsVectorTileDataItemGuiProvider::loadXyzTilesServers( QgsDataItem *item )
   dlg.exec();
   item->refreshConnections();
 }
+
+///@endcond
diff --git a/src/gui/vectortile/qgsvectortiledataitemguiprovider.h b/src/gui/vectortile/qgsvectortiledataitemguiprovider.h
@@ -16,6 +16,9 @@
 #ifndef QGSVECTORTILEDATAITEMGUIPROVIDER_H
 #define QGSVECTORTILEDATAITEMGUIPROVIDER_H
 
+///@cond PRIVATE
+#define SIP_NO_FILE
+
 #include "qgsdataitemguiprovider.h"
 
 
@@ -38,5 +41,6 @@ class QgsVectorTileDataItemGuiProvider : public QObject, public QgsDataItemGuiPr
 
 };
 
+///@endcond
 
 #endif // QGSVECTORTILEDATAITEMGUIPROVIDER_H
diff --git a/src/gui/vectortile/qgsvectortileproviderguimetadata.cpp b/src/gui/vectortile/qgsvectortileproviderguimetadata.cpp
@@ -17,6 +17,7 @@
 
 #include "qgsvectortiledataitemguiprovider.h"
 
+///@cond PRIVATE
 
 QgsVectorTileProviderGuiMetadata::QgsVectorTileProviderGuiMetadata()
   : QgsProviderGuiMetadata( QStringLiteral( "vectortile" ) )
@@ -28,3 +29,5 @@ QList<QgsDataItemGuiProvider *> QgsVectorTileProviderGuiMetadata::dataItemGuiPro
   return QList<QgsDataItemGuiProvider *>()
          << new QgsVectorTileDataItemGuiProvider;
 }
+
+///@endcond
diff --git a/src/gui/vectortile/qgsvectortileproviderguimetadata.h b/src/gui/vectortile/qgsvectortileproviderguimetadata.h
@@ -16,6 +16,9 @@
 #ifndef QGSVECTORTILEPROVIDERGUIMETADATA_H
 #define QGSVECTORTILEPROVIDERGUIMETADATA_H
 
+///@cond PRIVATE
+#define SIP_NO_FILE
+
 #include <QList>
 #include <QMainWindow>
 
@@ -30,4 +33,6 @@ class QgsVectorTileProviderGuiMetadata: public QgsProviderGuiMetadata
 
 };
 
+///@endcond
+
 #endif // QGSVECTORTILEPROVIDERGUIMETADATA_H