Ran scripts/astyle-all.sh and scripts/sipify_all.sh

qgis · Feb 24, 2019 · 403a2e3 · 403a2e3
1 parent 09efa48
commit 403a2e3
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 27 deletions.
diff --git a/python/core/auto_generated/mesh/qgsmeshlayer.sip.in b/python/core/auto_generated/mesh/qgsmeshlayer.sip.in
@@ -77,7 +77,7 @@ is the MDAL connection string. QGIS must be built with MDAL support to allow thi
 
     struct LayerOptions
     {
-      int unused;  //! @todo remove me once there are actual members here (breaks SIP <4.19)
+      int unused;  //!< @todo remove me once there are actual members here (breaks SIP <4.19)
     };
 
     explicit QgsMeshLayer( const QString &path = QString(), const QString &baseName = QString(), const QString &providerLib = "mesh_memory",

diff --git a/python/core/auto_generated/qgsdataprovider.sip.in b/python/core/auto_generated/qgsdataprovider.sip.in
@@ -58,7 +58,7 @@ Abstract base class for spatial data provider implementations.
 
     struct ProviderOptions
     {
-      int unused; //! @todo remove me once there are actual members here (breaks SIP <4.19)
+      int unused; //!< @todo remove me once there are actual members here (breaks SIP <4.19)
     };
 
     QgsDataProvider( const QString &uri = QString(), const QgsDataProvider::ProviderOptions &options = QgsDataProvider::ProviderOptions() );

diff --git a/src/core/pal/pal.h b/src/core/pal/pal.h
@@ -62,7 +62,7 @@ namespace pal
     POPMUSIC_TABU_CHAIN = 1, //!< Is the best but slowest
     POPMUSIC_TABU = 2, //!< Is a little bit better than CHAIN but slower
     POPMUSIC_CHAIN = 3, //!< Is slower and best than TABU, worse and faster than TABU_CHAIN
-    FALP = 4 //!< only initial solution
+    FALP = 4 //!< Only initial solution
   };
 
   //! Enumeration line arrangement flags. Flags can be combined.

diff --git a/src/core/qgsdiagramrenderer.h b/src/core/qgsdiagramrenderer.h
@@ -89,8 +89,8 @@ class CORE_EXPORT QgsDiagramLayerSettings
       BackgroundColor, //!< Diagram background color
       StrokeColor, //!< Stroke color
       StrokeWidth, //!< Stroke width
-      PositionX, //!< x-coordinate data defined diagram position
-      PositionY, //!< y-coordinate data defined diagram position
+      PositionX, //!< X-coordinate data defined diagram position
+      PositionY, //!< Y-coordinate data defined diagram position
       Distance, //!< Distance to diagram from feature
       Priority, //!< Diagram priority (between 0 and 10)
       ZIndex, //!< Z-index for diagram ordering

diff --git a/src/core/qgsunittypes.h b/src/core/qgsunittypes.h
@@ -114,7 +114,7 @@ class CORE_EXPORT QgsUnitTypes
       RenderMapUnits, //!< Map units
       RenderPixels, //!< Pixels
       RenderPercentage, //!< Percentage of another measurement (e.g., canvas size, feature size)
-      RenderPoints, //!< points (e.g., for font sizes)
+      RenderPoints, //!< Points (e.g., for font sizes)
       RenderInches, //!< Inches
       RenderUnknownUnit, //!< Mixed or unknown units
       RenderMetersInMapUnits, //!< Meters value as Map units

diff --git a/src/providers/oracle/qgsoraclefeatureiterator.h b/src/providers/oracle/qgsoraclefeatureiterator.h
@@ -39,11 +39,11 @@ class QgsOracleFeatureSource : public QgsAbstractFeatureSource
     QgsDataSourceUri mUri;
     QgsFields mFields;
 
-    QString mGeometryColumn;          //!< name of the geometry column
-    int mSrid;                        //!< srid of column
-    bool mHasSpatialIndex;            //!< has spatial index of geometry column
-    QgsWkbTypes::Type mDetectedGeomType;  //!< geometry type detected in the database
-    QgsWkbTypes::Type mRequestedGeomType; //!< geometry type requested in the uri
+    QString mGeometryColumn;          //!< Name of the geometry column
+    int mSrid;                        //!< Srid of column
+    bool mHasSpatialIndex;            //!< Has spatial index of geometry column
+    QgsWkbTypes::Type mDetectedGeomType;  //!< Geometry type detected in the database
+    QgsWkbTypes::Type mRequestedGeomType; //!< Geometry type requested in the uri
     QString mSqlWhereClause;
     QgsOraclePrimaryKeyType mPrimaryKeyType;
     QList<int> mPrimaryKeyAttrs;

diff --git a/src/providers/oracle/qgsoracleprovider.h b/src/providers/oracle/qgsoracleprovider.h
@@ -238,14 +238,14 @@ class QgsOracleProvider : public QgsVectorDataProvider
     QList<int> mPrimaryKeyAttrs;
     QString mPrimaryKeyDefault;
 
-    QString mGeometryColumn;           //!< name of the geometry column
+    QString mGeometryColumn;           //!< Name of the geometry column
     mutable QgsRectangle mLayerExtent; //!< Rectangle that contains the extent (bounding box) of the layer
     mutable long mFeaturesCounted;     //!< Number of features in the layer
-    int mSrid;                         //!< srid of column
-    QgsVectorDataProvider::Capabilities mEnabledCapabilities;          //!< capabilities of layer
+    int mSrid;                         //!< Srid of column
+    QgsVectorDataProvider::Capabilities mEnabledCapabilities;          //!< Capabilities of layer
 
-    QgsWkbTypes::Type mDetectedGeomType;   //!< geometry type detected in the database
-    QgsWkbTypes::Type mRequestedGeomType;  //!< geometry type requested in the uri
+    QgsWkbTypes::Type mDetectedGeomType;   //!< Geometry type detected in the database
+    QgsWkbTypes::Type mRequestedGeomType;  //!< Geometry type requested in the uri
 
     bool getGeometryDetails();
 
@@ -299,12 +299,12 @@ class QgsOracleProvider : public QgsVectorDataProvider
     static QString quotedIdentifier( QString ident ) { return QgsOracleConn::quotedIdentifier( ident ); }
     static QString quotedValue( const QVariant &value, QVariant::Type type = QVariant::Invalid ) { return QgsOracleConn::quotedValue( value, type ); }
 
-    QMap<QVariant, QgsFeatureId> mKeyToFid;  //!< map key values to feature id
-    QMap<QgsFeatureId, QVariant> mFidToKey;  //!< map feature back to fea
+    QMap<QVariant, QgsFeatureId> mKeyToFid;  //!< Map key values to feature id
+    QMap<QgsFeatureId, QVariant> mFidToKey;  //!< Map feature back to fea
     QgsOracleConn *mConnection = nullptr;
 
     bool mHasSpatialIndex;                   //!< Geometry column is indexed
-    QString mSpatialIndexName;               //!< name of spatial index of geometry column
+    QString mSpatialIndexName;               //!< Name of spatial index of geometry column
 
     std::shared_ptr<QgsOracleSharedData> mShared;
 

diff --git a/src/providers/postgres/qgspostgresconn.h b/src/providers/postgres/qgspostgresconn.h
@@ -431,7 +431,7 @@ class QgsPostgresConn : public QObject
 
     int mNextCursorId;
 
-    bool mShared; //!< whether the connection is shared by more providers (must not be if going to be used in worker threads)
+    bool mShared; //!< Whether the connection is shared by more providers (must not be if going to be used in worker threads)
 
     bool mTransaction;
 

diff --git a/src/providers/postgres/qgspostgresfeatureiterator.h b/src/providers/postgres/qgspostgresfeatureiterator.h
@@ -44,8 +44,8 @@ class QgsPostgresFeatureSource : public QgsAbstractFeatureSource
     QgsPostgresGeometryColumnType mSpatialColType;
     QString mRequestedSrid;
     QString mDetectedSrid;
-    QgsWkbTypes::Type mRequestedGeomType; //!< geometry type requested in the uri
-    QgsWkbTypes::Type mDetectedGeomType;  //!< geometry type detected in the database
+    QgsWkbTypes::Type mRequestedGeomType; //!< Geometry type requested in the uri
+    QgsWkbTypes::Type mDetectedGeomType;  //!< Geometry type detected in the database
     QgsPostgresPrimaryKeyType mPrimaryKeyType;
     QList<int> mPrimaryKeyAttrs;
     QString mQuery;

diff --git a/src/providers/postgres/qgspostgresprovider.h b/src/providers/postgres/qgspostgresprovider.h
@@ -378,11 +378,11 @@ class QgsPostgresProvider : public QgsVectorDataProvider
     QList<int> mPrimaryKeyAttrs;
     QString mPrimaryKeyDefault;
 
-    QString mGeometryColumn;          //!< name of the geometry column
+    QString mGeometryColumn;          //!< Name of the geometry column
     mutable QgsRectangle mLayerExtent;        //!< Rectangle that contains the extent (bounding box) of the layer
 
-    QgsWkbTypes::Type mDetectedGeomType = QgsWkbTypes::Unknown ;  //!< geometry type detected in the database
-    QgsWkbTypes::Type mRequestedGeomType = QgsWkbTypes::Unknown ; //!< geometry type requested in the uri
+    QgsWkbTypes::Type mDetectedGeomType = QgsWkbTypes::Unknown ;  //!< Geometry type detected in the database
+    QgsWkbTypes::Type mRequestedGeomType = QgsWkbTypes::Unknown ; //!< Geometry type requested in the uri
     QString mDetectedSrid;            //!< Spatial reference detected in the database
     QString mRequestedSrid;           //!< Spatial reference requested in the uri
 
@@ -438,8 +438,8 @@ class QgsPostgresProvider : public QgsVectorDataProvider
 
     QString paramValue( const QString &fieldvalue, const QString &defaultValue ) const;
 
-    QgsPostgresConn *mConnectionRO = nullptr ; //!< read-only database connection (initially)
-    QgsPostgresConn *mConnectionRW = nullptr ; //!< read-write database connection (on update)
+    QgsPostgresConn *mConnectionRO = nullptr ; //!< Read-only database connection (initially)
+    QgsPostgresConn *mConnectionRW = nullptr ; //!< Read-write database connection (on update)
 
     QgsPostgresConn *connectionRO() const;
     QgsPostgresConn *connectionRW();