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

Fix some warnings

Browse Source
This commit is contained in:
Nyall Dawson 2023-01-12 09:08:14 +10:00
parent c56407da0d
commit 0b31551a08
3 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
python/gui/auto_generated/vector/qgsvectorlayerproperties.sip.in
View File

@ -28,6 +28,7 @@ Adds a properties page factory to the vector layer properties dialog.
%End
protected slots:
void optionsStackedWidget_CurrentChanged( int index ) final;
signals:

12
src/gui/vector/qgsvectorlayerproperties.cpp
View File

@ -1329,9 +1329,8 @@ void QgsVectorLayerProperties::saveMultipleStylesAs()
while ( QFile::exists( safePath ) )
{
const QFileInfo fi { filePath };
safePath = QString( filePath ).replace( '.' + fi.completeSuffix(), QStringLiteral( "_%1.%2" )
.arg( QString::number( i ) )
.arg( fi.completeSuffix() ) );
safePath = QString( filePath ).replace( '.' + fi.completeSuffix(),
QStringLiteral( "_%1.%2" ).arg( QString::number( i ), fi.completeSuffix() ) );
i++;
}
}
@ -1356,8 +1355,7 @@ void QgsVectorLayerProperties::saveMultipleStylesAs()
case DB:
{
QString infoWindowTitle = QObject::tr( "Save style '%1' to DB (%2)" )
.arg( styleName )
.arg( mLayer->providerType() );
.arg( styleName, mLayer->providerType() );
QString msgError;
QgsVectorLayerSaveStyleDialog::SaveToDbSettings dbSettings = dlg.saveToDbSettings();
@ -1375,7 +1373,7 @@ void QgsVectorLayerProperties::saveMultipleStylesAs()
int i = 1;
while ( names.contains( name ) )
{
name = QStringLiteral( "%1 %2" ).arg( name ).arg( QString::number( i ) );
name = QStringLiteral( "%1 %2" ).arg( name, QString::number( i ) );
i++;
}
}
@ -1891,7 +1889,7 @@ void QgsVectorLayerProperties::addWmsDimensionInfoToTreeWidget( const QgsMapLaye
QTreeWidgetItem *childWmsDimensionDefaultValue = new QTreeWidgetItem();
childWmsDimensionDefaultValue->setText( 0, tr( "Default display" ) );
childWmsDimensionDefaultValue->setText( 1, QgsMapLayerServerProperties::wmsDimensionDefaultDisplayLabels()[wmsDim.defaultDisplayType] );
childWmsDimensionDefaultValue->setText( 1, QgsMapLayerServerProperties::wmsDimensionDefaultDisplayLabels().value( wmsDim.defaultDisplayType ) );
childWmsDimensionDefaultValue->setFlags( Qt::ItemIsEnabled );
wmsDimensionItem->addChild( childWmsDimensionDefaultValue );

2
src/gui/vector/qgsvectorlayerproperties.h
View File

@ -76,7 +76,7 @@ class GUI_EXPORT QgsVectorLayerProperties : public QgsOptionsDialogBase, private
void addPropertiesPageFactory( const QgsMapLayerConfigWidgetFactory *factory );
protected slots:
void optionsStackedWidget_CurrentChanged( int index ) override SIP_SKIP;
void optionsStackedWidget_CurrentChanged( int index ) final;
private slots: