Skip to content
Permalink
Browse files
fix MSVC build: reverts fee62e4, dff05dd and e3a77b9 effectivly
reverting 3fb0f66 (followup #45348)

Using --no-public-is-protected (default on Windows) also works on Linux
and fixes #45331 too
  • Loading branch information
jef-n committed Oct 21, 2021
1 parent 1c70953 commit c6008b7ee19117e374dce3679434abc0b1016d54
Showing 403 changed files with 569 additions and 576 deletions.
@@ -101,7 +101,7 @@ MACRO(GENERATE_SIP_PYTHON_MODULE_CODE MODULE_NAME MODULE_SIP SIP_FILES CPP_FILES
ENDIF( ${CONCAT_NUM} LESS ${SIP_CONCAT_PARTS} )
ENDFOREACH(CONCAT_NUM RANGE 0 ${SIP_CONCAT_PARTS} )

SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT5_SIP_DIR} ${SIP_BUILD_EXTRA_OPTIONS})
SET(SIPCMD ${SIP_BUILD_EXECUTABLE} --no-protected-is-public --pep484-pyi --no-make --concatenate=${SIP_CONCAT_PARTS} --qmake=${QMAKE_EXECUTABLE} --include-dir=${CMAKE_CURRENT_BINARY_DIR} --include-dir=${PYQT5_SIP_DIR} ${SIP_BUILD_EXTRA_OPTIONS})

ADD_CUSTOM_COMMAND(
OUTPUT ${_sip_output_files}
@@ -40,7 +40,7 @@ Constructor for Qgs3DAlgorithms.
virtual bool supportsNonFileBasedOutput() const;


public:
protected:

virtual void loadAlgorithms();

@@ -97,7 +97,7 @@ Returns tiling settings of the renderer
virtual void resolveReferences( const QgsProject &project );


public:
protected:
void copyBaseProperties( QgsAbstractVectorLayer3DRenderer *r ) const;
%Docstring
Copies common properties of this object to another object
@@ -102,7 +102,7 @@ overridden to show "3D Map 1" type names
virtual void refresh();


public:
protected:
virtual void draw( QgsLayoutItemRenderContext &context );

virtual bool writePropertiesToElement( QDomElement &element, QDomDocument &document, const QgsReadWriteContext &context ) const;
@@ -72,7 +72,7 @@ Sets the point size
Returns the byte stride for the geometries used to for the vertex buffer
%End

public:
protected:
};

class QgsSingleColorPointCloud3DSymbol : QgsPointCloud3DSymbol
@@ -98,7 +98,7 @@ Calculates interpolation value for map coordinates x, y
%End


public:
protected:

Result cacheBaseData( QgsFeedback *feedback = 0 );
%Docstring
@@ -61,7 +61,7 @@ Add optimization strategy
Returns director name
%End

public:
protected:
};

/************************************************************************
@@ -80,7 +80,7 @@ exists for the lifetime of this algorithm.
virtual bool supportInPlaceEdit( const QgsMapLayer *layer ) const;


public:
protected:
virtual QString outputName() const;

virtual bool prepareAlgorithm( const QVariantMap &parameters, QgsProcessingContext &context, QgsProcessingFeedback *feedback );
@@ -40,7 +40,7 @@ Constructor for QgsNativeAlgorithms.
virtual bool supportsNonFileBasedOutput() const;


public:
protected:

virtual void loadAlgorithms();

@@ -84,7 +84,7 @@ Write contents of the object to standard error stream - for debugging
Gets raster value at the given coordinates (from the first band)
%End

public:
protected:

private:
RasterInfo( const QgsAlignRaster::RasterInfo &rh );
@@ -264,7 +264,7 @@ write contents of the object to standard error stream - for debugging
Returns the index of the layer which has smallest cell size (returns -1 on error)
%End

public:
protected:

bool createAndWarp( const Item &raster );
%Docstring
@@ -276,7 +276,7 @@ Internal function for processing of one raster (1. create output, 2. do the alig
Determine suggested output of raster warp to a different CRS. Returns ``True`` on success
%End

public:
protected:



@@ -27,7 +27,7 @@ Needs to be subclassed (e.g. for slope and aspect).
float *x12, float *x22, float *x32,
float *x13, float *x23, float *x33 ) = 0;

public:
protected:
float calcFirstDerX( float *x11, float *x21, float *x31, float *x12, float *x22, float *x32, float *x13, float *x23, float *x33 );
%Docstring
Calculates the first order derivative in x-direction according to Horn (1981)
@@ -75,7 +75,7 @@ First index of the input cell is the row, second index is the column
:return: the calculated cell value for the central cell x22
%End

public:
protected:


};
@@ -23,7 +23,7 @@ Algorithm from Riley et al. 1999: A terrain ruggedness index that quantifies top
public:
QgsRuggednessFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );

public:
protected:

virtual float processNineCellWindow( float *x11, float *x21, float *x31,
float *x12, float *x22, float *x32,
@@ -21,7 +21,7 @@ Calculates total curvature as described by Wilson, Gallant (2000): terrain analy
public:
QgsTotalCurvatureFilter( const QString &inputFile, const QString &outputFile, const QString &outputFormat );

public:
protected:

virtual float processNineCellWindow( float *x11, float *x21, float *x31,
float *x12, float *x22, float *x32,
@@ -86,7 +86,7 @@ Should be preferred over :py:func:`~QgsFeaturePool.layer`.name() because it can
the background thread.
%End

public:
protected:

void insertFeature( const QgsFeature &feature, bool skipLock = false );
%Docstring
@@ -231,7 +231,7 @@ Returns the context
.. versionadded:: 3.4
%End

public:
protected:



@@ -179,7 +179,7 @@ Returns an icon that should be shown for this kind of error.

.. versionadded:: 3.8
%End
public:
protected:

QgsGeometryCheckError( const QgsGeometryCheck *check,
const QString &layerId,
@@ -76,7 +76,7 @@ The vertex id of the error. May be invalid depending on the check.
.. versionadded:: 3.4
%End

public:
protected:
};

class QgsGeometryCheckErrorSingle : QgsGeometryCheckError
@@ -37,14 +37,14 @@ Returns new instance of the renderer given the DOM element. Returns ``None`` on
Pure virtual function: must be implemented in derived classes.
%End

public:
protected:

explicit Qgs3DRendererAbstractMetadata( const QString &type );
%Docstring
Constructor of the base class
%End

public:
protected:
};


@@ -53,7 +53,7 @@ Reads renderer's properties from given XML element
Resolves references to other objects - second phase of loading - after :py:func:`~QgsAbstract3DRenderer.readXml`
%End

public:
protected:
QgsAbstract3DRenderer();
%Docstring
Default constructor
@@ -86,7 +86,7 @@ Sets the symbol layer's property collection, used for data defined overrides.
%End


public:
protected:

void copyBaseSettings( QgsAbstract3DSymbol *destination ) const;
%Docstring
@@ -359,7 +359,7 @@ to be moved to reflect this.
Emitted when the map layer associated with the annotation changes.
%End

public:
protected:

virtual void renderAnnotation( QgsRenderContext &context, QSizeF size ) const = 0;
%Docstring
@@ -205,7 +205,7 @@ exactly 2mm thick when a map is rendered at 1:1000, or 1mm thick when rendered a
.. seealso:: :py:func:`setUseSymbologyReferenceScale`
%End

public:
protected:

void copyCommonProperties( const QgsAnnotationItem *other );
%Docstring
@@ -47,7 +47,7 @@ Returns the operation type.
Returns the associated item ID.
%End

public:
protected:


};
@@ -75,7 +75,7 @@ Returns html source text
Returns a new QgsHtmlAnnotation object.
%End

public:
protected:

virtual void renderAnnotation( QgsRenderContext &context, QSizeF size ) const;

@@ -54,7 +54,7 @@ Returns the file path for the source SVG file.
Returns a new QgsSvgAnnotation object.
%End

public:
protected:

virtual void renderAnnotation( QgsRenderContext &context, QSizeF size ) const;

@@ -56,7 +56,7 @@ within the annotation. Ownership is not transferred.
Returns a new QgsTextAnnotation object.
%End

public:
protected:

virtual void renderAnnotation( QgsRenderContext &context, QSizeF size ) const;

@@ -842,12 +842,12 @@ Clear all authentication configs from authentication method caches
Clear an authentication config from its associated authentication method cache
%End

public:
protected:



public:
public:
protected:

};

@@ -153,7 +153,7 @@ Update an authentication configuration in place
Useful for updating previously stored authcfgs, when an authentication method has been significantly updated
%End

public:
protected:

explicit QgsAuthMethod();
%Docstring
@@ -237,7 +237,7 @@ Delayed initialization, needed because the provider registry must be already pop
.. seealso:: :py:func:`initialized`
%End

public:
protected:
void addRootItems();
%Docstring
Populates the model
@@ -187,7 +187,7 @@ Sets show layers to ``showLayers``
.. versionadded:: 3.14
%End

public:
protected:

virtual bool filterAcceptsRow( int sourceRow, const QModelIndex &sourceParent ) const;

@@ -62,7 +62,7 @@ Returns the standard browser data collection icon.
virtual QgsAbstractDatabaseProviderConnection *databaseConnection() const;


public:
protected:

static QIcon openDirIcon( const QColor &fillColor = QColor(), const QColor &strokeColor = QColor() );
%Docstring
@@ -419,7 +419,7 @@ Ownership of the returned objects is transferred to the caller.
.. versionadded:: 3.16
%End

public:
protected:
virtual void populate( const QVector<QgsDataItem *> &children );

virtual void refresh( const QVector<QgsDataItem *> &children );
@@ -187,7 +187,7 @@ This is a persistent setting, which is saved in QSettings.

void directoryChanged();

public:
protected:
void init();


@@ -208,7 +208,7 @@ Browser parameter widget implementation for directory items.
public:
QgsDirectoryParamWidget( const QString &path, QWidget *parent /TransferThis/ = 0 );

public:
protected:
virtual void mousePressEvent( QMouseEvent *event );


@@ -106,7 +106,7 @@ Use :py:class:`QgsDataItemGuiProvider`.deleteLayer instead
QGIS 3.10
%End

public:
protected:

public:

@@ -17,7 +17,7 @@ A zip file: contains layers, using GDAL/OGR VSIFILE mechanism
%TypeHeaderCode
#include "qgszipitem.h"
%End
public:
protected:

public:
QgsZipItem( QgsDataItem *parent, const QString &name, const QString &path );

0 comments on commit c6008b7

Please sign in to comment.