Skip to content

Commit 216b9d2

Browse files
nyalldawsonnyalldawson
committedJan 14, 2022
Fix getter name should not include 'get' prefix
·
ltr-3_40final-3_24_0
1 parent 8e1b7aa commit 216b9d2

File tree

5 files changed

+25
-25
lines changed

5 files changed

+25
-25
lines changed
 

‎python/core/auto_generated/project/qgsproject.sip.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -745,7 +745,7 @@ the project.
745745
%End
746746

747747

748-
QgsMapViewsManager *getViewsManager();
748+
QgsMapViewsManager *viewsManager();
749749
%Docstring
750750
Returns the project's views manager, which manages map views (including 3d maps)
751751
in the project.

‎src/app/3d/qgs3dviewsmanagerdialog.cpp

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ Qgs3DViewsManagerDialog::Qgs3DViewsManagerDialog( QWidget *parent, Qt::WindowFla
4646

4747
connect( m3DViewsListView->selectionModel(), &QItemSelectionModel::currentChanged, this, &Qgs3DViewsManagerDialog::currentChanged );
4848

49-
connect( QgsProject::instance()->getViewsManager(), &QgsMapViewsManager::views3DListChanged, this, &Qgs3DViewsManagerDialog::on3DViewsListChanged );
49+
connect( QgsProject::instance()->viewsManager(), &QgsMapViewsManager::views3DListChanged, this, &Qgs3DViewsManagerDialog::on3DViewsListChanged );
5050
m3DViewsListView->selectionModel()->setCurrentIndex( m3DViewsListView->model()->index( 0, 0 ), QItemSelectionModel::Select );
5151
currentChanged( m3DViewsListView->selectionModel()->currentIndex(), m3DViewsListView->selectionModel()->currentIndex() );
5252
}
@@ -113,7 +113,7 @@ void Qgs3DViewsManagerDialog::removeClicked()
113113

114114
QString viewName = m3DViewsListView->selectionModel()->selectedRows().at( 0 ).data( Qt::DisplayRole ).toString();
115115

116-
QgsProject::instance()->getViewsManager()->remove3DView( viewName );
116+
QgsProject::instance()->viewsManager()->remove3DView( viewName );
117117
if ( Qgs3DMapCanvasDockWidget *w = QgisApp::instance()->get3DMapViewDock( viewName ) )
118118
{
119119
w->close();
@@ -132,7 +132,7 @@ void Qgs3DViewsManagerDialog::renameClicked()
132132
if ( newTitle.isEmpty() )
133133
return;
134134

135-
QgsProject::instance()->getViewsManager()->rename3DView( oldTitle, newTitle );
135+
QgsProject::instance()->viewsManager()->rename3DView( oldTitle, newTitle );
136136

137137
if ( Qgs3DMapCanvasDockWidget *widget = QgisApp::instance()->get3DMapViewDock( oldTitle ) )
138138
{
@@ -158,14 +158,14 @@ void Qgs3DViewsManagerDialog::currentChanged( const QModelIndex &current, const
158158
}
159159

160160
QString viewName = current.data( Qt::DisplayRole ).toString();
161-
bool isOpen = QgsProject::instance()->getViewsManager()->is3DViewOpen( viewName );
161+
bool isOpen = QgsProject::instance()->viewsManager()->is3DViewOpen( viewName );
162162
mShowButton->setEnabled( !isOpen );
163163
mHideButton->setEnabled( isOpen );
164164
}
165165

166166
void Qgs3DViewsManagerDialog::reload()
167167
{
168-
QStringList names = QgsProject::instance()->getViewsManager()->get3DViewsNames();
168+
QStringList names = QgsProject::instance()->viewsManager()->get3DViewsNames();
169169
mListModel->setStringList( names );
170170
}
171171

‎src/app/qgisapp.cpp

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -1746,7 +1746,7 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, bool skipBadLayers
17461746
setupLayoutManagerConnections();
17471747

17481748
#ifdef HAVE_3D
1749-
connect( QgsProject::instance()->getViewsManager(), &QgsMapViewsManager::views3DListChanged, this, &QgisApp::views3DMenuAboutToShow );
1749+
connect( QgsProject::instance()->viewsManager(), &QgsMapViewsManager::views3DListChanged, this, &QgisApp::views3DMenuAboutToShow );
17501750
#endif
17511751

17521752
setupDuplicateFeaturesAction();
@@ -9904,7 +9904,7 @@ Qgs3DMapCanvasDockWidget *QgisApp::open3DMapView( const QString &viewName )
99049904
QgsReadWriteContext readWriteContext;
99059905
readWriteContext.setPathResolver( QgsProject::instance()->pathResolver() );
99069906

9907-
QDomElement elem3DMap = QgsProject::instance()->getViewsManager()->get3DViewSettings( viewName );
9907+
QDomElement elem3DMap = QgsProject::instance()->viewsManager()->get3DViewSettings( viewName );
99089908

99099909
if ( elem3DMap.isNull() )
99109910
return nullptr;
@@ -9916,7 +9916,7 @@ Qgs3DMapCanvasDockWidget *QgisApp::open3DMapView( const QString &viewName )
99169916
read3DMapViewSettings( mapCanvasDock3D, elem3DMap );
99179917
mPanelMenu->removeAction( mapCanvasDock3D->toggleViewAction() );
99189918

9919-
QgsProject::instance()->getViewsManager()->set3DViewInitiallyVisible( viewName, true );
9919+
QgsProject::instance()->viewsManager()->set3DViewInitiallyVisible( viewName, true );
99209920

99219921
return mapCanvasDock3D;
99229922
#else
@@ -9963,7 +9963,7 @@ Qgs3DMapCanvasDockWidget *QgisApp::duplicate3DMapView( const QString &existingVi
99639963
}
99649964
else
99659965
{
9966-
QDomElement elem = QgsProject::instance()->getViewsManager()->get3DViewSettings( existingViewName );
9966+
QDomElement elem = QgsProject::instance()->viewsManager()->get3DViewSettings( existingViewName );
99679967
elem.setAttribute( QStringLiteral( "name" ), newViewName );
99689968
read3DMapViewSettings( mapCanvasDock3D, elem );
99699969
}
@@ -9974,8 +9974,8 @@ Qgs3DMapCanvasDockWidget *QgisApp::duplicate3DMapView( const QString &existingVi
99749974
elem3DMap = doc.createElement( QStringLiteral( "view" ) );
99759975
write3DMapViewSettings( mapCanvasDock3D, doc, elem3DMap );
99769976

9977-
QgsProject::instance()->getViewsManager()->register3DViewSettings( newViewName, elem3DMap );
9978-
QgsProject::instance()->getViewsManager()->set3DViewInitiallyVisible( newViewName, true );
9977+
QgsProject::instance()->viewsManager()->register3DViewSettings( newViewName, elem3DMap );
9978+
QgsProject::instance()->viewsManager()->set3DViewInitiallyVisible( newViewName, true );
99799979

99809980
mPanelMenu->removeAction( mapCanvasDock3D->toggleViewAction() );
99819981

@@ -10092,7 +10092,7 @@ void QgisApp::populate3DMapviewsMenu( QMenu *menu )
1009210092
#ifdef HAVE_3D
1009310093
menu->clear();
1009410094
QList<QAction *> acts;
10095-
QList< QDomElement > views = QgsProject::instance()->getViewsManager()->get3DViews();
10095+
QList< QDomElement > views = QgsProject::instance()->viewsManager()->get3DViews();
1009610096
acts.reserve( views.size() );
1009710097
for ( const QDomElement &viewConfig : views )
1009810098
{
@@ -13989,14 +13989,14 @@ Qgs3DMapCanvasDockWidget *QgisApp::createNew3DMapCanvasDock( const QString &name
1398913989
QDomDocument doc( documentType );
1399013990

1399113991
QString viewName = map3DWidget->mapCanvas3D()->objectName();
13992-
if ( !QgsProject::instance()->getViewsManager()->get3DViewSettings( viewName ).isNull() )
13992+
if ( !QgsProject::instance()->viewsManager()->get3DViewSettings( viewName ).isNull() )
1399313993
{
1399413994
QDomElement elem3DMap;
1399513995
elem3DMap = doc.createElement( QStringLiteral( "view" ) );
1399613996
write3DMapViewSettings( map3DWidget, doc, elem3DMap );
1399713997

13998-
QgsProject::instance()->getViewsManager()->register3DViewSettings( viewName, elem3DMap );
13999-
QgsProject::instance()->getViewsManager()->set3DViewInitiallyVisible( viewName, false );
13998+
QgsProject::instance()->viewsManager()->register3DViewSettings( viewName, elem3DMap );
13999+
QgsProject::instance()->viewsManager()->set3DViewInitiallyVisible( viewName, false );
1400014000
}
1400114001
QgisApp::instance()->mOpen3DDocks.remove( map3DWidget );
1400214002
} );
@@ -14029,7 +14029,7 @@ void QgisApp::new3DMapCanvas()
1402914029
}
1403014030

1403114031
int i = 1;
14032-
const QList< QString > usedCanvasNames = QgsProject::instance()->getViewsManager()->get3DViewsNames();
14032+
const QList< QString > usedCanvasNames = QgsProject::instance()->viewsManager()->get3DViewsNames();
1403314033
QString name = tr( "3D Map %1" ).arg( i );
1403414034
while ( usedCanvasNames.contains( name ) )
1403514035
{
@@ -14106,8 +14106,8 @@ void QgisApp::new3DMapCanvas()
1410614106

1410714107
write3DMapViewSettings( dock, doc, elem3DMap );
1410814108

14109-
QgsProject::instance()->getViewsManager()->register3DViewSettings( name, elem3DMap );
14110-
QgsProject::instance()->getViewsManager()->set3DViewInitiallyVisible( name, true );
14109+
QgsProject::instance()->viewsManager()->register3DViewSettings( name, elem3DMap );
14110+
QgsProject::instance()->viewsManager()->set3DViewInitiallyVisible( name, true );
1411114111

1411214112
mPanelMenu->removeAction( dock->toggleViewAction() );
1411314113
}
@@ -16811,7 +16811,7 @@ void QgisApp::writeProject( QDomDocument &doc )
1681116811
QDomElement elem3DMap = doc.createElement( QStringLiteral( "view" ) );
1681216812
elem3DMap.setAttribute( QStringLiteral( "isOpen" ), 1 );
1681316813
write3DMapViewSettings( widget, doc, elem3DMap );
16814-
QgsProject::instance()->getViewsManager()->register3DViewSettings( viewName, elem3DMap );
16814+
QgsProject::instance()->viewsManager()->register3DViewSettings( viewName, elem3DMap );
1681516815
}
1681616816
#endif
1681716817
projectChanged( doc );
@@ -16922,7 +16922,7 @@ void QgisApp::readProject( const QDomDocument &doc )
1692216922

1692316923
#ifdef HAVE_3D
1692416924
// Open 3D Views that were already open
16925-
for ( QDomElement viewConfig : QgsProject::instance()->getViewsManager()->get3DViews() )
16925+
for ( QDomElement viewConfig : QgsProject::instance()->viewsManager()->get3DViews() )
1692616926
{
1692716927
QString viewName = viewConfig.attribute( QStringLiteral( "name" ) );
1692816928
bool isOpen = viewConfig.attribute( QStringLiteral( "isOpen" ), QStringLiteral( "1" ) ).toInt() == 1;

‎src/core/project/qgsproject.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3172,12 +3172,12 @@ QgsLayoutManager *QgsProject::layoutManager()
31723172
return mLayoutManager.get();
31733173
}
31743174

3175-
const QgsMapViewsManager *QgsProject::getViewsManager() const
3175+
const QgsMapViewsManager *QgsProject::viewsManager() const
31763176
{
31773177
return m3DViewsManager.get();
31783178
}
31793179

3180-
QgsMapViewsManager *QgsProject::getViewsManager()
3180+
QgsMapViewsManager *QgsProject::viewsManager()
31813181
{
31823182
return m3DViewsManager.get();
31833183
}

‎src/core/project/qgsproject.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -762,14 +762,14 @@ class CORE_EXPORT QgsProject : public QObject, public QgsExpressionContextGenera
762762
* \note not available in Python bindings
763763
* \since QGIS 3.24
764764
*/
765-
const QgsMapViewsManager *getViewsManager() const SIP_SKIP;
765+
const QgsMapViewsManager *viewsManager() const SIP_SKIP;
766766

767767
/**
768768
* Returns the project's views manager, which manages map views (including 3d maps)
769769
* in the project.
770770
* \since QGIS 3.24
771771
*/
772-
QgsMapViewsManager *getViewsManager();
772+
QgsMapViewsManager *viewsManager();
773773

774774
/**
775775
* Returns the project's bookmark manager, which manages bookmarks within

0 commit comments

Comments
 (0)
Please sign in to comment.