@@ -728,7 +728,7 @@ void QgisApp::createActions()
728
728
mActionZoomLast = new QAction ( getThemeIcon ( " mActionZoomLast.png" ), tr ( " Zoom Last" ), this );
729
729
// mActionZoomLast->setShortcut(tr("Ctrl+O","Zoom to Last Extent"));
730
730
mActionZoomLast ->setStatusTip ( tr ( " Zoom to Last Extent" ) );
731
- connect ( mActionZoomLast , SIGNAL ( triggered () ), this , SLOT ( zoomPrevious () ) );
731
+ connect ( mActionZoomLast , SIGNAL ( triggered () ), this , SLOT ( zoomToPrevious () ) );
732
732
733
733
mActionZoomActualSize = new QAction ( tr ( " Zoom Actual Size" ), this );
734
734
mActionZoomActualSize ->setStatusTip ( tr ( " Zoom to Actual Size" ) );
@@ -825,7 +825,7 @@ void QgisApp::createActions()
825
825
mActionAddToOverview = new QAction ( getThemeIcon ( " mActionInOverview.png" ), tr ( " Add to Overview" ), this );
826
826
mActionAddToOverview ->setShortcut ( tr ( " O" , " Add current layer to overview map" ) );
827
827
mActionAddToOverview ->setStatusTip ( tr ( " Add current layer to overview map" ) );
828
- connect ( mActionAddToOverview , SIGNAL ( triggered () ), this , SLOT ( inOverview () ) );
828
+ connect ( mActionAddToOverview , SIGNAL ( triggered () ), this , SLOT ( isInOverview () ) );
829
829
mActionAddToOverview ->setEnabled ( false );
830
830
831
831
mActionAddAllToOverview = new QAction ( getThemeIcon ( " mActionAddAllToOverview.png" ), tr ( " Add All to Overview" ), this );
@@ -1596,7 +1596,7 @@ void QgisApp::createOverview()
1596
1596
// moved here to set anti aliasing to both map canvas and overview
1597
1597
QSettings mySettings;
1598
1598
mMapCanvas ->enableAntiAliasing ( mySettings.value ( " /qgis/enable_anti_aliasing" , false ).toBool () );
1599
- mMapCanvas ->useQImageToRender ( mySettings.value ( " /qgis/use_qimage_to_render" , false ).toBool () );
1599
+ mMapCanvas ->useImageToRender ( mySettings.value ( " /qgis/use_qimage_to_render" , false ).toBool () );
1600
1600
1601
1601
int action = mySettings.value ( " /qgis/wheel_action" , 0 ).toInt ();
1602
1602
double zoomFactor = mySettings.value ( " /qgis/zoom_factor" , 2 ).toDouble ();
@@ -3650,15 +3650,15 @@ void QgisApp::pan()
3650
3650
3651
3651
void QgisApp::zoomFull ()
3652
3652
{
3653
- mMapCanvas ->zoomFullExtent ();
3653
+ mMapCanvas ->zoomToFullExtent ();
3654
3654
// notify the project we've made a change
3655
3655
QgsProject::instance ()->dirty ( true );
3656
3656
3657
3657
}
3658
3658
3659
- void QgisApp::zoomPrevious ()
3659
+ void QgisApp::zoomToPrevious ()
3660
3660
{
3661
- mMapCanvas ->zoomPreviousExtent ();
3661
+ mMapCanvas ->zoomToPreviousExtent ();
3662
3662
// notify the project we've made a change
3663
3663
QgsProject::instance ()->dirty ( true );
3664
3664
@@ -4078,7 +4078,7 @@ void QgisApp::showScale( double theScale )
4078
4078
4079
4079
void QgisApp::userScale ()
4080
4080
{
4081
- double currentScale = mMapCanvas ->getScale ();
4081
+ double currentScale = mMapCanvas ->scale ();
4082
4082
4083
4083
QStringList parts = mScaleEdit ->text ().split ( ' :' );
4084
4084
if ( parts.size () == 2 )
@@ -4096,7 +4096,7 @@ void QgisApp::userScale()
4096
4096
4097
4097
4098
4098
// toggle overview status
4099
- void QgisApp::inOverview ()
4099
+ void QgisApp::isInOverview ()
4100
4100
{
4101
4101
mMapLegend ->legendLayerShowInOverview ();
4102
4102
}
@@ -4477,7 +4477,7 @@ void QgisApp::options()
4477
4477
4478
4478
QSettings mySettings;
4479
4479
mMapCanvas ->enableAntiAliasing ( mySettings.value ( " /qgis/enable_anti_aliasing" ).toBool () );
4480
- mMapCanvas ->useQImageToRender ( mySettings.value ( " /qgis/use_qimage_to_render" ).toBool () );
4480
+ mMapCanvas ->useImageToRender ( mySettings.value ( " /qgis/use_qimage_to_render" ).toBool () );
4481
4481
4482
4482
int action = mySettings.value ( " /qgis/wheel_action" , 0 ).toInt ();
4483
4483
double zoomFactor = mySettings.value ( " /qgis/zoom_factor" , 2 ).toDouble ();
0 commit comments