diff --git a/python/PyQt6/core/auto_additions/qgsstacdataitems.py b/python/PyQt6/core/auto_additions/qgsstacdataitems.py deleted file mode 100644 index 7b3bcec7976..00000000000 --- a/python/PyQt6/core/auto_additions/qgsstacdataitems.py +++ /dev/null @@ -1,30 +0,0 @@ -# The following has been generated automatically from src/core/stac/qgsstacdataitems.h -try: - QgsStacFetchMoreItem.__overridden_methods__ = ['handleDoubleClick', 'sortKey'] - QgsStacFetchMoreItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacItemItem.__overridden_methods__ = ['createChildren', 'hasDragEnabled', 'mimeUris', 'equal', 'sortKey'] - QgsStacItemItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacCatalogItem.__overridden_methods__ = ['createChildren', 'equal', 'sortKey', 'childrenCreated'] - QgsStacCatalogItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacRootItem.__overridden_methods__ = ['createChildren', 'sortKey'] - QgsStacRootItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacDataItemProvider.__overridden_methods__ = ['name', 'dataProviderKey', 'capabilities', 'createDataItem'] - QgsStacDataItemProvider.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacConnectionItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass diff --git a/python/PyQt6/core/auto_generated/stac/qgsstacdataitems.sip.in b/python/PyQt6/core/auto_generated/stac/qgsstacdataitems.sip.in deleted file mode 100644 index 187f755bf70..00000000000 --- a/python/PyQt6/core/auto_generated/stac/qgsstacdataitems.sip.in +++ /dev/null @@ -1,197 +0,0 @@ -/************************************************************************ - * This file has been generated automatically from * - * * - * src/core/stac/qgsstacdataitems.h * - * * - * Do not edit manually ! Edit header and run scripts/sipify.py again * - ************************************************************************/ - - - - - - -class QgsStacFetchMoreItem : QgsDataItem -{ -%Docstring(signature="appended") -Item to display that there are additional STAC items which are not -loaded. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacFetchMoreItem( QgsDataItem *parent, const QString &name ); - - virtual bool handleDoubleClick(); - - virtual QVariant sortKey() const; - -}; - -class QgsStacItemItem : QgsDataItem -{ -%Docstring(signature="appended") -Item for STAC Items within a catalog or collection. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacItemItem( QgsDataItem *parent, const QString &name, const QString &path ); - - virtual QVector createChildren(); - - virtual bool hasDragEnabled() const; - - virtual QgsMimeDataUtils::UriList mimeUris() const; - - virtual bool equal( const QgsDataItem *other ); - - virtual QVariant sortKey() const; - - void updateToolTip(); - QgsStacController *stacController(); - - void setStacItem( QgsStacItem *item /Transfer/ ); -%MethodCode - sipCpp-> setStacItem( std::unique_ptr< QgsStacItem >( a0 ) ); -%End - - - QgsStacItem *stacItem() const; -%Docstring -does not transfer ownership -%End - - public slots: - void itemRequestFinished( int requestId, QString error ); - -}; - -class QgsStacCatalogItem : QgsDataCollectionItem -{ -%Docstring(signature="appended") -Item for catalogs and collections. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacCatalogItem( QgsDataItem *parent, const QString &name, const QString &path ); - - virtual QVector createChildren(); - - virtual bool equal( const QgsDataItem *other ); - - virtual QVariant sortKey() const; - - void updateToolTip(); - - void setStacCatalog( QgsStacCatalog *object /Transfer/ ) /HoldGIL/; -%Docstring -takes ownership -%End -%MethodCode - sipCpp->setStacCatalog( std::unique_ptr< QgsStacCatalog>( a0 ) ); -%End - - QgsStacCatalog *stacCatalog() const; -%Docstring -does not transfer ownership -%End - - void fetchMoreChildren(); - - bool isCatalog() const; - bool isCollection() const; - QgsStacController *stacController() const; - QgsStacCatalog *rootCatalog() const; - QgsStacFetchMoreItem *fetchMoreItem() const; - - public slots: - virtual void childrenCreated(); - - -}; - -class QgsStacConnectionItem : QgsStacCatalogItem -{ -%Docstring(signature="appended") -Item for STAC connections, is also a catalog itself. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacConnectionItem( QgsDataItem *parent, const QString &connectionName ); - - QgsStacController *controller() const; - -}; - -class QgsStacRootItem : QgsConnectionsRootItem -{ -%Docstring(signature="appended") -Root item for STAC connections. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacRootItem( QgsDataItem *parent, const QString &name, const QString &path ); - - virtual QVector createChildren(); - - - virtual QVariant sortKey() const; - - public slots: - void onConnectionsChanged(); -}; - -class QgsStacDataItemProvider : QgsDataItemProvider -{ -%Docstring(signature="appended") -Provider for STAC root data item. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - virtual QString name(); - - virtual QString dataProviderKey() const; - - virtual Qgis::DataItemProviderCapabilities capabilities() const; - - virtual QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ); - -}; - - -/************************************************************************ - * This file has been generated automatically from * - * * - * src/core/stac/qgsstacdataitems.h * - * * - * Do not edit manually ! Edit header and run scripts/sipify.py again * - ************************************************************************/ diff --git a/python/PyQt6/core/core_auto.sip b/python/PyQt6/core/core_auto.sip index e7f02e429ac..50a597be743 100644 --- a/python/PyQt6/core/core_auto.sip +++ b/python/PyQt6/core/core_auto.sip @@ -698,7 +698,6 @@ %Include auto_generated/stac/qgsstaccollectionlist.sip %Include auto_generated/stac/qgsstacconnection.sip %Include auto_generated/stac/qgsstaccontroller.sip -%Include auto_generated/stac/qgsstacdataitems.sip %Include auto_generated/stac/qgsstacextent.sip %Include auto_generated/stac/qgsstacitemcollection.sip %Include auto_generated/stac/qgsstacitem.sip diff --git a/python/core/auto_additions/qgsstacdataitems.py b/python/core/auto_additions/qgsstacdataitems.py deleted file mode 100644 index 7b3bcec7976..00000000000 --- a/python/core/auto_additions/qgsstacdataitems.py +++ /dev/null @@ -1,30 +0,0 @@ -# The following has been generated automatically from src/core/stac/qgsstacdataitems.h -try: - QgsStacFetchMoreItem.__overridden_methods__ = ['handleDoubleClick', 'sortKey'] - QgsStacFetchMoreItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacItemItem.__overridden_methods__ = ['createChildren', 'hasDragEnabled', 'mimeUris', 'equal', 'sortKey'] - QgsStacItemItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacCatalogItem.__overridden_methods__ = ['createChildren', 'equal', 'sortKey', 'childrenCreated'] - QgsStacCatalogItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacRootItem.__overridden_methods__ = ['createChildren', 'sortKey'] - QgsStacRootItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacDataItemProvider.__overridden_methods__ = ['name', 'dataProviderKey', 'capabilities', 'createDataItem'] - QgsStacDataItemProvider.__group__ = ['stac'] -except (NameError, AttributeError): - pass -try: - QgsStacConnectionItem.__group__ = ['stac'] -except (NameError, AttributeError): - pass diff --git a/python/core/auto_generated/stac/qgsstacdataitems.sip.in b/python/core/auto_generated/stac/qgsstacdataitems.sip.in deleted file mode 100644 index 187f755bf70..00000000000 --- a/python/core/auto_generated/stac/qgsstacdataitems.sip.in +++ /dev/null @@ -1,197 +0,0 @@ -/************************************************************************ - * This file has been generated automatically from * - * * - * src/core/stac/qgsstacdataitems.h * - * * - * Do not edit manually ! Edit header and run scripts/sipify.py again * - ************************************************************************/ - - - - - - -class QgsStacFetchMoreItem : QgsDataItem -{ -%Docstring(signature="appended") -Item to display that there are additional STAC items which are not -loaded. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacFetchMoreItem( QgsDataItem *parent, const QString &name ); - - virtual bool handleDoubleClick(); - - virtual QVariant sortKey() const; - -}; - -class QgsStacItemItem : QgsDataItem -{ -%Docstring(signature="appended") -Item for STAC Items within a catalog or collection. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacItemItem( QgsDataItem *parent, const QString &name, const QString &path ); - - virtual QVector createChildren(); - - virtual bool hasDragEnabled() const; - - virtual QgsMimeDataUtils::UriList mimeUris() const; - - virtual bool equal( const QgsDataItem *other ); - - virtual QVariant sortKey() const; - - void updateToolTip(); - QgsStacController *stacController(); - - void setStacItem( QgsStacItem *item /Transfer/ ); -%MethodCode - sipCpp-> setStacItem( std::unique_ptr< QgsStacItem >( a0 ) ); -%End - - - QgsStacItem *stacItem() const; -%Docstring -does not transfer ownership -%End - - public slots: - void itemRequestFinished( int requestId, QString error ); - -}; - -class QgsStacCatalogItem : QgsDataCollectionItem -{ -%Docstring(signature="appended") -Item for catalogs and collections. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacCatalogItem( QgsDataItem *parent, const QString &name, const QString &path ); - - virtual QVector createChildren(); - - virtual bool equal( const QgsDataItem *other ); - - virtual QVariant sortKey() const; - - void updateToolTip(); - - void setStacCatalog( QgsStacCatalog *object /Transfer/ ) /HoldGIL/; -%Docstring -takes ownership -%End -%MethodCode - sipCpp->setStacCatalog( std::unique_ptr< QgsStacCatalog>( a0 ) ); -%End - - QgsStacCatalog *stacCatalog() const; -%Docstring -does not transfer ownership -%End - - void fetchMoreChildren(); - - bool isCatalog() const; - bool isCollection() const; - QgsStacController *stacController() const; - QgsStacCatalog *rootCatalog() const; - QgsStacFetchMoreItem *fetchMoreItem() const; - - public slots: - virtual void childrenCreated(); - - -}; - -class QgsStacConnectionItem : QgsStacCatalogItem -{ -%Docstring(signature="appended") -Item for STAC connections, is also a catalog itself. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacConnectionItem( QgsDataItem *parent, const QString &connectionName ); - - QgsStacController *controller() const; - -}; - -class QgsStacRootItem : QgsConnectionsRootItem -{ -%Docstring(signature="appended") -Root item for STAC connections. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - QgsStacRootItem( QgsDataItem *parent, const QString &name, const QString &path ); - - virtual QVector createChildren(); - - - virtual QVariant sortKey() const; - - public slots: - void onConnectionsChanged(); -}; - -class QgsStacDataItemProvider : QgsDataItemProvider -{ -%Docstring(signature="appended") -Provider for STAC root data item. - -.. versionadded:: 3.44 -%End - -%TypeHeaderCode -#include "qgsstacdataitems.h" -%End - public: - virtual QString name(); - - virtual QString dataProviderKey() const; - - virtual Qgis::DataItemProviderCapabilities capabilities() const; - - virtual QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ); - -}; - - -/************************************************************************ - * This file has been generated automatically from * - * * - * src/core/stac/qgsstacdataitems.h * - * * - * Do not edit manually ! Edit header and run scripts/sipify.py again * - ************************************************************************/ diff --git a/python/core/core_auto.sip b/python/core/core_auto.sip index e7f02e429ac..50a597be743 100644 --- a/python/core/core_auto.sip +++ b/python/core/core_auto.sip @@ -698,7 +698,6 @@ %Include auto_generated/stac/qgsstaccollectionlist.sip %Include auto_generated/stac/qgsstacconnection.sip %Include auto_generated/stac/qgsstaccontroller.sip -%Include auto_generated/stac/qgsstacdataitems.sip %Include auto_generated/stac/qgsstacextent.sip %Include auto_generated/stac/qgsstacitemcollection.sip %Include auto_generated/stac/qgsstacitem.sip diff --git a/src/core/stac/qgsstacdataitems.h b/src/core/stac/qgsstacdataitems.h index 991a3187842..adc460f5b64 100644 --- a/src/core/stac/qgsstacdataitems.h +++ b/src/core/stac/qgsstacdataitems.h @@ -27,11 +27,12 @@ class QgsStacController; class QgsStacCollection; +///@cond PRIVATE +#define SIP_NO_FILE /** - * \ingroup core * \brief Item to display that there are additional STAC items which are not loaded. - * \since QGIS 3.44 + * \since QGIS 3.40 */ class CORE_EXPORT QgsStacFetchMoreItem : public QgsDataItem { @@ -45,9 +46,8 @@ class CORE_EXPORT QgsStacFetchMoreItem : public QgsDataItem }; /** - * \ingroup core * \brief Item for STAC Items within a catalog or collection. - * \since QGIS 3.44 + * \since QGIS 3.40 */ class CORE_EXPORT QgsStacItemItem : public QgsDataItem { @@ -64,16 +64,8 @@ class CORE_EXPORT QgsStacItemItem : public QgsDataItem void updateToolTip(); QgsStacController *stacController(); -#ifndef SIP_RUN //! takes ownership void setStacItem( std::unique_ptr< QgsStacItem > item ); -#else - void setStacItem( QgsStacItem *item SIP_TRANSFER ); - % MethodCode - sipCpp-> setStacItem( std::unique_ptr< QgsStacItem >( a0 ) ); - % End -#endif - //! does not transfer ownership QgsStacItem *stacItem() const; @@ -88,9 +80,8 @@ class CORE_EXPORT QgsStacItemItem : public QgsDataItem }; /** - * \ingroup core * \brief Item for catalogs and collections. - * \since QGIS 3.44 + * \since QGIS 3.40 */ class CORE_EXPORT QgsStacCatalogItem : public QgsDataCollectionItem { @@ -105,14 +96,7 @@ class CORE_EXPORT QgsStacCatalogItem : public QgsDataCollectionItem void updateToolTip(); //! takes ownership -#ifndef SIP_RUN void setStacCatalog( std::unique_ptr< QgsStacCatalog > object ); -#else - void setStacCatalog( QgsStacCatalog *object SIP_TRANSFER ) SIP_HOLDGIL; - % MethodCode - sipCpp->setStacCatalog( std::unique_ptr< QgsStacCatalog>( a0 ) ); - % End -#endif //! does not transfer ownership QgsStacCatalog *stacCatalog() const; @@ -145,9 +129,8 @@ class CORE_EXPORT QgsStacCatalogItem : public QgsDataCollectionItem }; /** - * \ingroup core * \brief Item for STAC connections, is also a catalog itself. - * \since QGIS 3.44 + * \since QGIS 3.40 */ class CORE_EXPORT QgsStacConnectionItem : public QgsStacCatalogItem { @@ -165,9 +148,8 @@ class CORE_EXPORT QgsStacConnectionItem : public QgsStacCatalogItem }; /** - * \ingroup core * \brief Root item for STAC connections. - * \since QGIS 3.44 + * \since QGIS 3.40 */ class CORE_EXPORT QgsStacRootItem : public QgsConnectionsRootItem { @@ -184,9 +166,8 @@ class CORE_EXPORT QgsStacRootItem : public QgsConnectionsRootItem }; /** - * \ingroup core * \brief Provider for STAC root data item. - * \since QGIS 3.44 + * \since QGIS 3.40 */ class CORE_EXPORT QgsStacDataItemProvider : public QgsDataItemProvider { @@ -197,5 +178,6 @@ class CORE_EXPORT QgsStacDataItemProvider : public QgsDataItemProvider QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) override; }; +///@endcond #endif // QGSSTACDATAITEMS_H