match Qt naming schema for factories

PeterPetrik · PeterPetrik · commit b55db3dfb543 · 2018-06-28T16:43:08.000+02:00
diff --git a/src/quickgui/qgsquickutils.cpp b/src/quickgui/qgsquickutils.cpp
@@ -42,12 +42,12 @@ QgsCoordinateReferenceSystem QgsQuickUtils::coordinateReferenceSystemFromEpsgId(
   return QgsCoordinateReferenceSystem::fromEpsgId( epsg );
 }
 
-QgsPointXY QgsQuickUtils::pointXYFactory( double x, double y ) const
+QgsPointXY QgsQuickUtils::pointXY( double x, double y ) const
 {
   return QgsPointXY( x, y );
 }
 
-QgsPoint QgsQuickUtils::pointFactory( double x, double y, double z, double m ) const
+QgsPoint QgsQuickUtils::point( double x, double y, double z, double m ) const
 {
   return QgsPoint( x, y, z, m );
 }
diff --git a/src/quickgui/qgsquickutils.h b/src/quickgui/qgsquickutils.h
@@ -84,14 +84,14 @@ class QUICK_EXPORT QgsQuickUtils: public QObject
       *
       * \since QGIS 3.4
       */
-    Q_INVOKABLE QgsPointXY pointXYFactory( double x, double y ) const;
+    Q_INVOKABLE QgsPointXY pointXY( double x, double y ) const;
 
     /**
       * Creates QgsPoint in QML
       *
       * \since QGIS 3.4
       */
-    Q_INVOKABLE QgsPoint pointFactory( double x, double y, double z = std::numeric_limits<double>::quiet_NaN(), double m = std::numeric_limits<double>::quiet_NaN() ) const;
+    Q_INVOKABLE QgsPoint point( double x, double y, double z = std::numeric_limits<double>::quiet_NaN(), double m = std::numeric_limits<double>::quiet_NaN() ) const;
 
     /**
       * Converts QGeoCoordinate to QgsPoint
diff --git a/tests/src/quickgui/testqgsquickutils.cpp b/tests/src/quickgui/testqgsquickutils.cpp
@@ -72,11 +72,11 @@ void TestQgsQuickUtils::screenUnitsToMeters()
 
 void TestQgsQuickUtils::transformedPoint()
 {
-  QgsPointXY pointXY = utils.pointXYFactory( 49.9, 16.3 );
+  QgsPointXY pointXY = utils.pointXY( 49.9, 16.3 );
   QGSCOMPARENEAR( pointXY.x(), 49.9, 1e-4 );
   QGSCOMPARENEAR( pointXY.y(), 16.3, 1e-4 );
 
-  QgsPoint point = utils.pointFactory( 1.0, -1.0 );
+  QgsPoint point = utils.point( 1.0, -1.0 );
   QGSCOMPARENEAR( point.x(), 1.0, 1e-4 );
   QGSCOMPARENEAR( point.y(), -1.0, 1e-4 );
 

Original file line number	Diff line number	Diff line change
`@@ -42,12 +42,12 @@ QgsCoordinateReferenceSystem QgsQuickUtils::coordinateReferenceSystemFromEpsgId(`
`42`	`42`	`return QgsCoordinateReferenceSystem::fromEpsgId( epsg );`
`43`	`43`	`}`
`44`	`44`
`45`		`-QgsPointXY QgsQuickUtils::pointXYFactory( double x, double y ) const`
	`45`	`+QgsPointXY QgsQuickUtils::pointXY( double x, double y ) const`
`46`	`46`	`{`
`47`	`47`	`return QgsPointXY( x, y );`
`48`	`48`	`}`
`49`	`49`
`50`		`-QgsPoint QgsQuickUtils::pointFactory( double x, double y, double z, double m ) const`
	`50`	`+QgsPoint QgsQuickUtils::point( double x, double y, double z, double m ) const`
`51`	`51`	`{`
`52`	`52`	`return QgsPoint( x, y, z, m );`
`53`	`53`	`}`