From 8e4304d25298444d6939ad7fa0f78d854cd7e5fa Mon Sep 17 00:00:00 2001 From: Martin Baeuml Date: Mon, 26 Sep 2011 16:45:49 +0200 Subject: [PATCH] use new style signals --- sloth/gui/annotationscene.py | 20 ++++++++++---------- sloth/gui/labeltool.py | 10 +++++----- 2 files changed, 15 insertions(+), 15 deletions(-) diff --git a/sloth/gui/annotationscene.py b/sloth/gui/annotationscene.py index ee98ed1..366f3e0 100644 --- a/sloth/gui/annotationscene.py +++ b/sloth/gui/annotationscene.py @@ -38,21 +38,21 @@ class AnnotationScene(QGraphicsScene): # disconnect old signals if self._model is not None: - self.disconnect(self._model, SIGNAL('dataChanged(QModelIndex,QModelIndex)'), self.dataChanged) - self.disconnect(self._model, SIGNAL('rowsInserted(QModelIndex,int,int)'), self.rowsInserted) - self.disconnect(self._model, SIGNAL('rowsAboutToBeRemoved(QModelIndex,int,int)'), self.rowsAboutToBeRemoved) - self.disconnect(self._model, SIGNAL('rowsRemoved(QModelIndex,int,int)'), self.rowsRemoved) - self.disconnect(self._model, SIGNAL('modelReset()'), self.reset) + self._model.dataChanged.disconnect(self.dataChanged) + self._model.rowsInserted.disconnect(self.rowsInserted) + self._model.rowsAboutToBeRemoved.disconnect(self.rowsAboutToBeRemoved) + self._model.rowsRemoved.disconnect(self.rowsRemoved) + self._model.modelReset.disconnect(self.reset) self._model = model # connect new signals if self._model is not None: - self.connect(self._model, SIGNAL('dataChanged(QModelIndex,QModelIndex)'), self.dataChanged) - self.connect(self._model, SIGNAL('rowsInserted(QModelIndex,int,int)'), self.rowsInserted) - self.connect(self._model, SIGNAL('rowsAboutToBeRemoved(QModelIndex,int,int)'), self.rowsAboutToBeRemoved) - self.connect(self._model, SIGNAL('rowsRemoved(QModelIndex,int,int)'), self.rowsRemoved) - self.connect(self._model, SIGNAL('modelReset()'), self.reset) + self._model.dataChanged.connect(self.dataChanged) + self._model.rowsInserted.connect(self.rowsInserted) + self._model.rowsAboutToBeRemoved.connect(self.rowsAboutToBeRemoved) + self._model.rowsRemoved.connect(self.rowsRemoved) + self._model.modelReset.connect(self.reset) # reset caches, invalidate root self.reset() diff --git a/sloth/gui/labeltool.py b/sloth/gui/labeltool.py index c4c0f6e..e4b3333 100755 --- a/sloth/gui/labeltool.py +++ b/sloth/gui/labeltool.py @@ -257,11 +257,11 @@ class MainWindow(QMainWindow): def connectActions(self): ## File menu - self.connect(self.ui.actionNew, SIGNAL("triggered()"), self.fileNew) - self.connect(self.ui.actionOpen, SIGNAL("triggered()"), self.fileOpen) - self.connect(self.ui.actionSave, SIGNAL("triggered()"), self.fileSave) - self.connect(self.ui.actionSave_As, SIGNAL("triggered()"), self.fileSaveAs) - self.connect(self.ui.actionExit, SIGNAL("triggered()"), self.close) + self.ui.actionNew. triggered.connect(self.fileNew) + self.ui.actionOpen. triggered.connect(self.fileOpen) + self.ui.actionSave. triggered.connect(self.fileSave) + self.ui.actionSave_As.triggered.connect(self.fileSaveAs) + self.ui.actionExit. triggered.connect(self.close) ## View menu self.ui.actionLocked.toggled.connect(self.onViewsLockedChanged)