Fix position of Oracle entry in data source manager

nyalldawson · nyalldawson · commit 7cb8d1a9bfa8 · 2018-01-03T12:42:38.000+10:00
Fixes #17755
diff --git a/src/providers/db2/qgsdb2provider.cpp b/src/providers/db2/qgsdb2provider.cpp
@@ -1757,7 +1757,7 @@ class QgsDb2SourceSelectProvider : public QgsSourceSelectProvider
 
     QString providerKey() const override { return QStringLiteral( "DB2" ); }
     QString text() const override { return QObject::tr( "DB2" ); }
-    int ordering() const override { return QgsSourceSelectProvider::OrderDatabaseProvider + 40; }
+    int ordering() const override { return QgsSourceSelectProvider::OrderDatabaseProvider + 50; }
     QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddDb2Layer.svg" ) ); }
     QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
     {
diff --git a/src/providers/oracle/qgsoracleprovider.cpp b/src/providers/oracle/qgsoracleprovider.cpp
@@ -3592,11 +3592,11 @@ class QgsOracleSourceSelectProvider : public QgsSourceSelectProvider
 {
   public:
 
-    virtual QString providerKey() const override { return QStringLiteral( "oracle" ); }
-    virtual QString text() const override { return QObject::tr( "Oracle" ); }
-    virtual int ordering() { return 80; }
-    virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOracleLayer.svg" ) ); }
-    virtual QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
+    QString providerKey() const override { return QStringLiteral( "oracle" ); }
+    QString text() const override { return QObject::tr( "Oracle" ); }
+    int ordering() const override { return QgsSourceSelectProvider::OrderDatabaseProvider + 40; }
+    QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOracleLayer.svg" ) ); }
+    QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override
     {
       return new QgsOracleSourceSelect( parent, fl, widgetMode );
     }
diff --git a/src/providers/virtual/qgsvirtuallayerprovider.cpp b/src/providers/virtual/qgsvirtuallayerprovider.cpp
@@ -657,7 +657,7 @@ class QgsVirtualSourceSelectProvider : public QgsSourceSelectProvider
 
     QString providerKey() const override { return QStringLiteral( "virtual" ); }
     QString text() const override { return QObject::tr( "Virtual Layer" ); }
-    int ordering() const override { return QgsSourceSelectProvider::OrderDatabaseProvider + 50; }
+    int ordering() const override { return QgsSourceSelectProvider::OrderDatabaseProvider + 60; }
     QString toolTip() const override { return QObject::tr( "Add Virtual Layer" ); }
     QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddVirtualLayer.svg" ) ); }
     QgsAbstractDataSourceWidget *createDataSourceWidget( QWidget *parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override

Original file line number	Diff line number	Diff line change
`@@ -1757,7 +1757,7 @@ class QgsDb2SourceSelectProvider : public QgsSourceSelectProvider`
`1757`	`1757`
`1758`	`1758`	`QString providerKey() const override { return QStringLiteral( "DB2" ); }`
`1759`	`1759`	`QString text() const override { return QObject::tr( "DB2" ); }`
`1760`		`- int ordering() const override { return QgsSourceSelectProvider::OrderDatabaseProvider + 40; }`
	`1760`	`+ int ordering() const override { return QgsSourceSelectProvider::OrderDatabaseProvider + 50; }`
`1761`	`1761`	`QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddDb2Layer.svg" ) ); }`
`1762`	`1762`	`QgsAbstractDataSourceWidget createDataSourceWidget( QWidget parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override`
`1763`	`1763`	`{`
Original file line number	Diff line number	Diff line change
`@@ -3592,11 +3592,11 @@ class QgsOracleSourceSelectProvider : public QgsSourceSelectProvider`
`3592`	`3592`	`{`
`3593`	`3593`	`public:`
`3594`	`3594`
`3595`		`- virtual QString providerKey() const override { return QStringLiteral( "oracle" ); }`
`3596`		`- virtual QString text() const override { return QObject::tr( "Oracle" ); }`
`3597`		`- virtual int ordering() { return 80; }`
`3598`		`- virtual QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOracleLayer.svg" ) ); }`
`3599`		`- virtual QgsAbstractDataSourceWidget createDataSourceWidget( QWidget parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override`
	`3595`	`+ QString providerKey() const override { return QStringLiteral( "oracle" ); }`
	`3596`	`+ QString text() const override { return QObject::tr( "Oracle" ); }`
	`3597`	`+ int ordering() const override { return QgsSourceSelectProvider::OrderDatabaseProvider + 40; }`
	`3598`	`+ QIcon icon() const override { return QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddOracleLayer.svg" ) ); }`
	`3599`	`+ QgsAbstractDataSourceWidget createDataSourceWidget( QWidget parent = nullptr, Qt::WindowFlags fl = Qt::Widget, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::Embedded ) const override`
`3600`	`3600`	`{`
`3601`	`3601`	`return new QgsOracleSourceSelect( parent, fl, widgetMode );`
`3602`	`3602`	`}`