From 567643005050c27c58d3074a36ec6a3035860612 Mon Sep 17 00:00:00 2001 From: Matthias Kuhn Date: Mon, 14 Mar 2016 08:52:06 +0100 Subject: [PATCH] Rewrite some signals to new-style --- .gitignore | 1 + tests/src/python/test_qgsrasterlayer.py | 3 +-- tests/src/python/test_qgsvectorlayer.py | 12 ++++-------- 3 files changed, 6 insertions(+), 10 deletions(-) diff --git a/.gitignore b/.gitignore index 6ce059ca795..e0e23277b34 100644 --- a/.gitignore +++ b/.gitignore @@ -1,6 +1,7 @@ *.*~ *.autosave *.aux +*.bak *.diff *.log* *.orig diff --git a/tests/src/python/test_qgsrasterlayer.py b/tests/src/python/test_qgsrasterlayer.py index a6e3ccaa845..ec1de21b057 100644 --- a/tests/src/python/test_qgsrasterlayer.py +++ b/tests/src/python/test_qgsrasterlayer.py @@ -223,8 +223,7 @@ class TestQgsRasterLayer(unittest.TestCase): layer = QgsRasterLayer(myPath, myBaseName) self.rendererChanged = False - QObject.connect(layer, SIGNAL("rendererChanged()"), - self.onRendererChanged) + layer.rendererChanged.connect(self.onRendererChanged) rShader = QgsRasterShader() r = QgsSingleBandPseudoColorRenderer(layer.dataProvider(), 1, rShader) diff --git a/tests/src/python/test_qgsvectorlayer.py b/tests/src/python/test_qgsvectorlayer.py index ce3a8359b33..c93e30880cc 100644 --- a/tests/src/python/test_qgsvectorlayer.py +++ b/tests/src/python/test_qgsvectorlayer.py @@ -942,8 +942,7 @@ class TestQgsVectorLayer(unittest.TestCase): layer = createLayerWithOnePoint() self.blendModeTest = 0 - QObject.connect(layer, SIGNAL("blendModeChanged( const QPainter::CompositionMode )"), - self.onBlendModeChanged) + layer.blendModeChanged.connect(self.onBlendModeChanged) layer.setBlendMode(QPainter.CompositionMode_Screen) assert self.blendModeTest == QPainter.CompositionMode_Screen @@ -953,8 +952,7 @@ class TestQgsVectorLayer(unittest.TestCase): layer = createLayerWithOnePoint() self.blendModeTest = 0 - QObject.connect(layer, SIGNAL("featureBlendModeChanged( const QPainter::CompositionMode )"), - self.onBlendModeChanged) + layer.featureBlendModeChanged.connect(self.onBlendModeChanged) layer.setFeatureBlendMode(QPainter.CompositionMode_Screen) assert self.blendModeTest == QPainter.CompositionMode_Screen @@ -1058,8 +1056,7 @@ class TestQgsVectorLayer(unittest.TestCase): layer = createLayerWithOnePoint() self.transparencyTest = 0 - QObject.connect(layer, SIGNAL("layerTransparencyChanged( int )"), - self.onLayerTransparencyChanged) + layer.layerTransparencyChanged.connect(self.onLayerTransparencyChanged) layer.setLayerTransparency(50) assert self.transparencyTest == 50 assert layer.layerTransparency() == 50 @@ -1071,8 +1068,7 @@ class TestQgsVectorLayer(unittest.TestCase): layer = createLayerWithOnePoint() self.rendererChanged = False - QObject.connect(layer, SIGNAL("rendererChanged()"), - self.onRendererChanged) + layer.rendererChanged.connect(self.onRendererChanged) r = QgsSingleSymbolRendererV2(QgsSymbolV2.defaultSymbol(QGis.Point)) layer.setRendererV2(r)