Skip to content

Commit d124011

Browse files
committed
use QStringLiteral
1 parent c42af60 commit d124011

File tree

6 files changed

+16
-13
lines changed

6 files changed

+16
-13
lines changed

python/core/core_auto.sip

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -376,6 +376,8 @@
376376
%Include raster/qgsrasterdataprovider.sip
377377
%Include raster/qgsrasterinterface.sip
378378
%Include raster/qgsrasterprojector.sip
379+
%Include mesh/qgsmeshdataprovider.sip
380+
%Include mesh/qgsmeshlayer.sip
379381
%Include geometry/qgsabstractgeometry.sip
380382
%Include geometry/qgsgeometry.sip
381383
%Include geometry/qgspoint.sip
@@ -433,6 +435,3 @@
433435
%Include qgsuserprofilemanager.sip
434436
%Include symbology/qgsarrowsymbollayer.sip
435437
%Include qgsuserprofile.sip
436-
%Include mesh/qgsmeshdataprovider.sip
437-
%Include mesh/qgsmeshlayer.sip
438-

python/core/mesh/qgsmeshdataprovider.sip.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,8 @@ Base class for providing data for :py:class:`QgsMeshLayer`
6969
Responsible for reading native mesh data
7070

7171
.. seealso:: :py:class:`QgsMeshSource`
72+
73+
.. versionadded:: 3.2
7274
%End
7375

7476
%TypeHeaderCode

src/core/mesh/qgsmeshdataprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,7 @@ class CORE_EXPORT QgsMeshSource SIP_ABSTRACT
7878
* Responsible for reading native mesh data
7979
*
8080
* \see QgsMeshSource
81-
*
81+
* \since QGIS 3.2
8282
*/
8383
class CORE_EXPORT QgsMeshDataProvider: public QgsDataProvider, public QgsMeshSource
8484
{

src/core/mesh/qgsmeshmemorydataprovider.cpp

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -26,12 +26,12 @@ bool QgsMeshMemoryDataProvider::isValid() const
2626

2727
QString QgsMeshMemoryDataProvider::name() const
2828
{
29-
return "mesh_memory";
29+
return TEXT_PROVIDER_KEY;
3030
}
3131

3232
QString QgsMeshMemoryDataProvider::description() const
3333
{
34-
return "memory data provider for mesh layer";
34+
return TEXT_PROVIDER_DESCRIPTION;
3535
}
3636

3737
QgsCoordinateReferenceSystem QgsMeshMemoryDataProvider::crs() const
@@ -41,7 +41,6 @@ QgsCoordinateReferenceSystem QgsMeshMemoryDataProvider::crs() const
4141

4242
QgsMeshMemoryDataProvider::QgsMeshMemoryDataProvider( const QString &uri )
4343
: QgsMeshDataProvider( uri )
44-
, mIsValid( false )
4544
{
4645
mIsValid = splitSections( uri );
4746
}
@@ -67,7 +66,7 @@ QgsMeshMemoryDataProvider *QgsMeshMemoryDataProvider::createProvider( const QStr
6766

6867
bool QgsMeshMemoryDataProvider::splitSections( const QString &uri )
6968
{
70-
QStringList sections = uri.split( "---", QString::SkipEmptyParts );
69+
const QStringList sections = uri.split( QStringLiteral( "---" ), QString::SkipEmptyParts );
7170
if ( sections.size() != 2 )
7271
{
7372
setError( QgsError( QStringLiteral( "Invalid mesh definition, does not contain 2 sections" ),
@@ -85,10 +84,10 @@ bool QgsMeshMemoryDataProvider::addVertices( const QString &def )
8584
{
8685
QVector<QgsMeshVertex> vertices;
8786

88-
QStringList verticesCoords = def.split( "\n", QString::SkipEmptyParts );
87+
const QStringList verticesCoords = def.split( '\n', QString::SkipEmptyParts );
8988
for ( int i = 0; i < verticesCoords.size(); ++i )
9089
{
91-
QStringList coords = verticesCoords[i].split( ",", QString::SkipEmptyParts );
90+
const QStringList coords = verticesCoords[i].split( ',', QString::SkipEmptyParts );
9291
if ( coords.size() != 2 )
9392
{
9493
setError( QgsError( QStringLiteral( "Invalid mesh definition, vertex definition does not contain x, y" ),
@@ -109,10 +108,10 @@ bool QgsMeshMemoryDataProvider::addFaces( const QString &def )
109108
{
110109
QVector<QgsMeshFace> faces;
111110

112-
QStringList facesVertices = def.split( "\n", QString::SkipEmptyParts );
111+
const QStringList facesVertices = def.split( '\n', QString::SkipEmptyParts );
113112
for ( int i = 0; i < facesVertices.size(); ++i )
114113
{
115-
QStringList vertices = facesVertices[i].split( ",", QString::SkipEmptyParts );
114+
const QStringList vertices = facesVertices[i].split( ',', QString::SkipEmptyParts );
116115
if ( vertices.size() < 3 )
117116
{
118117
setError( QgsError( QStringLiteral( "Invalid mesh definition, face must contain at least 3 vertices" ),

src/core/mesh/qgsmeshmemorydataprovider.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -90,7 +90,7 @@ class QgsMeshMemoryDataProvider: public QgsMeshDataProvider
9090
QVector<QgsMeshVertex> mVertices;
9191
QVector<QgsMeshFace> mFaces;
9292

93-
bool mIsValid;
93+
bool mIsValid = false;
9494
};
9595

9696
///@endcond

src/core/mesh/qgstriangularmesh.h

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,10 @@ struct CORE_EXPORT QgsMesh
3838
};
3939

4040
/**
41+
* \ingroup core
42+
*
4143
* Triangular/Derived Mesh
44+
*
4245
* \since QGIS 3.2
4346
*/
4447
class CORE_EXPORT QgsTriangularMesh

0 commit comments

Comments
 (0)