Fix api doc and sip issues

qgis · Apr 9, 2018 · f06f652 · f06f652
1 parent 641cbe3
commit f06f652
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 34 deletions.
diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip
@@ -45,6 +45,7 @@
 %Include layertree/qgslayertreeembeddedconfigwidget.sip
 %Include layertree/qgslayertreeembeddedwidgetregistry.sip
 %Include layout/qgslayoutviewmouseevent.sip
+%Include processing/qgsprocessingguiregistry.sip
 %Include raster/qgsrasterrendererwidget.sip
 %Include symbology/qgssymbolwidgetcontext.sip
 %Include qgisinterface.sip
@@ -313,6 +314,4 @@
 %Include locator/qgslocatorwidget.sip
 %Include processing/qgsprocessingalgorithmconfigurationwidget.sip
 %Include processing/qgsprocessingalgorithmdialogbase.sip
-%Include processing/qgsprocessingconfigurationwidgets.sip
-%Include processing/qgsprocessingguiregistry.sip
 %Include qgsadvanceddigitizingcanvasitem.sip
diff --git a/python/gui/processing/qgsprocessingconfigurationwidgets.sip.in b/python/gui/processing/qgsprocessingconfigurationwidgets.sip.in
@@ -1,23 +0,0 @@
-/************************************************************************
- * This file has been generated automatically from                      *
- *                                                                      *
- * src/gui/processing/qgsprocessingconfigurationwidgets.h               *
- *                                                                      *
- * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
- ************************************************************************/
-
-
-
-
-
-
-
-
-
-/************************************************************************
- * This file has been generated automatically from                      *
- *                                                                      *
- * src/gui/processing/qgsprocessingconfigurationwidgets.h               *
- *                                                                      *
- * Do not edit manually ! Edit header and run scripts/sipify.pl again   *
- ************************************************************************/

diff --git a/src/analysis/processing/qgsalgorithmbuffer.h b/src/analysis/processing/qgsalgorithmbuffer.h
@@ -53,5 +53,3 @@ class QgsBufferAlgorithm : public QgsProcessingAlgorithm
 ///@endcond PRIVATE
 
 #endif // QGSALGORITHMBUFFER_H
-
-
diff --git a/src/analysis/processing/qgsalgorithmfilter.h b/src/analysis/processing/qgsalgorithmfilter.h
@@ -72,6 +72,6 @@ class QgsFilterAlgorithm : public QgsProcessingAlgorithm
     QList<Output *> mOutputs;
 };
 
-///@cond PRIVATE
+///@endcond PRIVATE
 
 #endif // QGSFILTERALGORITHM_H
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
@@ -715,7 +715,6 @@ SET(QGIS_GUI_MOC_HDRS
   processing/qgsprocessingalgorithmconfigurationwidget.h
   processing/qgsprocessingalgorithmdialogbase.h
   processing/qgsprocessingconfigurationwidgets.h
-  processing/qgsprocessingguiregistry.h
 )
 SET_PROPERTY(GLOBAL PROPERTY QGIS_GUI_MOC_HDRS ${QGIS_GUI_MOC_HDRS})
 
@@ -815,6 +814,8 @@ SET(QGIS_GUI_HDRS
   layout/qgslayoutreportsectionlabel.h
   layout/qgslayoutviewmouseevent.h
 
+  processing/qgsprocessingguiregistry.h
+
   raster/qgsrasterrendererwidget.h
 
   symbology/qgssymbolwidgetcontext.h

diff --git a/src/gui/processing/qgsprocessingconfigurationwidgets.cpp b/src/gui/processing/qgsprocessingconfigurationwidgets.cpp
@@ -30,6 +30,8 @@
 #include <QCheckBox>
 #include <QHeaderView>
 
+///@cond PRIVATE
+
 QgsFilterAlgorithmConfigurationWidget::QgsFilterAlgorithmConfigurationWidget( QWidget *parent )
   : QgsProcessingAlgorithmConfigurationWidget( parent )
 {
@@ -160,3 +162,5 @@ bool QgsFilterAlgorithmConfigurationWidgetFactory::canCreateFor( QgsProcessingAl
   else
     return false;
 }
+
+///@endcond PRIVATE
diff --git a/src/gui/processing/qgsprocessingconfigurationwidgets.h b/src/gui/processing/qgsprocessingconfigurationwidgets.h
@@ -19,16 +19,15 @@
 #ifndef QGSPROCESSINGCONFIGURATIONWIDGETS_H
 #define QGSPROCESSINGCONFIGURATIONWIDGETS_H
 
+#define SIP_NO_FILE
+
 #include "qgsprocessingalgorithmconfigurationwidget.h"
 #include "qgis_gui.h"
-#include "qgis_sip.h"
 
 class QTableWidget;
 
 ///@cond PRIVATE
 
-#ifndef SIP_RUN
-
 class QgsFilterAlgorithmConfigurationWidget : public QgsProcessingAlgorithmConfigurationWidget
 {
     Q_OBJECT
@@ -55,8 +54,6 @@ class QgsFilterAlgorithmConfigurationWidgetFactory : public QgsProcessingAlgorit
     virtual bool canCreateFor( QgsProcessingAlgorithm *algorithm ) const override;
 };
 
-#endif
-
 ///@endcond
 
 #endif // QGSPROCESSINGCONFIGURATIONWIDGETS_H