Remove deprecated calls

qgis · Mar 2, 2021 · 675e150 · 675e150
1 parent d762646
commit 675e150
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 22 deletions.
diff --git a/python/core/auto_generated/qgsdataitem.sip.in b/python/core/auto_generated/qgsdataitem.sip.in
@@ -239,9 +239,9 @@ double-click behavior for items.
 %Docstring
 Returns ``True`` if the item may be dragged.
 Default implementation returns ``False``.
-A draggable item has to implement :py:func:`~QgsDataItem.mimeUri` that will be used to pass data.
+A draggable item has to implement :py:func:`~QgsDataItem.mimeUris` that will be used to pass data.
 
-.. seealso:: :py:func:`mimeUri`
+.. seealso:: :py:func:`mimeUris`
 
 .. versionadded:: 3.0
 %End
@@ -551,7 +551,7 @@ Item that represents a layer that can be opened with one of the providers
 
     virtual bool hasDragEnabled() const;
 
-    virtual QgsMimeDataUtils::Uri mimeUri() const;
+    virtual QgsMimeDataUtils::UriList mimeUris() const;
 
 
 
@@ -856,7 +856,7 @@ Returns the full path to the directory the item represents.
  virtual QWidget *paramWidget() /Factory,Deprecated/;
 
     virtual bool hasDragEnabled() const;
-    virtual QgsMimeDataUtils::Uri mimeUri() const;
+    virtual QgsMimeDataUtils::UriList mimeUris() const;
 
 
     static bool hiddenPath( const QString &path );
@@ -897,7 +897,7 @@ A data item holding a reference to a QGIS project file.
 
     virtual bool hasDragEnabled() const;
 
-    virtual QgsMimeDataUtils::Uri mimeUri() const;
+    virtual QgsMimeDataUtils::UriList mimeUris() const;
 
 
 };

diff --git a/src/app/browser/qgsinbuiltdataitemproviders.cpp b/src/app/browser/qgsinbuiltdataitemproviders.cpp
@@ -602,7 +602,7 @@ void QgsLayerItemGuiProvider::addLayersFromItems( const QList<QgsDataItem *> &it
     if ( item && item->type() == QgsDataItem::Layer )
     {
       if ( QgsLayerItem *layerItem = qobject_cast<QgsLayerItem *>( item ) )
-        layerUriList << layerItem->mimeUri();
+        layerUriList.append( layerItem->mimeUris() );
     }
   }
   if ( !layerUriList.isEmpty() )

diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
@@ -1009,7 +1009,7 @@ bool QgsLayerItem::equal( const QgsDataItem *other )
   return ( mPath == o->mPath && mName == o->mName && mUri == o->mUri && mProviderKey == o->mProviderKey );
 }
 
-QgsMimeDataUtils::Uri QgsLayerItem::mimeUri() const
+QgsMimeDataUtils::UriList QgsLayerItem::mimeUris() const
 {
   QgsMimeDataUtils::Uri u;
 
@@ -1069,7 +1069,7 @@ QgsMimeDataUtils::Uri QgsLayerItem::mimeUri() const
   u.uri = uri();
   u.supportedCrs = supportedCrs();
   u.supportedFormats = supportedFormats();
-  return u;
+  return { u };
 }
 
 // ---------------------------------------------------------------------
@@ -1352,13 +1352,13 @@ QWidget *QgsDirectoryItem::paramWidget()
   return new QgsDirectoryParamWidget( mPath );
 }
 
-QgsMimeDataUtils::Uri QgsDirectoryItem::mimeUri() const
+QgsMimeDataUtils::UriList QgsDirectoryItem::mimeUris() const
 {
   QgsMimeDataUtils::Uri u;
   u.layerType = QStringLiteral( "directory" );
   u.name = mName;
   u.uri = mDirPath;
-  return u;
+  return { u };
 }
 
 QgsDirectoryParamWidget::QgsDirectoryParamWidget( const QString &path, QWidget *parent )
@@ -1510,13 +1510,13 @@ QgsProjectItem::QgsProjectItem( QgsDataItem *parent, const QString &name,
   setState( Populated ); // no more children
 }
 
-QgsMimeDataUtils::Uri QgsProjectItem::mimeUri() const
+QgsMimeDataUtils::UriList QgsProjectItem::mimeUris() const
 {
   QgsMimeDataUtils::Uri u;
   u.layerType = QStringLiteral( "project" );
   u.name = mName;
   u.uri = mPath;
-  return u;
+  return { u };
 }
 
 QgsErrorItem::QgsErrorItem( QgsDataItem *parent, const QString &error, const QString &path )

diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
@@ -250,8 +250,8 @@ class CORE_EXPORT QgsDataItem : public QObject
     /**
      * Returns TRUE if the item may be dragged.
      * Default implementation returns FALSE.
-     * A draggable item has to implement mimeUri() that will be used to pass data.
-     * \see mimeUri()
+     * A draggable item has to implement mimeUris() that will be used to pass data.
+     * \see mimeUris()
      * \since QGIS 3.0
      */
     virtual bool hasDragEnabled() const { return false; }
@@ -582,7 +582,7 @@ class CORE_EXPORT QgsLayerItem : public QgsDataItem
 
     bool hasDragEnabled() const override { return true; }
 
-    QgsMimeDataUtils::Uri mimeUri() const override;
+    QgsMimeDataUtils::UriList mimeUris() const override;
 
     // --- New virtual methods for layer item derived classes ---
 
@@ -852,7 +852,7 @@ class CORE_EXPORT QgsDirectoryItem : public QgsDataCollectionItem
     QIcon icon() override;
     Q_DECL_DEPRECATED QWidget *paramWidget() override SIP_FACTORY SIP_DEPRECATED;
     bool hasDragEnabled() const override { return true; }
-    QgsMimeDataUtils::Uri mimeUri() const override;
+    QgsMimeDataUtils::UriList mimeUris() const override;
 
     //! Check if the given path is hidden from the browser model
     static bool hiddenPath( const QString &path );
@@ -891,7 +891,7 @@ class CORE_EXPORT QgsProjectItem : public QgsDataItem
 
     bool hasDragEnabled() const override { return true; }
 
-    QgsMimeDataUtils::Uri mimeUri() const override;
+    QgsMimeDataUtils::UriList mimeUris() const override;
 
 };
 

diff --git a/src/gui/qgsbrowserdockwidget.cpp b/src/gui/qgsbrowserdockwidget.cpp
@@ -356,9 +356,7 @@ void QgsBrowserDockWidget::addLayer( QgsLayerItem *layerItem )
   if ( !layerItem )
     return;
 
-  QgsMimeDataUtils::UriList list;
-  list << layerItem->mimeUri();
-  emit handleDropUriList( list );
+  emit handleDropUriList( layerItem->mimeUris() );
 }
 
 bool QgsBrowserDockWidget::addLayerAtIndex( const QModelIndex &index )

diff --git a/src/gui/qgsdatasourceselectdialog.cpp b/src/gui/qgsdatasourceselectdialog.cpp
@@ -286,7 +286,7 @@ void QgsDataSourceSelectWidget::onLayerSelected( const QModelIndex &index )
                           ( layerItem->mapLayerType() == mBrowserProxyModel.layerType() ) ) )
       {
         isLayerCompatible = true;
-        mUri = layerItem->mimeUri();
+        mUri = layerItem->mimeUris().isEmpty() ? QgsMimeDataUtils::Uri() : layerItem->mimeUris().first();
         // Store last viewed item
         QgsSettings().setValue( QStringLiteral( "datasourceSelectLastSelectedItem" ),  mBrowserProxyModel.data( index, QgsBrowserGuiModel::PathRole ).toString(), QgsSettings::Section::Gui );
       }

diff --git a/tests/src/core/testqgsdataitem.cpp b/tests/src/core/testqgsdataitem.cpp
@@ -118,7 +118,7 @@ void TestQgsDataItem::testDirItem()
   QCOMPARE( dirItem->name(), QStringLiteral( "Test" ) );
 
   QVERIFY( dirItem->hasDragEnabled() );
-  QgsMimeDataUtils::Uri mime = dirItem->mimeUri();
+  QgsMimeDataUtils::Uri mime = dirItem->mimeUris().isEmpty() ? QgsMimeDataUtils::Uri() : dirItem->mimeUris().first();
   QVERIFY( mime.isValid() );
   QCOMPARE( mime.uri, QStringLiteral( TEST_DATA_DIR ) );
   QCOMPARE( mime.layerType, QStringLiteral( "directory" ) );