Permalink
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Browse files
Merge pull request #5166 from nyalldawson/tidy
- Loading branch information
Showing
613 changed files
with
845 additions
and
2,072 deletions.
|
@@ -107,7 +107,11 @@ class QgsGraph |
|
|
#include "qgsgraph.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsGraph(); |
|
|
%Docstring |
|
|
Constructor for QgsGraph. |
|
|
%End |
|
|
|
|
|
|
|
|
int addVertex( const QgsPointXY &pt ); |
|
|
|
@@ -19,6 +19,7 @@ class QgsDiagram |
|
|
#include "qgsdiagram.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
virtual ~QgsDiagram(); |
|
|
|
|
|
virtual QgsDiagram *clone() const = 0 /Factory/; |
|
@@ -71,7 +72,11 @@ Returns the size in map units the diagram will use to render. Interpolate size |
|
|
%End |
|
|
|
|
|
protected: |
|
|
|
|
|
QgsDiagram(); |
|
|
%Docstring |
|
|
Constructor for QgsDiagram. |
|
|
%End |
|
|
QgsDiagram( const QgsDiagram &other ); |
|
|
|
|
|
void setPenWidth( QPen &pen, const QgsDiagramSettings &s, const QgsRenderContext &c ); |
|
|
|
@@ -35,6 +35,9 @@ class QgsValueRelationFieldFormatter : QgsFieldFormatter |
|
|
typedef QVector < QgsValueRelationFieldFormatter::ValueRelationItem > ValueRelationCache; |
|
|
|
|
|
QgsValueRelationFieldFormatter(); |
|
|
%Docstring |
|
|
Constructor for QgsValueRelationFieldFormatter. |
|
|
%End |
|
|
|
|
|
virtual QString id() const; |
|
|
|
|
|
|
@@ -25,7 +25,11 @@ class QgsGPSConnectionRegistry |
|
|
#include "qgsgpsconnectionregistry.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsGPSConnectionRegistry(); |
|
|
%Docstring |
|
|
Constructor for QgsGPSConnectionRegistry. |
|
|
%End |
|
|
~QgsGPSConnectionRegistry(); |
|
|
|
|
|
|
|
|
|
@@ -21,7 +21,6 @@ class QgsGpsdConnection: QgsNMEAConnection |
|
|
%End |
|
|
public: |
|
|
QgsGpsdConnection( const QString &host, qint16 port, const QString &device ); |
|
|
~QgsGpsdConnection(); |
|
|
|
|
|
}; |
|
|
|
|
|
|
@@ -20,7 +20,6 @@ class QgsNMEAConnection: QgsGPSConnection |
|
|
%End |
|
|
public: |
|
|
QgsNMEAConnection( QIODevice *dev ); |
|
|
~QgsNMEAConnection(); |
|
|
|
|
|
protected slots: |
|
|
virtual void parseData(); |
|
|
|
@@ -28,7 +28,6 @@ class QgsQtLocationConnection: QgsGPSConnection |
|
|
%End |
|
|
public: |
|
|
QgsQtLocationConnection(); |
|
|
~QgsQtLocationConnection(); |
|
|
|
|
|
protected slots: |
|
|
void broadcastConnectionAvailable(); |
|
|
|
@@ -286,6 +286,9 @@ class QgsProjectColorScheme : QgsColorScheme |
|
|
public: |
|
|
|
|
|
QgsProjectColorScheme(); |
|
|
%Docstring |
|
|
Constructor for QgsProjectColorScheme. |
|
|
%End |
|
|
|
|
|
virtual QString schemeName() const; |
|
|
|
|
|
|
@@ -30,6 +30,9 @@ class QgsCredentials |
|
|
public: |
|
|
|
|
|
virtual ~QgsCredentials(); |
|
|
%Docstring |
|
|
Destructor. |
|
|
%End |
|
|
|
|
|
bool get( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() ); |
|
|
%Docstring |
|
@@ -70,7 +73,11 @@ retrieves instance |
|
|
%End |
|
|
|
|
|
protected: |
|
|
|
|
|
QgsCredentials(); |
|
|
%Docstring |
|
|
Constructor for QgsCredentials. |
|
|
%End |
|
|
|
|
|
virtual bool request( const QString &realm, QString &username /In,Out/, QString &password /In,Out/, const QString &message = QString() ) = 0; |
|
|
%Docstring |
|
|
|
@@ -25,7 +25,11 @@ class QgsDataDefinedSizeLegend |
|
|
#include "qgsdatadefinedsizelegend.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsDataDefinedSizeLegend(); |
|
|
%Docstring |
|
|
Constructor for QgsDataDefinedSizeLegend. |
|
|
%End |
|
|
|
|
|
QgsDataDefinedSizeLegend( const QgsDataDefinedSizeLegend &other ); |
|
|
%Docstring |
|
|
|
@@ -11,7 +11,6 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
class QgsDiagramLayerSettings |
|
|
{ |
|
|
%Docstring |
|
|
|
@@ -31,6 +31,9 @@ class QgsExpressionFieldBuffer |
|
|
}; |
|
|
|
|
|
QgsExpressionFieldBuffer(); |
|
|
%Docstring |
|
|
Constructor for QgsExpressionFieldBuffer. |
|
|
%End |
|
|
|
|
|
void addExpression( const QString &exp, const QgsField &fld ); |
|
|
%Docstring |
|
|
|
@@ -18,7 +18,11 @@ class QgsGmlFeatureClass |
|
|
#include "qgsgmlschema.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsGmlFeatureClass(); |
|
|
%Docstring |
|
|
Constructor for QgsGmlFeatureClass. |
|
|
%End |
|
|
QgsGmlFeatureClass( const QString &name, const QString &path ); |
|
|
|
|
|
QList<QgsField> &fields(); |
|
|
|
@@ -248,7 +248,7 @@ class QgsJsonUtils |
|
|
%End |
|
|
|
|
|
static QString exportAttributes( const QgsFeature &feature, QgsVectorLayer *layer = 0, |
|
|
QVector<QVariant> attributeWidgetCaches = QVector<QVariant>() ); |
|
|
const QVector<QVariant> &attributeWidgetCaches = QVector<QVariant>() ); |
|
|
%Docstring |
|
|
Exports all attributes from a QgsFeature as a JSON map type. |
|
|
\param feature feature to export |
|
|
|
@@ -20,7 +20,11 @@ class QgsLabelSearchTree |
|
|
#include "qgslabelsearchtree.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsLabelSearchTree(); |
|
|
%Docstring |
|
|
Constructor for QgsLabelSearchTree. |
|
|
%End |
|
|
~QgsLabelSearchTree(); |
|
|
|
|
|
|
|
|
|
@@ -48,7 +48,7 @@ class QgsMapRendererTask : QgsTask |
|
|
Adds ``annotations`` to be rendered on the map. |
|
|
%End |
|
|
|
|
|
void addDecorations( QList< QgsMapDecoration * > decorations ); |
|
|
void addDecorations( const QList<QgsMapDecoration *> &decorations ); |
|
|
%Docstring |
|
|
Adds ``decorations`` to be rendered on the map. |
|
|
%End |
|
|
|
@@ -23,7 +23,11 @@ class QgsObjectCustomProperties |
|
|
#include "qgsobjectcustomproperties.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsObjectCustomProperties(); |
|
|
%Docstring |
|
|
Constructor for QgsObjectCustomProperties. |
|
|
%End |
|
|
|
|
|
QStringList keys() const; |
|
|
%Docstring |
|
|
|
@@ -68,6 +68,9 @@ class QgsPluginLayerRegistry |
|
|
public: |
|
|
|
|
|
QgsPluginLayerRegistry(); |
|
|
%Docstring |
|
|
Constructor for QgsPluginLayerRegistry. |
|
|
%End |
|
|
~QgsPluginLayerRegistry(); |
|
|
|
|
|
|
|
|
|
@@ -368,6 +368,9 @@ class QgsPropertyCollectionStack : QgsAbstractPropertyCollection |
|
|
public: |
|
|
|
|
|
QgsPropertyCollectionStack(); |
|
|
%Docstring |
|
|
Constructor for QgsPropertyCollectionStack. |
|
|
%End |
|
|
|
|
|
~QgsPropertyCollectionStack(); |
|
|
|
|
|
|
@@ -339,11 +339,6 @@ class QgsGenericNumericTransformer : QgsPropertyTransformer |
|
|
\param exponent optional exponential for non-linear scaling |
|
|
%End |
|
|
|
|
|
QgsGenericNumericTransformer( const QgsGenericNumericTransformer &other ); |
|
|
%Docstring |
|
|
Copy constructor. |
|
|
%End |
|
|
|
|
|
virtual Type transformerType() const; |
|
|
virtual QgsGenericNumericTransformer *clone() const /Factory/; |
|
|
virtual QVariant toVariant() const; |
|
@@ -475,11 +470,6 @@ class QgsSizeScaleTransformer : QgsPropertyTransformer |
|
|
\param exponent exponent for Exponential scaling method |
|
|
%End |
|
|
|
|
|
QgsSizeScaleTransformer( const QgsSizeScaleTransformer &other ); |
|
|
%Docstring |
|
|
Copy constructor. |
|
|
%End |
|
|
|
|
|
virtual Type transformerType() const; |
|
|
virtual QgsSizeScaleTransformer *clone() const /Factory/; |
|
|
virtual QVariant toVariant() const; |
|
|
|
@@ -20,7 +20,11 @@ class QgsReadWriteContext |
|
|
#include "qgsreadwritecontext.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsReadWriteContext(); |
|
|
%Docstring |
|
|
Constructor for QgsReadWriteContext. |
|
|
%End |
|
|
|
|
|
const QgsPathResolver &pathResolver() const; |
|
|
%Docstring |
|
|
|
@@ -166,7 +166,7 @@ Returns a list of all key top-level groups (same as childGroups) but only for gr |
|
|
Return the path to the Global Settings QSettings storage file |
|
|
:rtype: str |
|
|
%End |
|
|
static bool setGlobalSettingsPath( QString path ); |
|
|
static bool setGlobalSettingsPath( const QString &path ); |
|
|
%Docstring |
|
|
Set the Global Settings QSettings storage file |
|
|
:rtype: bool |
|
|
|
@@ -14,7 +14,11 @@ class QgsTrackedVectorLayerTools : QgsVectorLayerTools |
|
|
#include "qgstrackedvectorlayertools.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsTrackedVectorLayerTools(); |
|
|
%Docstring |
|
|
Constructor for QgsTrackedVectorLayerTools. |
|
|
%End |
|
|
|
|
|
virtual bool addFeature( QgsVectorLayer *layer, const QgsAttributeMap &defaultValues, const QgsGeometry &defaultGeometry, QgsFeature *feature ) const; |
|
|
|
|
|
|
@@ -20,7 +20,11 @@ Bilinear Raster Resampler |
|
|
#include "qgsbilinearrasterresampler.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsBilinearRasterResampler(); |
|
|
%Docstring |
|
|
Constructor for QgsBilinearRasterResampler. |
|
|
%End |
|
|
|
|
|
virtual void resample( const QImage &srcImage, QImage &dstImage ); |
|
|
|
|
|
|
@@ -34,6 +34,10 @@ class QgsRasterPipe |
|
|
}; |
|
|
|
|
|
QgsRasterPipe(); |
|
|
%Docstring |
|
|
Constructor for QgsRasterPipe. |
|
|
%End |
|
|
|
|
|
|
|
|
~QgsRasterPipe(); |
|
|
|
|
|
|
@@ -19,7 +19,11 @@ class QgsRasterTransparency |
|
|
#include "qgsrastertransparency.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsRasterTransparency(); |
|
|
%Docstring |
|
|
Constructor for QgsRasterTransparency. |
|
|
%End |
|
|
|
|
|
struct TransparentThreeValuePixel |
|
|
{ |
|
@@ -87,8 +91,14 @@ True if there are no entries in the pixel lists except the nodata value |
|
|
%End |
|
|
|
|
|
void writeXml( QDomDocument &doc, QDomElement &parentElem ) const; |
|
|
%Docstring |
|
|
Writes the transparency information to an XML document. |
|
|
%End |
|
|
|
|
|
void readXml( const QDomElement &elem ); |
|
|
%Docstring |
|
|
Reads the transparency information from an XML document. |
|
|
%End |
|
|
|
|
|
}; |
|
|
/************************************************************************ |
|
|
|
@@ -78,7 +78,6 @@ class QgsCategorizedSymbolRenderer : QgsFeatureRenderer |
|
|
public: |
|
|
|
|
|
QgsCategorizedSymbolRenderer( const QString &attrName = QString(), const QgsCategoryList &categories = QgsCategoryList() ); |
|
|
~QgsCategorizedSymbolRenderer(); |
|
|
|
|
|
virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context ); |
|
|
virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context ); |
|
|
|
@@ -17,7 +17,6 @@ class QgsSingleSymbolRenderer : QgsFeatureRenderer |
|
|
public: |
|
|
|
|
|
QgsSingleSymbolRenderer( QgsSymbol *symbol /Transfer/ ); |
|
|
~QgsSingleSymbolRenderer(); |
|
|
|
|
|
virtual QgsSymbol *symbolForFeature( QgsFeature &feature, QgsRenderContext &context ); |
|
|
virtual QgsSymbol *originalSymbolForFeature( QgsFeature &feature, QgsRenderContext &context ); |
|
|
|
@@ -34,7 +34,6 @@ class QgsFeatureListModel : QAbstractProxyModel, QgsFeatureModel |
|
|
|
|
|
public: |
|
|
explicit QgsFeatureListModel( QgsAttributeTableFilterModel *sourceModel, QObject *parent /TransferThis/ = 0 ); |
|
|
virtual ~QgsFeatureListModel(); |
|
|
|
|
|
virtual void setSourceModel( QgsAttributeTableFilterModel *sourceModel ); |
|
|
QgsVectorLayerCache *layerCache(); |
|
|
|
@@ -28,8 +28,6 @@ class QgsFieldConditionalFormatWidget : QWidget |
|
|
\param parent parent widget |
|
|
%End |
|
|
|
|
|
~QgsFieldConditionalFormatWidget(); |
|
|
|
|
|
void viewRules(); |
|
|
%Docstring |
|
|
Switches the widget to the rules page. |
|
|
|
@@ -32,7 +32,7 @@ class QgsFileDownloader : QObject |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsFileDownloader( const QUrl &url, const QString &outputFileName, bool guiNotificationsEnabled = true, QString authcfg = QString() ); |
|
|
QgsFileDownloader( const QUrl &url, const QString &outputFileName, bool guiNotificationsEnabled = true, const QString &authcfg = QString() ); |
|
|
%Docstring |
|
|
QgsFileDownloader |
|
|
\param url the download url |
|
|
|
@@ -30,7 +30,11 @@ class QgsSourceSelectProviderRegistry |
|
|
#include "qgssourceselectproviderregistry.h" |
|
|
%End |
|
|
public: |
|
|
|
|
|
QgsSourceSelectProviderRegistry(); |
|
|
%Docstring |
|
|
Constructor for QgsSourceSelectProviderRegistry. |
|
|
%End |
|
|
|
|
|
~QgsSourceSelectProviderRegistry(); |
|
|
|
|
|
|
@@ -75,7 +75,6 @@ class QgsSvgSelectorWidget : QWidget |
|
|
%End |
|
|
public: |
|
|
QgsSvgSelectorWidget( QWidget *parent /TransferThis/ = 0 ); |
|
|
~QgsSvgSelectorWidget(); |
|
|
|
|
|
QString currentSvgPath() const; |
|
|
%Docstring |
|
|
|
@@ -26,6 +26,9 @@ class QgsSymbolWidgetContext |
|
|
public: |
|
|
|
|
|
QgsSymbolWidgetContext(); |
|
|
%Docstring |
|
|
Constructor for QgsSymbolWidgetContext. |
|
|
%End |
|
|
|
|
|
QgsSymbolWidgetContext( const QgsSymbolWidgetContext &other ); |
|
|
%Docstring |
|
|
Oops, something went wrong.