Use class enum

qgis · Oct 30, 2019 · 312c869 · 312c869
1 parent 1bfa34a
commit 312c869
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/python/core/auto_additions/qgsdxfexport.py b/python/core/auto_additions/qgsdxfexport.py
@@ -0,0 +1,8 @@
+# The following has been generated automatically from src/core/dxf/qgsdxfexport.h
+# monkey patching scoped based enum
+QgsDxfExport.ExportResult.Success.__doc__ = "Successful export"
+QgsDxfExport.ExportResult.InvalidDeviceError.__doc__ = "Invalid device error"
+QgsDxfExport.ExportResult.DeviceNotWritableError.__doc__ = "Device not writable error"
+QgsDxfExport.ExportResult.EmptyExtentError.__doc__ = "Empty extent, no extent given and no extent could be derived from layers"
+QgsDxfExport.ExportResult.__doc__ = 'The result of an export as dxf operaion\n\n.. versionadded:: 3.12\n\n' + '* ``Success``: ' + QgsDxfExport.ExportResult.Success.__doc__ + '\n' + '* ``InvalidDeviceError``: ' + QgsDxfExport.ExportResult.InvalidDeviceError.__doc__ + '\n' + '* ``DeviceNotWritableError``: ' + QgsDxfExport.ExportResult.DeviceNotWritableError.__doc__ + '\n' + '* ``EmptyExtentError``: ' + QgsDxfExport.ExportResult.EmptyExtentError.__doc__
+# --
diff --git a/python/core/auto_generated/dxf/qgsdxfexport.sip.in b/python/core/auto_generated/dxf/qgsdxfexport.sip.in
@@ -52,7 +52,7 @@ The attribute value is used for layer names.
     typedef QFlags<QgsDxfExport::Flag> Flags;
 
 
-    enum ExportResult
+    enum class ExportResult
     {
       Success,
       InvalidDeviceError,

diff --git a/src/app/main.cpp b/src/app/main.cpp
@@ -1531,7 +1531,7 @@ int main( int argc, char *argv[] )
 
     delete qgis;
 
-    return res;
+    return static_cast<int>( res );
   }
 
   // make sure we don't have a dirty blank project after launch

diff --git a/src/core/dxf/qgsdxfexport.cpp b/src/core/dxf/qgsdxfexport.cpp
@@ -505,12 +505,12 @@ QgsDxfExport::ExportResult QgsDxfExport::writeToFile( QIODevice *d, const QStrin
 {
   if ( !d )
   {
-    return InvalidDeviceError;
+    return ExportResult::InvalidDeviceError;
   }
 
   if ( !d->isOpen() && !d->open( QIODevice::WriteOnly | QIODevice::Truncate ) )
   {
-    return DeviceNotWritableError;
+    return ExportResult::DeviceNotWritableError;
   }
 
   mTextStream.setDevice( d );
@@ -546,7 +546,7 @@ QgsDxfExport::ExportResult QgsDxfExport::writeToFile( QIODevice *d, const QStrin
   }
 
   if ( mExtent.isEmpty() )
-    return EmptyExtentError;
+    return ExportResult::EmptyExtentError;
 
   QgsUnitTypes::DistanceUnit mapUnits = mCrs.mapUnits();
   mMapSettings.setExtent( mExtent );
@@ -562,7 +562,7 @@ QgsDxfExport::ExportResult QgsDxfExport::writeToFile( QIODevice *d, const QStrin
   writeEntities();
   writeEndFile();
 
-  return Success;
+  return ExportResult::Success;
 }
 
 QgsUnitTypes::DistanceUnit QgsDxfExport::mapUnits() const

diff --git a/src/core/dxf/qgsdxfexport.h b/src/core/dxf/qgsdxfexport.h
@@ -100,7 +100,7 @@ class CORE_EXPORT QgsDxfExport
      *
      * \since QGIS 3.12
      */
-    enum ExportResult
+    enum class ExportResult
     {
       Success = 0, //!< Successful export
       InvalidDeviceError, //!< Invalid device error