use new style signals

This commit is contained in:
Martin Baeuml
2011-09-26 16:45:49 +02:00
parent cccfa412ba
commit 8e4304d252
2 changed files with 15 additions and 15 deletions
+10 -10
View File
@@ -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()
+5 -5
View File
@@ -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)