Rename Qgis::MessageLevel::None to NoLevel. None is a reserved

keyword in Python, so this value was previously inaccessible to PyQGIS scripts Also change all references to Qgis::MessageLevel values to their fully qualified names, to ease a future transition to an enum class (when sip bugs are fixed) Fixes #42996
qgis · May 30, 2021 · 02266ef · 02266ef
1 parent 4e73dd9
commit 02266ef
Show file tree

Hide file tree

Showing 155 changed files with 673 additions and 671 deletions.
diff --git a/python/core/auto_additions/qgis.py b/python/core/auto_additions/qgis.py
@@ -17,6 +17,7 @@
 QgsMapLayer.PointCloudLayer.__doc__ = "Added in 3.18"
 QgsMapLayerType.__doc__ = 'Types of layers that can be added to a map\n\n.. versionadded:: 3.8\n\n' + '* ``VectorLayer``: ' + QgsMapLayerType.VectorLayer.__doc__ + '\n' + '* ``RasterLayer``: ' + QgsMapLayerType.RasterLayer.__doc__ + '\n' + '* ``PluginLayer``: ' + QgsMapLayerType.PluginLayer.__doc__ + '\n' + '* ``MeshLayer``: ' + QgsMapLayerType.MeshLayer.__doc__ + '\n' + '* ``VectorTileLayer``: ' + QgsMapLayerType.VectorTileLayer.__doc__ + '\n' + '* ``AnnotationLayer``: ' + QgsMapLayerType.AnnotationLayer.__doc__ + '\n' + '* ``PointCloudLayer``: ' + QgsMapLayerType.PointCloudLayer.__doc__
 # --
+Qgis.MessageLevel.baseClass = Qgis
 # monkey patching scoped based enum
 Qgis.UnknownDataType = Qgis.DataType.UnknownDataType
 Qgis.UnknownDataType.__doc__ = "Unknown or unspecified type"

diff --git a/python/core/auto_generated/layertree/qgslayertreemodel.sip.in b/python/core/auto_generated/layertree/qgslayertreemodel.sip.in
@@ -324,7 +324,7 @@ displays.
 
   signals:
 
-    void messageEmitted( const QString &message, Qgis::MessageLevel level = Qgis::Info, int duration = 5 );
+    void messageEmitted( const QString &message, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = 5 );
 %Docstring
 Emits a message than can be displayed to the user in a GUI class
 

diff --git a/python/core/auto_generated/locator/qgslocatorfilter.sip.in b/python/core/auto_generated/locator/qgslocatorfilter.sip.in
@@ -310,7 +310,7 @@ custom configuration widget.
    :py:func:`~QgsLocatorFilter.hasConfigWidget` must return ``True`` to indicate that the filter supports configuration.
 %End
 
-    void logMessage( const QString &message, Qgis::MessageLevel level = Qgis::Info );
+    void logMessage( const QString &message, Qgis::MessageLevel level = Qgis::MessageLevel::Info );
 %Docstring
 Logs a ``message`` to the log panel
 

diff --git a/python/core/auto_generated/qgis.sip.in b/python/core/auto_generated/qgis.sip.in
@@ -81,7 +81,7 @@ The development version
       Warning,
       Critical,
       Success,
-      None,
+      NoLevel,
     };
 
     enum class DataType

diff --git a/python/core/auto_generated/qgsmessagelog.sip.in b/python/core/auto_generated/qgsmessagelog.sip.in
@@ -35,7 +35,7 @@ window for the user.
 Constructor for QgsMessageLog.
 %End
 
-    static void logMessage( const QString &message, const QString &tag = QString(), Qgis::MessageLevel level = Qgis::Warning, bool notifyUser = true );
+    static void logMessage( const QString &message, const QString &tag = QString(), Qgis::MessageLevel level = Qgis::MessageLevel::Warning, bool notifyUser = true );
 %Docstring
 Adds a ``message`` to the log instance (and creates it if necessary).
 
@@ -57,7 +57,7 @@ value for the message.
 
     void messageReceived( bool received );
 %Docstring
-Emitted whenever the log receives a message which is not a Qgis.Info level message
+Emitted whenever the log receives a message which is not a Qgis.MessageLevel.Info level message
 and which has the ``notifyUser`` flag as ``True``.
 
 If :py:class:`QgsMessageLogNotifyBlocker` objects have been created then this signal may be
@@ -124,7 +124,7 @@ Constructor for QgsMessageLogConsole.
 
   protected:
 
-    QString formatLogMessage( const QString &message, const QString &tag, Qgis::MessageLevel level = Qgis::Info ) const;
+    QString formatLogMessage( const QString &message, const QString &tag, Qgis::MessageLevel level = Qgis::MessageLevel::Info ) const;
 %Docstring
 Formats a log message. Used by child classes.
 

diff --git a/python/core/auto_generated/qgsreadwritecontext.sip.in b/python/core/auto_generated/qgsreadwritecontext.sip.in
@@ -25,7 +25,7 @@ The class is used as a container of context for various read/write operations on
 
     struct ReadWriteMessage
     {
-        ReadWriteMessage( const QString &message = QString(), Qgis::MessageLevel level = Qgis::Warning, const QStringList &categories = QStringList() );
+        ReadWriteMessage( const QString &message = QString(), Qgis::MessageLevel level = Qgis::MessageLevel::Warning, const QStringList &categories = QStringList() );
 %Docstring
 Construct a container for QgsReadWriteContext error or warning messages
 %End
@@ -74,7 +74,7 @@ Returns path resolver for conversion between relative and absolute paths
 Sets up path resolver for conversion between relative and absolute paths
 %End
 
-    void pushMessage( const QString &message, Qgis::MessageLevel level = Qgis::Warning ) const;
+    void pushMessage( const QString &message, Qgis::MessageLevel level = Qgis::MessageLevel::Warning ) const;
 %Docstring
 Append a message to the context
 

diff --git a/python/gui/auto_generated/processing/models/qgsmodelgraphicsscene.sip.in b/python/gui/auto_generated/processing/models/qgsmodelgraphicsscene.sip.in
@@ -148,7 +148,7 @@ Sets the message ``bar`` associated with the scene.
 .. seealso:: :py:func:`messageBar`
 %End
 
-    void showWarning( const QString &shortMessage, const QString &title, const QString &longMessage, Qgis::MessageLevel level = Qgis::Warning ) const;
+    void showWarning( const QString &shortMessage, const QString &title, const QString &longMessage, Qgis::MessageLevel level = Qgis::MessageLevel::Warning ) const;
 %Docstring
 Shows a warning message, allowing users to click a button to see the full details (``longMessage``).
 %End

diff --git a/python/gui/auto_generated/qgsdataitemguiprovider.sip.in b/python/gui/auto_generated/qgsdataitemguiprovider.sip.in
@@ -158,7 +158,7 @@ The function is replacement of :py:func:`QgsDataItem.paramWidget()`
 .. versionadded:: 3.10
 %End
 
-    static void notify( const QString &title, const QString &message, QgsDataItemGuiContext context, Qgis::MessageLevel level = Qgis::Info, int duration = -1, QWidget *parent = 0 );
+    static void notify( const QString &title, const QString &message, QgsDataItemGuiContext context, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = -1, QWidget *parent = 0 );
 %Docstring
 Notify the user showing a ``message`` with ``title`` and ``level``
 If the context has a message bar the message will be shown in the message bar

diff --git a/python/gui/auto_generated/qgsmapcanvas.sip.in b/python/gui/auto_generated/qgsmapcanvas.sip.in
@@ -1220,7 +1220,7 @@ Emitted when the canvas has been assigned a different map theme.
 .. versionadded:: 3.0
 %End
 
-    void messageEmitted( const QString &title, const QString &message, Qgis::MessageLevel = Qgis::Info );
+    void messageEmitted( const QString &title, const QString &message, Qgis::MessageLevel = Qgis::MessageLevel::Info );
 %Docstring
 emit a message (usually to be displayed in a message bar)
 %End

diff --git a/python/gui/auto_generated/qgsmaptool.sip.in b/python/gui/auto_generated/qgsmaptool.sip.in
@@ -239,7 +239,7 @@ The default implementation does nothing and returns false.
 %End
 
   signals:
-    void messageEmitted( const QString &message, Qgis::MessageLevel = Qgis::Info );
+    void messageEmitted( const QString &message, Qgis::MessageLevel = Qgis::MessageLevel::Info );
 %Docstring
 emit a message
 %End

diff --git a/python/gui/auto_generated/qgsmessagebar.sip.in b/python/gui/auto_generated/qgsmessagebar.sip.in
@@ -50,13 +50,13 @@ and putting it in a stack.
 The message bar will take ownership of ``item``.
 %End
 
-    QgsMessageBarItem *pushWidget( QWidget *widget /Transfer/, Qgis::MessageLevel level = Qgis::Info, int duration = 0 );
+    QgsMessageBarItem *pushWidget( QWidget *widget /Transfer/, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = 0 );
 %Docstring
 Display a ``widget`` as a message on the bar, after hiding the currently visible one
 and putting it in a stack.
 
 :param widget: message widget to display
-:param level: is Qgis.Info, Warning, Critical or Success
+:param level: is Qgis.MessageLevel.Info, Warning, Critical or Success
 :param duration: timeout duration of message in seconds, 0 value indicates no timeout (i.e.
                  the message must be manually cleared by the user).
 %End
@@ -107,7 +107,7 @@ The caller takes ownership of the returned item.
    instead.
 %End
 
-    void pushMessage( const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = -1 );
+    void pushMessage( const QString &text, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = -1 );
 %Docstring
 A convenience method for pushing a message with the specified ``text`` to the bar.
 
@@ -119,7 +119,7 @@ is set to 0, then the message must be manually dismissed by the user. Since QGIS
 the default timeout for the message ``level`` should be used.
 %End
 
-    void pushMessage( const QString &title, const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = -1 );
+    void pushMessage( const QString &title, const QString &text, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = -1 );
 %Docstring
 A convenience method for pushing a message with the specified ``title`` and ``text`` to the bar.
 
@@ -131,7 +131,7 @@ is set to 0, then the message must be manually dismissed by the user. Since QGIS
 the default timeout for the message ``level`` should be used.
 %End
 
-    void pushMessage( const QString &title, const QString &text, const QString &showMore, Qgis::MessageLevel level = Qgis::Info, int duration = -1 );
+    void pushMessage( const QString &title, const QString &text, const QString &showMore, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = -1 );
 %Docstring
 A convenience method for pushing a message with the specified ``title`` and ``text`` to the bar. Additional
 message content specified via ``showMore`` will be shown when the user presses a "more" button.
@@ -156,7 +156,7 @@ Returns a list of all items currently visible or queued for the bar.
 .. versionadded:: 3.14
 %End
 
-    static int defaultMessageTimeout( Qgis::MessageLevel level = Qgis::None );
+    static int defaultMessageTimeout( Qgis::MessageLevel level = Qgis::MessageLevel::NoLevel );
 %Docstring
 Returns the default timeout in seconds for timed messages of the specified ``level``.
 

diff --git a/python/gui/auto_generated/qgsmessagebaritem.sip.in b/python/gui/auto_generated/qgsmessagebaritem.sip.in
@@ -23,7 +23,7 @@ Represents an item shown within a :py:class:`QgsMessageBar` widget.
 %End
   public:
 
-    QgsMessageBarItem( const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
+    QgsMessageBarItem( const QString &text, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
 %Docstring
 Constructor for QgsMessageBarItem, containing a message with the specified ``text`` to be displayed on the bar.
 
@@ -35,7 +35,7 @@ is set to 0, then the message must be manually dismissed by the user. Since QGIS
 the default timeout for the message ``level`` should be used.
 %End
 
-    QgsMessageBarItem( const QString &title, const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
+    QgsMessageBarItem( const QString &title, const QString &text, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
 %Docstring
 Constructor for QgsMessageBarItem, containing a ``title`` and message with the specified ``text`` to be displayed on the bar.
 
@@ -47,7 +47,7 @@ is set to 0, then the message must be manually dismissed by the user. Since QGIS
 the default timeout for the message ``level`` should be used.
 %End
 
-    QgsMessageBarItem( const QString &title, const QString &text, QWidget *widget, Qgis::MessageLevel level = Qgis::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
+    QgsMessageBarItem( const QString &title, const QString &text, QWidget *widget, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
 %Docstring
 Constructor for QgsMessageBarItem, containing a ``title``, message with the specified ``text``, and a custom ``widget`` to be displayed on the bar.
 
@@ -59,7 +59,7 @@ is set to 0, then the message must be manually dismissed by the user. Since QGIS
 the default timeout for the message ``level`` should be used.
 %End
 
-    QgsMessageBarItem( QWidget *widget, Qgis::MessageLevel level = Qgis::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
+    QgsMessageBarItem( QWidget *widget, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = 0, QWidget *parent /TransferThis/ = 0 );
 %Docstring
 Constructor for QgsMessageBarItem, containing a custom ``widget`` to be displayed on the bar.
 

diff --git a/python/gui/auto_generated/qgspluginmanagerinterface.sip.in b/python/gui/auto_generated/qgspluginmanagerinterface.sip.in
@@ -57,7 +57,7 @@ add repository to the repository listWidget
 show the Plugin Manager window and optionally open tab tabIndex
 %End
 
-    virtual void pushMessage( const QString &text, Qgis::MessageLevel level = Qgis::Info, int duration = -1 ) = 0;
+    virtual void pushMessage( const QString &text, Qgis::MessageLevel level = Qgis::MessageLevel::Info, int duration = -1 ) = 0;
 %Docstring
 show the given message in the Plugin Manager internal message bar
 %End

diff --git a/python/server/auto_generated/qgsserversettings.sip.in b/python/server/auto_generated/qgsserversettings.sip.in
@@ -131,7 +131,7 @@ Returns ``True`` if profile information has to be added to the logs, default val
 
 .. note::
 
-   this flag is only effective when :py:func:`~QgsServerSettings.logLevel` returns Qgis.Info (0)
+   this flag is only effective when :py:func:`~QgsServerSettings.logLevel` returns Qgis.MessageLevel.Info (0)
 
 .. seealso:: :py:func:`logLevel`
 

diff --git a/src/analysis/processing/qgsalgorithmbuffer.cpp b/src/analysis/processing/qgsalgorithmbuffer.cpp
@@ -140,7 +140,7 @@ QVariantMap QgsBufferAlgorithm::processAlgorithm( const QVariantMap &parameters,
       QgsGeometry outputGeometry = f.geometry().buffer( distance, segments, endCapStyle, joinStyle, miterLimit );
       if ( outputGeometry.isNull() )
       {
-        QgsMessageLog::logMessage( QObject::tr( "Error calculating buffer for feature %1" ).arg( f.id() ), QObject::tr( "Processing" ), Qgis::Warning );
+        QgsMessageLog::logMessage( QObject::tr( "Error calculating buffer for feature %1" ).arg( f.id() ), QObject::tr( "Processing" ), Qgis::MessageLevel::Warning );
       }
       if ( dissolve )
         bufferedGeometriesForDissolve << outputGeometry;

diff --git a/src/analysis/raster/qgsninecellfilter.cpp b/src/analysis/raster/qgsninecellfilter.cpp
@@ -60,15 +60,15 @@ int QgsNineCellFilter::processRaster( QgsFeedback *feedback )
       catch ( cl::Error &e )
       {
         QString err = QObject::tr( "Error running OpenCL program: %1 - %2" ).arg( e.what( ), QgsOpenClUtils::errorText( e.err( ) ) );
-        QgsMessageLog::logMessage( err, QgsOpenClUtils::LOGMESSAGE_TAG, Qgis::Critical );
+        QgsMessageLog::logMessage( err, QgsOpenClUtils::LOGMESSAGE_TAG, Qgis::MessageLevel::Critical );
         throw QgsProcessingException( err );
       }
     }
     else
     {
       QString err = QObject::tr( "Error loading OpenCL program sources" );
       QgsMessageLog::logMessage( err,
-                                 QgsOpenClUtils::LOGMESSAGE_TAG, Qgis::Critical );
+                                 QgsOpenClUtils::LOGMESSAGE_TAG, Qgis::MessageLevel::Critical );
       throw QgsProcessingException( err );
     }
   }

diff --git a/src/app/3d/qgs3dmapconfigwidget.cpp b/src/app/3d/qgs3dmapconfigwidget.cpp
@@ -452,15 +452,15 @@ void Qgs3DMapConfigWidget::validate()
       if ( ! cboTerrainLayer->currentLayer() )
       {
         valid = false;
-        mMessageBar->pushMessage( tr( "An elevation layer must be selected for a DEM terrain" ), Qgis::Critical );
+        mMessageBar->pushMessage( tr( "An elevation layer must be selected for a DEM terrain" ), Qgis::MessageLevel::Critical );
       }
       break;
 
     case QgsTerrainGenerator::Mesh:
       if ( ! cboTerrainLayer->currentLayer() )
       {
         valid = false;
-        mMessageBar->pushMessage( tr( "An elevation layer must be selected for a mesh terrain" ), Qgis::Critical );
+        mMessageBar->pushMessage( tr( "An elevation layer must be selected for a mesh terrain" ), Qgis::MessageLevel::Critical );
       }
       break;
 
@@ -471,7 +471,7 @@ void Qgs3DMapConfigWidget::validate()
 
   if ( valid && widgetLights->directionalLights().empty() && widgetLights->pointLights().empty() )
   {
-    mMessageBar->pushMessage( tr( "No lights exist in the scene" ), Qgis::Warning );
+    mMessageBar->pushMessage( tr( "No lights exist in the scene" ), Qgis::MessageLevel::Warning );
   }
 
   emit isValidChanged( valid );

diff --git a/src/app/dwg/qgsdwgimportdialog.cpp b/src/app/dwg/qgsdwgimportdialog.cpp
@@ -93,7 +93,7 @@ QgsDwgImportDialog::QgsDwgImportDialog( QWidget *parent, Qt::WindowFlags f )
 
   if ( ! QgsVectorFileWriter::supportedFormatExtensions().contains( QStringLiteral( "gpkg" ) ) )
   {
-    bar->pushMessage( tr( "GDAL/OGR not built with GPKG (sqlite3) support. You will not be able to export the DWG in a GPKG." ), Qgis::Critical );
+    bar->pushMessage( tr( "GDAL/OGR not built with GPKG (sqlite3) support. You will not be able to export the DWG in a GPKG." ), Qgis::MessageLevel::Critical );
   }
   pbLoadDatabase_clicked();
   updateUI();
@@ -233,7 +233,7 @@ void QgsDwgImportDialog::pbLoadDatabase_clicked()
   }
   else
   {
-    bar->pushMessage( tr( "Could not open layer list" ), Qgis::Critical );
+    bar->pushMessage( tr( "Could not open layer list" ), Qgis::MessageLevel::Critical );
   }
 }
 
@@ -260,11 +260,11 @@ void QgsDwgImportDialog::pbImportDrawing_clicked()
   QString error;
   if ( importer.import( leDrawing->text(), error, cbExpandInserts->isChecked(), cbUseCurves->isChecked(), lblMessage ) )
   {
-    bar->pushMessage( tr( "Drawing import completed." ), Qgis::Info );
+    bar->pushMessage( tr( "Drawing import completed." ), Qgis::MessageLevel::Info );
   }
   else
   {
-    bar->pushMessage( tr( "Drawing import failed (%1)" ).arg( error ), Qgis::Critical );
+    bar->pushMessage( tr( "Drawing import failed (%1)" ).arg( error ), Qgis::MessageLevel::Critical );
   }
 
   pbLoadDatabase_clicked();