Finalize FID_NULL

qgis · Oct 2, 2018 · c35ea6e · c35ea6e
1 parent 626ad6c
commit c35ea6e
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/src/core/qgsfeatureid.h b/src/core/qgsfeatureid.h
@@ -24,11 +24,11 @@ email                : matthias@opengis.ch
 // 64 bit feature ids
 typedef qint64 QgsFeatureId SIP_SKIP;
 #define FID_NULL            std::numeric_limits<QgsFeatureId>::min()
-#define FID_IS_NULL(fid)    (fid==std::numeric_limits<QgsFeatureId>::min())
-#define FID_IS_NEW(fid)     (fid<0)
-#define FID_TO_NUMBER(fid)  static_cast<qint64>(fid)
-#define FID_TO_STRING(fid)  QString::number( fid )
-#define STRING_TO_FID(str)  (str).toLongLong()
+#define FID_IS_NULL(fid)    ( fid == std::numeric_limits<QgsFeatureId>::min() )
+#define FID_IS_NEW(fid)     ( fid < 0 && fid != std::numeric_limits<QgsFeatureId>::min() )
+#define FID_TO_NUMBER(fid)  static_cast<qint64>( fid )
+#define FID_TO_STRING(fid)  ( fid != std::numeric_limits<QgsFeatureId>::min() ? QString::number( fid ) : QStringLiteral( "NULL" ) )
+#define STRING_TO_FID(str)  ( ( fid != QLatin1String( "NULL" ) ) ? (str).toLongLong() : std::numeric_limits<QgsFeatureId>::min() )
 
 #ifndef SIP_RUN
 typedef QSet<QgsFeatureId> QgsFeatureIds;