Skip to content

Commit

Permalink
Merge pull request #46458 from Koyaani/remove-unnecessary-instance
Browse files Browse the repository at this point in the history
  • Loading branch information
@m-kuhn
m-kuhn committed Dec 16, 2021
2 parents 9500bfb + 6e68586 commit 41801d9
Show file tree
Hide file tree
Showing 73 changed files with 119 additions and 119 deletions.
10 changes: 5 additions & 5 deletions src/3d/qgs3d.cpp
View file
Expand Up @@ -71,15 +71,15 @@ void Qgs3D::initialize()
QgsApplication::symbol3DRegistry()->addSymbolType( new Qgs3DSymbolMetadata( QStringLiteral( "polygon" ), QObject::tr( "Polygon" ),
&QgsPolygon3DSymbol::create, nullptr, Qgs3DSymbolImpl::handlerForPolygon3DSymbol ) );

instance()->materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "null" ), QObject::tr( "Embedded Textures" ),
Qgs3D::materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "null" ), QObject::tr( "Embedded Textures" ),
QgsNullMaterialSettings::create, QgsNullMaterialSettings::supportsTechnique, nullptr, QgsApplication::getThemeIcon( QStringLiteral( "/mIconPhongTexturedMaterial.svg" ) ) ) );
instance()->materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "phong" ), QObject::tr( "Realistic (Phong)" ),
Qgs3D::materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "phong" ), QObject::tr( "Realistic (Phong)" ),
QgsPhongMaterialSettings::create, QgsPhongMaterialSettings::supportsTechnique, nullptr, QgsApplication::getThemeIcon( QStringLiteral( "/mIconPhongMaterial.svg" ) ) ) );
instance()->materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "phongtextured" ), QObject::tr( "Realistic Textured (Phong)" ),
Qgs3D::materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "phongtextured" ), QObject::tr( "Realistic Textured (Phong)" ),
QgsPhongTexturedMaterialSettings::create, QgsPhongTexturedMaterialSettings::supportsTechnique, nullptr, QgsApplication::getThemeIcon( QStringLiteral( "/mIconPhongTexturedMaterial.svg" ) ) ) );
instance()->materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "simpleline" ), QObject::tr( "Single Color (Unlit)" ),
Qgs3D::materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "simpleline" ), QObject::tr( "Single Color (Unlit)" ),
QgsSimpleLineMaterialSettings::create, QgsSimpleLineMaterialSettings::supportsTechnique, nullptr, QgsApplication::getThemeIcon( QStringLiteral( "/mIconSimpleLineMaterial.svg" ) ) ) );
instance()->materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "gooch" ), QObject::tr( "CAD (Gooch)" ),
Qgs3D::materialRegistry()->addMaterialSettingsType( new QgsMaterialSettingsMetadata( QStringLiteral( "gooch" ), QObject::tr( "CAD (Gooch)" ),
QgsGoochMaterialSettings::create, QgsGoochMaterialSettings::supportsTechnique, nullptr, QgsApplication::getThemeIcon( QStringLiteral( "/mIconGoochMaterial.svg" ) ) ) );

// because we are usually populating the 3d registry AFTER QgsApplication initialization, we need to defer creation
Expand Down
2 changes: 1 addition & 1 deletion src/3d/qgs3dmapscene.cpp
View file
Expand Up @@ -145,7 +145,7 @@ Qgs3DMapScene::Qgs3DMapScene( const Qgs3DMapSettings &map, QgsAbstract3DEngine *
connect( &map, &Qgs3DMapSettings::fpsCounterEnabledChanged, this, &Qgs3DMapScene::fpsCounterEnabledChanged );
connect( &map, &Qgs3DMapSettings::cameraMovementSpeedChanged, this, &Qgs3DMapScene::onCameraMovementSpeedChanged );

connect( QgsApplication::instance()->sourceCache(), &QgsSourceCache::remoteSourceFetched, this, [ = ]( const QString & url )
connect( QgsApplication::sourceCache(), &QgsSourceCache::remoteSourceFetched, this, [ = ]( const QString & url )
{
const QList<QgsMapLayer *> modelVectorLayers = mModelVectorLayers;
for ( QgsMapLayer *layer : modelVectorLayers )
Expand Down
4 changes: 2 additions & 2 deletions src/3d/symbols/qgspoint3dsymbol_p.cpp
View file
Expand Up @@ -425,7 +425,7 @@ void QgsModelPoint3DSymbolHandler::addSceneEntities( const Qgs3DMapSettings &map
Q_UNUSED( map )
for ( const QVector3D &position : positions )
{
const QString source = QgsApplication::instance()->sourceCache()->localFilePath( symbol->shapeProperties()[QStringLiteral( "model" )].toString() );
const QString source = QgsApplication::sourceCache()->localFilePath( symbol->shapeProperties()[QStringLiteral( "model" )].toString() );
// if the source is remote, the Qgs3DMapScene will take care of refreshing this 3D symbol when the source is fetched
if ( !source.isEmpty() )
{
Expand Down Expand Up @@ -460,7 +460,7 @@ void QgsModelPoint3DSymbolHandler::addMeshEntities( const Qgs3DMapSettings &map,
// get nodes
for ( const QVector3D &position : positions )
{
const QString source = QgsApplication::instance()->sourceCache()->localFilePath( symbol->shapeProperties()[QStringLiteral( "model" )].toString() );
const QString source = QgsApplication::sourceCache()->localFilePath( symbol->shapeProperties()[QStringLiteral( "model" )].toString() );
if ( !source.isEmpty() )
{
// build the entity
Expand Down
4 changes: 2 additions & 2 deletions src/app/3d/qgs3dmapcanvasdockwidget.cpp
View file
Expand Up @@ -317,7 +317,7 @@ void Qgs3DMapCanvasDockWidget::configure()
dlg.setWindowTitle( tr( "3D Configuration" ) );
dlg.setObjectName( QStringLiteral( "3DConfigurationDialog" ) );
dlg.setMinimumSize( 600, 460 );
QgsGui::instance()->enableAutoGeometryRestore( &dlg );
QgsGui::enableAutoGeometryRestore( &dlg );

Qgs3DMapSettings *map = mCanvas->map();
Qgs3DMapConfigWidget *w = new Qgs3DMapConfigWidget( map, mMainCanvas, mCanvas, &dlg );
Expand Down Expand Up @@ -382,7 +382,7 @@ void Qgs3DMapCanvasDockWidget::exportScene()
QDialog dlg;
dlg.setWindowTitle( tr( "Export 3D Scene" ) );
dlg.setObjectName( QStringLiteral( "3DSceneExportDialog" ) );
QgsGui::instance()->enableAutoGeometryRestore( &dlg );
QgsGui::enableAutoGeometryRestore( &dlg );

Qgs3DMapExportSettings exportSettings;
QgsMap3DExportWidget w( mCanvas->scene(), &exportSettings );
Expand Down
2 changes: 1 addition & 1 deletion src/app/annotations/qgsannotationlayerproperties.cpp
View file
Expand Up @@ -310,7 +310,7 @@ void QgsAnnotationLayerProperties::urlClicked( const QUrl &url )
{
const QFileInfo file( url.toLocalFile() );
if ( file.exists() && !file.isDir() )
QgsGui::instance()->nativePlatformInterface()->openFileExplorerAndSelectFile( url.toLocalFile() );
QgsGui::nativePlatformInterface()->openFileExplorerAndSelectFile( url.toLocalFile() );
else
QDesktopServices::openUrl( url );
}
Expand Down
4 changes: 2 additions & 2 deletions src/app/browser/qgsinbuiltdataitemproviders.cpp
View file
Expand Up @@ -298,12 +298,12 @@ void QgsAppDirectoryItemGuiProvider::populateContextMenu( QgsDataItem *item, QMe
} );
menu->addAction( openFolder );

if ( QgsGui::instance()->nativePlatformInterface()->capabilities() & QgsNative::NativeOpenTerminalAtPath )
if ( QgsGui::nativePlatformInterface()->capabilities() & QgsNative::NativeOpenTerminalAtPath )
{
QAction *openTerminal = new QAction( QgsApplication::getThemeIcon( QStringLiteral( "mActionTerminal.svg" ) ), tr( "Open in Terminal…" ), menu );
connect( openTerminal, &QAction::triggered, this, [ = ]
{
QgsGui::instance()->nativePlatformInterface()->openTerminalAtPath( directoryItem->dirPath() );
QgsGui::nativePlatformInterface()->openTerminalAtPath( directoryItem->dirPath() );
} );
menu->addAction( openTerminal );
menu->addSeparator();
Expand Down
2 changes: 1 addition & 1 deletion src/app/dwg/qgsdwgimportdialog.cpp
View file
Expand Up @@ -56,7 +56,7 @@ QgsDwgImportDialog::QgsDwgImportDialog( QWidget *parent, Qt::WindowFlags f )
: QDialog( parent, f )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );
mDatabaseFileWidget->setStorageMode( QgsFileWidget::SaveFile );
mDatabaseFileWidget->setConfirmOverwrite( false );

Expand Down
2 changes: 1 addition & 1 deletion src/app/georeferencer/qgsgeorefmainwindow.cpp
View file
Expand Up @@ -79,7 +79,7 @@ QgsGeoreferencerMainWindow::QgsGeoreferencerMainWindow( QWidget *parent, Qt::Win
: QMainWindow( parent, fl )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );
setAcceptDrops( true );

QWidget *centralWidget = this->centralWidget();
Expand Down
2 changes: 1 addition & 1 deletion src/app/georeferencer/qgstransformsettingsdialog.cpp
View file
Expand Up @@ -35,7 +35,7 @@ QgsTransformSettingsDialog::QgsTransformSettingsDialog( const QString &raster, c
{
setupUi( this );
QgsSettings settings;
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );


mOutputRaster->setStorageMode( QgsFileWidget::SaveFile );
Expand Down
2 changes: 1 addition & 1 deletion src/app/labeling/qgslabelpropertydialog.cpp
View file
Expand Up @@ -44,7 +44,7 @@ QgsLabelPropertyDialog::QgsLabelPropertyDialog( const QString &layerId, const QS
, mIsPinned( isPinned )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

// set defaults to layer defaults
mLabelAllPartsCheckBox->setChecked( layerSettings.labelPerPart );
Expand Down
2 changes: 1 addition & 1 deletion src/app/locator/qgsnominatimlocatorfilter.cpp
View file
Expand Up @@ -40,7 +40,7 @@ void QgsNominatimLocatorFilter::triggerResult( const QgsLocatorResult &result )
{
settings.setValue( "locator_filters/nominatim_geocoder/attribution_shown", true, QgsSettings::App );

QgsMessageBarItem *messageWidget = QgisApp::instance()->messageBar()->createMessage( tr( "The Nominatim geocoder data is made available by OpenStreetMap Foundation and contributors." ) );
QgsMessageBarItem *messageWidget = QgsMessageBar::createMessage( tr( "The Nominatim geocoder data is made available by OpenStreetMap Foundation and contributors." ) );
QPushButton *learnMoreButton = new QPushButton( tr( "Learn more" ) );
connect( learnMoreButton, &QPushButton::clicked, learnMoreButton, [ = ]
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/pointcloud/qgspointcloudlayerproperties.cpp
View file
Expand Up @@ -408,7 +408,7 @@ void QgsPointCloudLayerProperties::urlClicked( const QUrl &url )
{
const QFileInfo file( url.toLocalFile() );
if ( file.exists() && !file.isDir() )
QgsGui::instance()->nativePlatformInterface()->openFileExplorerAndSelectFile( url.toLocalFile() );
QgsGui::nativePlatformInterface()->openFileExplorerAndSelectFile( url.toLocalFile() );
else
QDesktopServices::openUrl( url );
}
Expand Down
42 changes: 21 additions & 21 deletions src/app/qgisapp.cpp
View file
Expand Up @@ -1290,7 +1290,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
QDialog *dialog = new QDialog( this, Qt::Tool );
dialog->setObjectName( QStringLiteral( "snappingSettings" ) );
dialog->setWindowTitle( tr( "Project Snapping Settings" ) );
QgsGui::instance()->enableAutoGeometryRestore( dialog );
QgsGui::enableAutoGeometryRestore( dialog );
QVBoxLayout *layout = new QVBoxLayout( dialog );
layout->addWidget( mSnappingDialog );
layout->setContentsMargins( 0, 0, 0, 0 );
Expand All @@ -1312,16 +1312,16 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh
mMapCanvas->setTemporalController( mTemporalControllerWidget->temporalController() );
mTemporalControllerWidget->setMapCanvas( mMapCanvas );

QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsAppDirectoryItemGuiProvider() );
QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsAppFileItemGuiProvider() );
QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsProjectHomeItemGuiProvider() );
QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsProjectItemGuiProvider() );
QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsFavoritesItemGuiProvider() );
QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsLayerItemGuiProvider() );
QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsBookmarksItemGuiProvider() );
QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsFieldsItemGuiProvider() );
QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsFieldItemGuiProvider() );
QgsGui::instance()->dataItemGuiProviderRegistry()->addProvider( new QgsDatabaseItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsAppDirectoryItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsAppFileItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsProjectHomeItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsProjectItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsFavoritesItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsLayerItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsBookmarksItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsFieldsItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsFieldItemGuiProvider() );
QgsGui::dataItemGuiProviderRegistry()->addProvider( new QgsDatabaseItemGuiProvider() );

QShortcut *showBrowserDock = new QShortcut( QKeySequence( tr( "Ctrl+2" ) ), this );
connect( showBrowserDock, &QShortcut::activated, mBrowserWidget, &QgsDockWidget::toggleUserVisible );
Expand Down Expand Up @@ -1691,28 +1691,28 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipVersionCh

connect( QgsApplication::taskManager(), &QgsTaskManager::statusChanged, this, &QgisApp::onTaskCompleteShowNotify );

QgsGui::instance()->nativePlatformInterface()->initializeMainWindow( windowHandle(),
QgsGui::nativePlatformInterface()->initializeMainWindow( windowHandle(),
QgsApplication::applicationName(),
QgsApplication::organizationName(),
Qgis::version() );
connect( QgsGui::instance()->nativePlatformInterface(), &QgsNative::usbStorageNotification, mBrowserModel, &QgsBrowserModel::refreshDrives );
connect( QgsGui::nativePlatformInterface(), &QgsNative::usbStorageNotification, mBrowserModel, &QgsBrowserModel::refreshDrives );

// setup application progress reports from task manager
connect( QgsApplication::taskManager(), &QgsTaskManager::taskAdded, this, []
{
QgsGui::instance()->nativePlatformInterface()->showUndefinedApplicationProgress();
QgsGui::nativePlatformInterface()->showUndefinedApplicationProgress();
} );
connect( QgsApplication::taskManager(), &QgsTaskManager::finalTaskProgressChanged, this, []( double val )
{
QgsGui::instance()->nativePlatformInterface()->setApplicationProgress( val );
QgsGui::nativePlatformInterface()->setApplicationProgress( val );
} );
connect( QgsApplication::taskManager(), &QgsTaskManager::allTasksFinished, this, []
{
QgsGui::instance()->nativePlatformInterface()->hideApplicationProgress();
QgsGui::nativePlatformInterface()->hideApplicationProgress();
} );
connect( QgsApplication::taskManager(), &QgsTaskManager::countActiveTasksChanged, this, []( int count )
{
QgsGui::instance()->nativePlatformInterface()->setApplicationBadgeCount( count );
QgsGui::nativePlatformInterface()->setApplicationBadgeCount( count );
} );

( void )new QgsAppMissingGridHandler( this );
Expand Down Expand Up @@ -1923,7 +1923,7 @@ QgisApp::~QgisApp()
delete mMapStylingDock;
mMapStylingDock = nullptr;

QgsGui::instance()->nativePlatformInterface()->cleanup();
QgsGui::nativePlatformInterface()->cleanup();

// This function *MUST* be the last one called, as it destroys in
// particular GDAL. As above objects can hold GDAL/OGR objects, it is not
Expand Down Expand Up @@ -5179,7 +5179,7 @@ void QgisApp::updateRecentProjectPaths()
project.name = project.title != project.path ? project.title : project.fileName;
recentProjects.emplace_back( project );
}
QgsGui::instance()->nativePlatformInterface()->onRecentProjectsChanged( recentProjects );
QgsGui::nativePlatformInterface()->onRecentProjectsChanged( recentProjects );
}

// add this file to the recently opened/saved projects list
Expand Down Expand Up @@ -6561,7 +6561,7 @@ void QgisApp::fileOpenAfterLaunch()
}

// Is this a storage based project?
const bool projectIsFromStorage { QgsApplication::instance()->projectStorageRegistry()->projectStorageFromUri( projPath ) != nullptr };
const bool projectIsFromStorage { QgsApplication::projectStorageRegistry()->projectStorageFromUri( projPath ) != nullptr };

if ( !projectIsFromStorage &&
!projPath.endsWith( QLatin1String( ".qgs" ), Qt::CaseInsensitive ) &&
Expand Down Expand Up @@ -17236,7 +17236,7 @@ void QgisApp::showSystemNotification( const QString &title, const QString &messa
settings.svgAppIconPath = QgsApplication::iconsPath() + QStringLiteral( "qgis_icon.svg" );
settings.pngAppIconPath = QgsApplication::appIconPath();

QgsNative::NotificationResult result = QgsGui::instance()->nativePlatformInterface()->showDesktopNotification( title, message, settings );
QgsNative::NotificationResult result = QgsGui::nativePlatformInterface()->showDesktopNotification( title, message, settings );

if ( !result.successful )
{
Expand Down
12 changes: 6 additions & 6 deletions src/app/qgsbookmarkeditordialog.cpp
View file
Expand Up @@ -35,11 +35,11 @@ QgsBookmarkEditorDialog::QgsBookmarkEditorDialog( QgsBookmark bookmark, bool inP
, mMapCanvas( mapCanvas )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );

mName->setText( mBookmark.name() );

const QSet<QString> groups = qgis::listToSet( QgsProject::instance()->bookmarkManager()->groups() << QgsApplication::instance()->bookmarkManager()->groups() );
const QSet<QString> groups = qgis::listToSet( QgsProject::instance()->bookmarkManager()->groups() << QgsApplication::bookmarkManager()->groups() );
QStringList groupsList = qgis::setToList( groups );
groupsList.removeOne( QString() );
groupsList.sort();
Expand Down Expand Up @@ -87,20 +87,20 @@ void QgsBookmarkEditorDialog::onAccepted()
if ( mSaveLocation->currentData() == ProjectManager )
QgsProject::instance()->bookmarkManager()->addBookmark( bookmark );
else
QgsApplication::instance()->bookmarkManager()->addBookmark( bookmark );
QgsApplication::bookmarkManager()->addBookmark( bookmark );
}
else
{
// Editing a pre-existing bookmark
if ( mInProject )
QgsProject::instance()->bookmarkManager()->updateBookmark( bookmark );
else
QgsApplication::instance()->bookmarkManager()->updateBookmark( bookmark );
QgsApplication::bookmarkManager()->updateBookmark( bookmark );

if ( !mInProject && mSaveLocation->currentData() == ProjectManager )
QgsApplication::instance()->bookmarkManager()->moveBookmark( bookmark.id(), QgsProject::instance()->bookmarkManager() );
QgsApplication::bookmarkManager()->moveBookmark( bookmark.id(), QgsProject::instance()->bookmarkManager() );
else if ( mInProject && mSaveLocation->currentData() == ApplicationManager )
QgsProject::instance()->bookmarkManager()->moveBookmark( bookmark.id(), QgsApplication::instance()->bookmarkManager() );
QgsProject::instance()->bookmarkManager()->moveBookmark( bookmark.id(), QgsApplication::bookmarkManager() );
}
}

2 changes: 1 addition & 1 deletion src/app/qgsgeometryvalidationdock.cpp
View file
Expand Up @@ -328,7 +328,7 @@ void QgsGeometryValidationDock::onLayerEditingStatusChanged()
{
if ( mCurrentLayer && mCurrentLayer->isSpatial() && mCurrentLayer->isEditable() )
{
const QList<QgsGeometryCheckFactory *> topologyCheckFactories = QgsAnalysis::instance()->geometryCheckRegistry()->geometryCheckFactories( mCurrentLayer, QgsGeometryCheck::LayerCheck, QgsGeometryCheck::Flag::AvailableInValidation );
const QList<QgsGeometryCheckFactory *> topologyCheckFactories = QgsAnalysis::geometryCheckRegistry()->geometryCheckFactories( mCurrentLayer, QgsGeometryCheck::LayerCheck, QgsGeometryCheck::Flag::AvailableInValidation );
const QStringList activeChecks = mCurrentLayer->geometryOptions()->geometryChecks();
for ( const QgsGeometryCheckFactory *factory : topologyCheckFactories )
{
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsgeometryvalidationservice.cpp
View file
Expand Up @@ -231,7 +231,7 @@ void QgsGeometryValidationService::enableLayerChecks( QgsVectorLayer *layer )

QList<QgsGeometryCheck *> layerChecks;

QgsGeometryCheckRegistry *checkRegistry = QgsAnalysis::instance()->geometryCheckRegistry();
QgsGeometryCheckRegistry *checkRegistry = QgsAnalysis::geometryCheckRegistry();

const QStringList activeChecks = layer->geometryOptions()->geometryChecks();

Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsmeasuredialog.cpp
View file
Expand Up @@ -40,7 +40,7 @@ QgsMeasureDialog::QgsMeasureDialog( QgsMeasureTool *tool, Qt::WindowFlags f )
, mCanvas( tool->canvas() )
{
setupUi( this );
QgsGui::instance()->enableAutoGeometryRestore( this );
QgsGui::enableAutoGeometryRestore( this );
connect( buttonBox, &QDialogButtonBox::helpRequested, this, &QgsMeasureDialog::showHelp );

// hide 3D related options
Expand Down
2 changes: 1 addition & 1 deletion src/app/qgsprovidersublayersdialog.cpp
View file
Expand Up @@ -132,7 +132,7 @@ QgsProviderSublayersDialog::QgsProviderSublayersDialog( const QString &uri, cons
const QUrl url( link );
const QFileInfo file( url.toLocalFile() );
if ( file.exists() && !file.isDir() )
QgsGui::instance()->nativePlatformInterface()->openFileExplorerAndSelectFile( url.toLocalFile() );
QgsGui::nativePlatformInterface()->openFileExplorerAndSelectFile( url.toLocalFile() );
else
QDesktopServices::openUrl( url );
} );
Expand Down

0 comments on commit 41801d9

Please sign in to comment.