Skip to content
Permalink
Browse files

Qt5 connects

  • Loading branch information
nyalldawson committed Mar 8, 2017
1 parent ff6e05c commit 3f1cd69e8ca7716a1b053326ffe2d7d870e0b2a7
Showing with 6 additions and 6 deletions.
  1. +3 −3 src/app/qgisapp.cpp
  2. +3 −3 src/app/qgsstatusbarscalewidget.cpp
@@ -2477,7 +2477,7 @@ void QgisApp::createStatusBar()
mScaleWidget = new QgsStatusBarScaleWidget( mMapCanvas, statusBar() );
mScaleWidget->setObjectName( QStringLiteral( "mScaleWidget" ) );
mScaleWidget->setFont( myFont );
connect( mScaleWidget, SIGNAL( scaleLockChanged( bool ) ), mMapCanvas, SLOT( setScaleLocked( bool ) ) );
connect( mScaleWidget, &QgsStatusBarScaleWidget::scaleLockChanged, mMapCanvas, &QgsMapCanvas::setScaleLocked );
statusBar()->addPermanentWidget( mScaleWidget, 0 );

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

connect( pp, SIGNAL( scalesChanged( const QStringList & ) ), mScaleWidget,
SLOT( updateScales( const QStringList & ) ) );
connect( pp, &QgsProjectProperties::scalesChanged, mScaleWidget,
&QgsStatusBarScaleWidget::updateScales );
QApplication::restoreOverrideCursor();

//pass any refresh signals off to canvases
@@ -67,10 +67,10 @@ QgsStatusBarScaleWidget::QgsStatusBarScaleWidget( QgsMapCanvas *canvas, QWidget

setLayout( mLayout );

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

connect( mLockButton, SIGNAL( toggled( bool ) ), this, SIGNAL( scaleLockChanged( bool ) ) );
connect( mLockButton, SIGNAL( toggled( bool ) ), mScale, SLOT( setDisabled( bool ) ) );
connect( mLockButton, &QAbstractButton::toggled, this, &QgsStatusBarScaleWidget::scaleLockChanged );
connect( mLockButton, &QAbstractButton::toggled, mScale, &QWidget::setDisabled );
}

QgsStatusBarScaleWidget::~QgsStatusBarScaleWidget()

0 comments on commit 3f1cd69

Please sign in to comment.
You can’t perform that action at this time.