Skip to content

Commit 3f1cd69

Browse files
committed
Qt5 connects
1 parent ff6e05c commit 3f1cd69

File tree

2 files changed

+6
-6
lines changed

2 files changed

+6
-6
lines changed

src/app/qgisapp.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -2477,7 +2477,7 @@ void QgisApp::createStatusBar()
24772477
mScaleWidget = new QgsStatusBarScaleWidget( mMapCanvas, statusBar() );
24782478
mScaleWidget->setObjectName( QStringLiteral( "mScaleWidget" ) );
24792479
mScaleWidget->setFont( myFont );
2480-
connect( mScaleWidget, SIGNAL( scaleLockChanged( bool ) ), mMapCanvas, SLOT( setScaleLocked( bool ) ) );
2480+
connect( mScaleWidget, &QgsStatusBarScaleWidget::scaleLockChanged, mMapCanvas, &QgsMapCanvas::setScaleLocked );
24812481
statusBar()->addPermanentWidget( mScaleWidget, 0 );
24822482

24832483
// zoom widget
@@ -10513,8 +10513,8 @@ void QgisApp::projectProperties()
1051310513
connect( pp, SIGNAL( displayPrecisionChanged() ), this,
1051410514
SLOT( updateMouseCoordinatePrecision() ) );
1051510515

10516-
connect( pp, SIGNAL( scalesChanged( const QStringList & ) ), mScaleWidget,
10517-
SLOT( updateScales( const QStringList & ) ) );
10516+
connect( pp, &QgsProjectProperties::scalesChanged, mScaleWidget,
10517+
&QgsStatusBarScaleWidget::updateScales );
1051810518
QApplication::restoreOverrideCursor();
1051910519

1052010520
//pass any refresh signals off to canvases

src/app/qgsstatusbarscalewidget.cpp

+3-3
Original file line numberDiff line numberDiff line change
@@ -67,10 +67,10 @@ QgsStatusBarScaleWidget::QgsStatusBarScaleWidget( QgsMapCanvas *canvas, QWidget
6767

6868
setLayout( mLayout );
6969

70-
connect( mScale, SIGNAL( scaleChanged( double ) ), this, SLOT( userScale() ) );
70+
connect( mScale, &QgsScaleComboBox::scaleChanged, this, &QgsStatusBarScaleWidget::userScale );
7171

72-
connect( mLockButton, SIGNAL( toggled( bool ) ), this, SIGNAL( scaleLockChanged( bool ) ) );
73-
connect( mLockButton, SIGNAL( toggled( bool ) ), mScale, SLOT( setDisabled( bool ) ) );
72+
connect( mLockButton, &QAbstractButton::toggled, this, &QgsStatusBarScaleWidget::scaleLockChanged );
73+
connect( mLockButton, &QAbstractButton::toggled, mScale, &QWidget::setDisabled );
7474
}
7575

7676
QgsStatusBarScaleWidget::~QgsStatusBarScaleWidget()

0 commit comments

Comments
 (0)