Skip to content

Commit f06f652

Browse files
committed
Fix api doc and sip issues
1 parent 641cbe3 commit f06f652

7 files changed

+10
-34
lines changed

python/gui/gui_auto.sip

+1-2
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
%Include layertree/qgslayertreeembeddedconfigwidget.sip
4646
%Include layertree/qgslayertreeembeddedwidgetregistry.sip
4747
%Include layout/qgslayoutviewmouseevent.sip
48+
%Include processing/qgsprocessingguiregistry.sip
4849
%Include raster/qgsrasterrendererwidget.sip
4950
%Include symbology/qgssymbolwidgetcontext.sip
5051
%Include qgisinterface.sip
@@ -313,6 +314,4 @@
313314
%Include locator/qgslocatorwidget.sip
314315
%Include processing/qgsprocessingalgorithmconfigurationwidget.sip
315316
%Include processing/qgsprocessingalgorithmdialogbase.sip
316-
%Include processing/qgsprocessingconfigurationwidgets.sip
317-
%Include processing/qgsprocessingguiregistry.sip
318317
%Include qgsadvanceddigitizingcanvasitem.sip
Original file line numberDiff line numberDiff line change
@@ -1,23 +0,0 @@
1-
/************************************************************************
2-
* This file has been generated automatically from *
3-
* *
4-
* src/gui/processing/qgsprocessingconfigurationwidgets.h *
5-
* *
6-
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
7-
************************************************************************/
8-
9-
10-
11-
12-
13-
14-
15-
16-
17-
/************************************************************************
18-
* This file has been generated automatically from *
19-
* *
20-
* src/gui/processing/qgsprocessingconfigurationwidgets.h *
21-
* *
22-
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
23-
************************************************************************/

src/analysis/processing/qgsalgorithmbuffer.h

-2
Original file line numberDiff line numberDiff line change
@@ -53,5 +53,3 @@ class QgsBufferAlgorithm : public QgsProcessingAlgorithm
5353
///@endcond PRIVATE
5454

5555
#endif // QGSALGORITHMBUFFER_H
56-
57-

src/analysis/processing/qgsalgorithmfilter.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -72,6 +72,6 @@ class QgsFilterAlgorithm : public QgsProcessingAlgorithm
7272
QList<Output *> mOutputs;
7373
};
7474

75-
///@cond PRIVATE
75+
///@endcond PRIVATE
7676

7777
#endif // QGSFILTERALGORITHM_H

src/gui/CMakeLists.txt

+2-1
Original file line numberDiff line numberDiff line change
@@ -715,7 +715,6 @@ SET(QGIS_GUI_MOC_HDRS
715715
processing/qgsprocessingalgorithmconfigurationwidget.h
716716
processing/qgsprocessingalgorithmdialogbase.h
717717
processing/qgsprocessingconfigurationwidgets.h
718-
processing/qgsprocessingguiregistry.h
719718
)
720719
SET_PROPERTY(GLOBAL PROPERTY QGIS_GUI_MOC_HDRS ${QGIS_GUI_MOC_HDRS})
721720

@@ -815,6 +814,8 @@ SET(QGIS_GUI_HDRS
815814
layout/qgslayoutreportsectionlabel.h
816815
layout/qgslayoutviewmouseevent.h
817816

817+
processing/qgsprocessingguiregistry.h
818+
818819
raster/qgsrasterrendererwidget.h
819820

820821
symbology/qgssymbolwidgetcontext.h

src/gui/processing/qgsprocessingconfigurationwidgets.cpp

+4
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@
3030
#include <QCheckBox>
3131
#include <QHeaderView>
3232

33+
///@cond PRIVATE
34+
3335
QgsFilterAlgorithmConfigurationWidget::QgsFilterAlgorithmConfigurationWidget( QWidget *parent )
3436
: QgsProcessingAlgorithmConfigurationWidget( parent )
3537
{
@@ -160,3 +162,5 @@ bool QgsFilterAlgorithmConfigurationWidgetFactory::canCreateFor( QgsProcessingAl
160162
else
161163
return false;
162164
}
165+
166+
///@endcond PRIVATE

src/gui/processing/qgsprocessingconfigurationwidgets.h

+2-5
Original file line numberDiff line numberDiff line change
@@ -19,16 +19,15 @@
1919
#ifndef QGSPROCESSINGCONFIGURATIONWIDGETS_H
2020
#define QGSPROCESSINGCONFIGURATIONWIDGETS_H
2121

22+
#define SIP_NO_FILE
23+
2224
#include "qgsprocessingalgorithmconfigurationwidget.h"
2325
#include "qgis_gui.h"
24-
#include "qgis_sip.h"
2526

2627
class QTableWidget;
2728

2829
///@cond PRIVATE
2930

30-
#ifndef SIP_RUN
31-
3231
class QgsFilterAlgorithmConfigurationWidget : public QgsProcessingAlgorithmConfigurationWidget
3332
{
3433
Q_OBJECT
@@ -55,8 +54,6 @@ class QgsFilterAlgorithmConfigurationWidgetFactory : public QgsProcessingAlgorit
5554
virtual bool canCreateFor( QgsProcessingAlgorithm *algorithm ) const override;
5655
};
5756

58-
#endif
59-
6057
///@endcond
6158

6259
#endif // QGSPROCESSINGCONFIGURATIONWIDGETS_H

0 commit comments

Comments
 (0)