sharpetronics/QGIS
1
0
Fork 0
mirror of https://github.com/qgis/QGIS.git synced 2025-04-17 00:04:02 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #9437 from 3nids/maplayertype_enum

Browse Source 
create scope based enum for QgsMapLayer::LayerType >> QgsMapLayerType
This commit is contained in:
Denis Rouzaud 2019-03-26 10:28:34 -05:00 committed by GitHub
commit f000956e86
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
100 changed files with 384 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake_templates/Doxyfile.in
View File

@ -2066,7 +2066,9 @@ EXPAND_AS_DEFINED = "SIP_ABSTRACT" \
"SIP_TRANSFERTHIS" \
"SIP_VIRTUAL_CATCHER_CODE" \
"SIP_VIRTUALERRORHANDLER" \
"SIP_WHEN_FEATURE"
"SIP_WHEN_FEATURE" \
"SIP_MONKEYPATCH_SCOPEENUM" \
"SIP_MONKEYPATCH_SCOPEENUM_UNNEST"
# If the SKIP_FUNCTION_MACROS tag is set to YES then doxygen's preprocessor will
# remove all references to function-like macros that are alone on a line, have

12
python/core/auto_additions/qgsmaplayer.py
View File

@ -1,4 +1,16 @@
# The following has been generated automatically from src/core/qgsmaplayer.h
QgsMapLayer.LayerType = QgsMapLayerType
# monkey patching scoped based enum
QgsMapLayer.VectorLayer = QgsMapLayerType.VectorLayer
QgsMapLayer.VectorLayer.__doc__ = ""
QgsMapLayer.RasterLayer = QgsMapLayerType.RasterLayer
QgsMapLayer.RasterLayer.__doc__ = ""
QgsMapLayer.PluginLayer = QgsMapLayerType.PluginLayer
QgsMapLayer.PluginLayer.__doc__ = ""
QgsMapLayer.MeshLayer = QgsMapLayerType.MeshLayer
QgsMapLayer.MeshLayer.__doc__ = "Added in 3.2"
QgsMapLayerType.__doc__ = 'Types of layers that can be added to a map\n\n.. versionadded:: 3.8\n\n' + '* VectorLayer: ' + QgsMapLayerType.VectorLayer.__doc__ + '\n' + '* RasterLayer: ' + QgsMapLayerType.RasterLayer.__doc__ + '\n' + '* PluginLayer: ' + QgsMapLayerType.PluginLayer.__doc__ + '\n' + '* MeshLayer: ' + QgsMapLayerType.MeshLayer.__doc__
# --
QgsMapLayer.LayerFlag.baseClass = QgsMapLayer
QgsMapLayer.LayerFlags.baseClass = QgsMapLayer
LayerFlags = QgsMapLayer # dirty hack since SIP seems to introduce the flags in module

4
python/core/auto_generated/qgsbrowserproxymodel.sip.in
View File

@ -113,7 +113,7 @@ Sets whether the model is filtered by map layer type.
.. seealso:: :py:func:`setLayerType`
%End
QgsMapLayer::LayerType layerType() const;
QgsMapLayerType layerType() const;
%Docstring
Returns the layer type to filter the model by. This is only used if
filterByLayerType() is ``True``.
@ -123,7 +123,7 @@ filterByLayerType() is ``True``.
.. seealso:: :py:func:`filterByLayerType`
%End
void setLayerType( QgsMapLayer::LayerType type );
void setLayerType( QgsMapLayerType type );
%Docstring
Sets the layer ``type`` to filter the model by. This is only used if
filterByLayerType() is ``True``.

4
python/core/auto_generated/qgsdataitem.sip.in
View File

@ -433,9 +433,9 @@ Item that represents a layer that can be opened with one of the providers
QgsMapLayer::LayerType mapLayerType() const;
QgsMapLayerType mapLayerType() const;
%Docstring
Returns QgsMapLayer.LayerType
Returns :py:class:`QgsMapLayerType`
%End
static LayerType typeFromMapLayer( QgsMapLayer *layer );

31
python/core/auto_generated/qgsmaplayer.sip.in
View File

@ -13,6 +13,15 @@
enum class QgsMapLayerType
{
VectorLayer,
RasterLayer,
PluginLayer,
MeshLayer
};
class QgsMapLayer : QObject
{
%Docstring
@ -24,7 +33,7 @@ This is the base class for all map layer types (vector, raster).
#include "qgsmaplayer.h"
%End
%ConvertToSubClassCode
QgsMapLayer *layer = qobject_cast<QgsMapLayer *>( sipCpp );
QgsMapLayer * layer = qobject_cast<QgsMapLayer *>( sipCpp );
sipType = 0;
@ -32,16 +41,16 @@ This is the base class for all map layer types (vector, raster).
{
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
sipType = sipType_QgsVectorLayer;
break;
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
sipType = sipType_QgsRasterLayer;
break;
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
sipType = sipType_QgsPluginLayer;
break;
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
sipType = sipType_QgsMeshLayer;
break;
default:
@ -52,14 +61,6 @@ This is the base class for all map layer types (vector, raster).
%End
public:
enum LayerType
{
VectorLayer,
RasterLayer,
PluginLayer,
MeshLayer
};
enum PropertyType
{
Style,
@ -95,7 +96,7 @@ This is the base class for all map layer types (vector, raster).
typedef QFlags<QgsMapLayer::StyleCategory> StyleCategories;
QgsMapLayer( QgsMapLayer::LayerType type = VectorLayer, const QString &name = QString(), const QString &source = QString() );
QgsMapLayer( QgsMapLayerType type = QgsMapLayerType::VectorLayer, const QString &name = QString(), const QString &source = QString() );
%Docstring
Constructor for QgsMapLayer
@ -117,7 +118,7 @@ is still unique.
.. versionadded:: 3.0
%End
QgsMapLayer::LayerType type() const;
QgsMapLayerType type() const;
%Docstring
Returns the type of the layer.
%End

6
python/gui/auto_additions/qgsadvanceddigitizingdockwidget.py
View File

@ -2,11 +2,11 @@
QgsAdvancedDigitizingDockWidget.CadCapacities.baseClass = QgsAdvancedDigitizingDockWidget
CadCapacities = QgsAdvancedDigitizingDockWidget # dirty hack since SIP seems to introduce the flags in module
# monkey patching scoped based enum
QgsAdvancedDigitizingDockWidget.AdditionalConstraint.NoConstraint.__doc__ = "No additional constraint"
QgsAdvancedDigitizingDockWidget.NoConstraint = QgsAdvancedDigitizingDockWidget.AdditionalConstraint.NoConstraint
QgsAdvancedDigitizingDockWidget.AdditionalConstraint.Perpendicular.__doc__ = "Perpendicular"
QgsAdvancedDigitizingDockWidget.AdditionalConstraint.NoConstraint.__doc__ = "No additional constraint"
QgsAdvancedDigitizingDockWidget.Perpendicular = QgsAdvancedDigitizingDockWidget.AdditionalConstraint.Perpendicular
QgsAdvancedDigitizingDockWidget.AdditionalConstraint.Parallel.__doc__ = "Parallel"
QgsAdvancedDigitizingDockWidget.AdditionalConstraint.Perpendicular.__doc__ = "Perpendicular"
QgsAdvancedDigitizingDockWidget.Parallel = QgsAdvancedDigitizingDockWidget.AdditionalConstraint.Parallel
QgsAdvancedDigitizingDockWidget.AdditionalConstraint.Parallel.__doc__ = "Parallel"
QgsAdvancedDigitizingDockWidget.AdditionalConstraint.__doc__ = 'Additional constraints which can be enabled\n\n' + '* NoConstraint: ' + QgsAdvancedDigitizingDockWidget.AdditionalConstraint.NoConstraint.__doc__ + '\n' + '* Perpendicular: ' + QgsAdvancedDigitizingDockWidget.AdditionalConstraint.Perpendicular.__doc__ + '\n' + '* Parallel: ' + QgsAdvancedDigitizingDockWidget.AdditionalConstraint.Parallel.__doc__
# --

2
python/gui/auto_generated/qgisinterface.sip.in
View File

@ -42,7 +42,7 @@ Constructor
virtual QgsLayerTreeView *layerTreeView() = 0;
virtual void addCustomActionForLayerType( QAction *action, QString menu,
QgsMapLayer::LayerType type, bool allLayers ) = 0;
QgsMapLayerType type, bool allLayers ) = 0;
%Docstring
Add action to context menu for layers in the layer tree.
If allLayers is ``True``, then the action will be available for all layers of given type,

4
python/gui/auto_generated/qgsdatasourceselectdialog.sip.in
View File

@ -33,7 +33,7 @@ will return a (possibly invalid) QgsMimeDataUtils.Uri.
QgsDataSourceSelectDialog( QgsBrowserModel *browserModel = 0,
bool setFilterByLayerType = false,
const QgsMapLayer::LayerType &layerType = QgsMapLayer::LayerType::VectorLayer,
const QgsMapLayerType &layerType = QgsMapLayerType::VectorLayer,
QWidget *parent = 0 );
%Docstring
Constructs a QgsDataSourceSelectDialog, optionally filtering by layer type
@ -47,7 +47,7 @@ Constructs a QgsDataSourceSelectDialog, optionally filtering by layer type
~QgsDataSourceSelectDialog();
void setLayerTypeFilter( QgsMapLayer::LayerType layerType );
void setLayerTypeFilter( QgsMapLayerType layerType );
%Docstring
Sets layer type filter to ``layerType`` and activates the filtering
%End

2
python/gui/auto_generated/qgsmaplayeractionregistry.sip.in
View File

@ -52,7 +52,7 @@ Creates a map layer action which can run on any layer
Creates a map layer action which can run only on a specific layer
%End
QgsMapLayerAction( const QString &name, QObject *parent /TransferThis/, QgsMapLayer::LayerType layerType, Targets targets = AllActions, const QIcon &icon = QIcon(), QgsMapLayerAction::Flags flags = 0 );
QgsMapLayerAction( const QString &name, QObject *parent /TransferThis/, QgsMapLayerType layerType, Targets targets = AllActions, const QIcon &icon = QIcon(), QgsMapLayerAction::Flags flags = 0 );
%Docstring
Creates a map layer action which can run on a specific type of layer
%End

37
scripts/sipify.pl
View File

@ -675,7 +675,7 @@ while ($LINE_IDX < $LINE_COUNT){
}
# Skip forward declarations
if ($LINE =~ m/^\s*(class|struct) \w+(?<external> *SIP_EXTERNAL)?;\s*(\/\/.*)?$/){
if ($LINE =~ m/^\s*(enum\s+)?(class|struct) \w+(?<external> *SIP_EXTERNAL)?;\s*(\/\/.*)?$/){
if ($+{external}){
dbg_info('do not skip external forward declaration');
$COMMENT = '';
@ -959,10 +959,15 @@ while ($LINE_IDX < $LINE_COUNT){
my $is_scope_based = "0";
$is_scope_based = "1" if defined $2;
my $monkeypatch = "0";
$monkeypatch = "1" if defined $is_scope_based eq "1" and $LINE =~ m/SIP_MONKEYPATCH_SCOPEENUM/;
$monkeypatch = "1" if defined $is_scope_based eq "1" and $LINE =~ m/SIP_MONKEYPATCH_SCOPEENUM(_UNNEST)?(:?\(\s*(?<emkb>\w+)\s*,\s*(?<emkf>\w+)\s*\))?/;
my $enum_mk_base = "";
$enum_mk_base = $+{emkb} if defined $+{emkb};
if (defined $+{emkf} and $monkeypatch eq "1"){
push @OUTPUT_PYTHON, "$enum_mk_base.$+{emkf} = $enum_qualname\n";
}
if ($LINE =~ m/\{((\s*\w+)(\s*=\s*[\w\s\d<|]+.*?)?(,?))+\s*\}/){
# one line declaration
$LINE !~ m/=/ or exit_with_error("spify.pl does not handle enum one liners with value assignment. Use multiple lines instead.");
$LINE !~ m/=/ or exit_with_error("Sipify does not handle enum one liners with value assignment. Use multiple lines instead. Or jusr write a new parser.");
next;
}
else
@ -983,17 +988,35 @@ while ($LINE_IDX < $LINE_COUNT){
do {no warnings 'uninitialized';
my $enum_decl = $LINE =~ s/^(\s*(?<em>\w+))(\s+SIP_\w+(?:\([^()]+\))?)?(?:\s*=\s*(?:[\w\s\d|+-]|::|<<)+)?(,?)(:?\s*\/\/!<\s*(?<co>.*)|.*)$/$1$3$4/r;
my $enum_member = $+{em};
push @enum_members_doc, "'* $enum_member: ' + $ACTUAL_CLASS.$enum_qualname.$2.__doc__";
my $comment = $+{co};
push @OUTPUT_PYTHON, "$ACTUAL_CLASS.$enum_qualname.$enum_member.__doc__ = \"$comment\"\n" if $is_scope_based eq "1";
push @OUTPUT_PYTHON, "$ACTUAL_CLASS.$enum_member = $ACTUAL_CLASS.$enum_qualname.$enum_member\n" if $monkeypatch eq "1";
dbg_info("is_scope_based:$is_scope_based enum_mk_base:$enum_mk_base monkeypatch:$monkeypatch");
if ($is_scope_based eq "1") {
if ( $monkeypatch eq 1 ){
if ($enum_mk_base ne "") {
push @OUTPUT_PYTHON, "$enum_mk_base.$enum_member = $enum_qualname.$enum_member\n";
push @OUTPUT_PYTHON, "$enum_mk_base.$enum_member.__doc__ = \"$comment\"\n" ;
push @enum_members_doc, "'* $enum_member: ' + $enum_qualname.$enum_member.__doc__";
} else {
push @OUTPUT_PYTHON, "$ACTUAL_CLASS.$enum_member = $ACTUAL_CLASS.$enum_qualname.$enum_member\n";
push @OUTPUT_PYTHON, "$ACTUAL_CLASS.$enum_qualname.$enum_member.__doc__ = \"$comment\"\n";
push @enum_members_doc, "'* $enum_member: ' + $ACTUAL_CLASS.$enum_qualname.$enum_member.__doc__";
}
}
}
$enum_decl = fix_annotations($enum_decl);
write_output("ENU3", "$enum_decl\n");
};
detect_comment_block(strict_mode => UNSTRICT);
}
write_output("ENU4", "$LINE\n");
push @OUTPUT_PYTHON, "$ACTUAL_CLASS.$enum_qualname.__doc__ = '$COMMENT\\n\\n' + " . join(" + '\\n' + ", @enum_members_doc) . "\n# --\n" if $is_scope_based eq "1";
if ($is_scope_based eq "1") {
$COMMENT =~ s/\n/\\n/g;
if ( $ACTUAL_CLASS ne "" ){
push @OUTPUT_PYTHON, "$ACTUAL_CLASS.$enum_qualname.__doc__ = '$COMMENT\\n\\n' + " . join(" + '\\n' + ", @enum_members_doc) . "\n# --\n";
} else {
push @OUTPUT_PYTHON, "$enum_qualname.__doc__ = '$COMMENT\\n\\n' + " . join(" + '\\n' + ", @enum_members_doc) . "\n# --\n";
}
}
# enums don't have Docstring apparently
$COMMENT = '';
next;

10
src/3d/qgs3dmapscene.cpp
View File

@ -545,15 +545,15 @@ void Qgs3DMapScene::addLayerEntity( QgsMapLayer *layer )
// This is a bit of a hack and it should be handled in QgsMapLayer::setRenderer3D() but in qgis_core
// the vector layer 3D renderer class is not available. Maybe we need an intermediate map layer 3D renderer
// class in qgis_core that can be used to handle this case nicely.
if ( layer->type() == QgsMapLayer::VectorLayer && renderer->type() == QLatin1String( "vector" ) )
if ( layer->type() == QgsMapLayerType::VectorLayer && renderer->type() == QLatin1String( "vector" ) )
{
static_cast<QgsVectorLayer3DRenderer *>( renderer )->setLayer( static_cast<QgsVectorLayer *>( layer ) );
}
else if ( layer->type() == QgsMapLayer::VectorLayer && renderer->type() == QLatin1String( "rulebased" ) )
else if ( layer->type() == QgsMapLayerType::VectorLayer && renderer->type() == QLatin1String( "rulebased" ) )
{
static_cast<QgsRuleBased3DRenderer *>( renderer )->setLayer( static_cast<QgsVectorLayer *>( layer ) );
}
else if ( layer->type() == QgsMapLayer::MeshLayer && renderer->type() == QLatin1String( "mesh" ) )
else if ( layer->type() == QgsMapLayerType::MeshLayer && renderer->type() == QLatin1String( "mesh" ) )
{
static_cast<QgsMeshLayer3DRenderer *>( renderer )->setLayer( static_cast<QgsMeshLayer *>( layer ) );
}
@ -575,7 +575,7 @@ void Qgs3DMapScene::addLayerEntity( QgsMapLayer *layer )
connect( layer, &QgsMapLayer::renderer3DChanged, this, &Qgs3DMapScene::onLayerRenderer3DChanged );
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
connect( vlayer, &QgsVectorLayer::selectionChanged, this, &Qgs3DMapScene::onLayerRenderer3DChanged );
@ -590,7 +590,7 @@ void Qgs3DMapScene::removeLayerEntity( QgsMapLayer *layer )
disconnect( layer, &QgsMapLayer::renderer3DChanged, this, &Qgs3DMapScene::onLayerRenderer3DChanged );
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
disconnect( vlayer, &QgsVectorLayer::selectionChanged, this, &Qgs3DMapScene::onLayerRenderer3DChanged );

2
src/analysis/processing/qgsalgorithmmergevector.cpp
View File

@ -98,7 +98,7 @@ QVariantMap QgsMergeVectorAlgorithm::processAlgorithm( const QVariantMap &parame
continue;
}
if ( layer->type() != QgsMapLayer::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
throw QgsProcessingException( QObject::tr( "All layers must be vector layers!" ) );
QgsVectorLayer *vl = qobject_cast< QgsVectorLayer * >( layer );

8
src/analysis/processing/qgsalgorithmpackage.cpp
View File

@ -120,7 +120,7 @@ QVariantMap QgsPackageAlgorithm::processAlgorithm( const QVariantMap &parameters
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
if ( !packageVectorLayer( qobject_cast< QgsVectorLayer * >( layer ), packagePath,
context, &multiStepFeedback ) )
@ -130,7 +130,7 @@ QVariantMap QgsPackageAlgorithm::processAlgorithm( const QVariantMap &parameters
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
//not supported
feedback->pushDebugInfo( QObject::tr( "Raster layers are not currently supported." ) );
@ -138,13 +138,13 @@ QVariantMap QgsPackageAlgorithm::processAlgorithm( const QVariantMap &parameters
break;
}
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
//not supported
feedback->pushDebugInfo( QObject::tr( "Packaging plugin layers is not supported." ) );
errored = true;
break;
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
//not supported
feedback->pushDebugInfo( QObject::tr( "Packaging mesh layers is not supported." ) );
errored = true;

2
src/analysis/processing/qgsalgorithmrasterlogicalop.cpp
View File

@ -90,7 +90,7 @@ bool QgsRasterBooleanLogicAlgorithmBase::prepareAlgorithm( const QVariantMap &pa
rasterLayers.reserve( layers.count() );
for ( QgsMapLayer *l : layers )
{
if ( l->type() == QgsMapLayer::RasterLayer )
if ( l->type() == QgsMapLayerType::RasterLayer )
{
QgsRasterLayer *layer = qobject_cast< QgsRasterLayer * >( l );
QgsRasterAnalysisUtils::RasterLogicInput input;

12
src/app/browser/qgsinbuiltdataitemproviders.cpp
View File

@ -350,8 +350,8 @@ void QgsLayerItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *men
return;
QgsLayerItem *layerItem = qobject_cast<QgsLayerItem *>( item );
if ( layerItem && ( layerItem->mapLayerType() == QgsMapLayer::VectorLayer ||
layerItem->mapLayerType() == QgsMapLayer::RasterLayer ) )
if ( layerItem && ( layerItem->mapLayerType() == QgsMapLayerType::VectorLayer ||
layerItem->mapLayerType() == QgsMapLayerType::RasterLayer ) )
{
QMenu *exportMenu = new QMenu( tr( "Export Layer" ), menu );
menu->addMenu( exportMenu );
@ -361,7 +361,7 @@ void QgsLayerItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *men
{
switch ( layerItem->mapLayerType() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
std::unique_ptr<QgsVectorLayer> layer( new QgsVectorLayer( layerItem->uri(), layerItem->name(), layerItem->providerKey() ) );
if ( layer && layer->isValid() )
@ -371,7 +371,7 @@ void QgsLayerItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *men
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
std::unique_ptr<QgsRasterLayer> layer( new QgsRasterLayer( layerItem->uri(), layerItem->name(), layerItem->providerKey() ) );
if ( layer && layer->isValid() )
@ -381,8 +381,8 @@ void QgsLayerItemGuiProvider::populateContextMenu( QgsDataItem *item, QMenu *men
break;
}
case QgsMapLayer::PluginLayer:
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::PluginLayer:
case QgsMapLayerType::MeshLayer:
break;
}
} );

2
src/app/decorations/qgsdecorationgrid.cpp
View File

@ -804,7 +804,7 @@ bool QgsDecorationGrid::getIntervalFromCurrentLayer( double *values )
QMessageBox::warning( nullptr, tr( "Get Interval from Layer" ), tr( "No active layer" ) );
return false;
}
if ( layer->type() != QgsMapLayer::RasterLayer )
if ( layer->type() != QgsMapLayerType::RasterLayer )
{
QMessageBox::warning( nullptr, tr( "Get Interval from Layer" ), tr( "Please select a raster layer." ) );
return false;

42
src/app/qgisapp.cpp
View File

@ -7126,7 +7126,7 @@ void QgisApp::changeDataSource( QgsMapLayer *layer )
{
// Get provider type
QString providerType( layer->providerType() );
QgsMapLayer::LayerType layerType( layer->type() );
QgsMapLayerType layerType( layer->type() );
QgsDataSourceSelectDialog dlg( mBrowserModel, true, layerType );
@ -7610,17 +7610,17 @@ QString QgisApp::saveAsFile( QgsMapLayer *layer, const bool onlySelected, const
if ( !layer )
return QString();
QgsMapLayer::LayerType layerType = layer->type();
QgsMapLayerType layerType = layer->type();
switch ( layerType )
{
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
return saveAsRasterFile( qobject_cast<QgsRasterLayer *>( layer ), defaultToAddToMap );
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
return saveAsVectorFileGeneral( qobject_cast<QgsVectorLayer *>( layer ), true, onlySelected, defaultToAddToMap );
case QgsMapLayer::MeshLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::MeshLayer:
case QgsMapLayerType::PluginLayer:
return QString();
}
return QString();
@ -9289,8 +9289,8 @@ void QgisApp::pasteStyle( QgsMapLayer *destinationLayer, QgsMapLayer::StyleCateg
}
bool isVectorStyle = doc.elementsByTagName( QStringLiteral( "pipe" ) ).isEmpty();
if ( ( selectionLayer->type() == QgsMapLayer::RasterLayer && isVectorStyle ) ||
( selectionLayer->type() == QgsMapLayer::VectorLayer && !isVectorStyle ) )
if ( ( selectionLayer->type() == QgsMapLayerType::RasterLayer && isVectorStyle ) ||
( selectionLayer->type() == QgsMapLayerType::VectorLayer && !isVectorStyle ) )
{
return;
}
@ -10034,7 +10034,7 @@ void QgisApp::duplicateLayers( const QList<QgsMapLayer *> &lyrList )
unSppType.clear();
layerDupName = selectedLyr->name() + ' ' + tr( "copy" );
if ( selectedLyr->type() == QgsMapLayer::PluginLayer )
if ( selectedLyr->type() == QgsMapLayerType::PluginLayer )
{
unSppType = tr( "Plugin layer" );
}
@ -12371,7 +12371,7 @@ void QgisApp::showMapTip()
{
// QgsDebugMsg("Current layer for maptip display is: " + mypLayer->source());
// only process vector layers
if ( mypLayer->type() == QgsMapLayer::VectorLayer )
if ( mypLayer->type() == QgsMapLayerType::VectorLayer )
{
// Show the maptip if the maptips button is depressed
if ( mMapTipsVisible )
@ -12470,7 +12470,7 @@ void QgisApp::legendLayerSelectionChanged()
if ( selectedLayers.size() == 1 )
{
QgsLayerTreeLayer *l = selectedLayers.front();
if ( l->layer() && l->layer()->type() == QgsMapLayer::VectorLayer )
if ( l->layer() && l->layer()->type() == QgsMapLayerType::VectorLayer )
{
mLegendExpressionFilterButton->setEnabled( true );
bool exprEnabled;
@ -12651,7 +12651,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
// Vector layers
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
QgsVectorDataProvider *dprovider = vlayer->dataProvider();
@ -12875,7 +12875,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
const QgsRasterLayer *rlayer = qobject_cast<const QgsRasterLayer *>( layer );
if ( rlayer->dataProvider()->dataType( 1 ) != Qgis::ARGB32
@ -12984,7 +12984,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
mActionLocalHistogramStretch->setEnabled( false );
mActionFullHistogramStretch->setEnabled( false );
mActionLocalCumulativeCutStretch->setEnabled( false );
@ -13045,7 +13045,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer *layer )
mActionIdentify->setEnabled( true );
break;
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
break;
}
@ -13848,7 +13848,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *mapLayer )
switch ( mapLayer->type() )
{
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
QgsRasterLayerProperties *rasterLayerPropertiesDialog = new QgsRasterLayerProperties( mapLayer, mMapCanvas, this );
// Cannot use exec here due to raster transparency map tool:
@ -13869,7 +13869,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *mapLayer )
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
{
QgsMeshLayerProperties meshLayerPropertiesDialog( mapLayer, mMapCanvas, this );
mMapStyleWidget->blockUpdates( true );
@ -13882,7 +13882,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *mapLayer )
break;
}
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mapLayer );
@ -13904,7 +13904,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *mapLayer )
break;
}
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
{
QgsPluginLayer *pl = qobject_cast<QgsPluginLayer *>( mapLayer );
if ( !pl )
@ -14268,7 +14268,7 @@ void QgisApp::transactionGroupCommitError( const QString &error )
QgsFeature QgisApp::duplicateFeatures( QgsMapLayer *mlayer, const QgsFeature &feature )
{
if ( mlayer->type() != QgsMapLayer::VectorLayer )
if ( mlayer->type() != QgsMapLayerType::VectorLayer )
return QgsFeature();
QgsVectorLayer *layer = qobject_cast<QgsVectorLayer *>( mlayer );
@ -14318,7 +14318,7 @@ QgsFeature QgisApp::duplicateFeatures( QgsMapLayer *mlayer, const QgsFeature &fe
QgsFeature QgisApp::duplicateFeatureDigitized( QgsMapLayer *mlayer, const QgsFeature &feature )
{
if ( mlayer->type() != QgsMapLayer::VectorLayer )
if ( mlayer->type() != QgsMapLayerType::VectorLayer )
return QgsFeature();
QgsVectorLayer *layer = qobject_cast<QgsVectorLayer *>( mlayer );

2
src/app/qgisappinterface.cpp
View File

@ -83,7 +83,7 @@ QgsLayerTreeView *QgisAppInterface::layerTreeView()
}
void QgisAppInterface::addCustomActionForLayerType( QAction *action,
QString menu, QgsMapLayer::LayerType type, bool allLayers )
QString menu, QgsMapLayerType type, bool allLayers )
{
QgsAppLayerTreeViewMenuProvider *menuProvider = dynamic_cast<QgsAppLayerTreeViewMenuProvider *>( qgis->layerTreeView()->menuProvider() );
if ( !menuProvider )

6
src/app/qgisappinterface.h
View File

@ -18,9 +18,11 @@
#ifndef QGISIFACE_H
#define QGISIFACE_H
#include "qgis_app.h"
#include "qgisinterface.h"
#include "qgsapppluginmanagerinterface.h"
#include "qgis_app.h"
class QTimer;
class QgisApp;
@ -54,7 +56,7 @@ class APP_EXPORT QgisAppInterface : public QgisInterface
QgsLayerTreeView *layerTreeView() override;
void addCustomActionForLayerType( QAction *action, QString menu,
QgsMapLayer::LayerType type, bool allLayers ) override;
QgsMapLayerType type, bool allLayers ) override;
void addCustomActionForLayer( QAction *action, QgsMapLayer *layer ) override;
bool removeCustomActionForLayerType( QAction *action ) override;

2
src/app/qgsalignrasterdialog.cpp
View File

@ -38,7 +38,7 @@ static QgsMapLayer *_rasterLayer( const QString &filename )
QMap<QString, QgsMapLayer *> layers = QgsProject::instance()->mapLayers();
Q_FOREACH ( QgsMapLayer *layer, layers )
{
if ( layer->type() == QgsMapLayer::RasterLayer && layer->source() == filename )
if ( layer->type() == QgsMapLayerType::RasterLayer && layer->source() == filename )
return layer;
}
return nullptr;

20
src/app/qgsapplayertreeviewmenuprovider.cpp
View File

@ -168,7 +168,7 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
}
addCustomLayerActions( menu, layer );
if ( layer && layer->type() == QgsMapLayer::VectorLayer && static_cast<QgsVectorLayer *>( layer )->providerType() == QLatin1String( "virtual" ) )
if ( layer && layer->type() == QgsMapLayerType::VectorLayer && static_cast<QgsVectorLayer *>( layer )->providerType() == QLatin1String( "virtual" ) )
{
menu->addAction( QgsApplication::getThemeIcon( QStringLiteral( "/mActionAddVirtualLayer.svg" ) ), tr( "Edit Virtual Layer…" ), QgisApp::instance(), &QgisApp::addVirtualLayer );
}
@ -328,7 +328,7 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
menuExportRaster->addAction( actionSaveStyle );
menu->addMenu( menuExportRaster );
}
else if ( layer && layer->type() == QgsMapLayer::PluginLayer && mView->selectedLayerNodes().count() == 1 )
else if ( layer && layer->type() == QgsMapLayerType::PluginLayer && mView->selectedLayerNodes().count() == 1 )
{
// disable duplication of plugin layers
duplicateLayersAction->setEnabled( false );
@ -343,7 +343,7 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
QMenu *menuStyleManager = new QMenu( tr( "Styles" ), menu );
QgisApp *app = QgisApp::instance();
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QMenu *copyStyleMenu = menuStyleManager->addMenu( tr( "Copy Style" ) );
copyStyleMenu->setToolTipsVisible( true );
@ -371,7 +371,7 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
if ( layer && app->clipboard()->hasFormat( QGSCLIPBOARD_STYLE_MIME ) )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QDomDocument doc( QStringLiteral( "qgis" ) );
QString errorMsg;
@ -532,14 +532,14 @@ QMenu *QgsAppLayerTreeViewMenuProvider::createContextMenu()
void QgsAppLayerTreeViewMenuProvider::addLegendLayerAction( QAction *action, const QString &menu,
QgsMapLayer::LayerType type, bool allLayers )
QgsMapLayerType type, bool allLayers )
{
mLegendLayerActionMap[type].append( LegendLayerAction( action, menu, allLayers ) );
}
bool QgsAppLayerTreeViewMenuProvider::removeLegendLayerAction( QAction *action )
{
QMap< QgsMapLayer::LayerType, QList< LegendLayerAction > >::iterator it;
QMap< QgsMapLayerType, QList< LegendLayerAction > >::iterator it;
for ( it = mLegendLayerActionMap.begin();
it != mLegendLayerActionMap.end(); ++it )
{
@ -564,7 +564,7 @@ void QgsAppLayerTreeViewMenuProvider::addLegendLayerActionForLayer( QAction *act
if ( !mLegendLayerActionMap.contains( layer->type() ) )
return;
QMap< QgsMapLayer::LayerType, QList< LegendLayerAction > >::iterator it
QMap< QgsMapLayerType, QList< LegendLayerAction > >::iterator it
= mLegendLayerActionMap.find( layer->type() );
for ( int i = 0; i < it->count(); i++ )
{
@ -581,7 +581,7 @@ void QgsAppLayerTreeViewMenuProvider::removeLegendLayerActionsForLayer( QgsMapLa
if ( ! layer || ! mLegendLayerActionMap.contains( layer->type() ) )
return;
QMap< QgsMapLayer::LayerType, QList< LegendLayerAction > >::iterator it
QMap< QgsMapLayerType, QList< LegendLayerAction > >::iterator it
= mLegendLayerActionMap.find( layer->type() );
for ( int i = 0; i < it->count(); i++ )
{
@ -589,12 +589,12 @@ void QgsAppLayerTreeViewMenuProvider::removeLegendLayerActionsForLayer( QgsMapLa
}
}
QList< LegendLayerAction > QgsAppLayerTreeViewMenuProvider::legendLayerActions( QgsMapLayer::LayerType type ) const
QList< LegendLayerAction > QgsAppLayerTreeViewMenuProvider::legendLayerActions( QgsMapLayerType type ) const
{
#ifdef QGISDEBUG
if ( mLegendLayerActionMap.contains( type ) )
{
QgsDebugMsg( QStringLiteral( "legendLayerActions for layers of type %1:" ).arg( type ) );
QgsDebugMsg( QStringLiteral( "legendLayerActions for layers of type %1:" ).arg( static_cast<int>( type ) ) );
Q_FOREACH ( const LegendLayerAction &lyrAction, mLegendLayerActionMap[ type ] )
{

6
src/app/qgsapplayertreeviewmenuprovider.h
View File

@ -46,11 +46,11 @@ class QgsAppLayerTreeViewMenuProvider : public QObject, public QgsLayerTreeViewM
QMenu *createContextMenu() override;
void addLegendLayerAction( QAction *action, const QString &menu,
QgsMapLayer::LayerType type, bool allLayers );
QgsMapLayerType type, bool allLayers );
bool removeLegendLayerAction( QAction *action );
void addLegendLayerActionForLayer( QAction *action, QgsMapLayer *layer );
void removeLegendLayerActionsForLayer( QgsMapLayer *layer );
QList< LegendLayerAction > legendLayerActions( QgsMapLayer::LayerType type ) const;
QList< LegendLayerAction > legendLayerActions( QgsMapLayerType type ) const;
protected:
@ -59,7 +59,7 @@ class QgsAppLayerTreeViewMenuProvider : public QObject, public QgsLayerTreeViewM
QgsLayerTreeView *mView = nullptr;
QgsMapCanvas *mCanvas = nullptr;
QMap< QgsMapLayer::LayerType, QList< LegendLayerAction > > mLegendLayerActionMap;
QMap< QgsMapLayerType, QList< LegendLayerAction > > mLegendLayerActionMap;
private slots:

2
src/app/qgsdxfexportdialog.cpp
View File

@ -517,7 +517,7 @@ void QgsDxfExportDialog::cleanGroup( QgsLayerTreeNode *node )
QList<QgsLayerTreeNode *> toRemove;
Q_FOREACH ( QgsLayerTreeNode *child, node->children() )
{
if ( QgsLayerTree::isLayer( child ) && QgsLayerTree::toLayer( child )->layer()->type() != QgsMapLayer::VectorLayer )
if ( QgsLayerTree::isLayer( child ) && QgsLayerTree::toLayer( child )->layer()->type() != QgsMapLayerType::VectorLayer )
{
toRemove << child;
continue;

8
src/app/qgsidentifyresultsdialog.cpp
View File

@ -469,19 +469,19 @@ void QgsIdentifyResultsDialog::addFeature( const QgsMapToolIdentify::IdentifyRes
{
switch ( result.mLayer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
addFeature( qobject_cast<QgsVectorLayer *>( result.mLayer ), result.mFeature, result.mDerivedAttributes );
break;
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
addFeature( qobject_cast<QgsRasterLayer *>( result.mLayer ), result.mLabel, result.mAttributes, result.mDerivedAttributes, result.mFields, result.mFeature, result.mParams );
break;
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
addFeature( qobject_cast<QgsMeshLayer *>( result.mLayer ), result.mLabel, result.mAttributes, result.mDerivedAttributes );
break;
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
break;
}
}

2
src/app/qgslabelinggui.cpp
View File

@ -108,7 +108,7 @@ void QgsLabelingGui::setLayer( QgsMapLayer *mapLayer )
{
mPreviewFeature = QgsFeature();
if ( !mapLayer || mapLayer->type() != QgsMapLayer::VectorLayer )
if ( !mapLayer || mapLayer->type() != QgsMapLayerType::VectorLayer )
{
setEnabled( false );
return;

2
src/app/qgslabelingwidget.cpp
View File

@ -58,7 +58,7 @@ void QgsLabelingWidget::resetSettings()
void QgsLabelingWidget::setLayer( QgsMapLayer *mapLayer )
{
if ( !mapLayer || mapLayer->type() != QgsMapLayer::VectorLayer )
if ( !mapLayer || mapLayer->type() != QgsMapLayerType::VectorLayer )
{
setEnabled( false );
return;

14
src/app/qgslayercapabilitiesmodel.cpp
View File

@ -29,7 +29,7 @@ QgsLayerCapabilitiesModel::QgsLayerCapabilitiesModel( QgsProject *project, QObje
for ( QMap<QString, QgsMapLayer *>::const_iterator it = mapLayers.constBegin(); it != mapLayers.constEnd(); ++it )
{
mReadOnlyLayers.insert( it.value(), it.value()->readOnly() );
mSearchableLayers.insert( it.value(), it.value()->type() == QgsMapLayer::VectorLayer && it.value()->flags().testFlag( QgsMapLayer::Searchable ) );
mSearchableLayers.insert( it.value(), it.value()->type() == QgsMapLayerType::VectorLayer && it.value()->flags().testFlag( QgsMapLayer::Searchable ) );
mIdentifiableLayers.insert( it.value(), it.value()->flags().testFlag( QgsMapLayer::Identifiable ) );
mRemovableLayers.insert( it.value(), it.value()->flags().testFlag( QgsMapLayer::Removable ) );
}
@ -160,7 +160,7 @@ Qt::ItemFlags QgsLayerCapabilitiesModel::flags( const QModelIndex &idx ) const
}
else if ( idx.column() == ReadOnlyColumn )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsUserCheckable;
}
@ -171,7 +171,7 @@ Qt::ItemFlags QgsLayerCapabilitiesModel::flags( const QModelIndex &idx ) const
}
else if ( idx.column() == SearchableColumn )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
return Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsEditable | Qt::ItemIsUserCheckable;
}
@ -261,12 +261,12 @@ QVariant QgsLayerCapabilitiesModel::data( const QModelIndex &idx, int role ) con
}
else if ( idx.column() == ReadOnlyColumn )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
return mReadOnlyLayers.value( layer, true ) ? trueValue : falseValue;
}
else if ( idx.column() == SearchableColumn )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
return mSearchableLayers.value( layer, true ) ? trueValue : falseValue;
}
else if ( idx.column() == RequiredColumn )
@ -301,7 +301,7 @@ bool QgsLayerCapabilitiesModel::setData( const QModelIndex &index, const QVarian
}
else if ( index.column() == ReadOnlyColumn )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
bool readOnly = value == Qt::Checked;
if ( readOnly != mReadOnlyLayers.value( layer, true ) )
@ -314,7 +314,7 @@ bool QgsLayerCapabilitiesModel::setData( const QModelIndex &index, const QVarian
}
else if ( index.column() == SearchableColumn )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
bool searchable = value == Qt::Checked;
if ( searchable != mSearchableLayers.value( layer, true ) )

24
src/app/qgslayerstylingwidget.cpp
View File

@ -165,7 +165,7 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QListWidgetItem *symbolItem = new QListWidgetItem( QgsApplication::getThemeIcon( QStringLiteral( "propertyicons/symbology.svg" ) ), QString() );
symbolItem->setData( Qt::UserRole, Symbology );
@ -184,7 +184,7 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )
#endif
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
QListWidgetItem *symbolItem = new QListWidgetItem( QgsApplication::getThemeIcon( QStringLiteral( "propertyicons/symbology.svg" ) ), QString() );
symbolItem->setData( Qt::UserRole, Symbology );
@ -204,7 +204,7 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )
}
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
{
QListWidgetItem *symbolItem = new QListWidgetItem( QgsApplication::getThemeIcon( QStringLiteral( "propertyicons/symbology.svg" ) ), QString() );
symbolItem->setData( Qt::UserRole, Symbology );
@ -220,7 +220,7 @@ void QgsLayerStylingWidget::setLayer( QgsMapLayer *layer )
break;
}
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
break;
}
@ -403,7 +403,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
{
switch ( mCurrentLayer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mCurrentLayer );
@ -456,7 +456,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
QgsRasterLayer *rlayer = qobject_cast<QgsRasterLayer *>( mCurrentLayer );
bool hasMinMaxCollapsedState = false;
@ -535,7 +535,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
{
QgsMeshLayer *meshLayer = qobject_cast<QgsMeshLayer *>( mCurrentLayer );
switch ( row )
@ -569,7 +569,7 @@ void QgsLayerStylingWidget::updateCurrentWidgetLayer()
break;
}
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
{
mStackedWidget->setCurrentIndex( mNotSupportedPage );
break;
@ -684,12 +684,12 @@ bool QgsLayerStyleManagerWidgetFactory::supportsLayer( QgsMapLayer *layer ) cons
{
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayer::RasterLayer:
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::VectorLayer:
case QgsMapLayerType::RasterLayer:
case QgsMapLayerType::MeshLayer:
return true;
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
return false;
}
return false; // no warnings

2
src/app/qgsmaptoolfeatureaction.cpp
View File

@ -57,7 +57,7 @@ void QgsMapToolFeatureAction::canvasReleaseEvent( QgsMapMouseEvent *e )
{
QgsMapLayer *layer = mCanvas->currentLayer();
if ( !layer || layer->type() != QgsMapLayer::VectorLayer )
if ( !layer || layer->type() != QgsMapLayerType::VectorLayer )
{
emit messageEmitted( tr( "To run an action, you must choose an active vector layer." ), Qgis::Info );
return;

4
src/app/qgsmaptoolidentifyaction.cpp
View File

@ -53,7 +53,7 @@ QgsMapToolIdentifyAction::QgsMapToolIdentifyAction( QgsMapCanvas *canvas )
setCursor( QgsApplication::getThemeCursor( QgsApplication::Cursor::Identify ) );
connect( this, &QgsMapToolIdentify::changedRasterResults, this, &QgsMapToolIdentifyAction::handleChangedRasterResults );
mIdentifyMenu->setAllowMultipleReturn( true );
QgsMapLayerAction *attrTableAction = new QgsMapLayerAction( tr( "Show Attribute Table" ), mIdentifyMenu, QgsMapLayer::VectorLayer, QgsMapLayerAction::MultipleFeatures );
QgsMapLayerAction *attrTableAction = new QgsMapLayerAction( tr( "Show Attribute Table" ), mIdentifyMenu, QgsMapLayerType::VectorLayer, QgsMapLayerAction::MultipleFeatures );
connect( attrTableAction, &QgsMapLayerAction::triggeredForFeatures, this, &QgsMapToolIdentifyAction::showAttributeTable );
identifyMenu()->addCustomAction( attrTableAction );
mSelectionHandler = new QgsMapToolSelectionHandler( canvas, QgsMapToolSelectionHandler::SelectSimple );
@ -182,7 +182,7 @@ void QgsMapToolIdentifyAction::handleChangedRasterResults( QList<IdentifyResult>
QList<IdentifyResult>::const_iterator rresult;
for ( rresult = results.constBegin(); rresult != results.constEnd(); ++rresult )
{
if ( rresult->mLayer->type() == QgsMapLayer::RasterLayer )
if ( rresult->mLayer->type() == QgsMapLayerType::RasterLayer )
{
resultsDialog()->addFeature( *rresult );
}

2
src/app/qgsmaptoolselectionhandler.cpp
View File

@ -259,7 +259,7 @@ void QgsMapToolSelectionHandler::selectPolygonPressEvent( QgsMapMouseEvent *e )
const QList<QgsMapLayer *> layers = mCanvas->layers();
for ( auto layer : layers )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
auto vectorLayer = static_cast<QgsVectorLayer *>( layer );
if ( vectorLayer->geometryType() == QgsWkbTypes::PolygonGeometry )

8
src/app/qgsprojectproperties.cpp
View File

@ -740,7 +740,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
for ( QMap<QString, QgsMapLayer *>::const_iterator it = mapLayers.constBegin(); it != mapLayers.constEnd(); ++it, i++ )
{
currentLayer = it.value();
if ( currentLayer->type() == QgsMapLayer::VectorLayer )
if ( currentLayer->type() == QgsMapLayerType::VectorLayer )
{
QTableWidgetItem *twi = new QTableWidgetItem( QString::number( j ) );
@ -804,7 +804,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
for ( QMap<QString, QgsMapLayer *>::const_iterator it = mapLayers.constBegin(); it != mapLayers.constEnd(); ++it, i++ )
{
currentLayer = it.value();
if ( currentLayer->type() == QgsMapLayer::RasterLayer )
if ( currentLayer->type() == QgsMapLayerType::RasterLayer )
{
QTableWidgetItem *twi = new QTableWidgetItem( QString::number( j ) );
@ -866,7 +866,7 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas *mapCanvas, QWidget *pa
QList<QgsVectorLayer *> vectorLayers;
Q_FOREACH ( QgsMapLayer *mapLayer, mapLayers )
{
if ( QgsMapLayer::VectorLayer == mapLayer->type() )
if ( QgsMapLayerType::VectorLayer == mapLayer->type() )
{
vectorLayers.append( qobject_cast<QgsVectorLayer *>( mapLayer ) );
}
@ -2300,7 +2300,7 @@ void QgsProjectProperties::checkOWS( QgsLayerTreeGroup *treeGroup, QStringList &
owsNames << l->name();
else
owsNames << shortName;
if ( l->type() == QgsMapLayer::VectorLayer )
if ( l->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vl = static_cast<QgsVectorLayer *>( l );
if ( vl->dataProvider()->encoding() == QLatin1String( "System" ) )

2
src/app/qgssnappingwidget.cpp
View File

@ -548,7 +548,7 @@ void QgsSnappingWidget::cleanGroup( QgsLayerTreeNode *node )
QList<QgsLayerTreeNode *> toRemove;
Q_FOREACH ( QgsLayerTreeNode *child, node->children() )
{
if ( QgsLayerTree::isLayer( child ) && ( !QgsLayerTree::toLayer( child )->layer() || QgsLayerTree::toLayer( child )->layer()->type() != QgsMapLayer::VectorLayer ) )
if ( QgsLayerTree::isLayer( child ) && ( !QgsLayerTree::toLayer( child )->layer() || QgsLayerTree::toLayer( child )->layer()->type() != QgsMapLayerType::VectorLayer ) )
{
toRemove << child;
continue;

8
src/core/expression/qgsexpressionfunction.cpp
View File

@ -4321,13 +4321,13 @@ static QVariant fcnGetLayerProperty( const QVariantList &values, const QgsExpres
{
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
return QCoreApplication::translate( "expressions", "Vector" );
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
return QCoreApplication::translate( "expressions", "Raster" );
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
return QCoreApplication::translate( "expressions", "Mesh" );
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
return QCoreApplication::translate( "expressions", "Plugin" );
}
}

12
src/core/layertree/qgslayertreemodel.cpp
View File

@ -197,14 +197,14 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
// icons possibly overriding default icon
switch ( layer->type() )
{
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
return QgsLayerItem::iconRaster();
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
return QgsLayerItem::iconMesh();
case QgsMapLayer::VectorLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::VectorLayer:
case QgsMapLayerType::PluginLayer:
break;
}
@ -216,7 +216,7 @@ QVariant QgsLayerTreeModel::data( const QModelIndex &index, int role ) const
{
icon = legendIconEmbeddedInParent( nodeLayer );
}
else if ( vlayer && layer->type() == QgsMapLayer::VectorLayer )
else if ( vlayer && layer->type() == QgsMapLayerType::VectorLayer )
{
if ( vlayer->geometryType() == QgsWkbTypes::PointGeometry )
icon = QgsLayerItem::iconPoint();
@ -877,7 +877,7 @@ void QgsLayerTreeModel::connectToLayer( QgsLayerTreeLayer *nodeLayer )
QgsMapLayer *layer = nodeLayer->layer();
connect( layer, &QgsMapLayer::legendChanged, this, &QgsLayerTreeModel::layerLegendChanged, Qt::UniqueConnection );
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
// using unique connection because there may be temporarily more nodes for a layer than just one
// which would create multiple connections, however disconnect() would disconnect all multiple connections

2
src/core/mesh/qgsmeshlayer.cpp
View File

@ -38,7 +38,7 @@ QgsMeshLayer::QgsMeshLayer( const QString &meshLayerPath,
const QString &baseName,
const QString &providerKey,
const LayerOptions & )
: QgsMapLayer( MeshLayer, baseName, meshLayerPath )
: QgsMapLayer( QgsMapLayerType::MeshLayer, baseName, meshLayerPath )
{
setProviderType( providerKey );
// if we’re given a provider type, try to create and bind one to this layer

14
src/core/processing/qgsprocessingutils.cpp
View File

@ -143,13 +143,13 @@ QgsMapLayer *QgsProcessingUtils::mapLayerFromStore( const QString &string, QgsMa
{
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
return !canUseLayer( qobject_cast< QgsVectorLayer * >( layer ) );
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
return !canUseLayer( qobject_cast< QgsRasterLayer * >( layer ) );
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
return true;
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
return !canUseLayer( qobject_cast< QgsMeshLayer * >( layer ) );
}
return true;
@ -163,13 +163,13 @@ QgsMapLayer *QgsProcessingUtils::mapLayerFromStore( const QString &string, QgsMa
return true;
case Vector:
return l->type() == QgsMapLayer::VectorLayer;
return l->type() == QgsMapLayerType::VectorLayer;
case Raster:
return l->type() == QgsMapLayer::RasterLayer;
return l->type() == QgsMapLayerType::RasterLayer;
case Mesh:
return l->type() == QgsMapLayer::MeshLayer;
return l->type() == QgsMapLayerType::MeshLayer;
}
return true;
};

7
src/core/qgis_sip.h
View File

@ -235,9 +235,14 @@
/*
* If one reformat an enum to a scope based enum
* sipify will take care of monkey patching to keep
* API compatibility
* API compatibility.
* If OUTSIDE_CLASS is defined, the enum has been unnested
* from the class, and it will be used for monkey patching
* e.g. QgsMapLayer.VectorLayer = QgsMapLayerType.VectorLayer
* These macros should be removed in QGIS 4
*/
#define SIP_MONKEYPATCH_SCOPEENUM
#define SIP_MONKEYPATCH_SCOPEENUM_UNNEST(OUTSIDE_CLASS,FORMERNAME)
#endif // QGIS_SIP_H

4
src/core/qgsbrowserproxymodel.cpp
View File

@ -153,12 +153,12 @@ bool QgsBrowserProxyModel::filterAcceptsRow( int sourceRow, const QModelIndex &s
return filterAcceptsItem( sourceIndex ) || filterAcceptsAncestor( sourceIndex ) || filterAcceptsDescendant( sourceIndex );
}
QgsMapLayer::LayerType QgsBrowserProxyModel::layerType() const
QgsMapLayerType QgsBrowserProxyModel::layerType() const
{
return mLayerType;
}
void QgsBrowserProxyModel::setLayerType( QgsMapLayer::LayerType type )
void QgsBrowserProxyModel::setLayerType( QgsMapLayerType type )
{
mLayerType = type;
invalidateFilter();

6
src/core/qgsbrowserproxymodel.h
View File

@ -132,7 +132,7 @@ class CORE_EXPORT QgsBrowserProxyModel : public QSortFilterProxyModel
* \see setLayerType()
* \see filterByLayerType()
*/
QgsMapLayer::LayerType layerType() const;
QgsMapLayerType layerType() const;
/**
* Sets the layer \a type to filter the model by. This is only used if
@ -141,7 +141,7 @@ class CORE_EXPORT QgsBrowserProxyModel : public QSortFilterProxyModel
* \see layerType()
* \see setFilterByLayerType()
*/
void setLayerType( QgsMapLayer::LayerType type );
void setLayerType( QgsMapLayerType type );
protected:
@ -157,7 +157,7 @@ class CORE_EXPORT QgsBrowserProxyModel : public QSortFilterProxyModel
Qt::CaseSensitivity mCaseSensitivity = Qt::CaseInsensitive;
bool mFilterByLayerType = false;
QgsMapLayer::LayerType mLayerType = QgsMapLayer::VectorLayer;
QgsMapLayerType mLayerType = QgsMapLayerType::VectorLayer;
//! Update filter
void updateFilter();

28
src/core/qgsdataitem.cpp
View File

@ -606,18 +606,18 @@ QgsLayerItem::QgsLayerItem( QgsDataItem *parent, const QString &name, const QStr
mIconName = iconName( layerType );
}
QgsMapLayer::LayerType QgsLayerItem::mapLayerType() const
QgsMapLayerType QgsLayerItem::mapLayerType() const
{
switch ( mLayerType )
{
case QgsLayerItem::Raster:
return QgsMapLayer::RasterLayer;
return QgsMapLayerType::RasterLayer;
case QgsLayerItem::Mesh:
return QgsMapLayer::MeshLayer;
return QgsMapLayerType::MeshLayer;
case QgsLayerItem::Plugin:
return QgsMapLayer::PluginLayer;
return QgsMapLayerType::PluginLayer;
case QgsLayerItem::NoType:
case QgsLayerItem::Vector:
@ -627,17 +627,17 @@ QgsMapLayer::LayerType QgsLayerItem::mapLayerType() const
case QgsLayerItem::TableLayer:
case QgsLayerItem::Table:
case QgsLayerItem::Database:
return QgsMapLayer::VectorLayer;
return QgsMapLayerType::VectorLayer;
}
return QgsMapLayer::VectorLayer; // no warnings
return QgsMapLayerType::VectorLayer; // no warnings
}
QgsLayerItem::LayerType QgsLayerItem::typeFromMapLayer( QgsMapLayer *layer )
{
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
switch ( qobject_cast< QgsVectorLayer * >( layer )->geometryType() )
{
@ -660,11 +660,11 @@ QgsLayerItem::LayerType QgsLayerItem::typeFromMapLayer( QgsMapLayer *layer )
return Vector; // no warnings
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
return Raster;
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
return Plugin;
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
return Mesh;
}
return Vector; // no warnings
@ -727,16 +727,16 @@ QgsMimeDataUtils::Uri QgsLayerItem::mimeUri() const
switch ( mapLayerType() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
u.layerType = QStringLiteral( "vector" );
break;
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
u.layerType = QStringLiteral( "raster" );
break;
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
u.layerType = QStringLiteral( "mesh" );
break;
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
u.layerType = QStringLiteral( "plugin" );
break;
}

4
src/core/qgsdataitem.h
View File

@ -467,8 +467,8 @@ class CORE_EXPORT QgsLayerItem : public QgsDataItem
// --- New virtual methods for layer item derived classes ---
//! Returns QgsMapLayer::LayerType
QgsMapLayer::LayerType mapLayerType() const;
//! Returns QgsMapLayerType
QgsMapLayerType mapLayerType() const;
/**
* Returns the layer item type corresponding to a QgsMapLayer \a layer.

8
src/core/qgsmaplayer.cpp
View File

@ -67,7 +67,7 @@ QString QgsMapLayer::extensionPropertyType( QgsMapLayer::PropertyType type )
return QString();
}
QgsMapLayer::QgsMapLayer( QgsMapLayer::LayerType type,
QgsMapLayer::QgsMapLayer( QgsMapLayerType type,
const QString &lyrname,
const QString &source )
: mDataSource( source )
@ -138,7 +138,7 @@ void QgsMapLayer::clone( QgsMapLayer *layer ) const
layer->setCustomProperties( mCustomProperties );
}
QgsMapLayer::LayerType QgsMapLayer::type() const
QgsMapLayerType QgsMapLayer::type() const
{
return mLayerType;
}
@ -1062,7 +1062,7 @@ bool QgsMapLayer::importNamedStyle( QDomDocument &myDocument, QString &myErrorMe
if ( ( sourceCategories.testFlag( QgsMapLayer::Symbology ) || sourceCategories.testFlag( QgsMapLayer::Symbology3D ) ) &&
( categories.testFlag( QgsMapLayer::Symbology ) || categories.testFlag( QgsMapLayer::Symbology3D ) ) )
{
if ( type() == QgsMapLayer::VectorLayer && !myRoot.firstChildElement( QStringLiteral( "layerGeometryType" ) ).isNull() )
if ( type() == QgsMapLayerType::VectorLayer && !myRoot.firstChildElement( QStringLiteral( "layerGeometryType" ) ).isNull() )
{
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( this );
QgsWkbTypes::GeometryType importLayerGeometryType = static_cast<QgsWkbTypes::GeometryType>( myRoot.firstChildElement( QStringLiteral( "layerGeometryType" ) ).text().toInt() );
@ -1117,7 +1117,7 @@ void QgsMapLayer::exportNamedStyle( QDomDocument &doc, QString &errorMsg, const
* Check to see if the layer is vector - in which case we should also export its geometryType
* to avoid eventually pasting to a layer with a different geometry
*/
if ( type() == QgsMapLayer::VectorLayer )
if ( type() == QgsMapLayerType::VectorLayer )
{
//Getting the selectionLayer geometry
const QgsVectorLayer *vl = qobject_cast<const QgsVectorLayer *>( this );

41
src/core/qgsmaplayer.h
View File

@ -56,6 +56,20 @@ class QPainter;
*/
#define QGSCLIPBOARD_MAPLAYER_MIME "application/qgis.maplayer"
/**
* \ingroup core
* Types of layers that can be added to a map
* \since QGIS 3.8
*/
enum class QgsMapLayerType SIP_MONKEYPATCH_SCOPEENUM_UNNEST( QgsMapLayer, LayerType ) : int
{
VectorLayer,
RasterLayer,
PluginLayer,
MeshLayer //!< Added in 3.2
};
/**
* \ingroup core
* Base class for all map layer types.
@ -72,7 +86,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
#ifdef SIP_RUN
SIP_CONVERT_TO_SUBCLASS_CODE
QgsMapLayer *layer = qobject_cast<QgsMapLayer *>( sipCpp );
QgsMapLayer * layer = qobject_cast<QgsMapLayer *>( sipCpp );
sipType = 0;
@ -80,16 +94,16 @@ class CORE_EXPORT QgsMapLayer : public QObject
{
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
sipType = sipType_QgsVectorLayer;
break;
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
sipType = sipType_QgsRasterLayer;
break;
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
sipType = sipType_QgsPluginLayer;
break;
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
sipType = sipType_QgsMeshLayer;
break;
default:
@ -102,15 +116,6 @@ class CORE_EXPORT QgsMapLayer : public QObject
public:
//! Types of layers that can be added to a map
enum LayerType
{
VectorLayer,
RasterLayer,
PluginLayer,
MeshLayer //!< Added in 3.2
};
/**
* Maplayer has a style and a metadata property
* \since QGIS 3.0
@ -168,7 +173,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
* \param name display name for the layer
* \param source datasource of layer
*/
QgsMapLayer( QgsMapLayer::LayerType type = VectorLayer, const QString &name = QString(), const QString &source = QString() );
QgsMapLayer( QgsMapLayerType type = QgsMapLayerType::VectorLayer, const QString &name = QString(), const QString &source = QString() );
~QgsMapLayer() override;
@ -188,7 +193,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
/**
* Returns the type of the layer.
*/
QgsMapLayer::LayerType type() const;
QgsMapLayerType type() const;
/**
* Returns the flags for this layer.
@ -831,7 +836,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
virtual QString loadSldStyle( const QString &uri, bool &resultFlag );
virtual bool readSld( const QDomNode &node, QString &errorMessage )
{ Q_UNUSED( node ); errorMessage = QStringLiteral( "Layer type %1 not supported" ).arg( type() ); return false; }
{ Q_UNUSED( node ); errorMessage = QStringLiteral( "Layer type %1 not supported" ).arg( static_cast<int>( type() ) ); return false; }
@ -1483,7 +1488,7 @@ class CORE_EXPORT QgsMapLayer : public QObject
QString mID;
//! Type of the layer (e.g., vector, raster)
QgsMapLayer::LayerType mLayerType;
QgsMapLayerType mLayerType;
LayerFlags mFlags = LayerFlags( Identifiable | Removable | Searchable );

6
src/core/qgsmaplayermodel.cpp
View File

@ -354,17 +354,17 @@ QIcon QgsMapLayerModel::iconForLayer( QgsMapLayer *layer )
{
switch ( layer->type() )
{
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
return QgsLayerItem::iconRaster();
}
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
{
return QgsLayerItem::iconMesh();
}
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vl = dynamic_cast<QgsVectorLayer *>( layer );
if ( !vl )

10
src/core/qgsmaplayerproxymodel.cpp
View File

@ -127,10 +127,10 @@ bool QgsMapLayerProxyModel::filterAcceptsRow( int source_row, const QModelIndex
return false;
// layer type
if ( ( mFilters.testFlag( RasterLayer ) && layer->type() == QgsMapLayer::RasterLayer ) ||
( mFilters.testFlag( VectorLayer ) && layer->type() == QgsMapLayer::VectorLayer ) ||
( mFilters.testFlag( MeshLayer ) && layer->type() == QgsMapLayer::MeshLayer ) ||
( mFilters.testFlag( PluginLayer ) && layer->type() == QgsMapLayer::PluginLayer ) )
if ( ( mFilters.testFlag( RasterLayer ) && layer->type() == QgsMapLayerType::RasterLayer ) ||
( mFilters.testFlag( VectorLayer ) && layer->type() == QgsMapLayerType::VectorLayer ) ||
( mFilters.testFlag( MeshLayer ) && layer->type() == QgsMapLayerType::MeshLayer ) ||
( mFilters.testFlag( PluginLayer ) && layer->type() == QgsMapLayerType::PluginLayer ) )
return true;
// geometry type
@ -139,7 +139,7 @@ bool QgsMapLayerProxyModel::filterAcceptsRow( int source_row, const QModelIndex
mFilters.testFlag( LineLayer ) ||
mFilters.testFlag( PolygonLayer ) ||
mFilters.testFlag( HasGeometry );
if ( detectGeometry && layer->type() == QgsMapLayer::VectorLayer )
if ( detectGeometry && layer->type() == QgsMapLayerType::VectorLayer )
{
if ( QgsVectorLayer *vl = qobject_cast< QgsVectorLayer *>( layer ) )
{

8
src/core/qgsmaprenderercustompainterjob.cpp
View File

@ -349,7 +349,7 @@ bool QgsMapRendererJob::needTemporaryImage( QgsMapLayer *ml )
{
switch ( ml->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( ml );
if ( vl->renderer() && vl->renderer()->forceRasterRender() )
@ -367,7 +367,7 @@ bool QgsMapRendererJob::needTemporaryImage( QgsMapLayer *ml )
}
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
// preview of intermediate raster rendering results requires a temporary output image
if ( mSettings.testFlag( QgsMapSettings::RenderPartialOutput ) )
@ -375,8 +375,8 @@ bool QgsMapRendererJob::needTemporaryImage( QgsMapLayer *ml )
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::MeshLayer:
case QgsMapLayerType::PluginLayer:
break;
}

4
src/core/qgsmaprendererjob.cpp
View File

@ -134,7 +134,7 @@ bool QgsMapRendererJob::reprojectToLayerExtent( const QgsMapLayer *ml, const Qgs
if ( ml->crs().isGeographic() )
{
if ( ml->type() == QgsMapLayer::VectorLayer && !ct.destinationCrs().isGeographic() )
if ( ml->type() == QgsMapLayerType::VectorLayer && !ct.destinationCrs().isGeographic() )
{
// if we transform from a projected coordinate system check
// check if transforming back roughly returns the input
@ -270,7 +270,7 @@ LayerRenderJobs QgsMapRendererJob::prepareJobs( QPainter *painter, QgsLabelingEn
// Force render of layers that are being edited
// or if there's a labeling engine that needs the layer to register features
if ( mCache && ml->type() == QgsMapLayer::VectorLayer )
if ( mCache && ml->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( ml );
bool requiresLabeling = false;

8
src/core/qgsmimedatautils.cpp
View File

@ -174,7 +174,7 @@ static void _addLayerTreeNodeToUriList( QgsLayerTreeNode *node, QgsMimeDataUtils
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
uri.layerType = QStringLiteral( "vector" );
if ( uri.providerKey == QStringLiteral( "memory" ) )
@ -186,14 +186,14 @@ static void _addLayerTreeNodeToUriList( QgsLayerTreeNode *node, QgsMimeDataUtils
}
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
uri.layerType = QStringLiteral( "raster" );
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::MeshLayer:
case QgsMapLayerType::PluginLayer:
{
// plugin layers do not have a standard way of storing their URI...
return;

2
src/core/qgspluginlayer.cpp
View File

@ -19,7 +19,7 @@
QgsPluginLayer::QgsPluginLayer( const QString &layerType, const QString &layerName )
: QgsMapLayer( PluginLayer, layerName )
: QgsMapLayer( QgsMapLayerType::PluginLayer, layerName )
, mPluginLayerType( layerType )
{
mDataProvider = new QgsPluginLayerDataProvider( layerType, QgsDataProvider::ProviderOptions() );

2
src/core/qgspluginlayerregistry.cpp
View File

@ -92,7 +92,7 @@ bool QgsPluginLayerRegistry::removePluginLayerType( const QString &typeName )
QList<QgsMapLayer *> layers = QgsProject::instance()->mapLayers().values();
Q_FOREACH ( QgsMapLayer *layer, layers )
{
if ( layer->type() == QgsMapLayer::PluginLayer )
if ( layer->type() == QgsMapLayerType::PluginLayer )
{
QgsPluginLayer *pl = qobject_cast<QgsPluginLayer *>( layer );
if ( pl->pluginLayerType() == typeName )

6
src/core/qgsproject.cpp
View File

@ -508,7 +508,7 @@ void QgsProject::registerTranslatableObjects( QgsTranslationContext *translation
translationContext->registerTranslation( QStringLiteral( "project:layers:%1" ).arg( layer->layerId() ), layer->name() );
QgsMapLayer *mapLayer = layer->layer();
if ( mapLayer && mapLayer->type() == QgsMapLayer::VectorLayer )
if ( mapLayer && mapLayer->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( mapLayer );
@ -2756,7 +2756,7 @@ QList<QgsMapLayer *> QgsProject::addMapLayers(
{
for ( QgsMapLayer *mlayer : myResultList )
{
if ( mlayer->type() != QgsMapLayer::VectorLayer )
if ( mlayer->type() != QgsMapLayerType::VectorLayer )
continue;
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( mlayer );
@ -2872,7 +2872,7 @@ bool QgsProject::saveAuxiliaryStorage( const QString &filename )
bool empty = true;
for ( auto it = layers.constBegin(); it != layers.constEnd(); ++it )
{
if ( it.value()->type() != QgsMapLayer::VectorLayer )
if ( it.value()->type() != QgsMapLayerType::VectorLayer )
continue;
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( it.value() );

4
src/core/qgsrelation.cpp
View File

@ -66,7 +66,7 @@ QgsRelation QgsRelation::createFromXml( const QDomNode &node, QgsReadWriteContex
{
QgsLogger::warning( QApplication::translate( "QgsRelation", "Relation defined for layer '%1' which does not exist." ).arg( referencingLayerId ) );
}
else if ( QgsMapLayer::VectorLayer != referencingLayer->type() )
else if ( QgsMapLayerType::VectorLayer != referencingLayer->type() )
{
QgsLogger::warning( QApplication::translate( "QgsRelation", "Relation defined for layer '%1' which is not of type VectorLayer." ).arg( referencingLayerId ) );
}
@ -75,7 +75,7 @@ QgsRelation QgsRelation::createFromXml( const QDomNode &node, QgsReadWriteContex
{
QgsLogger::warning( QApplication::translate( "QgsRelation", "Relation defined for layer '%1' which does not exist." ).arg( referencedLayerId ) );
}
else if ( QgsMapLayer::VectorLayer != referencedLayer->type() )
else if ( QgsMapLayerType::VectorLayer != referencedLayer->type() )
{
QgsLogger::warning( QApplication::translate( "QgsRelation", "Relation defined for layer '%1' which is not of type VectorLayer." ).arg( referencedLayerId ) );
}

2
src/core/qgssnappingconfig.cpp
View File

@ -325,7 +325,7 @@ void QgsSnappingConfig::readProject( const QDomDocument &doc )
QgsTolerance::UnitType units = ( QgsTolerance::UnitType )settingElement.attribute( QStringLiteral( "units" ) ).toInt();
QgsMapLayer *ml = mProject->mapLayer( layerId );
if ( !ml || ml->type() != QgsMapLayer::VectorLayer )
if ( !ml || ml->type() != QgsMapLayerType::VectorLayer )
continue;
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( ml );

2
src/core/qgsvectorlayer.cpp
View File

@ -143,7 +143,7 @@ QgsVectorLayer::QgsVectorLayer( const QString &vectorLayerPath,
const QString &baseName,
const QString &providerKey,
const LayerOptions &options )
: QgsMapLayer( VectorLayer, baseName, vectorLayerPath )
: QgsMapLayer( QgsMapLayerType::VectorLayer, baseName, vectorLayerPath )
, mAuxiliaryLayer( nullptr )
, mAuxiliaryLayerKey( QString() )
, mReadExtentFromXml( options.readExtentFromXml )

4
src/core/raster/qgsrasterlayer.cpp
View File

@ -100,7 +100,7 @@ const QgsRasterMinMaxOrigin::Limits
QgsRasterLayer::MULTIPLE_BAND_MULTI_BYTE_MIN_MAX_LIMITS = QgsRasterMinMaxOrigin::CumulativeCut;
QgsRasterLayer::QgsRasterLayer()
: QgsMapLayer( RasterLayer )
: QgsMapLayer( QgsMapLayerType::RasterLayer )
, QSTRING_NOT_SET( QStringLiteral( "Not Set" ) )
, TRSTRING_NOT_SET( tr( "Not Set" ) )
@ -113,7 +113,7 @@ QgsRasterLayer::QgsRasterLayer( const QString &uri,
const QString &baseName,
const QString &providerKey,
const LayerOptions &options )
: QgsMapLayer( RasterLayer, baseName, uri )
: QgsMapLayer( QgsMapLayerType::RasterLayer, baseName, uri )
// Constant that signals property not used.
, QSTRING_NOT_SET( QStringLiteral( "Not Set" ) )
, TRSTRING_NOT_SET( tr( "Not Set" ) )

24
src/gui/layertree/qgslayertreeembeddedwidgetsimpl.cpp
View File

@ -50,7 +50,7 @@ QgsLayerTreeOpacityWidget::QgsLayerTreeOpacityWidget( QgsMapLayer *layer )
// init from layer
switch ( mLayer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( mLayer );
mSlider->setValue( vl->opacity() * 1000.0 );
@ -58,15 +58,15 @@ QgsLayerTreeOpacityWidget::QgsLayerTreeOpacityWidget( QgsMapLayer *layer )
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
mSlider->setValue( 1000 - qobject_cast<QgsRasterLayer *>( mLayer )->renderer()->opacity() * 1000 );
// TODO: there is no signal for raster layers
break;
}
case QgsMapLayer::PluginLayer:
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::PluginLayer:
case QgsMapLayerType::MeshLayer:
break;
}
@ -93,19 +93,19 @@ void QgsLayerTreeOpacityWidget::updateOpacityFromSlider()
switch ( mLayer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
qobject_cast<QgsVectorLayer *>( mLayer )->setOpacity( value / 1000.0 );
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
qobject_cast<QgsRasterLayer *>( mLayer )->renderer()->setOpacity( 1 - value / 1000.0 );
break;
}
case QgsMapLayer::PluginLayer:
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::PluginLayer:
case QgsMapLayerType::MeshLayer:
break;
}
@ -141,12 +141,12 @@ bool QgsLayerTreeOpacityWidget::Provider::supportsLayer( QgsMapLayer *layer )
{
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::VectorLayer:
case QgsMapLayerType::RasterLayer:
return true;
case QgsMapLayer::MeshLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::MeshLayer:
case QgsMapLayerType::PluginLayer:
return false;
}
return false;

2
src/gui/processing/qgsprocessingwidgetwrapper.cpp
View File

@ -277,7 +277,7 @@ void QgsAbstractProcessingParameterWidgetWrapper::setDynamicParentLayerParameter
// need to grab ownership of layer if required - otherwise layer may be deleted when context
// goes out of scope
std::unique_ptr< QgsMapLayer > ownedLayer( context->takeResultLayer( layer->id() ) );
if ( ownedLayer && ownedLayer->type() == QgsMapLayer::VectorLayer )
if ( ownedLayer && ownedLayer->type() == QgsMapLayerType::VectorLayer )
{
mDynamicLayer.reset( qobject_cast< QgsVectorLayer * >( ownedLayer.release() ) );
layer = mDynamicLayer.get();

2
src/gui/processing/qgsprocessingwidgetwrapperimpl.cpp
View File

@ -1410,7 +1410,7 @@ void QgsProcessingExpressionWidgetWrapper::setParentLayerWrapperValue( const Qgs
// need to grab ownership of layer if required - otherwise layer may be deleted when context
// goes out of scope
std::unique_ptr< QgsMapLayer > ownedLayer( context->takeResultLayer( layer->id() ) );
if ( ownedLayer && ownedLayer->type() == QgsMapLayer::VectorLayer )
if ( ownedLayer && ownedLayer->type() == QgsMapLayerType::VectorLayer )
{
mParentLayer.reset( qobject_cast< QgsVectorLayer * >( ownedLayer.release() ) );
layer = mParentLayer.get();

22
src/gui/qgisinterface.h
View File

@ -18,7 +18,17 @@
#ifndef QGISINTERFACE_H
#define QGISINTERFACE_H
#include <QObject>
#include <map>
#include "qgis.h"
#include "qgis_sip.h"
#include "qgis_gui.h"
#include "qgscoordinatereferencesystem.h"
class QAction;
class QDialog;
class QFont;
class QMenu;
class QToolBar;
class QDockWidget;
@ -37,6 +47,7 @@ class QgsMasterLayoutInterface;
class QgsLayoutDesignerInterface;
class QgsMapCanvas;
class QgsMapLayer;
enum class QgsMapLayerType;
class QgsMapLayerConfigWidgetFactory;
class QgsMessageBar;
class QgsPluginManagerInterface;
@ -50,15 +61,6 @@ class QgsStatusBar;
class QgsMeshLayer;
class QgsBrowserModel;
#include <QObject>
#include <QFont>
#include <QPair>
#include <map>
#include "qgis_sip.h"
#include "qgsmaplayer.h"
#include "qgis_gui.h"
/**
* \ingroup gui
@ -100,7 +102,7 @@ class GUI_EXPORT QgisInterface : public QObject
* \see addCustomActionForLayer()
*/
virtual void addCustomActionForLayerType( QAction *action, QString menu,
QgsMapLayer::LayerType type, bool allLayers ) = 0;
QgsMapLayerType type, bool allLayers ) = 0;
/**
* Add action to context menu for a specific layer in the layer tree.

14
src/gui/qgsbrowserdockwidget_p.cpp
View File

@ -173,7 +173,7 @@ void QgsBrowserLayerProperties::setItem( QgsDataItem *item )
mNoticeLabel->clear();
QgsMapLayer::LayerType type = layerItem->mapLayerType();
QgsMapLayerType type = layerItem->mapLayerType();
QString layerMetadata = tr( "Error" );
QgsCoordinateReferenceSystem layerCrs;
@ -191,7 +191,7 @@ void QgsBrowserLayerProperties::setItem( QgsDataItem *item )
QgsDebugMsg( QStringLiteral( "creating temporary layer using path %1" ).arg( layerItem->path() ) );
switch ( type )
{
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
QgsDebugMsg( QStringLiteral( "creating raster layer" ) );
// should copy code from addLayer() to split uri ?
@ -199,21 +199,21 @@ void QgsBrowserLayerProperties::setItem( QgsDataItem *item )
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::MeshLayer:
{
QgsDebugMsg( QStringLiteral( "creating mesh layer" ) );
mLayer = qgis::make_unique < QgsMeshLayer >( layerItem->uri(), layerItem->name(), layerItem->providerKey() );
break;
}
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsDebugMsg( QStringLiteral( "creating vector layer" ) );
mLayer = qgis::make_unique < QgsVectorLayer>( layerItem->uri(), layerItem->name(), layerItem->providerKey() );
break;
}
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::PluginLayer:
{
// TODO: support display of properties for plugin layers
return;
@ -238,7 +238,7 @@ void QgsBrowserLayerProperties::setItem( QgsDataItem *item )
mMapCanvas->setLayers( QList< QgsMapLayer * >() << mLayer.get() );
mMapCanvas->zoomToFullExtent();
if ( mAttributesTab && mLayer->type() != QgsMapLayer::VectorLayer )
if ( mAttributesTab && mLayer->type() != QgsMapLayerType::VectorLayer )
{
mTabWidget->removeTab( mTabWidget->indexOf( mAttributesTab ) );
mAttributesTab = nullptr;
@ -280,7 +280,7 @@ void QgsBrowserLayerProperties::urlClicked( const QUrl &url )
void QgsBrowserLayerProperties::loadAttributeTable()
{
if ( !mLayer || !mLayer->isValid() || mLayer->type() != QgsMapLayer::VectorLayer )
if ( !mLayer || !mLayer->isValid() || mLayer->type() != QgsMapLayerType::VectorLayer )
return;
// Initialize the cache

4
src/gui/qgsdatasourceselectdialog.cpp
View File

@ -27,7 +27,7 @@
QgsDataSourceSelectDialog::QgsDataSourceSelectDialog(
QgsBrowserModel *browserModel,
bool setFilterByLayerType,
const QgsMapLayer::LayerType &layerType,
const QgsMapLayerType &layerType,
QWidget *parent )
: QDialog( parent )
{
@ -218,7 +218,7 @@ void QgsDataSourceSelectDialog::setCaseSensitive( bool caseSensitive )
mBrowserProxyModel.setFilterCaseSensitivity( caseSensitive ? Qt::CaseSensitive : Qt::CaseInsensitive );
}
void QgsDataSourceSelectDialog::setLayerTypeFilter( QgsMapLayer::LayerType layerType )
void QgsDataSourceSelectDialog::setLayerTypeFilter( QgsMapLayerType layerType )
{
mBrowserProxyModel.setFilterByLayerType( true );
mBrowserProxyModel.setLayerType( layerType );

4
src/gui/qgsdatasourceselectdialog.h
View File

@ -57,7 +57,7 @@ class GUI_EXPORT QgsDataSourceSelectDialog: public QDialog, private Ui::QgsDataS
*/
QgsDataSourceSelectDialog( QgsBrowserModel *browserModel = nullptr,
bool setFilterByLayerType = false,
const QgsMapLayer::LayerType &layerType = QgsMapLayer::LayerType::VectorLayer,
const QgsMapLayerType &layerType = QgsMapLayerType::VectorLayer,
QWidget *parent = nullptr );
@ -66,7 +66,7 @@ class GUI_EXPORT QgsDataSourceSelectDialog: public QDialog, private Ui::QgsDataS
/**
* Sets layer type filter to \a layerType and activates the filtering
*/
void setLayerTypeFilter( QgsMapLayer::LayerType layerType );
void setLayerTypeFilter( QgsMapLayerType layerType );
/**
* Returns the (possibly invalid) uri of the selected data source

8
src/gui/qgsidentifymenu.cpp
View File

@ -110,12 +110,12 @@ QList<QgsMapToolIdentify::IdentifyResult> QgsIdentifyMenu::exec( const QList<Qgs
QgsMapLayer *layer = it.key();
switch ( layer->type() )
{
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
addRasterLayer( layer );
break;
}
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layer );
if ( !vl )
@ -124,8 +124,8 @@ QList<QgsMapToolIdentify::IdentifyResult> QgsIdentifyMenu::exec( const QList<Qgs
break;
}
case QgsMapLayer::PluginLayer:
case QgsMapLayer::MeshLayer:
case QgsMapLayerType::PluginLayer:
case QgsMapLayerType::MeshLayer:
break;
}
}

4
src/gui/qgsmaplayeractionregistry.cpp
View File

@ -33,7 +33,7 @@ QgsMapLayerAction::QgsMapLayerAction( const QString &name, QObject *parent, QgsM
{
}
QgsMapLayerAction::QgsMapLayerAction( const QString &name, QObject *parent, QgsMapLayer::LayerType layerType, Targets targets, const QIcon &icon, QgsMapLayerAction::Flags flags )
QgsMapLayerAction::QgsMapLayerAction( const QString &name, QObject *parent, QgsMapLayerType layerType, Targets targets, const QIcon &icon, QgsMapLayerAction::Flags flags )
: QAction( icon, name, parent )
, mSpecificLayerType( true )
, mLayerType( layerType )
@ -60,7 +60,7 @@ bool QgsMapLayerAction::canRunUsingLayer( QgsMapLayer *layer ) const
// action is only enabled for editable layers
if ( !layer )
return false;
if ( layer->type() != QgsMapLayer::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
return false;
if ( !qobject_cast<QgsVectorLayer *>( layer )->isEditable() )
return false;

4
src/gui/qgsmaplayeractionregistry.h
View File

@ -72,7 +72,7 @@ class GUI_EXPORT QgsMapLayerAction : public QAction
QgsMapLayerAction( const QString &name, QObject *parent SIP_TRANSFERTHIS, QgsMapLayer *layer, Targets targets = AllActions, const QIcon &icon = QIcon(), QgsMapLayerAction::Flags flags = nullptr );
//! Creates a map layer action which can run on a specific type of layer
QgsMapLayerAction( const QString &name, QObject *parent SIP_TRANSFERTHIS, QgsMapLayer::LayerType layerType, Targets targets = AllActions, const QIcon &icon = QIcon(), QgsMapLayerAction::Flags flags = nullptr );
QgsMapLayerAction( const QString &name, QObject *parent SIP_TRANSFERTHIS, QgsMapLayerType layerType, Targets targets = AllActions, const QIcon &icon = QIcon(), QgsMapLayerAction::Flags flags = nullptr );
~QgsMapLayerAction() override;
@ -125,7 +125,7 @@ class GUI_EXPORT QgsMapLayerAction : public QAction
// true if action is only valid for a specific layer type
bool mSpecificLayerType = false;
// layer type if action is only valid for a specific layer type
QgsMapLayer::LayerType mLayerType = QgsMapLayer::VectorLayer;
QgsMapLayerType mLayerType = QgsMapLayerType::VectorLayer;
// determine if the action can be run on layer and/or single feature and/or multiple features
Targets mTargets = nullptr;

6
src/gui/qgsmaptoolidentify.cpp
View File

@ -208,15 +208,15 @@ bool QgsMapToolIdentify::identifyLayer( QList<IdentifyResult> *results, QgsMapLa
bool QgsMapToolIdentify::identifyLayer( QList<IdentifyResult> *results, QgsMapLayer *layer, const QgsGeometry &geometry, const QgsRectangle &viewExtent, double mapUnitsPerPixel, QgsMapToolIdentify::LayerType layerType )
{
if ( layer->type() == QgsMapLayer::RasterLayer && layerType.testFlag( RasterLayer ) )
if ( layer->type() == QgsMapLayerType::RasterLayer && layerType.testFlag( RasterLayer ) )
{
return identifyRasterLayer( results, qobject_cast<QgsRasterLayer *>( layer ), geometry, viewExtent, mapUnitsPerPixel );
}
else if ( layer->type() == QgsMapLayer::VectorLayer && layerType.testFlag( VectorLayer ) )
else if ( layer->type() == QgsMapLayerType::VectorLayer && layerType.testFlag( VectorLayer ) )
{
return identifyVectorLayer( results, qobject_cast<QgsVectorLayer *>( layer ), geometry );
}
else if ( layer->type() == QgsMapLayer::MeshLayer && layerType.testFlag( MeshLayer ) )
else if ( layer->type() == QgsMapLayerType::MeshLayer && layerType.testFlag( MeshLayer ) )
{
return identifyMeshLayer( results, qobject_cast<QgsMeshLayer *>( layer ), geometry );
}

4
src/plugins/evis/eventbrowser/evisgenericeventbrowsergui.cpp
View File

@ -228,7 +228,7 @@ bool eVisGenericEventBrowserGui::initBrowser()
if ( mInterface->activeLayer() )
{
//verify that the active layer is a vector layer
if ( QgsMapLayer::VectorLayer == mInterface->activeLayer()->type() )
if ( QgsMapLayerType::VectorLayer == mInterface->activeLayer()->type() )
{
mVectorLayer = qobject_cast< QgsVectorLayer * >( mInterface->activeLayer() );
mCanvas = mInterface->mapCanvas();
@ -252,7 +252,7 @@ bool eVisGenericEventBrowserGui::initBrowser()
if ( mCanvas->currentLayer() )
{
//verify that the active layer is a vector layer
if ( QgsMapLayer::VectorLayer == mCanvas->currentLayer()->type() )
if ( QgsMapLayerType::VectorLayer == mCanvas->currentLayer()->type() )
{
mVectorLayer = qobject_cast< QgsVectorLayer * >( mCanvas->currentLayer() );
}

2
src/plugins/evis/idtool/eviseventidtool.cpp
View File

@ -72,7 +72,7 @@ void eVisEventIdTool::canvasReleaseEvent( QgsMapMouseEvent *mouseEvent )
if ( mCanvas->currentLayer() )
{
//Check to see if the current layer is a vector layer
if ( QgsMapLayer::VectorLayer == mCanvas->currentLayer()->type() )
if ( QgsMapLayerType::VectorLayer == mCanvas->currentLayer()->type() )
{
select( mCanvas->getCoordinateTransform()->toMapCoordinates( mouseEvent->x(), mouseEvent->y() ) );
}

2
src/plugins/globe/qgsglobevectorlayerproperties.cpp
View File

@ -206,7 +206,7 @@ QString QgsGlobeLayerPropertiesFactory::title() const
bool QgsGlobeLayerPropertiesFactory::supportsLayer( QgsMapLayer *layer ) const
{
return layer->type() == QgsMapLayer::VectorLayer;
return layer->type() == QgsMapLayerType::VectorLayer;
}
void QgsGlobeLayerPropertiesFactory::readGlobeVectorLayerConfig( QgsMapLayer *mapLayer, const QDomElement &elem )

2
src/plugins/gps_importer/qgsgpsplugin.cpp
View File

@ -118,7 +118,7 @@ void QgsGpsPlugin::run()
for ( iter = layers.constBegin();
iter != layers.constEnd(); ++iter )
{
if ( iter.value()->type() == QgsMapLayer::VectorLayer )
if ( iter.value()->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vLayer = qobject_cast<QgsVectorLayer *>( iter.value() );
if ( vLayer->providerType() == QLatin1String( "gpx" ) )

4
src/plugins/grass/qgsgrassmoduleoptions.cpp
View File

@ -467,7 +467,7 @@ QList<QgsGrassProvider *> QgsGrassModuleStandardOptions::grassProviders()
QList<QgsGrassProvider *> providers;
Q_FOREACH ( QgsMapLayer *layer, QgsProject::instance()->mapLayers().values() )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vector = qobject_cast<QgsVectorLayer *>( layer );
if ( vector && vector->providerType() == QLatin1String( "grass" ) )
@ -488,7 +488,7 @@ QList<QgsGrassRasterProvider *> QgsGrassModuleStandardOptions::grassRasterProvid
QList<QgsGrassRasterProvider *> providers;
Q_FOREACH ( QgsMapLayer *layer, QgsProject::instance()->mapLayers().values() )
{
if ( layer->type() == QgsMapLayer::RasterLayer )
if ( layer->type() == QgsMapLayerType::RasterLayer )
{
QgsRasterLayer *raster = qobject_cast<QgsRasterLayer *>( layer );
if ( raster && raster->providerType() == QLatin1String( "grassraster" ) )

4
src/plugins/grass/qgsgrassmoduleparam.cpp
View File

@ -871,7 +871,7 @@ void QgsGrassModuleGdalInput::updateQgisLayers()
{
if ( !layer ) continue;
if ( mType == Ogr && layer->type() == QgsMapLayer::VectorLayer )
if ( mType == Ogr && layer->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vector = qobject_cast<QgsVectorLayer *>( layer );
if ( !vector ||
@ -952,7 +952,7 @@ void QgsGrassModuleGdalInput::updateQgisLayers()
mOgrLayers.push_back( ogrLayer );
mOgrWheres.push_back( ogrWhere );
}
else if ( mType == Gdal && layer->type() == QgsMapLayer::RasterLayer )
else if ( mType == Gdal && layer->type() == QgsMapLayerType::RasterLayer )
{
QString uri = layer->source();
mLayerComboBox->addItem( layer->name() );

4
src/plugins/grass/qgsgrassplugin.cpp
View File

@ -431,7 +431,7 @@ void QgsGrassPlugin::onFieldsChanged()
QgsDebugMsg( "uri = " + uri );
Q_FOREACH ( QgsMapLayer *layer, QgsProject::instance()->mapLayers().values() )
{
if ( !layer || layer->type() != QgsMapLayer::VectorLayer )
if ( !layer || layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}
@ -800,7 +800,7 @@ void QgsGrassPlugin::unload()
Q_FOREACH ( QgsMapLayer *layer, QgsProject::instance()->mapLayers().values() )
{
if ( !layer || layer->type() != QgsMapLayer::VectorLayer )
if ( !layer || layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}

4
src/plugins/topology/rulesDialog.cpp
View File

@ -174,7 +174,7 @@ void rulesDialog::showControls( const QString &testName )
}
if ( v1->type() == QgsMapLayer::VectorLayer )
if ( v1->type() == QgsMapLayerType::VectorLayer )
{
if ( topologyRule.layer2AcceptsType( v1->geometryType() ) )
{
@ -317,7 +317,7 @@ void rulesDialog::initGui()
qDebug() << "layerid = " + layerList[i];
// add layer name to the layer combo boxes
if ( v1->type() == QgsMapLayer::VectorLayer )
if ( v1->type() == QgsMapLayerType::VectorLayer )
{
mLayer1Box->addItem( v1->name(), v1->id() );
}

2
src/providers/virtual/qgsembeddedlayerselectdialog.cpp
View File

@ -56,7 +56,7 @@ void QgsEmbeddedLayerSelectDialog::updateLayersList()
QList<QgsLayerTreeLayer *> layers = mTreeView->layerTreeModel()->rootGroup()->findLayers();
Q_FOREACH ( const QgsLayerTreeLayer *l, layers )
{
if ( l->layer() && l->layer()->type() == QgsMapLayer::VectorLayer )
if ( l->layer() && l->layer()->type() == QgsMapLayerType::VectorLayer )
{
// display layer name and store its pointer
QListWidgetItem *item = new QListWidgetItem();

4
src/providers/virtual/qgsvirtuallayerprovider.cpp
View File

@ -121,7 +121,7 @@ bool QgsVirtualLayerProvider::loadSourceLayers()
PROVIDER_ERROR( QString( "Cannot find layer %1" ).arg( layer.reference() ) );
return false;
}
if ( l->type() != QgsMapLayer::VectorLayer )
if ( l->type() != QgsMapLayerType::VectorLayer )
{
PROVIDER_ERROR( QString( "Layer %1 is not a vector layer" ).arg( layer.reference() ) );
return false;
@ -246,7 +246,7 @@ bool QgsVirtualLayerProvider::createIt()
bool found = false;
Q_FOREACH ( const QgsMapLayer *l, QgsProject::instance()->mapLayers() )
{
if ( l->type() != QgsMapLayer::VectorLayer )
if ( l->type() != QgsMapLayerType::VectorLayer )
continue;
const QgsVectorLayer *vl = static_cast<const QgsVectorLayer *>( l );

4
src/providers/virtual/qgsvirtuallayersourceselect.cpp
View File

@ -272,7 +272,7 @@ void QgsVirtualLayerSourceSelect::updateLayersList()
if ( mTreeView )
{
QList<QgsMapLayer *> selected = mTreeView->selectedLayers();
if ( selected.size() == 1 && selected[0]->type() == QgsMapLayer::VectorLayer && static_cast<QgsVectorLayer *>( selected[0] )->providerType() == QLatin1String( "virtual" ) )
if ( selected.size() == 1 && selected[0]->type() == QgsMapLayerType::VectorLayer && static_cast<QgsVectorLayer *>( selected[0] )->providerType() == QLatin1String( "virtual" ) )
{
mLayerNameCombo->setCurrentIndex( mLayerNameCombo->findData( selected[0]->id() ) );
}
@ -296,7 +296,7 @@ void QgsVirtualLayerSourceSelect::updateLayersList()
// configure auto completion with table and column names
Q_FOREACH ( QgsMapLayer *l, QgsProject::instance()->mapLayers() )
{
if ( l->type() == QgsMapLayer::VectorLayer )
if ( l->type() == QgsMapLayerType::VectorLayer )
{
apis->add( l->name() );
QgsVectorLayer *vl = static_cast<QgsVectorLayer *>( l );

2
src/providers/virtual/qgsvirtuallayersqlitemodule.cpp
View File

@ -352,7 +352,7 @@ int vtableCreateConnect( sqlite3 *sql, void *aux, int argc, const char *const *a
layerid = layerid.mid( 1, layerid.size() - 2 );
}
QgsMapLayer *l = QgsProject::instance()->mapLayer( layerid );
if ( !l || l->type() != QgsMapLayer::VectorLayer )
if ( !l || l->type() != QgsMapLayerType::VectorLayer )
{
if ( outErr )
{

2
src/server/qgsaccesscontrol.cpp
View File

@ -25,7 +25,7 @@ void QgsAccessControl::resolveFilterFeatures( const QList<QgsMapLayer *> &layers
{
for ( QgsMapLayer *l : layers )
{
if ( l->type() == QgsMapLayer::LayerType::VectorLayer )
if ( l->type() == QgsMapLayerType::VectorLayer )
{
const QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( l );
mFilterFeaturesExpressions[vl->id()] = resolveFilterFeatures( vl );

2
src/server/services/wcs/qgswcsdescribecoverage.cpp
View File

@ -123,7 +123,7 @@ namespace QgsWcs
{
continue;
}
if ( layer->type() != QgsMapLayer::LayerType::RasterLayer )
if ( layer->type() != QgsMapLayerType::RasterLayer )
{
continue;
}

2
src/server/services/wcs/qgswcsgetcapabilities.cpp
View File

@ -287,7 +287,7 @@ namespace QgsWcs
{
continue;
}
if ( layer->type() != QgsMapLayer::LayerType::RasterLayer )
if ( layer->type() != QgsMapLayerType::RasterLayer )
{
continue;
}

2
src/server/services/wcs/qgswcsgetcoverage.cpp
View File

@ -86,7 +86,7 @@ namespace QgsWcs
{
continue;
}
if ( layer->type() != QgsMapLayer::LayerType::RasterLayer )
if ( layer->type() != QgsMapLayerType::RasterLayer )
{
continue;
}

2
src/server/services/wfs/qgswfsdescribefeaturetype.cpp
View File

@ -141,7 +141,7 @@ namespace QgsWfs
{
continue;
}
if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}

2
src/server/services/wfs/qgswfsgetcapabilities.cpp
View File

@ -454,7 +454,7 @@ namespace QgsWfs
{
continue;
}
if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}

2
src/server/services/wfs/qgswfsgetcapabilities_1_0_0.cpp
View File

@ -290,7 +290,7 @@ namespace QgsWfs
{
continue;
}
if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}

2
src/server/services/wfs/qgswfsgetfeature.cpp
View File

@ -137,7 +137,7 @@ namespace QgsWfs
{
continue;
}
if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}

2
src/server/services/wfs/qgswfstransaction.cpp
View File

@ -259,7 +259,7 @@ namespace QgsWfs
{
continue;
}
if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}

2
src/server/services/wfs/qgswfstransaction_1_0_0.cpp
View File

@ -241,7 +241,7 @@ namespace QgsWfs
for ( int i = 0; i < wfsLayerIds.size(); ++i )
{
QgsMapLayer *layer = project->mapLayer( wfsLayerIds.at( i ) );
if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}

2
src/server/services/wfs/qgswfsutils.cpp
View File

@ -87,7 +87,7 @@ namespace QgsWfs
{
continue;
}
if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}

16
src/server/services/wms/qgslayerrestorer.cpp
View File

@ -43,7 +43,7 @@ QgsLayerRestorer::QgsLayerRestorer( const QList<QgsMapLayer *> &layers )
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vLayer = qobject_cast<QgsVectorLayer *>( layer );
@ -55,7 +55,7 @@ QgsLayerRestorer::QgsLayerRestorer( const QList<QgsMapLayer *> &layers )
}
break;
}
case QgsMapLayer::LayerType::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
QgsRasterLayer *rLayer = qobject_cast<QgsRasterLayer *>( layer );
@ -66,8 +66,8 @@ QgsLayerRestorer::QgsLayerRestorer( const QList<QgsMapLayer *> &layers )
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::MeshLayer:
case QgsMapLayerType::PluginLayer:
break;
}
@ -95,7 +95,7 @@ QgsLayerRestorer::~QgsLayerRestorer()
switch ( layer->type() )
{
case QgsMapLayer::LayerType::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vLayer = qobject_cast<QgsVectorLayer *>( layer );
@ -107,7 +107,7 @@ QgsLayerRestorer::~QgsLayerRestorer()
}
break;
}
case QgsMapLayer::LayerType::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
QgsRasterLayer *rLayer = qobject_cast<QgsRasterLayer *>( layer );
@ -118,8 +118,8 @@ QgsLayerRestorer::~QgsLayerRestorer()
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::MeshLayer:
case QgsMapLayerType::PluginLayer:
break;
}
}

8
src/server/services/wms/qgswmsdescribelayer.cpp
View File

@ -157,7 +157,7 @@ namespace QgsWms
QDomElement nameNode = myDocument.createElement( QStringLiteral( "TypeName" ) );
switch ( layer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
typeNode.appendChild( myDocument.createTextNode( QStringLiteral( "wfs" ) ) );
@ -172,7 +172,7 @@ namespace QgsWms
nameNode.appendChild( typeNameNode );
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
typeNode.appendChild( myDocument.createTextNode( QStringLiteral( "wcs" ) ) );
@ -188,8 +188,8 @@ namespace QgsWms
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::MeshLayer:
case QgsMapLayerType::PluginLayer:
break;
}
layerNode.appendChild( typeNode );

14
src/server/services/wms/qgswmsgetcapabilities.cpp
View File

@ -771,7 +771,7 @@ namespace QgsWms
for ( int i = 0; i < wfsLayerIds.size(); ++i )
{
QgsMapLayer *layer = project->mapLayer( wfsLayerIds.at( i ) );
if ( layer->type() != QgsMapLayer::LayerType::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
{
continue;
}
@ -1014,7 +1014,7 @@ namespace QgsWms
//vector layer without geometry
bool geometryLayer = true;
if ( l->type() == QgsMapLayer::VectorLayer )
if ( l->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vLayer = qobject_cast<QgsVectorLayer *>( l );
if ( vLayer )
@ -1036,7 +1036,7 @@ namespace QgsWms
//Ex_GeographicBoundingBox
QgsRectangle extent = l->extent(); // layer extent by default
if ( l->type() == QgsMapLayer::VectorLayer )
if ( l->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( l );
if ( vl && vl->featureCount() == 0 )
@ -1710,7 +1710,7 @@ namespace QgsWms
switch ( currentLayer->type() )
{
case QgsMapLayer::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vLayer = static_cast<QgsVectorLayer *>( currentLayer );
const QSet<QString> &excludedAttributes = vLayer->excludeAttributesWms();
@ -1783,7 +1783,7 @@ namespace QgsWms
break;
}
case QgsMapLayer::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
const QgsDataProvider *provider = currentLayer->dataProvider();
if ( provider && provider->name() == "wms" )
@ -1820,8 +1820,8 @@ namespace QgsWms
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::MeshLayer:
case QgsMapLayerType::PluginLayer:
break;
}
}

2
src/server/services/wms/qgswmsgetstyles.cpp
View File

@ -171,7 +171,7 @@ namespace QgsWms
nameNode.appendChild( myDocument.createTextNode( name ) );
namedLayerNode.appendChild( nameNode );
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vlayer = qobject_cast<QgsVectorLayer *>( layer );
if ( vlayer->isSpatial() )

20
src/server/services/wms/qgswmsrenderer.cpp
View File

@ -929,7 +929,7 @@ namespace QgsWms
for ( QgsMapLayer *layer : layers )
{
layerIdx++;
if ( layer->type() != QgsMapLayer::VectorLayer )
if ( layer->type() != QgsMapLayerType::VectorLayer )
continue;
if ( !wfsLayerIds.contains( layer->id() ) )
continue;
@ -1432,7 +1432,7 @@ namespace QgsWms
}
}
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vectorLayer = qobject_cast<QgsVectorLayer *>( layer );
if ( vectorLayer )
@ -2300,7 +2300,7 @@ namespace QgsWms
if ( !layer )
continue;
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layer );
@ -3072,14 +3072,14 @@ namespace QgsWms
{
switch ( layer->type() )
{
case QgsMapLayer::LayerType::VectorLayer:
case QgsMapLayerType::VectorLayer:
{
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( layer );
vl->setOpacity( opacity / 255. );
break;
}
case QgsMapLayer::LayerType::RasterLayer:
case QgsMapLayerType::RasterLayer:
{
QgsRasterLayer *rl = qobject_cast<QgsRasterLayer *>( layer );
QgsRasterRenderer *rasterRenderer = rl->renderer();
@ -3087,8 +3087,8 @@ namespace QgsWms
break;
}
case QgsMapLayer::MeshLayer:
case QgsMapLayer::PluginLayer:
case QgsMapLayerType::MeshLayer:
case QgsMapLayerType::PluginLayer:
break;
}
}
@ -3096,7 +3096,7 @@ namespace QgsWms
void QgsRenderer::setLayerFilter( QgsMapLayer *layer, const QList<QgsWmsParametersFilter> &filters )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QgsVectorLayer *filteredLayer = qobject_cast<QgsVectorLayer *>( layer );
for ( const QgsWmsParametersFilter &filter : filters )
@ -3151,7 +3151,7 @@ namespace QgsWms
void QgsRenderer::setLayerSelection( QgsMapLayer *layer, const QStringList &fids ) const
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
{
QgsFeatureIds selectedIds;
@ -3295,7 +3295,7 @@ namespace QgsWms
if ( !ml->title().isEmpty() )
lt->setName( ml->title() );
if ( ml->type() != QgsMapLayer::VectorLayer || !showFeatureCount )
if ( ml->type() != QgsMapLayerType::VectorLayer || !showFeatureCount )
continue;
QgsVectorLayer *vl = qobject_cast<QgsVectorLayer *>( ml );

8
tests/src/analysis/testqgsprocessing.cpp
View File

@ -1034,7 +1034,7 @@ void TestQgsProcessing::mapLayers()
// test loadMapLayerFromString with raster
QgsMapLayer *l = QgsProcessingUtils::loadMapLayerFromString( raster );
QVERIFY( l->isValid() );
QCOMPARE( l->type(), QgsMapLayer::RasterLayer );
QCOMPARE( l->type(), QgsMapLayerType::RasterLayer );
QCOMPARE( l->name(), QStringLiteral( "landsat" ) );
delete l;
@ -1042,7 +1042,7 @@ void TestQgsProcessing::mapLayers()
//test with vector
l = QgsProcessingUtils::loadMapLayerFromString( vector );
QVERIFY( l->isValid() );
QCOMPARE( l->type(), QgsMapLayer::VectorLayer );
QCOMPARE( l->type(), QgsMapLayerType::VectorLayer );
QCOMPARE( l->name(), QStringLiteral( "points" ) );
delete l;
@ -1052,7 +1052,7 @@ void TestQgsProcessing::mapLayers()
QVERIFY( !l );
l = QgsProcessingUtils::loadMapLayerFromString( testDataDir + "multipoint.shp" );
QVERIFY( l->isValid() );
QCOMPARE( l->type(), QgsMapLayer::VectorLayer );
QCOMPARE( l->type(), QgsMapLayerType::VectorLayer );
QCOMPARE( l->name(), QStringLiteral( "multipoint" ) );
delete l;
@ -1188,7 +1188,7 @@ void TestQgsProcessing::mapLayerFromString()
// allow loading
QgsMapLayer *loadedLayer = QgsProcessingUtils::mapLayerFromString( newRaster, c, true );
QVERIFY( loadedLayer->isValid() );
QCOMPARE( loadedLayer->type(), QgsMapLayer::RasterLayer );
QCOMPARE( loadedLayer->type(), QgsMapLayerType::RasterLayer );
// should now be in temporary store
QCOMPARE( c.temporaryLayerStore()->mapLayer( loadedLayer->id() ), loadedLayer );

4
tests/src/core/testqgsbrowserproxymodel.cpp
View File

@ -217,7 +217,7 @@ void TestQgsBrowserProxyModel::testModel()
proxy.setFilterString( QString() );
// layer type filtering
proxy.setLayerType( QgsMapLayer::VectorLayer );
proxy.setLayerType( QgsMapLayerType::VectorLayer );
proxy.setFilterByLayerType( true );
QCOMPARE( proxy.rowCount(), 2 );
@ -235,7 +235,7 @@ void TestQgsBrowserProxyModel::testModel()
QCOMPARE( proxy.data( proxy.index( 0, 0, child2Index ) ).toString(), QStringLiteral( "Child3" ) );
QCOMPARE( proxy.rowCount( root2Index ), 0 );
proxy.setLayerType( QgsMapLayer::RasterLayer );
proxy.setLayerType( QgsMapLayerType::RasterLayer );
QCOMPARE( proxy.rowCount(), 2 );
root1Index = proxy.index( 0, 0 );
root2Index = proxy.index( 1, 0 );

2
tests/src/core/testqgsproject.cpp
View File

@ -165,7 +165,7 @@ static QString _getLayerSvgMarkerPath( const QgsProject &prj, const QString &lay
{
QList<QgsMapLayer *> layers = prj.mapLayersByName( layerName );
Q_ASSERT( layers.count() == 1 );
Q_ASSERT( layers[0]->type() == QgsMapLayer::VectorLayer );
Q_ASSERT( layers[0]->type() == QgsMapLayerType::VectorLayer );
QgsVectorLayer *layer = qobject_cast<QgsVectorLayer *>( layers[0] );
Q_ASSERT( layer->renderer() );
Q_ASSERT( layer->renderer()->type() == "singleSymbol" );

2
tests/src/core/testziplayer.cpp
View File

@ -244,7 +244,7 @@ int TestZipLayer::getLayerTransparency( const QString &myFileName, const QString
if ( myLayer && myLayer->isValid() )
{
// myTransparency = myLayer->getTransparency();
if ( myLayer->type() == QgsMapLayer::RasterLayer )
if ( myLayer->type() == QgsMapLayerType::RasterLayer )
{
QgsRasterLayer *layer = dynamic_cast<QgsRasterLayer *>( myLayer );
if ( layer && layer->renderer() )

4
tests/src/gui/testrenderergui.cpp
View File

@ -45,7 +45,7 @@ void TestRendererGUI::loadLayers()
QList<QgsMapLayer *> canvasLayers;
foreach ( QgsMapLayer *layer, QgsProject::instance()->mapLayers().values() )
{
if ( layer->type() == QgsMapLayer::VectorLayer )
if ( layer->type() == QgsMapLayerType::VectorLayer )
canvasLayers << layer;
}
@ -56,7 +56,7 @@ void TestRendererGUI::setRenderer()
{
QgsMapLayer *layer = mMapCanvas->layer( 0 );
QVERIFY( layer );
QVERIFY( layer->type() == QgsMapLayer::VectorLayer );
QVERIFY( layer->type() == QgsMapLayerType::VectorLayer );
QgsVectorLayer *vlayer = static_cast<QgsVectorLayer *>( layer );
QgsRendererPropertiesDialog dlg( vlayer, QgsStyle::defaultStyle() );