From 56e58a2f7470e6c566cea976ffc9cf6eb40d36ac Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Tue, 15 Oct 2024 11:13:57 +1000 Subject: [PATCH] Remove duplicate inherited members --- python/PyQt6/core/auto_additions/qgsdatabaseschemaitem.py | 1 - .../auto_generated/browser/qgsdatabaseschemaitem.sip.in | 7 ------- python/core/auto_additions/qgsdatabaseschemaitem.py | 1 - .../auto_generated/browser/qgsdatabaseschemaitem.sip.in | 7 ------- src/core/browser/qgsdatabaseschemaitem.cpp | 5 ----- src/core/browser/qgsdatabaseschemaitem.h | 6 ------ 6 files changed, 27 deletions(-) diff --git a/python/PyQt6/core/auto_additions/qgsdatabaseschemaitem.py b/python/PyQt6/core/auto_additions/qgsdatabaseschemaitem.py index 7a0b1bbabd8..6c702e7b333 100644 --- a/python/PyQt6/core/auto_additions/qgsdatabaseschemaitem.py +++ b/python/PyQt6/core/auto_additions/qgsdatabaseschemaitem.py @@ -1,6 +1,5 @@ # The following has been generated automatically from src/core/browser/qgsdatabaseschemaitem.h try: - QgsDatabaseSchemaItem.iconDataCollection = staticmethod(QgsDatabaseSchemaItem.iconDataCollection) QgsDatabaseSchemaItem.__group__ = ['browser'] except NameError: pass diff --git a/python/PyQt6/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in b/python/PyQt6/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in index 65936c00515..83486c33549 100644 --- a/python/PyQt6/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in +++ b/python/PyQt6/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in @@ -45,13 +45,6 @@ The optional ``providerKey`` string can be used to specify the key for the :py:c virtual QgsAbstractDatabaseProviderConnection *databaseConnection() const; - static QIcon iconDataCollection(); -%Docstring -Returns the standard browser data collection icon. - -.. seealso:: :py:func:`iconDir` -%End - }; diff --git a/python/core/auto_additions/qgsdatabaseschemaitem.py b/python/core/auto_additions/qgsdatabaseschemaitem.py index 7a0b1bbabd8..6c702e7b333 100644 --- a/python/core/auto_additions/qgsdatabaseschemaitem.py +++ b/python/core/auto_additions/qgsdatabaseschemaitem.py @@ -1,6 +1,5 @@ # The following has been generated automatically from src/core/browser/qgsdatabaseschemaitem.h try: - QgsDatabaseSchemaItem.iconDataCollection = staticmethod(QgsDatabaseSchemaItem.iconDataCollection) QgsDatabaseSchemaItem.__group__ = ['browser'] except NameError: pass diff --git a/python/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in b/python/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in index 65936c00515..83486c33549 100644 --- a/python/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in +++ b/python/core/auto_generated/browser/qgsdatabaseschemaitem.sip.in @@ -45,13 +45,6 @@ The optional ``providerKey`` string can be used to specify the key for the :py:c virtual QgsAbstractDatabaseProviderConnection *databaseConnection() const; - static QIcon iconDataCollection(); -%Docstring -Returns the standard browser data collection icon. - -.. seealso:: :py:func:`iconDir` -%End - }; diff --git a/src/core/browser/qgsdatabaseschemaitem.cpp b/src/core/browser/qgsdatabaseschemaitem.cpp index 1f6522702af..c294d424461 100644 --- a/src/core/browser/qgsdatabaseschemaitem.cpp +++ b/src/core/browser/qgsdatabaseschemaitem.cpp @@ -33,11 +33,6 @@ QgsDatabaseSchemaItem::~QgsDatabaseSchemaItem() } -QIcon QgsDatabaseSchemaItem::iconDataCollection() -{ - return QgsApplication::getThemeIcon( QStringLiteral( "/mIconDbSchema.svg" ) ); -} - QgsAbstractDatabaseProviderConnection *QgsDatabaseSchemaItem::databaseConnection() const { const QString dataProviderKey { QgsApplication::dataItemProviderRegistry()->dataProviderKey( providerKey() ) }; diff --git a/src/core/browser/qgsdatabaseschemaitem.h b/src/core/browser/qgsdatabaseschemaitem.h index 7dd54f4d51f..12313944ebd 100644 --- a/src/core/browser/qgsdatabaseschemaitem.h +++ b/src/core/browser/qgsdatabaseschemaitem.h @@ -56,12 +56,6 @@ class CORE_EXPORT QgsDatabaseSchemaItem : public QgsDataCollectionItem QgsAbstractDatabaseProviderConnection *databaseConnection() const override; - /** - * Returns the standard browser data collection icon. - * \see iconDir() - */ - static QIcon iconDataCollection(); - }; #endif // QGSDATABASESCHEMAITEM_H