Update connections to Qt5 style

m-kuhn · m-kuhn · commit d3e35ee9a215 · 2017-08-13T14:21:39.000+02:00
diff --git a/src/app/qgsmaptooladdcircularstring.cpp b/src/app/qgsmaptooladdcircularstring.cpp
@@ -36,8 +36,8 @@ QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapToolCapture *par
   {
     connect( mCanvas, &QgsMapCanvas::mapToolSet, this, &QgsMapToolAddCircularString::setParentTool );
   }
-  connect( QgisApp::instance(), SIGNAL( newProject() ), this, SLOT( stopCapturing() ) );
-  connect( QgisApp::instance(), SIGNAL( projectRead() ), this, SLOT( stopCapturing() ) );
+  connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddCircularString::stopCapturing );
+  connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddCircularString::stopCapturing );
 }
 
 QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapCanvas *canvas )
diff --git a/src/app/qgsmaptooladdfeature.cpp b/src/app/qgsmaptooladdfeature.cpp
@@ -40,8 +40,8 @@ QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas *canvas, CaptureMode mo
   , mCheckGeometryType( true )
 {
   mToolName = tr( "Add feature" );
-  connect( QgisApp::instance(), SIGNAL( newProject() ), this, SLOT( stopCapturing() ) );
-  connect( QgisApp::instance(), SIGNAL( projectRead() ), this, SLOT( stopCapturing() ) );
+  connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddFeature::stopCapturing );
+  connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddFeature::stopCapturing );
 }
 
 QgsMapToolAddFeature::~QgsMapToolAddFeature()
diff --git a/src/app/qgsmaptooladdpart.cpp b/src/app/qgsmaptooladdpart.cpp
@@ -31,8 +31,8 @@ QgsMapToolAddPart::QgsMapToolAddPart( QgsMapCanvas *canvas )
   : QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget() )
 {
   mToolName = tr( "Add part" );
-  connect( QgisApp::instance(), SIGNAL( newProject() ), this, SLOT( stopCapturing() ) );
-  connect( QgisApp::instance(), SIGNAL( projectRead() ), this, SLOT( stopCapturing() ) );
+  connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddPart::stopCapturing );
+  connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddPart::stopCapturing );
 }
 
 QgsMapToolAddPart::~QgsMapToolAddPart()
diff --git a/src/app/qgsmaptooladdring.cpp b/src/app/qgsmaptooladdring.cpp
@@ -29,8 +29,8 @@ QgsMapToolAddRing::QgsMapToolAddRing( QgsMapCanvas *canvas )
   : QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), QgsMapToolCapture::CapturePolygon )
 {
   mToolName = tr( "Add ring" );
-  connect( QgisApp::instance(), SIGNAL( newProject() ), this, SLOT( stopCapturing() ) );
-  connect( QgisApp::instance(), SIGNAL( projectRead() ), this, SLOT( stopCapturing() ) );
+  connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddRing::stopCapturing );
+  connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddRing::stopCapturing );
 }
 
 QgsMapToolAddRing::~QgsMapToolAddRing()

Original file line number	Diff line number	Diff line change
`@@ -36,8 +36,8 @@ QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapToolCapture *par`
`36`	`36`	`{`
`37`	`37`	`connect( mCanvas, &QgsMapCanvas::mapToolSet, this, &QgsMapToolAddCircularString::setParentTool );`
`38`	`38`	`}`
`39`		`- connect( QgisApp::instance(), SIGNAL( newProject() ), this, SLOT( stopCapturing() ) );`
`40`		`- connect( QgisApp::instance(), SIGNAL( projectRead() ), this, SLOT( stopCapturing() ) );`
	`39`	`+ connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddCircularString::stopCapturing );`
	`40`	`+ connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddCircularString::stopCapturing );`
`41`	`41`	`}`
`42`	`42`
`43`	`43`	`QgsMapToolAddCircularString::QgsMapToolAddCircularString( QgsMapCanvas *canvas )`
Original file line number	Diff line number	Diff line change
`@@ -40,8 +40,8 @@ QgsMapToolAddFeature::QgsMapToolAddFeature( QgsMapCanvas *canvas, CaptureMode mo`
`40`	`40`	`, mCheckGeometryType( true )`
`41`	`41`	`{`
`42`	`42`	`mToolName = tr( "Add feature" );`
`43`		`- connect( QgisApp::instance(), SIGNAL( newProject() ), this, SLOT( stopCapturing() ) );`
`44`		`- connect( QgisApp::instance(), SIGNAL( projectRead() ), this, SLOT( stopCapturing() ) );`
	`43`	`+ connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddFeature::stopCapturing );`
	`44`	`+ connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddFeature::stopCapturing );`
`45`	`45`	`}`
`46`	`46`
`47`	`47`	`QgsMapToolAddFeature::~QgsMapToolAddFeature()`
Original file line number	Diff line number	Diff line change
`@@ -31,8 +31,8 @@ QgsMapToolAddPart::QgsMapToolAddPart( QgsMapCanvas *canvas )`
`31`	`31`	`: QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget() )`
`32`	`32`	`{`
`33`	`33`	`mToolName = tr( "Add part" );`
`34`		`- connect( QgisApp::instance(), SIGNAL( newProject() ), this, SLOT( stopCapturing() ) );`
`35`		`- connect( QgisApp::instance(), SIGNAL( projectRead() ), this, SLOT( stopCapturing() ) );`
	`34`	`+ connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddPart::stopCapturing );`
	`35`	`+ connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddPart::stopCapturing );`
`36`	`36`	`}`
`37`	`37`
`38`	`38`	`QgsMapToolAddPart::~QgsMapToolAddPart()`
Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,8 @@ QgsMapToolAddRing::QgsMapToolAddRing( QgsMapCanvas *canvas )`
`29`	`29`	`: QgsMapToolCapture( canvas, QgisApp::instance()->cadDockWidget(), QgsMapToolCapture::CapturePolygon )`
`30`	`30`	`{`
`31`	`31`	`mToolName = tr( "Add ring" );`
`32`		`- connect( QgisApp::instance(), SIGNAL( newProject() ), this, SLOT( stopCapturing() ) );`
`33`		`- connect( QgisApp::instance(), SIGNAL( projectRead() ), this, SLOT( stopCapturing() ) );`
	`32`	`+ connect( QgisApp::instance(), &QgisApp::newProject, this, &QgsMapToolAddRing::stopCapturing );`
	`33`	`+ connect( QgisApp::instance(), &QgisApp::projectRead, this, &QgsMapToolAddRing::stopCapturing );`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`QgsMapToolAddRing::~QgsMapToolAddRing()`