Skip to content

Commit

Permalink
Fix vtable issues because missing key function
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-kuhn @PeterPetrik
m-kuhn authored and PeterPetrik committed Jul 4, 2019
1 parent cd53764 commit 738e560
Show file tree
Hide file tree
Showing 34 changed files with 212 additions and 42 deletions.
10 changes: 10 additions & 0 deletions src/core/providers/gdal/qgsgdaldataitems.cpp
View file
Expand Up @@ -126,6 +126,16 @@ static QStringList sExtensions = QStringList();
static QStringList sWildcards = QStringList();
static QMutex sBuildingFilters;

QString QgsGdalDataItemProvider::name()
{
return QStringLiteral( "GDAL" );
}

int QgsGdalDataItemProvider::capabilities() const
{
return QgsDataProvider::File | QgsDataProvider::Dir | QgsDataProvider::Net;
}

QgsDataItem *QgsGdalDataItemProvider::createDataItem( const QString &pathIn, QgsDataItem *parentItem )
{
QString path( pathIn );
Expand Down
4 changes: 2 additions & 2 deletions src/core/providers/gdal/qgsgdaldataitems.h
View file
Expand Up @@ -49,9 +49,9 @@ class CORE_EXPORT QgsGdalLayerItem : public QgsLayerItem
class QgsGdalDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "GDAL" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::File | QgsDataProvider::Dir | QgsDataProvider::Net; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &pathIn, QgsDataItem *parentItem ) override;
};
Expand Down
10 changes: 10 additions & 0 deletions src/core/providers/ogr/qgsgeopackagedataitems.cpp
View file
Expand Up @@ -42,6 +42,16 @@
#include "qgsprojectstorageregistry.h"
#include "qgsgeopackageprojectstorage.h"

QString QgsGeoPackageDataItemProvider::name()
{
return QStringLiteral( "GPKG" );
}

int QgsGeoPackageDataItemProvider::capabilities() const
{
return QgsDataProvider::Database;
}

QgsDataItem *QgsGeoPackageDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )
{
QgsDebugMsg( "path = " + path );
Expand Down
4 changes: 2 additions & 2 deletions src/core/providers/ogr/qgsgeopackagedataitems.h
View file
Expand Up @@ -145,8 +145,8 @@ class CORE_EXPORT QgsGeoPackageRootItem : public QgsDataCollectionItem
class QgsGeoPackageDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "GPKG" ); }
int capabilities() const override { return QgsDataProvider::Database; }
QString name() override;
int capabilities() const override;
QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) override;
};

Expand Down
10 changes: 10 additions & 0 deletions src/core/providers/ogr/qgsogrdataitems.cpp
View file
Expand Up @@ -405,6 +405,16 @@ bool QgsOgrDataCollectionItem::createConnection( const QString &name, const QStr

// ---------------------------------------------------------------------------

QString QgsOgrDataItemProvider::name()
{
return QStringLiteral( "OGR" );
}

int QgsOgrDataItemProvider::capabilities() const
{
return QgsDataProvider::File | QgsDataProvider::Dir | QgsDataProvider::Net;
}

QgsDataItem *QgsOgrDataItemProvider::createDataItem( const QString &pathIn, QgsDataItem *parentItem )
{
QString path( pathIn );
Expand Down
4 changes: 2 additions & 2 deletions src/core/providers/ogr/qgsogrdataitems.h
View file
Expand Up @@ -102,9 +102,9 @@ class CORE_EXPORT QgsOgrDataCollectionItem : public QgsDataCollectionItem
class QgsOgrDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "OGR" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::File | QgsDataProvider::Dir | QgsDataProvider::Net; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) override;

Expand Down
7 changes: 7 additions & 0 deletions src/core/qgsdataitemprovider.cpp
View file
Expand Up @@ -17,6 +17,13 @@

// no implementation currently

QVector<QgsDataItem *> QgsDataItemProvider::createDataItems( const QString &path, QgsDataItem *parentItem )
{
Q_UNUSED( path )
Q_UNUSED( parentItem )
return QVector<QgsDataItem *>();
}

bool QgsDataItemProvider::handlesDirectoryPath( const QString & )
{
return false;
Expand Down
2 changes: 1 addition & 1 deletion src/core/qgsdataitemprovider.h
View file
Expand Up @@ -62,7 +62,7 @@ class CORE_EXPORT QgsDataItemProvider
* Create a vector of instances of QgsDataItem (or NULLPTR) for given path and parent item.
* Caller takes responsibility of deleting created items.
*/
virtual QVector<QgsDataItem *> createDataItems( const QString &path, QgsDataItem *parentItem ) { Q_UNUSED( path ) Q_UNUSED( parentItem ); return QVector<QgsDataItem *>(); }
virtual QVector<QgsDataItem *> createDataItems( const QString &path, QgsDataItem *parentItem );

/**
* Returns TRUE if the provider will handle the directory at the specified \a path.
Expand Down
10 changes: 10 additions & 0 deletions src/providers/arcgisrest/qgsafsdataitems.cpp
View file
Expand Up @@ -295,6 +295,16 @@ bool QgsAfsParentLayerItem::equal( const QgsDataItem *other )
// QgsAfsDataItemProvider
//

QString QgsAfsDataItemProvider::name()
{
return QStringLiteral( "AFS" );
}

int QgsAfsDataItemProvider::capabilities() const
{
return QgsDataProvider::Net;
}

QgsDataItem *QgsAfsDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )
{
if ( path.isEmpty() )
Expand Down
4 changes: 2 additions & 2 deletions src/providers/arcgisrest/qgsafsdataitems.h
View file
Expand Up @@ -113,9 +113,9 @@ class QgsAfsLayerItem : public QgsLayerItem
class QgsAfsDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "AFS" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::Net; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) override;
};
Expand Down
10 changes: 10 additions & 0 deletions src/providers/arcgisrest/qgsamsdataitems.cpp
View file
Expand Up @@ -276,6 +276,16 @@ QgsAmsLayerItem::QgsAmsLayerItem( QgsDataItem *parent, const QString &, const QS
// QgsAmsDataItemProvider
//

QString QgsAmsDataItemProvider::name()
{
return QStringLiteral( "AMS" );
}

int QgsAmsDataItemProvider::capabilities() const
{
return QgsDataProvider::Net;
}

QgsDataItem *QgsAmsDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )
{
if ( path.isEmpty() )
Expand Down
4 changes: 2 additions & 2 deletions src/providers/arcgisrest/qgsamsdataitems.h
View file
Expand Up @@ -102,9 +102,9 @@ class QgsAmsLayerItem : public QgsLayerItem
class QgsAmsDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "AMS" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::Net; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) override;
};
Expand Down
10 changes: 10 additions & 0 deletions src/providers/db2/qgsdb2dataitems.cpp
View file
Expand Up @@ -474,6 +474,16 @@ QgsDb2LayerItem *QgsDb2SchemaItem::addLayer( QgsDb2LayerProperty layerProperty,
return layerItem;
}

QString QgsDb2DataItemProvider::name()
{
return QStringLiteral( "DB2" );
}

int QgsDb2DataItemProvider::capabilities() const
{
return QgsDataProvider::Database;
}

QgsDataItem *QgsDb2DataItemProvider::createDataItem( const QString &pathIn, QgsDataItem *parentItem )
{
Q_UNUSED( pathIn );
Expand Down
4 changes: 2 additions & 2 deletions src/providers/db2/qgsdb2dataitems.h
View file
Expand Up @@ -133,7 +133,7 @@ class QgsDb2LayerItem : public QgsLayerItem
class QgsDb2DataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "DB2" ); }
int capabilities() const override { return QgsDataProvider::Database; }
QString name() override;
int capabilities() const override;
QgsDataItem *createDataItem( const QString &pathIn, QgsDataItem *parentItem ) override;
};
15 changes: 13 additions & 2 deletions src/providers/geonode/qgsgeonodedataitems.cpp
View file
Expand Up @@ -176,7 +176,7 @@ QVector<QgsDataItem *> QgsGeoNodeServiceItem::createChildren()
}

// reset path recursively
void QgsGeoNodeServiceItem::replacePath( QgsDataItem *item, QString before, QString after )
void QgsGeoNodeServiceItem::replacePath( QgsDataItem *item, const QString &before, const QString &after )
{
item->setPath( item->path().replace( before, after ) );
const QVector< QgsDataItem * > children = item->children();
Expand All @@ -186,7 +186,8 @@ void QgsGeoNodeServiceItem::replacePath( QgsDataItem *item, QString before, QStr
}
}

QgsGeoNodeRootItem::QgsGeoNodeRootItem( QgsDataItem *parent, QString name, QString path ) : QgsDataCollectionItem( parent, name, path )
QgsGeoNodeRootItem::QgsGeoNodeRootItem( QgsDataItem *parent, QString name, QString path )
: QgsDataCollectionItem( parent, name, path )
{
mCapabilities |= Fast;
{
Expand All @@ -211,6 +212,16 @@ QVector<QgsDataItem *> QgsGeoNodeRootItem::createChildren()
}


QString QgsGeoNodeDataItemProvider::name()
{
return QStringLiteral( "GeoNode" );
}

int QgsGeoNodeDataItemProvider::capabilities() const
{
return QgsDataProvider::Net;
}

QgsDataItem *QgsGeoNodeDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )
{
QgsDebugMsgLevel( "thePath = " + path, 4 );
Expand Down
6 changes: 3 additions & 3 deletions src/providers/geonode/qgsgeonodedataitems.h
View file
Expand Up @@ -45,7 +45,7 @@ class QgsGeoNodeServiceItem : public QgsDataCollectionItem
QVector<QgsDataItem *> createChildren() override;

private:
void replacePath( QgsDataItem *item, QString before, QString after );
void replacePath( QgsDataItem *item, const QString &before, const QString &after );
QString mName;
QString mServiceName;
QString mUri;
Expand All @@ -68,9 +68,9 @@ class QgsGeoNodeRootItem : public QgsDataCollectionItem
class QgsGeoNodeDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "GeoNode" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::Net; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &path, QgsDataItem *parentItem ) override;
};
Expand Down
10 changes: 10 additions & 0 deletions src/providers/mdal/qgsmdaldataitems.cpp
View file
Expand Up @@ -38,6 +38,16 @@ QString QgsMdalLayerItem::layerName() const
// ---------------------------------------------------------------------------
static QStringList sExtensions = QStringList();

QString QgsMdalDataItemProvider::name()
{
return QStringLiteral( "MDAL" );
}

int QgsMdalDataItemProvider::capabilities() const
{
return QgsDataProvider::File;
}

QgsDataItem *QgsMdalDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )
{
if ( path.isEmpty() )
Expand Down
4 changes: 2 additions & 2 deletions src/providers/mdal/qgsmdaldataitems.h
View file
Expand Up @@ -33,9 +33,9 @@ class QgsMdalLayerItem : public QgsLayerItem
class QgsMdalDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "MDAL" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::File; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &pathIn, QgsDataItem *parentItem ) override;
};
Expand Down
10 changes: 10 additions & 0 deletions src/providers/mssql/qgsmssqldataitems.cpp
View file
Expand Up @@ -631,6 +631,16 @@ void QgsMssqlRootItem::onConnectionsChanged()
}
#endif

QString QgsMssqlDataItemProvider::name()
{
return QStringLiteral( "MSSQL" );
}

int QgsMssqlDataItemProvider::capabilities() const
{
return QgsDataProvider::Database;
}

QgsDataItem *QgsMssqlDataItemProvider::createDataItem( const QString &pathIn, QgsDataItem *parentItem )
{
Q_UNUSED( pathIn )
Expand Down
4 changes: 2 additions & 2 deletions src/providers/mssql/qgsmssqldataitems.h
View file
Expand Up @@ -133,9 +133,9 @@ class QgsMssqlLayerItem : public QgsLayerItem
class QgsMssqlDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "MSSQL" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::Database; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &pathIn, QgsDataItem *parentItem ) override;
};
Expand Down
10 changes: 10 additions & 0 deletions src/providers/oracle/qgsoracledataitems.cpp
View file
Expand Up @@ -591,3 +591,13 @@ QgsDataItem *QgsOracleDataItemProvider::createDataItem( const QString &pathIn, Q
Q_UNUSED( pathIn )
return new QgsOracleRootItem( parentItem, "Oracle", "oracle:" );
}

QString QgsOracleDataItemProvider::name()
{
return QStringLiteral( "ORACLE" );
}

int QgsOracleDataItemProvider::capabilities() const
{
return QgsDataProvider::Database;
}
4 changes: 2 additions & 2 deletions src/providers/oracle/qgsoracledataitems.h
View file
Expand Up @@ -125,9 +125,9 @@ class QgsOracleLayerItem : public QgsLayerItem
class QgsOracleDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "ORACLE" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::Database; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &pathIn, QgsDataItem *parentItem ) override;
};
Expand Down
10 changes: 10 additions & 0 deletions src/providers/ows/qgsowsdataitems.cpp
View file
Expand Up @@ -179,6 +179,16 @@ QVector<QgsDataItem *> QgsOWSRootItem::createChildren()
static QStringList extensions = QStringList();
static QStringList wildcards = QStringList();

QString QgsOwsDataItemProvider::name()
{
return QStringLiteral( "OWS" );
}

int QgsOwsDataItemProvider::capabilities() const
{
return QgsDataProvider::Net;
}

QgsDataItem *QgsOwsDataItemProvider::createDataItem( const QString &path, QgsDataItem *parentItem )
{
if ( path.isEmpty() )
Expand Down
4 changes: 2 additions & 2 deletions src/providers/ows/qgsowsdataitems.h
View file
Expand Up @@ -49,9 +49,9 @@ class QgsOWSRootItem : public QgsDataCollectionItem
class QgsOwsDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "OWS" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::Net; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &pathIn, QgsDataItem *parentItem ) override;
};
Expand Down
10 changes: 10 additions & 0 deletions src/providers/postgres/qgspostgresdataitems.cpp
View file
Expand Up @@ -538,6 +538,16 @@ void QgsPGRootItem::onConnectionsChanged()

QMainWindow *QgsPGRootItem::sMainWindow = nullptr;

QString QgsPostgresDataItemProvider::name()
{
return QStringLiteral( "PostGIS" );
}

int QgsPostgresDataItemProvider::capabilities() const
{
return QgsDataProvider::Database;
}

QgsDataItem *QgsPostgresDataItemProvider::createDataItem( const QString &pathIn, QgsDataItem *parentItem )
{
Q_UNUSED( pathIn )
Expand Down
4 changes: 2 additions & 2 deletions src/providers/postgres/qgspostgresdataitems.h
View file
Expand Up @@ -110,9 +110,9 @@ class QgsPGLayerItem : public QgsLayerItem
class QgsPostgresDataItemProvider : public QgsDataItemProvider
{
public:
QString name() override { return QStringLiteral( "PostGIS" ); }
QString name() override;

int capabilities() const override { return QgsDataProvider::Database; }
int capabilities() const override;

QgsDataItem *createDataItem( const QString &pathIn, QgsDataItem *parentItem ) override;
};
Expand Down

0 comments on commit 738e560

Please sign in to comment.