From e841f76251e6bce8d321c71befdf43982e34c4a4 Mon Sep 17 00:00:00 2001 From: Denis Rouzaud Date: Fri, 12 Nov 2021 08:41:44 +0100 Subject: [PATCH] rename QgsDbSourceSelectBase to QgsAbstractDbSourceSelect --- .../providers/qgsdbsourceselectbase.sip.in | 12 ++++++------ src/gui/CMakeLists.txt | 4 ++-- src/gui/providers/ogr/qgsogrdbsourceselect.cpp | 2 +- src/gui/providers/ogr/qgsogrdbsourceselect.h | 4 ++-- ...tbase.cpp => qgsabstractdbsourceselect.cpp} | 18 +++++++++--------- ...electbase.h => qgsabstractdbsourceselect.h} | 14 +++++++------- src/providers/db2/qgsdb2sourceselect.cpp | 2 +- src/providers/db2/qgsdb2sourceselect.h | 6 +++--- src/providers/hana/qgshanasourceselect.cpp | 2 +- src/providers/hana/qgshanasourceselect.h | 4 ++-- src/providers/mssql/qgsmssqlsourceselect.cpp | 2 +- src/providers/mssql/qgsmssqlsourceselect.h | 4 ++-- src/providers/oracle/qgsoraclesourceselect.cpp | 2 +- src/providers/oracle/qgsoraclesourceselect.h | 4 ++-- src/providers/postgres/qgspgsourceselect.cpp | 2 +- src/providers/postgres/qgspgsourceselect.h | 4 ++-- .../spatialite/qgsspatialitesourceselect.cpp | 2 +- .../spatialite/qgsspatialitesourceselect.h | 4 ++-- 18 files changed, 46 insertions(+), 46 deletions(-) rename src/gui/providers/{qgsdbsourceselectbase.cpp => qgsabstractdbsourceselect.cpp} (88%) rename src/gui/providers/{qgsdbsourceselectbase.h => qgsabstractdbsourceselect.h} (79%) diff --git a/python/gui/auto_generated/providers/qgsdbsourceselectbase.sip.in b/python/gui/auto_generated/providers/qgsdbsourceselectbase.sip.in index 09f4972b67f..3fafc366df3 100644 --- a/python/gui/auto_generated/providers/qgsdbsourceselectbase.sip.in +++ b/python/gui/auto_generated/providers/qgsdbsourceselectbase.sip.in @@ -1,7 +1,7 @@ /************************************************************************ * This file has been generated automatically from * * * - * src/gui/providers/qgsdbsourceselectbase.h * + * src/gui/providers/qgsabstractdbsourceselect.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ @@ -10,19 +10,19 @@ -class QgsDbSourceSelectBase : QgsAbstractDataSourceWidget, protected Ui::QgsDbSourceSelectBase +class QgsAbstractDbSourceSelect : QgsAbstractDataSourceWidget, protected Ui::QgsAbstractDbSourceSelect { %Docstring(signature="appended") -The :py:class:`QgsDbSourceSelectBase` class is a base class for database source widget selector +The :py:class:`QgsAbstractDbSourceSelect` class is a base class for database source widget selector .. versionadded:: 3.24 %End %TypeHeaderCode -#include "qgsdbsourceselectbase.h" +#include "qgsabstractdbsourceselect.h" %End public: - QgsDbSourceSelectBase( QWidget *parent = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ); + QgsAbstractDbSourceSelect( QWidget *parent = 0, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ); %Docstring Constructor %End @@ -52,7 +52,7 @@ This is called to define the SQL query and must be re-implemented. The implement /************************************************************************ * This file has been generated automatically from * * * - * src/gui/providers/qgsdbsourceselectbase.h * + * src/gui/providers/qgsabstractdbsourceselect.h * * * * Do not edit manually ! Edit header and run scripts/sipify.pl again * ************************************************************************/ diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index d5de86febfd..b363b41bc4b 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -361,7 +361,7 @@ set(QGIS_GUI_SRCS processing/models/qgsmodelviewtooltemporarymousepan.cpp processing/models/qgsmodelviewtoolzoom.cpp - providers/qgsdbsourceselectbase.cpp + providers/qgsabstractdbsourceselect.cpp providers/qgspointcloudproviderguimetadata.cpp providers/qgspointcloudsourceselect.cpp @@ -1181,7 +1181,7 @@ set(QGIS_GUI_HDRS processing/models/qgsmodelviewtooltemporarymousepan.h processing/models/qgsmodelviewtoolzoom.h - providers/qgsdbsourceselectbase.h + providers/qgsabstractdbsourceselect.h providers/qgspointcloudsourceselect.h providers/qgspointcloudproviderguimetadata.h diff --git a/src/gui/providers/ogr/qgsogrdbsourceselect.cpp b/src/gui/providers/ogr/qgsogrdbsourceselect.cpp index 4a6454a8c40..da380bb6d2d 100644 --- a/src/gui/providers/ogr/qgsogrdbsourceselect.cpp +++ b/src/gui/providers/ogr/qgsogrdbsourceselect.cpp @@ -34,7 +34,7 @@ QgsOgrDbSourceSelect::QgsOgrDbSourceSelect( const QString &theSettingsKey, const QString &theName, const QString &theExtensions, QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode ) - : QgsDbSourceSelectBase( parent, fl, theWidgetMode ) + : QgsAbstractDbSourceSelect( parent, fl, theWidgetMode ) , mOgrDriverName( theSettingsKey ) , mName( theName ) , mExtension( theExtensions ) diff --git a/src/gui/providers/ogr/qgsogrdbsourceselect.h b/src/gui/providers/ogr/qgsogrdbsourceselect.h index 11459dcf454..4c7a80ba383 100644 --- a/src/gui/providers/ogr/qgsogrdbsourceselect.h +++ b/src/gui/providers/ogr/qgsogrdbsourceselect.h @@ -20,7 +20,7 @@ #include "qgsguiutils.h" #include "qgshelp.h" -#include "qgsdbsourceselectbase.h" +#include "qgsabstractdbsourceselect.h" #include "qgsproviderregistry.h" #include "qgis_sip.h" @@ -35,7 +35,7 @@ class QgsOgrDbTableModel; * source selects. * */ -class QgsOgrDbSourceSelect: public QgsDbSourceSelectBase +class QgsOgrDbSourceSelect: public QgsAbstractDbSourceSelect { Q_OBJECT diff --git a/src/gui/providers/qgsdbsourceselectbase.cpp b/src/gui/providers/qgsabstractdbsourceselect.cpp similarity index 88% rename from src/gui/providers/qgsdbsourceselectbase.cpp rename to src/gui/providers/qgsabstractdbsourceselect.cpp index 99000d63e9f..3d655d14daa 100644 --- a/src/gui/providers/qgsdbsourceselectbase.cpp +++ b/src/gui/providers/qgsabstractdbsourceselect.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - qgsdbsourceselectbase.h + qgsabstractdbsourceselect.h -------------------------------------- Date : 08.11.2021 Copyright : (C) 2021 Denis Rouzaud @@ -14,13 +14,13 @@ ***************************************************************************/ #include "qgsabstractdbtablemodel.h" -#include "qgsdbsourceselectbase.h" +#include "qgsabstractdbsourceselect.h" #include #include #include -QgsDbSourceSelectBase::QgsDbSourceSelectBase( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode ) +QgsAbstractDbSourceSelect::QgsAbstractDbSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode widgetMode ) : QgsAbstractDataSourceWidget( parent, fl, widgetMode ) { setupUi( this ); @@ -45,13 +45,13 @@ QgsDbSourceSelectBase::QgsDbSourceSelectBase( QWidget *parent, Qt::WindowFlags f mBuildQueryButton->setDisabled( true ); buttonBox->addButton( mBuildQueryButton, QDialogButtonBox::ActionRole ); - connect( mTablesTreeView, &QTreeView::clicked, this, &QgsDbSourceSelectBase::treeviewClicked ); - connect( mTablesTreeView, &QTreeView::doubleClicked, this, &QgsDbSourceSelectBase::treeviewDoubleClicked ); + connect( mTablesTreeView, &QTreeView::clicked, this, &QgsAbstractDbSourceSelect::treeviewClicked ); + connect( mTablesTreeView, &QTreeView::doubleClicked, this, &QgsAbstractDbSourceSelect::treeviewDoubleClicked ); connect( mBuildQueryButton, &QAbstractButton::clicked, this, [ = ]() {setSql( mTablesTreeView->currentIndex() );} ); } -void QgsDbSourceSelectBase::init( QgsAbstractDbTableModel *model, QItemDelegate *delegate ) +void QgsAbstractDbSourceSelect::init( QgsAbstractDbTableModel *model, QItemDelegate *delegate ) { mProxyModel->setSourceModel( model ); mTablesTreeView->setModel( mProxyModel ); @@ -107,18 +107,18 @@ void QgsDbSourceSelectBase::init( QgsAbstractDbTableModel *model, QItemDelegate connect( mSearchTableEdit, &QLineEdit::textChanged, this, [ = ]() {filterResults();} ); } -void QgsDbSourceSelectBase::treeviewClicked( const QModelIndex &index ) +void QgsAbstractDbSourceSelect::treeviewClicked( const QModelIndex &index ) { mBuildQueryButton->setEnabled( index.parent().isValid() ); } -void QgsDbSourceSelectBase::treeviewDoubleClicked( const QModelIndex &index ) +void QgsAbstractDbSourceSelect::treeviewDoubleClicked( const QModelIndex &index ) { Q_UNUSED( index ) addButtonClicked(); } -void QgsDbSourceSelectBase::filterResults() +void QgsAbstractDbSourceSelect::filterResults() { QString searchText = mSearchTableEdit->text(); bool regex = mSearchModeRegexAction->isChecked(); diff --git a/src/gui/providers/qgsdbsourceselectbase.h b/src/gui/providers/qgsabstractdbsourceselect.h similarity index 79% rename from src/gui/providers/qgsdbsourceselectbase.h rename to src/gui/providers/qgsabstractdbsourceselect.h index e884d619130..67e538c895b 100644 --- a/src/gui/providers/qgsdbsourceselectbase.h +++ b/src/gui/providers/qgsabstractdbsourceselect.h @@ -1,5 +1,5 @@ /*************************************************************************** - qgsdbsourceselectbase.h + qgsabstractdbsourceselect.h -------------------------------------- Date : 08.11.2021 Copyright : (C) 2021 Denis Rouzaud @@ -13,8 +13,8 @@ * * ***************************************************************************/ -#ifndef QGSDBSOURCESELECTBASE_H -#define QGSDBSOURCESELECTBASE_H +#ifndef QGSABSTRACTDBSOURCESELECT_H +#define QGSABSTRACTDBSOURCESELECT_H #include "qgis_gui.h" @@ -27,15 +27,15 @@ class QItemDelegate; /** * \ingroup gui - * \brief The QgsDbSourceSelectBase class is a base class for database source widget selector + * \brief The QgsAbstractDbSourceSelect class is a base class for database source widget selector * \since QGIS 3.24 */ -class GUI_EXPORT QgsDbSourceSelectBase : public QgsAbstractDataSourceWidget, protected Ui::QgsDbSourceSelectBase +class GUI_EXPORT QgsAbstractDbSourceSelect : public QgsAbstractDataSourceWidget, protected Ui::QgsAbstractDbSourceSelect { Q_OBJECT public: //! Constructor - QgsDbSourceSelectBase( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ); + QgsAbstractDbSourceSelect( QWidget *parent = nullptr, Qt::WindowFlags fl = QgsGuiUtils::ModalDialogFlags, QgsProviderRegistry::WidgetMode widgetMode = QgsProviderRegistry::WidgetMode::None ); protected: //! Sets the source model for the table and optionally a delegate @@ -65,4 +65,4 @@ class GUI_EXPORT QgsDbSourceSelectBase : public QgsAbstractDataSourceWidget, pro QPushButton *mBuildQueryButton = nullptr; }; -#endif // QGSDBSOURCESELECTBASE_H +#endif // QGSABSTRACTDBSOURCESELECT_H diff --git a/src/providers/db2/qgsdb2sourceselect.cpp b/src/providers/db2/qgsdb2sourceselect.cpp index e774cd28310..8828efc732d 100644 --- a/src/providers/db2/qgsdb2sourceselect.cpp +++ b/src/providers/db2/qgsdb2sourceselect.cpp @@ -123,7 +123,7 @@ void QgsDb2SourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemMod } QgsDb2SourceSelect::QgsDb2SourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode ) - : QgsDbSourceSelectBase( parent, fl, theWidgetMode ) + : QgsAbstractDbSourceSelect( parent, fl, theWidgetMode ) { QgsGui::instance()->enableAutoGeometryRestore( this ); diff --git a/src/providers/db2/qgsdb2sourceselect.h b/src/providers/db2/qgsdb2sourceselect.h index e8984753758..c2c7893c854 100644 --- a/src/providers/db2/qgsdb2sourceselect.h +++ b/src/providers/db2/qgsdb2sourceselect.h @@ -19,12 +19,12 @@ #ifndef QGSDB2SOURCESELECT_H #define QGSDB2SOURCESELECT_H -#include "ui_qgsdbsourceselectbase.h" +#include "ui_qgsabstractdbsourceselect.h" #include "qgsguiutils.h" #include "qgsdb2tablemodel.h" #include "qgshelp.h" #include "qgsproviderregistry.h" -#include "qgsdbsourceselectbase.h" +#include "qgsabstractdbsourceselect.h" #include #include @@ -87,7 +87,7 @@ class QgsDb2GeomColumnTypeThread : public QThread * for Db2 databases. The user can then connect and add * tables from the database to the map canvas. */ -class QgsDb2SourceSelect : public QgsDbSourceSelectBase +class QgsDb2SourceSelect : public QgsAbstractDbSourceSelect { Q_OBJECT diff --git a/src/providers/hana/qgshanasourceselect.cpp b/src/providers/hana/qgshanasourceselect.cpp index 05dc4f8880d..57b26781414 100644 --- a/src/providers/hana/qgshanasourceselect.cpp +++ b/src/providers/hana/qgshanasourceselect.cpp @@ -200,7 +200,7 @@ QgsHanaSourceSelect::QgsHanaSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode ) - : QgsDbSourceSelectBase( parent, fl, theWidgetMode ) + : QgsAbstractDbSourceSelect( parent, fl, theWidgetMode ) { QgsGui::instance()->enableAutoGeometryRestore( this ); diff --git a/src/providers/hana/qgshanasourceselect.h b/src/providers/hana/qgshanasourceselect.h index 7f167e7b287..8363868cee2 100644 --- a/src/providers/hana/qgshanasourceselect.h +++ b/src/providers/hana/qgshanasourceselect.h @@ -22,7 +22,7 @@ #include "qgshelp.h" #include "qgsproviderregistry.h" #include "qgsguiutils.h" -#include "qgsdbsourceselectbase.h" +#include "qgsabstractdbsourceselect.h" #include @@ -63,7 +63,7 @@ class QgsHanaSourceSelectDelegate : public QItemDelegate * for SAP HANA databases. The user can then connect and add * tables from the database to the map canvas. */ -class QgsHanaSourceSelect : public QgsDbSourceSelectBase +class QgsHanaSourceSelect : public QgsAbstractDbSourceSelect { Q_OBJECT diff --git a/src/providers/mssql/qgsmssqlsourceselect.cpp b/src/providers/mssql/qgsmssqlsourceselect.cpp index 33b44dcfd73..21d642812ef 100644 --- a/src/providers/mssql/qgsmssqlsourceselect.cpp +++ b/src/providers/mssql/qgsmssqlsourceselect.cpp @@ -125,7 +125,7 @@ void QgsMssqlSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemM } QgsMssqlSourceSelect::QgsMssqlSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode ) - : QgsDbSourceSelectBase( parent, fl, theWidgetMode ) + : QgsAbstractDbSourceSelect( parent, fl, theWidgetMode ) { QgsGui::instance()->enableAutoGeometryRestore( this ); diff --git a/src/providers/mssql/qgsmssqlsourceselect.h b/src/providers/mssql/qgsmssqlsourceselect.h index 7e4f351f52d..b401b0bff2d 100644 --- a/src/providers/mssql/qgsmssqlsourceselect.h +++ b/src/providers/mssql/qgsmssqlsourceselect.h @@ -20,7 +20,7 @@ #include "qgsguiutils.h" #include "qgshelp.h" #include "qgsproviderregistry.h" -#include "qgsdbsourceselectbase.h" +#include "qgsabstractdbsourceselect.h" #include "qgsmssqltablemodel.h" @@ -57,7 +57,7 @@ class QgsMssqlSourceSelectDelegate : public QItemDelegate * for MSSQL databases. The user can then connect and add * tables from the database to the map canvas. */ -class QgsMssqlSourceSelect : public QgsDbSourceSelectBase +class QgsMssqlSourceSelect : public QgsAbstractDbSourceSelect { Q_OBJECT diff --git a/src/providers/oracle/qgsoraclesourceselect.cpp b/src/providers/oracle/qgsoraclesourceselect.cpp index 0a3b169e316..c4fa0eda360 100644 --- a/src/providers/oracle/qgsoraclesourceselect.cpp +++ b/src/providers/oracle/qgsoraclesourceselect.cpp @@ -173,7 +173,7 @@ void QgsOracleSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItem } QgsOracleSourceSelect::QgsOracleSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode ) - : QgsDbSourceSelectBase( parent, fl, theWidgetMode ) + : QgsAbstractDbSourceSelect( parent, fl, theWidgetMode ) { QgsGui::instance()->enableAutoGeometryRestore( this ); setupButtons( buttonBox ); diff --git a/src/providers/oracle/qgsoraclesourceselect.h b/src/providers/oracle/qgsoraclesourceselect.h index 21c8e48cba6..3dfe292db80 100644 --- a/src/providers/oracle/qgsoraclesourceselect.h +++ b/src/providers/oracle/qgsoraclesourceselect.h @@ -21,7 +21,7 @@ #include "qgshelp.h" #include "qgsoracleconnpool.h" #include "qgsproviderregistry.h" -#include "qgsdbsourceselectbase.h" +#include "qgsabstractdbsourceselect.h" #include #include @@ -79,7 +79,7 @@ class QgsOracleSourceSelectDelegate : public QItemDelegate * for Oracle databases. The user can then connect and add * tables from the database to the map canvas. */ -class QgsOracleSourceSelect : public QgsDbSourceSelectBase +class QgsOracleSourceSelect : public QgsAbstractDbSourceSelect { Q_OBJECT diff --git a/src/providers/postgres/qgspgsourceselect.cpp b/src/providers/postgres/qgspgsourceselect.cpp index 85bc40e1138..21ca5c2af72 100644 --- a/src/providers/postgres/qgspgsourceselect.cpp +++ b/src/providers/postgres/qgspgsourceselect.cpp @@ -215,7 +215,7 @@ void QgsPgSourceSelectDelegate::setModelData( QWidget *editor, QAbstractItemMode } QgsPgSourceSelect::QgsPgSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode ) - : QgsDbSourceSelectBase( parent, fl, theWidgetMode ) + : QgsAbstractDbSourceSelect( parent, fl, theWidgetMode ) { QgsGui::instance()->enableAutoGeometryRestore( this ); diff --git a/src/providers/postgres/qgspgsourceselect.h b/src/providers/postgres/qgspgsourceselect.h index 5c8f2246cd8..31cdee445b3 100644 --- a/src/providers/postgres/qgspgsourceselect.h +++ b/src/providers/postgres/qgspgsourceselect.h @@ -21,7 +21,7 @@ #include "qgsdatasourceuri.h" #include "qgshelp.h" #include "qgsproviderregistry.h" -#include "qgsdbsourceselectbase.h" +#include "qgsabstractdbsourceselect.h" #include "qgspostgresconn.h" #include @@ -59,7 +59,7 @@ class QgsPgSourceSelectDelegate : public QItemDelegate * for PostGIS enabled PostgreSQL databases. The user can then connect and add * tables from the database to the map canvas. */ -class QgsPgSourceSelect : public QgsDbSourceSelectBase +class QgsPgSourceSelect : public QgsAbstractDbSourceSelect { Q_OBJECT diff --git a/src/providers/spatialite/qgsspatialitesourceselect.cpp b/src/providers/spatialite/qgsspatialitesourceselect.cpp index cc9fdb8ae35..2dcf377f5b8 100644 --- a/src/providers/spatialite/qgsspatialitesourceselect.cpp +++ b/src/providers/spatialite/qgsspatialitesourceselect.cpp @@ -46,7 +46,7 @@ email : a.furieri@lqt.it #endif QgsSpatiaLiteSourceSelect::QgsSpatiaLiteSourceSelect( QWidget *parent, Qt::WindowFlags fl, QgsProviderRegistry::WidgetMode theWidgetMode ): - QgsDbSourceSelectBase( parent, fl, theWidgetMode ) + QgsAbstractDbSourceSelect( parent, fl, theWidgetMode ) { QgsGui::instance()->enableAutoGeometryRestore( this ); diff --git a/src/providers/spatialite/qgsspatialitesourceselect.h b/src/providers/spatialite/qgsspatialitesourceselect.h index 822f8384668..d4389afa567 100644 --- a/src/providers/spatialite/qgsspatialitesourceselect.h +++ b/src/providers/spatialite/qgsspatialitesourceselect.h @@ -20,7 +20,7 @@ #include "qgsguiutils.h" #include "qgshelp.h" #include "qgsproviderregistry.h" -#include "qgsdbsourceselectbase.h" +#include "qgsabstractdbsourceselect.h" #include #include @@ -42,7 +42,7 @@ class QPushButton; * for SpatiaLite/SQLite databases. The user can then connect and add * tables from the database to the map canvas. */ -class QgsSpatiaLiteSourceSelect: public QgsDbSourceSelectBase +class QgsSpatiaLiteSourceSelect: public QgsAbstractDbSourceSelect { Q_OBJECT