Move enum DevToolsNodeRole to Qgis namespace

Author: domi4484

src/app/devtools/querylogger/qgsappquerylogger.cpp

@@ -141,7 +141,7 @@ void QgsAppQueryLogger::removeRequestRows( const QList<int> &rows )
 
   for ( int row : std::as_const( res ) )
   {
-    int popId = data( index( row, 0, QModelIndex() ), static_cast<int>( QgsDevToolsModelNode::Roles::RoleId ) ).toInt();
+    int popId = data( index( row, 0, QModelIndex() ), static_cast<int>( Qgis::DevToolsNodeRole::Id ) ).toInt();
     mQueryGroups.remove( popId );
 
     beginRemoveRows( QModelIndex(), row, row );
@@ -217,11 +217,11 @@ QVariant QgsAppQueryLogger::data( const QModelIndex &index, int role ) const
       switch ( role )
       {
         case Qt::DisplayRole:
-        case static_cast<int>( QgsDevToolsModelNode::Roles::RoleElapsedTime ):
-        case static_cast<int>( QgsDevToolsModelNode::Roles::RoleSort ):
-          return node->data( static_cast<int>( QgsDevToolsModelNode::Roles::RoleElapsedTime ) );
+        case static_cast<int>( Qgis::DevToolsNodeRole::ElapsedTime ):
+        case static_cast<int>( Qgis::DevToolsNodeRole::Sort ):
+          return node->data( static_cast<int>( Qgis::DevToolsNodeRole::ElapsedTime ) );
 
-        case static_cast<int>( QgsDevToolsModelNode::Roles::RoleMaximumTime ):
+        case static_cast<int>( Qgis::DevToolsNodeRole::MaximumTime ):
           return mMaxCost;
 
         default:

src/app/devtools/querylogger/qgsdatabasequeryloggernode.cpp

@@ -88,7 +88,7 @@ QVariant QgsDatabaseQueryLoggerQueryGroup::data( int role ) const
     case Qt::DisplayRole:
       return QStringLiteral( "%1 %2" ).arg( QString::number( mQueryId ), mSql );
 
-    case static_cast<int>( QgsDevToolsModelNode::Roles::RoleSort ):
+    case static_cast<int>( Qgis::DevToolsNodeRole::Sort ):
       return mQueryId;
 
     case Qt::ToolTipRole:
@@ -118,13 +118,13 @@ QVariant QgsDatabaseQueryLoggerQueryGroup::data( int role ) const
 #endif
     }
 
-    case static_cast<int>( Roles::RoleStatus ):
+    case static_cast<int>( Qgis::DevToolsNodeRole::Status ):
       return static_cast<int>( mStatus );
 
-    case static_cast<int>( Roles::RoleId ):
+    case static_cast<int>( Qgis::DevToolsNodeRole::Id ):
       return mQueryId;
 
-    case static_cast<int>( Roles::RoleElapsedTime ):
+    case static_cast<int>( Qgis::DevToolsNodeRole::ElapsedTime ):
       return mElapsed;
 
     case Qt::ForegroundRole:

src/app/devtools/querylogger/qgsqueryloggerpanelwidget.cpp

@@ -48,7 +48,7 @@ QgsDatabaseQueryLoggerTreeView::QgsDatabaseQueryLoggerTreeView( QgsAppQueryLogge
   setFont( QFontDatabase::systemFont( QFontDatabase::FixedFont ) );
 
   mProxyModel = new QgsDatabaseQueryLoggerProxyModel( mLogger, this );
-  mProxyModel->setSortRole( static_cast<int>( QgsDevToolsModelNode::Roles::RoleSort ) );
+  mProxyModel->setSortRole( static_cast<int>( Qgis::DevToolsNodeRole::Sort ) );
   setModel( mProxyModel );
 
   connect( mProxyModel, &QAbstractItemModel::rowsInserted, this, [this]( const QModelIndex &parent, int first, int last ) {
@@ -168,7 +168,7 @@ QgsDatabaseQueryLoggerPanelWidget::QgsDatabaseQueryLoggerPanelWidget( QgsAppQuer
   setupUi( this );
 
   mTreeView = new QgsDatabaseQueryLoggerTreeView( mLogger );
-  mTreeView->setItemDelegateForColumn( 1, new QueryCostDelegate( static_cast<int>( QgsDevToolsModelNode::Roles::RoleElapsedTime ), static_cast<int>( QgsDevToolsModelNode::Roles::RoleMaximumTime ), mTreeView ) );
+  mTreeView->setItemDelegateForColumn( 1, new QueryCostDelegate( static_cast<int>( Qgis::DevToolsNodeRole::ElapsedTime ), static_cast<int>( Qgis::DevToolsNodeRole::MaximumTime ), mTreeView ) );
   mTreeView->setSortingEnabled( true );
   mTreeView->sortByColumn( 0, Qt::SortOrder::AscendingOrder );
 

src/core/qgis.h

@@ -6080,6 +6080,20 @@ class CORE_EXPORT Qgis
     Q_DECLARE_FLAGS( RasterProcessingParameterCapabilities, RasterProcessingParameterCapability )
     Q_FLAG( RasterProcessingParameterCapabilities )
 
+    /**
+     * Dev tools node custom data roles.
+     * \since QGIS 4.0
+     */
+    enum class DevToolsNodeRole
+    {
+      Status = Qt::UserRole + 1, //!< Request status role
+      Id,                        //!< Request ID role
+      ElapsedTime,               //!< Elapsed time
+      MaximumTime,               //!< Maximum encountered elapsed time
+      Sort,                      //!< Sort order role
+    };
+    Q_ENUM( DevToolsNodeRole )
+
     /**
      * Identify search radius in mm
      */

src/gui/devtools/networklogger/qgsnetworklogger.cpp

@@ -215,7 +215,7 @@ void QgsNetworkLogger::removeRequestRows( const QList<int> &rows )
 
   for ( int row : std::as_const( res ) )
   {
-    int popId = data( index( row, 0, QModelIndex() ), static_cast<int>( QgsDevToolsModelNode::Roles::RoleId ) ).toInt();
+    int popId = data( index( row, 0, QModelIndex() ), static_cast<int>( Qgis::DevToolsNodeRole::Id ) ).toInt();
     mRequestGroups.remove( popId );
 
     beginRemoveRows( QModelIndex(), row, row );

src/gui/devtools/networklogger/qgsnetworkloggernode.cpp

@@ -101,10 +101,10 @@ QVariant QgsNetworkLoggerRequestGroup::data( int role ) const
         .arg( mUrl.url(), statusToString( mStatus ), QString::number( mHttpStatus ), mContentType, bytes, mStatus == Status::Pending ? QString::number( mTimer.elapsed() / 1000 ) : QString::number( mTotalTime ), QString::number( mReplies ) );
     }
 
-    case static_cast<int>( Roles::RoleStatus ):
+    case static_cast<int>( Qgis::DevToolsNodeRole::Status ):
       return static_cast<int>( mStatus );
 
-    case static_cast<int>( Roles::RoleId ):
+    case static_cast<int>( Qgis::DevToolsNodeRole::Id ):
       return mRequestId;
 
     case Qt::ForegroundRole:

src/gui/devtools/qgsdevtoolsmodelnode.h

@@ -37,16 +37,6 @@ class QgsDevToolsModelGroup;
 class GUI_EXPORT QgsDevToolsModelNode
 {
   public:
-    //! Custom node data roles
-    enum class Roles
-    {
-      RoleStatus = Qt::UserRole + 1, //!< Request status role
-      RoleId,                        //!< Request ID role
-      RoleElapsedTime,               //!< Elapsed time
-      RoleMaximumTime,               //!< Maximum encountered elapsed time
-      RoleSort,                      //!< Sort order role
-    };
-
     virtual ~QgsDevToolsModelNode();
 
     /**