Skip to content
Permalink
Browse files

Fix build

  • Loading branch information
nyalldawson committed Aug 4, 2016
1 parent bb79d13 commit e363d242f910296afe8e79df656431eb8f674756
@@ -595,7 +595,7 @@ bool QgsGrassVectorImport::import()
QDataStream outStream( mProcess );
mProcess->setReadChannel( QProcess::StandardOutput );

QgsWkbTypes::Type wkbType = mProvider->geometryType();
QgsWkbTypes::Type wkbType = mProvider->wkbType();
bool isPolygon = QgsWkbTypes::singleType( QgsWkbTypes::flatType( wkbType ) ) == QgsWkbTypes::Polygon;
outStream << ( qint32 )wkbType;

@@ -443,7 +443,7 @@ QgsRectangle QgsGrassProvider::extent() const
/**
* Return the feature type
*/
QgsWkbTypes::Type QgsGrassProvider::geometryType() const
QgsWkbTypes::Type QgsGrassProvider::wkbType() const
{
return mQgisType;
}
@@ -78,7 +78,7 @@ class GRASS_LIB_EXPORT QgsGrassProvider : public QgsVectorDataProvider
* Get the feature type as defined in WkbType (qgis.h).
* @return int representing the feature type
*/
QgsWkbTypes::Type geometryType() const override;
QgsWkbTypes::Type wkbType() const override;


/**
@@ -257,7 +257,7 @@ bool QgsOracleConnectionItem::handleDrop( const QMimeData * data, Qt::DropAction
if ( srcLayer->isValid() )
{
uri.setDataSource( QString(), u.name.left( 30 ).toUpper(), "GEOM" );
uri.setWkbType( QGis::fromOldWkbType( srcLayer->wkbType() ) );
uri.setWkbType( srcLayer->wkbType() );
QString authid = srcLayer->crs().authid();
if ( authid.startsWith( "EPSG:", Qt::CaseInsensitive ) )
{
@@ -374,7 +374,7 @@ QString QgsOracleLayerItem::createUri()
QgsDataSourceUri uri = QgsOracleConn::connUri( connItem->name() );
uri.setDataSource( mLayerProperty.ownerName, mLayerProperty.tableName, mLayerProperty.geometryColName, mLayerProperty.sql, QString::null );
uri.setSrid( QString::number( mLayerProperty.srids.at( 0 ) ) );
uri.setWkbType( QGis::fromOldWkbType( mLayerProperty.types.at( 0 ) ) );
uri.setWkbType( mLayerProperty.types.at( 0 ) );
if ( mLayerProperty.isView && mLayerProperty.pkCols.size() > 0 )
uri.setKeyColumn( mLayerProperty.pkCols[0] );
QgsDebugMsgLevel( QString( "layer uri: %1" ).arg( uri.uri() ), 3 );
@@ -499,7 +499,7 @@ void QgsOracleProvider::setExtent( QgsRectangle& newExtent )
/**
* Return the feature type
*/
QgsWkbTypes::Type QgsOracleProvider::geometryType() const
QgsWkbTypes::Type QgsOracleProvider::wkbType() const
{
return mRequestedGeomType != QgsWkbTypes::Unknown ? mRequestedGeomType : mDetectedGeomType;
}
@@ -2419,7 +2419,7 @@ bool QgsOracleProvider::getGeometryDetails()
mEnabledCapabilities &= ~( QgsVectorDataProvider::ChangeGeometries | QgsVectorDataProvider::AddFeatures );
}

QgsDebugMsg( QString( "Feature type name is %1" ).arg( QGis::featureType( geometryType() ) ) );
QgsDebugMsg( QString( "Feature type name is %1" ).arg( QgsWkbTypes::displayString( wkbType() ) ) );

return mValid;
}
@@ -105,7 +105,7 @@ class QgsOracleProvider : public QgsVectorDataProvider
* WKBMultiPolygon
* as defined in qgis.h
*/
QgsWkbTypes::Type geometryType() const override;
QgsWkbTypes::Type wkbType() const override;

/** Return the number of layers for the current data source
* @note Should this be subLayerCount() instead?

0 comments on commit e363d24

Please sign in to comment.
You can’t perform that action at this time.