diff -r c27f6cc60391 -r 0389d4a924cc RefactoringRope/Refactoring.py
--- a/RefactoringRope/Refactoring.py Sun May 22 11:37:19 2011 +0200
+++ b/RefactoringRope/Refactoring.py Sat Jul 30 11:07:35 2011 +0200
@@ -32,7 +32,7 @@
import rope.contrib.findit
-from PyQt4.QtCore import QObject, SIGNAL
+from PyQt4.QtCore import QObject
from PyQt4.QtGui import QMenu, QApplication, QMessageBox, QDialog
from E5Gui.E5Application import e5App
@@ -70,18 +70,16 @@
"""
Class implementing the refactoring interface to rope.
"""
- def __init__(self, plugin, newStyle, parent=None):
+ def __init__(self, plugin, parent=None):
"""
Constructor
@param plugin reference to the plugin object
- @param newStyle flag indicating usage of new style signals (bool)
@param parent parent (QObject)
"""
QObject.__init__(self, parent)
self.__plugin = plugin
- self.__newStyle = newStyle
self.__ui = parent
self.__e5project = e5App().getObject("Project")
self.__projectpath = ''
@@ -796,8 +794,7 @@
smenu.addSeparator()
hmenu = smenu.addMenu(self.trUtf8("History"))
- self.connect(hmenu, SIGNAL("aboutToShow()"),
- self.__showRefactoringHistoryMenu)
+ hmenu.aboutToShow.connect(self.__showRefactoringHistoryMenu)
hmenu.addAction(self.refactoringUndoHistoryAct)
hmenu.addAction(self.refactoringUndoFileHistoryAct)
hmenu.addSeparator()
@@ -1211,7 +1208,7 @@
return
if isinstance(mover, rope.refactor.move.MoveGlobal):
- self.dlg = MoveGlobalMethodDialog(self, title, mover,
+ self.dlg = MoveGlobalMethodDialog(self, title, mover,
self.__project, parent=self.__ui)
else:
self.dlg = MoveMethodDialog(self, title, mover, parent=self.__ui)
@@ -1974,11 +1971,7 @@
if os.path.exists(configfile):
self.__editor = MiniEditor(configfile)
self.__editor.show()
- if self.__newStyle:
- self.__editor.editorSaved.connect(self.__configChanged)
- else:
- self.connect(self.__editor, SIGNAL("editorSaved"),
- self.__configChanged)
+ self.__editor.editorSaved.connect(self.__configChanged)
else:
QMessageBox.critical(self.__ui,
self.trUtf8("Configure Rope"),
