Mercurial Repositories > eric / changeset

--- a/IconEditor/IconEditorGrid.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/IconEditor/IconEditorGrid.py	Wed Aug 11 19:55:34 2010 +0200
@@ -69,6 +69,16 @@
     @signal selectionAvailable(bool) emitted to signal a change of the selection
     @signal sizeChanged(int, int) emitted after the size has been changed
     """
+    canRedoChanged = pyqtSignal(bool)
+    canUndoChanged = pyqtSignal(bool)
+    clipboardImageAvailable = pyqtSignal(bool)
+    colorChanged = pyqtSignal(QColor)
+    imageChanged = pyqtSignal(bool)
+    positionChanged = pyqtSignal(int, int)
+    previewChanged = pyqtSignal(QPixmap)
+    selectionAvailable = pyqtSignal(bool)
+    sizeChanged = pyqtSignal(int, int)
+    
     Pencil = 1
     Rubber = 2
     Line = 3
@@ -126,16 +136,12 @@
         
         self.setMouseTracking(True)
         
-        self.connect(self.__undoStack, SIGNAL("canRedoChanged(bool)"), 
-                     self, SIGNAL("canRedoChanged(bool)"))
-        self.connect(self.__undoStack, SIGNAL("canUndoChanged(bool)"), 
-                     self, SIGNAL("canUndoChanged(bool)"))
-        self.connect(self.__undoStack, SIGNAL("cleanChanged(bool)"), 
-                     self.__cleanChanged)
+        self.__undoStack.canRedoChanged.connect(self.canRedoChanged)
+        self.__undoStack.canUndoChanged.connect(self.canUndoChanged)
+        self.__undoStack.cleanChanged.connect(elf.__cleanChanged)
         
-        self.connect(self, SIGNAL("imageChanged(bool)"), self.__updatePreviewPixmap)
-        self.connect(QApplication.clipboard(), SIGNAL("dataChanged()"), 
-                     self.__checkClipboard)
+        self.imageChanged.connect(self.__updatePreviewPixmap)
+        QApplication.clipboard().dataChanged.connect(self.__checkClipboard)
         
         self.__checkClipboard()
     
@@ -204,7 +210,7 @@
         @param setCleanState flag indicating to set the undo stack to clean (boolean)
         """
         self.__dirty = dirty
-        self.emit(SIGNAL("imageChanged(bool)"), dirty)
+        self.imageChanged.emit(dirty)
         
         if not dirty and setCleanState:
             self.__undoStack.setClean()
@@ -227,7 +233,7 @@
         @param newColor reference to the new color (QColor)
         """
         self.__curColor = QColor(newColor)
-        self.emit(SIGNAL("colorChanged(const QColor&)"), QColor(newColor))
+        self.colorChanged.emit(QColor(newColor))
     
     def penColor(self):
         """
@@ -301,7 +307,7 @@
             if clearUndo:
                 self.__undoStack.clear()
             
-            self.emit(SIGNAL("sizeChanged(int, int)"), *self.iconSize())
+            self.sizeChanged.emit(*self.iconSize())
     
     def iconImage(self):
         """
@@ -463,8 +469,7 @@
         
         @param evt reference to the mouse event object (QMouseEvent)
         """
-        self.emit(SIGNAL("positionChanged(int, int)"), 
-                  *self.__imageCoordinates(evt.pos()))
+        self.positionChanged.emit(*self.__imageCoordinates(evt.pos()))
         
         if self.__isPasting and not (evt.buttons() & Qt.LeftButton):
             self.__drawPasteRect(evt.pos())
@@ -608,7 +613,7 @@
             if self.__selecting:
                 self.__selRect = QRect(l, t, r - l + 1, b - t + 1)
                 self.__selectionAvailable = True
-                self.emit(SIGNAL("selectionAvailable(bool)"), True)
+                self.selectionAvailable.emit(True)
         
         elif self.__curTool in [self.Circle, self.FilledCircle, 
                                 self.CircleSelection]:
@@ -619,7 +624,7 @@
             if self.__selecting:
                 self.__selRect = QRect(start.x() - r, start.y() - r, 2 * r + 1, 2 * r + 1)
                 self.__selectionAvailable = True
-                self.emit(SIGNAL("selectionAvailable(bool)"), True)
+                self.selectionAvailable.emit(True)
         
         elif self.__curTool in [self.Ellipse, self.FilledEllipse]:
             r1 = abs(start.x() - end.x())
@@ -706,7 +711,7 @@
         if self.__selecting:
             self.__selRect = QRect()
             self.__selectionAvailable = False
-            self.emit(SIGNAL("selectionAvailable(bool)"), False)
+            self.selectionAvailable.emit(False)
     
     def __isMarked(self, i, j):
         """
@@ -723,7 +728,7 @@
         Private slot to generate and signal an updated preview pixmap.
         """
         p = QPixmap.fromImage(self.__image)
-        self.emit(SIGNAL("previewChanged(const QPixmap&)"), p)
+        self.previewChanged.emit(p)
     
     def previewPixmap(self):
         """
@@ -741,7 +746,7 @@
         """
         ok = self.__clipboardImage()[1]
         self.__clipboardImageAvailable = ok
-        self.emit(SIGNAL("clipboardImageAvailable(bool)"), ok)
+        self.clipboardImageAvailable.emit(ok)
     
     def canPaste(self):
         """
@@ -935,7 +940,7 @@
         self.__markImage.fill(self.MarkColor.rgba())
         self.__selRect = self.__image.rect()
         self.__selectionAvailable = True
-        self.emit(SIGNAL("selectionAvailable(bool)"), True)
+        self.selectionAvailable.emit(True)
         
         self.update()
     
@@ -1039,12 +1044,9 @@
         """
         Public slot to perform some shutdown actions.
         """
-        self.disconnect(self.__undoStack, SIGNAL("canRedoChanged(bool)"), 
-                        self, SIGNAL("canRedoChanged(bool)"))
-        self.disconnect(self.__undoStack, SIGNAL("canUndoChanged(bool)"), 
-                        self, SIGNAL("canUndoChanged(bool)"))
-        self.disconnect(self.__undoStack, SIGNAL("cleanChanged(bool)"), 
-                        self.__cleanChanged)
+        self.__undoStack.canRedoChanged.disconnect(self.canRedoChanged)
+        self.__undoStack.canUndoChanged.disconnect(self.canUndoChanged)
+        self.__undoStack.cleanChanged.disconnect(self.__cleanChanged)
     
     def isSelectionAvailable(self):
         """

--- a/IconEditor/IconEditorPalette.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/IconEditor/IconEditorPalette.py	Wed Aug 11 19:55:34 2010 +0200
@@ -16,6 +16,8 @@
     
     @signal colorSelected(QColor) emitted after a new color has been selected
     """
+    colorSelected = pyqtSignal(QColor)
+    
     def __init__(self, parent = None):
         """
         Constructor
@@ -74,8 +76,7 @@
             """<p>Select the value for the alpha channel of the current color.</p>"""
         ))
         self.__layout.addWidget(self.__colorAlpha)
-        self.connect(self.__colorAlpha, SIGNAL("valueChanged(int)"), 
-                     self.__alphaChanged)
+        self.__colorAlpha.valueChanged[int].connect(self.__alphaChanged)
         
         spacer = QSpacerItem(10, 10, QSizePolicy.Minimum, QSizePolicy.Expanding)
         self.__layout.addItem(spacer)
@@ -111,7 +112,7 @@
         col.setAlpha(self.__currentAlpha)
         
         if col.isValid():
-            self.emit(SIGNAL("colorSelected(QColor)"), col)
+            self.colorSelected.emit(col)
     
     def __alphaChanged(self, val):
         """
@@ -122,4 +123,4 @@
         if val != self.__currentAlpha:
            col = QColor(self.__currentColor) 
            col.setAlpha(val)
-           self.emit(SIGNAL("colorSelected(QColor)"), col)
\ No newline at end of file
+           self.colorSelected.emit(col)

--- a/IconEditor/IconEditorWindow.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/IconEditor/IconEditorWindow.py	Wed Aug 11 19:55:34 2010 +0200
@@ -27,6 +27,8 @@
     
     @signal editorClosed() emitted after the window was requested to close down
     """
+    editorClosed = pyqtSignal()
+    
     windows = []
     
     def __init__(self, fileName = "", parent = None, fromEric = False, 
@@ -36,7 +38,8 @@
         
         @param fileName name of a file to load on startup (string)
         @param parent parent widget of this window (QWidget)
-        @keyparam fromEric flag indicating whether it was called from within eric5 (boolean)
+        @keyparam fromEric flag indicating whether it was called from within 
+            eric5 (boolean)
         @keyparam initShortcutsOnly flag indicating to just initialize the keyboard
             shortcuts (boolean)
         """
@@ -80,18 +83,12 @@
             state = Preferences.getIconEditor("IconEditorState")
             self.restoreState(state)
             
-            self.connect(self.__editor, SIGNAL("imageChanged(bool)"), 
-                         self.__modificationChanged)
-            self.connect(self.__editor, SIGNAL("positionChanged(int, int)"), 
-                         self.__updatePosition)
-            self.connect(self.__editor, SIGNAL("sizeChanged(int, int)"), 
-                         self.__updateSize)
-            self.connect(self.__editor, SIGNAL("previewChanged(const QPixmap&)"), 
-                         self.__palette.previewChanged)
-            self.connect(self.__editor, SIGNAL("colorChanged(const QColor&)"), 
-                         self.__palette.colorChanged)
-            self.connect(self.__palette, SIGNAL("colorSelected(QColor)"), 
-                         self.__editor.setPenColor)
+            self.__editor.imageChanged.connect(self.__modificationChanged)
+            self.__editor.positionChanged.connect(self.__updatePosition)
+            self.__editor.sizeChanged.connect(self.__updateSize)
+            self.__editor.previewChanged.connect(self.__palette.previewChanged)
+            self.__editor.colorChanged.connect(self.__palette.colorChanged)
+            self.__palette.colorSelected.connect(self.__editor.setPenColor)
             
             self.__setCurrentFile("")
             if fileName:
@@ -407,26 +404,22 @@
         self.__actions.append(self.grayscaleAct)
         
         self.redoAct.setEnabled(False)
-        self.connect(self.__editor, SIGNAL("canRedoChanged(bool)"), 
-                     self.redoAct, SLOT("setEnabled(bool)"))
+        self.__editor.canRedoChanged.connect(self.redoAct.setEnabled)
         
         self.undoAct.setEnabled(False)
-        self.connect(self.__editor, SIGNAL("canUndoChanged(bool)"), 
-                     self.undoAct, SLOT("setEnabled(bool)"))
+        self.__editor.canUndoChanged.connect(self.undoAct.setEnabled)
         
         self.cutAct.setEnabled(False)
         self.copyAct.setEnabled(False)
-        self.connect(self.__editor, SIGNAL("selectionAvailable(bool)"), 
-                     self.cutAct, SLOT("setEnabled(bool)"))
-        self.connect(self.__editor, SIGNAL("selectionAvailable(bool)"), 
-                     self.copyAct, SLOT("setEnabled(bool)"))
+        self.__editor.selectionAvailable.connect(self.cutAct.setEnabled)
+        self.__editor.selectionAvailable.connect(self.copyAct.setEnabled)
         
         self.pasteAct.setEnabled(self.__editor.canPaste())
         self.pasteNewAct.setEnabled(self.__editor.canPaste())
-        self.connect(self.__editor, SIGNAL("clipboardImageAvailable(bool)"), 
-                     self.pasteAct, SLOT("setEnabled(bool)"))
-        self.connect(self.__editor, SIGNAL("clipboardImageAvailable(bool)"), 
-                     self.pasteNewAct, SLOT("setEnabled(bool)"))
+        self.__editor.clipboardImageAvailable.connect(
+            self.pasteAct.setEnabled)
+        self.__editor.clipboardImageAvailable.connect(
+            self.pasteNewAct.setEnabled)
     
     def __initViewActions(self):
         """
@@ -497,8 +490,7 @@
                 """<b>Show Grid</b>"""
                 """<p>Toggle the display of the grid.</p>"""
                 ))
-        self.connect(self.showGridAct, SIGNAL('triggered(bool)'), 
-                     self.__editor.setGridEnabled)
+        self.showGridAct.triggered[bool].connect(self.__editor.setGridEnabled)
         self.__actions.append(self.showGridAct)
         self.showGridAct.setCheckable(True)
         self.showGridAct.setChecked(self.__editor.isGridEnabled())
@@ -508,7 +500,7 @@
         Private method to create the View actions.
         """
         self.esm = QSignalMapper(self)
-        self.connect(self.esm, SIGNAL('mapped(int)'), self.__editor.setTool)
+        self.esm.mapped[int].connect(self.__editor.setTool)
         
         self.drawingActGrp = createActionGroup(self)
         self.drawingActGrp.setExclusive(True)
@@ -943,7 +935,7 @@
                 Preferences.syncPreferences()
             
             evt.accept()
-            self.emit(SIGNAL("editorClosed"))
+            self.editorClosed.emit()
         else:
             evt.ignore()
     
@@ -1230,4 +1222,4 @@
         """
         Private slot called in to enter Whats This mode.
         """
-        QWhatsThis.enterWhatsThisMode()
\ No newline at end of file
+        QWhatsThis.enterWhatsThisMode()

--- a/MultiProject/MultiProject.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/MultiProject/MultiProject.py	Wed Aug 11 19:55:34 2010 +0200
@@ -36,7 +36,7 @@
     """
     Class implementing the project management functionality.
     
-    @signal dirty(int) emitted when the dirty state changes
+    @signal dirty(bool) emitted when the dirty state changes
     @signal newMultiProject() emitted after a new multi project was generated
     @signal multiProjectOpened() emitted after a multi project file was read
     @signal multiProjectClosed() emitted after a multi project was closed
@@ -52,6 +52,15 @@
             has been removed
     @signal projectOpened(filename) emitted after the project has been opened
     """
+    dirty = pyqtSignal(bool)
+    newMultiProject = pyqtSignal()
+    multiProjectOpened = pyqtSignal()
+    multiProjectClosed = pyqtSignal()
+    multiProjectPropertiesChanged = pyqtSignal()
+    showMenu = pyqtSignal(str, QMenu)
+    projectDataChanged = pyqtSignal(dict)
+    projectAdded = pyqtSignal(dict)
+    projectRemoved = pyqtSignal(dict)
     projectOpened = pyqtSignal(str)
     
     def __init__(self, project, parent = None, filename = None):
@@ -132,7 +141,7 @@
         """
         self.dirty = b
         self.saveAct.setEnabled(b)
-        self.emit(SIGNAL("dirty"), bool(b))
+        self.dirty.emit(bool(b))
     
     def isDirty(self):
         """
@@ -397,7 +406,7 @@
                 for project in self.projects:
                     if project['master']:
                         project['master'] = False
-                        self.emit(SIGNAL("projectDataChanged"), project)
+                        self.projectDataChanged.emit(project)
                         self.setDirty(True)
                         break
             
@@ -409,7 +418,7 @@
                 'description' : description, 
             }
             self.projects.append(project)
-            self.emit(SIGNAL("projectAdded"), project)
+            self.projectAdded.emit(project)
             self.setDirty(True)
     
     def changeProjectProperties(self, pro):
@@ -424,7 +433,7 @@
                 if project['master']:
                     if project['file'] != pro['file']:
                         project['master'] = False
-                        self.emit(SIGNAL("projectDataChanged"), project)
+                        self.projectDataChanged.emit(project)
                         self.setDirty(True)
                     break
         
@@ -435,7 +444,7 @@
                 project['name'] = pro['name']
                 project['master'] = pro['master']
                 project['description'] = pro['description']
-                self.emit(SIGNAL("projectDataChanged"), project)
+                self.projectDataChanged.emit(project)
                 self.setDirty(True)
     
     def getProjects(self):
@@ -468,13 +477,13 @@
         for project in self.projects:
             if project['file'] == fn:
                 self.projects.remove(project)
-                self.emit(SIGNAL("projectRemoved"), project)
+                self.projectRemoved.emit(project)
                 self.setDirty(True)
                 break
     
-    def newMultiProject(self):
+    def __newMultiProject(self):
         """
-        Public slot to build a new multi project.
+        Private slot to build a new multi project.
         
         This method displays the new multi project dialog and initializes
         the multi project object with the data entered.
@@ -492,7 +501,7 @@
             self.saveasAct.setEnabled(True)
             self.addProjectAct.setEnabled(True)
             self.propsAct.setEnabled(True)
-            self.emit(SIGNAL('newMultiProject'))
+            self.newMultiProject.emit()
     
     def __showProperties(self):
         """
@@ -502,7 +511,7 @@
         if dlg.exec_() == QDialog.Accepted:
             dlg.storeData()
             self.setDirty(True)
-            self.emit(SIGNAL('multiProjectPropertiesChanged'))
+            self.multiProjectPropertiesChanged.emit()
     
     def openMultiProject(self, fn = None, openMaster = True):
         """
@@ -541,7 +550,7 @@
                 self.addProjectAct.setEnabled(True)
                 self.propsAct.setEnabled(True)
                 
-                self.emit(SIGNAL('multiProjectOpened'))
+                self.multiProjectOpened.emit()
                 
                 if openMaster and Preferences.getMultiProject("OpenMasterAutomatically"):
                     self.__openMasterProject(False)
@@ -603,8 +612,8 @@
             self.name = QFileInfo(fn).baseName()
             self.__writeMultiProject(fn)
             
-            self.emit(SIGNAL('multiProjectClosed'))
-            self.emit(SIGNAL('multiProjectOpened'))
+            self.multiProjectClosed.emit()
+            self.multiProjectOpened.emit()
             return True
         else:
             return False
@@ -665,7 +674,7 @@
         self.addProjectAct.setEnabled(False)
         self.propsAct.setEnabled(False)
         
-        self.emit(SIGNAL('multiProjectClosed'))
+        self.multiProjectClosed.emit()
         
         return True
 
@@ -687,7 +696,7 @@
             """<p>This opens a dialog for entering the info for a"""
             """ new multiproject.</p>"""
         ))
-        act.triggered[()].connect(self.newMultiProject)
+        act.triggered[()].connect(self.__newMultiProject)
         self.actions.append(act)
 
         act = E5Action(self.trUtf8('Open multiproject'),
@@ -783,8 +792,7 @@
         
         # connect the aboutToShow signals
         self.recentMenu.aboutToShow.connect(self.__showContextMenuRecent)
-        self.connect(self.recentMenu, SIGNAL('triggered(QAction *)'),
-                     self.__openRecent)
+        self.recentMenu.triggered.connect(self.__openRecent)
         menu.aboutToShow.connect(self.__showMenu)
         
         # build the main menu
@@ -834,7 +842,7 @@
         """
         self.menuRecentAct.setEnabled(len(self.recent) > 0)
         
-        self.emit(SIGNAL("showMenu"), "Main", self.__menus["Main"])
+        self.showMenu.emit("Main", self.__menus["Main"])
     
     def __syncRecent(self):
         """

--- a/MultiProject/MultiProjectBrowser.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/MultiProject/MultiProjectBrowser.py	Wed Aug 11 19:55:34 2010 +0200
@@ -33,24 +33,18 @@
         self.setWindowIcon(UI.PixmapCache.getIcon("eric.png"))
         self.setAlternatingRowColors(True)
         
-        self.connect(self.multiProject, SIGNAL("newMultiProject"), 
-                     self.__newMultiProject)
-        self.connect(self.multiProject, SIGNAL("multiProjectOpened"), 
-                     self.__multiProjectOpened)
-        self.connect(self.multiProject, SIGNAL("multiProjectClosed"), 
-                     self.__multiProjectClosed)
-        self.connect(self.multiProject, SIGNAL("projectDataChanged"), 
-                     self.__projectDataChanged)
-        self.connect(self.multiProject, SIGNAL("projectAdded"), 
-                     self.__projectAdded)
-        self.connect(self.multiProject, SIGNAL("projectRemoved"), 
-                     self.__projectRemoved)
+        self.multiProject.newMultiProject.connect(self.__newMultiProject)
+        self.multiProject.multiProjectOpened.connect(self.__multiProjectOpened)
+        self.multiProject.multiProjectClosed.connect(self.__multiProjectClosed)
+        self.multiProject.projectDataChanged.connect(self.__projectDataChanged)
+        self.multiProject.projectAdded.connect(self.__projectAdded)
+        self.multiProject.projectRemoved.connect(self.__projectRemoved)
         self.multiProject.projectOpened.connect(self.__projectOpened)
         
         self.__createPopupMenu()
         self.setContextMenuPolicy(Qt.CustomContextMenu)
         self.customContextMenuRequested.connect(self.__contextMenuRequested)
-        self.connect(self, SIGNAL("itemActivated(QListWidgetItem*)"), self.__openItem)
+        self.itemActivated.connect(self.__openItem)
     
     ############################################################################
     ## Slot handling methods below

--- a/PluginManager/PluginManager.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/PluginManager/PluginManager.py	Wed Aug 11 19:55:34 2010 +0200
@@ -39,6 +39,13 @@
     @signal pluginDeactivated(modulName, pluginObject) emitted just after a plugin
         was deactivated
     """
+    shutdown = pyqtSignal()
+    pluginAboutToBeActivated = pyqtSignal(str, QObject)
+    pluginActivated = pyqtSignal(str, QObject)
+    allPlugginsActivated = pyqtSignal()
+    pluginAboutToBeDeactivated = pyqtSignal(str, QObject)
+    pluginDeactivated = pyqtSignal(str, QObject)
+    
     def __init__(self, parent = None, doLoadPlugins = True, develPlugin = None):
         """
         Constructor
@@ -430,7 +437,7 @@
         for name in names:
             if savedInactiveList is None or name not in savedInactiveList:
                 self.activatePlugin(name)
-        self.emit(SIGNAL("allPlugginsActivated()"))
+        self.allPlugginsActivated.emit()
     
     def activatePlugin(self, name, onDemand = False):
         """
@@ -462,7 +469,7 @@
                 pluginObject = self.__inactivePlugins[name]
             else:
                 pluginObject = pluginClass(self.__ui)
-            self.emit(SIGNAL("pluginAboutToBeActivated"), name, pluginObject)
+            self.pluginAboutToBeActivated.emit(name, pluginObject)
             try:
                 obj, ok = pluginObject.activate()
             except TypeError:
@@ -476,7 +483,7 @@
             if not ok:
                 return None
             
-            self.emit(SIGNAL("pluginActivated"), name, pluginObject)
+            self.pluginActivated.emit(name, pluginObject)
             pluginObject.eric5PluginModule = module
             pluginObject.eric5PluginName = className
             pluginObject.eric5PluginVersion = version
@@ -558,9 +565,9 @@
             elif not onDemand and name in self.__activePlugins:
                 pluginObject = self.__activePlugins[name]
             if pluginObject:
-                self.emit(SIGNAL("pluginAboutToBeDeactivated"), name, pluginObject)
+                self.pluginAboutToBeDeactivated.emit(name, pluginObject)
                 pluginObject.deactivate()
-                self.emit(SIGNAL("pluginDeactivated"), name, pluginObject)
+                self.pluginDeactivated.emit(name, pluginObject)
                 
                 if onDemand:
                     self.__onDemandActiveModules.pop(name)
@@ -710,7 +717,7 @@
             names.append(name)
         Preferences.Prefs.settings.setValue(self.__inactivePluginsKey, names)
         
-        self.emit(SIGNAL("shutdown()"))
+        self.shutdown.emit()
 
     def getPluginDisplayStrings(self, type_):
         """

--- a/PluginManager/PluginRepositoryDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/PluginManager/PluginRepositoryDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -44,6 +44,8 @@
     
     @signal closeAndInstall emitted when the Close & Install button is pressed
     """
+    closeAndInstall = pyqtSignal()
+    
     def __init__(self, parent = None):
         """
         Constructor
@@ -74,12 +76,9 @@
         
         # attributes for the network objects
         self.__networkManager = QNetworkAccessManager(self)
-        self.connect(self.__networkManager, 
-            SIGNAL('proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)'),
+        self.__networkManager.proxyAuthenticationRequired.connect(
             proxyAuthenticationRequired)
-        self.connect(self.__networkManager, 
-            SIGNAL('sslErrors(QNetworkReply *, const QList<QSslError> &)'), 
-            self.__sslErrors)
+        self.__networkManager.sslErrors.connect(self.__sslErrors)
         self.__replies = []
         
         self.__doneMethod = None
@@ -101,7 +100,7 @@
         elif button == self.__downloadCancelButton:
             self.__downloadCancel()
         elif button == self.__installButton:
-            self.emit(SIGNAL("closeAndInstall"))
+            self.closeAndInstall.emit()
     
     def __formatDescription(self, lines):
         """
@@ -345,8 +344,7 @@
         
         reply = self.__networkManager.get(QNetworkRequest(QUrl(url)))
         reply.finished[()].connect(self.__downloadFileDone)
-        self.connect(reply, SIGNAL("downloadProgress(qint64, qint64)"), 
-            self.__downloadProgress)
+        reply.downloadProgress.connect(self.__downloadProgress)
         self.__replies.append(reply)
     
     def __downloadFileDone(self):
@@ -547,7 +545,7 @@
         
         self.cw.buttonBox.accepted[()].connect(self.accept)
         self.cw.buttonBox.rejected[()].connect(self.reject)
-        self.connect(self.cw, SIGNAL("closeAndInstall"), self.__closeAndInstall)
+        self.cw.closeAndInstall.connect(self.__closeAndInstall)
         
     def __closeAndInstall(self):
         """
@@ -581,7 +579,7 @@
         
         self.cw.buttonBox.accepted[()].connect(self.close)
         self.cw.buttonBox.rejected[()].connect(self.close)
-        self.connect(self.cw, SIGNAL("closeAndInstall"), self.__startPluginInstall)
+        self.cw.closeAndInstall.connect(self.__startPluginInstall)
     
     def __startPluginInstall(self):
         """
@@ -603,4 +601,4 @@
                 ).format(applPath),
                 self.trUtf8('OK'))
         
-        self.close()
\ No newline at end of file
+        self.close()

--- a/PluginManager/PluginUninstallDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/PluginManager/PluginUninstallDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -72,7 +72,7 @@
         Private slot to handle the accepted signal of the button box.
         """
         if self.__uninstallPlugin():
-            self.emit(SIGNAL("accepted()"))
+            self.accepted.emit()
     
     def __uninstallPlugin(self):
         """
@@ -200,4 +200,4 @@
         self.resize(size)
         
         self.cw.accepted[()].connect(self.close)
-        self.cw.buttonBox.rejected[()].connect(self.close)
\ No newline at end of file
+        self.cw.buttonBox.rejected[()].connect(self.close)

--- a/Plugins/PluginEricapi.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/PluginEricapi.py	Wed Aug 11 19:55:34 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QObject, SIGNAL
+from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog, QApplication
 
 from E5Gui.E5Application import e5App
@@ -105,8 +105,7 @@
             e5App().getObject("Project").addE5Actions([self.__projectAct])
             menu.addAction(self.__projectAct)
         
-        self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                     self.__projectShowMenu)
+        e5App().getObject("Project").showMenu.connect(self.__projectShowMenu)
         
         return None, True
 
@@ -114,8 +113,7 @@
         """
         Public method to deactivate this plugin.
         """
-        self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                        self.__projectShowMenu)
+        e5App().getObject("Project").showMenu.disconnect(self.__projectShowMenu)
         
         menu = e5App().getObject("Project").getMenu("Apidoc")
         if menu:
@@ -180,4 +178,4 @@
                 if outfile not in project.pdata['OTHERS']:
                     project.pdata['OTHERS'].append(outfile)
                     project.setDirty(True)
-                    project.othersAdded(outfile)
\ No newline at end of file
+                    project.othersAdded(outfile)

--- a/Plugins/PluginEricdoc.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/PluginEricdoc.py	Wed Aug 11 19:55:34 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QObject, SIGNAL
+from PyQt4.QtCore import QObject
 from PyQt4.QtGui import QDialog, QApplication
 
 from E5Gui.E5Application import e5App
@@ -141,8 +141,7 @@
             e5App().getObject("Project").addE5Actions([self.__projectAct])
             menu.addAction(self.__projectAct)
         
-        self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                     self.__projectShowMenu)
+        e5App().getObject("Project").showMenu.connect(self.__projectShowMenu)
         
         return None, True
 
@@ -150,8 +149,7 @@
         """
         Public method to deactivate this plugin.
         """
-        self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                        self.__projectShowMenu)
+        e5App().getObject("Project").showMenu.disconnect(self.__projectShowMenu)
         
         menu = e5App().getObject("Project").getMenu("Apidoc")
         if menu:
@@ -220,4 +218,4 @@
                 if outdir not in project.pdata['OTHERS']:
                     project.pdata['OTHERS'].append(outdir)
                     project.setDirty(True)
-                    project.othersAdded(outdir)
\ No newline at end of file
+                    project.othersAdded(outdir)

--- a/Plugins/PluginSyntaxChecker.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/PluginSyntaxChecker.py	Wed Aug 11 19:55:34 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QObject, SIGNAL
+from PyQt4.QtCore import QObject
 
 from E5Gui.E5Application import e5App
 
@@ -94,14 +94,11 @@
         ))
         self.__editorAct.triggered[()].connect(self.__editorSyntaxCheck)
         
-        self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                     self.__projectShowMenu)
-        self.connect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), 
-                     SIGNAL("showMenu"), self.__projectBrowserShowMenu)
-        self.connect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), 
-                     self.__editorOpened)
-        self.connect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), 
-                     self.__editorClosed)
+        e5App().getObject("Project").showMenu.connect(self.__projectShowMenu)
+        e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\
+            .showMenu.connect(self.__projectBrowserShowMenu)
+        e5App().getObject("ViewManager").editorOpenedEd.connect(self.__editorOpened)
+        e5App().getObject("ViewManager").editorClosedEd.connect(self.__editorClosed)
         
         for editor in e5App().getObject("ViewManager").getOpenEditors():
             self.__editorOpened(editor)
@@ -112,14 +109,11 @@
         """
         Public method to deactivate this plugin.
         """
-        self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                        self.__projectShowMenu)
-        self.disconnect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), 
-                        SIGNAL("showMenu"), self.__projectBrowserShowMenu)
-        self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), 
-                        self.__editorOpened)
-        self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), 
-                        self.__editorClosed)
+        e5App().getObject("Project").showMenu.disconnect(self.__projectShowMenu)
+        e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\
+            .showMenu.disconnect(self.__projectBrowserShowMenu)
+        e5App().getObject("ViewManager").editorOpenedEd.disconnect(self.__editorOpened)
+        e5App().getObject("ViewManager").editorClosedEd.disconnect(self.__editorClosed)
         
         menu = e5App().getObject("Project").getMenu("Checks")
         if menu:
@@ -130,7 +124,7 @@
                 self.__projectBrowserMenu.removeAction(self.__projectBrowserAct)
         
         for editor in self.__editors:
-            self.disconnect(editor, SIGNAL("showMenu"), self.__editorShowMenu)
+            editor.showMenu.disconnect(self.__editorShowMenu)
             menu = editor.getMenu("Checks")
             if menu is not None:
                 menu.removeAction(self.__editorAct)
@@ -211,7 +205,7 @@
         menu = editor.getMenu("Checks")
         if menu is not None:
             menu.addAction(self.__editorAct)
-            self.connect(editor, SIGNAL("showMenu"), self.__editorShowMenu)
+            editor.showMenu.connect(self.__editorShowMenu)
             self.__editors.append(editor)
     
     def __editorClosed(self, editor):
@@ -248,4 +242,4 @@
             self.__editorSyntaxCheckerDialog = SyntaxCheckerDialog()
             self.__editorSyntaxCheckerDialog.show()
             self.__editorSyntaxCheckerDialog.start(editor.getFileName(), 
-                                                   editor.text())
\ No newline at end of file
+                                                   editor.text())

--- a/Plugins/PluginTabnanny.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/PluginTabnanny.py	Wed Aug 11 19:55:34 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QObject, SIGNAL
+from PyQt4.QtCore import QObject
 
 from E5Gui.E5Application import e5App
 
@@ -96,14 +96,11 @@
         ))
         self.__editorAct.triggered[()].connect(self.__editorTabnanny)
         
-        self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                     self.__projectShowMenu)
-        self.connect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), 
-                     SIGNAL("showMenu"), self.__projectBrowserShowMenu)
-        self.connect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), 
-                     self.__editorOpened)
-        self.connect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), 
-                     self.__editorClosed)
+        e5App().getObject("Project").showMenu.connect(self.__projectShowMenu)
+        e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\
+            .showMenu.connect(self.__projectBrowserShowMenu)
+        e5App().getObject("ViewManager").editorOpenedEd.connect(self.__editorOpened)
+        e5App().getObject("ViewManager").editorClosedEd.connect(self.__editorClosed)
         
         for editor in e5App().getObject("ViewManager").getOpenEditors():
             self.__editorOpened(editor)
@@ -114,14 +111,11 @@
         """
         Public method to deactivate this plugin.
         """
-        self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                        self.__projectShowMenu)
-        self.disconnect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), 
-                        SIGNAL("showMenu"), self.__projectBrowserShowMenu)
-        self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), 
-                        self.__editorOpened)
-        self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), 
-                        self.__editorClosed)
+        e5App().getObject("Project").showMenu.disconnect(self.__projectShowMenu)
+        e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\
+            .showMenu.disconnect(self.__projectBrowserShowMenu)
+        e5App().getObject("ViewManager").editorOpenedEd.disconnect(self.__editorOpened)
+        e5App().getObject("ViewManager").editorClosedEd.disconnect(self.__editorClosed)
         
         menu = e5App().getObject("Project").getMenu("Checks")
         if menu:
@@ -132,7 +126,7 @@
                 self.__projectBrowserMenu.removeAction(self.__projectBrowserAct)
         
         for editor in self.__editors:
-            self.disconnect(editor, SIGNAL("showMenu"), self.__editorShowMenu)
+            editor.showMenu.disconnect(self.__editorShowMenu)
             menu = editor.getMenu("Checks")
             if menu is not None:
                 menu.removeAction(self.__editorAct)
@@ -214,7 +208,7 @@
         menu = editor.getMenu("Checks")
         if menu is not None:
             menu.addAction(self.__editorAct)
-            self.connect(editor, SIGNAL("showMenu"), self.__editorShowMenu)
+            editor.showMenu.connect(self.__editorShowMenu)
             self.__editors.append(editor)
     
     def __editorClosed(self, editor):
@@ -253,4 +247,4 @@
             
             self.__editorTabnannyDialog = TabnannyDialog()
             self.__editorTabnannyDialog.show()
-            self.__editorTabnannyDialog.start(editor.getFileName())
\ No newline at end of file
+            self.__editorTabnannyDialog.start(editor.getFileName())

--- a/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgCommitDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -7,7 +7,7 @@
 Module implementing a dialog to enter the commit message.
 """
 
-from PyQt4.QtCore import pyqtSlot, Qt, SIGNAL
+from PyQt4.QtCore import pyqtSlot, Qt
 from PyQt4.QtGui import QWidget, QDialogButtonBox
 
 from .Ui_HgCommitDialog import Ui_HgCommitDialog
@@ -75,14 +75,14 @@
         Private slot called by the buttonBox accepted signal.
         """
         self.close()
-        self.emit(SIGNAL("accepted()"))
+        self.accepted.emit()
     
     def on_buttonBox_rejected(self):
         """
         Private slot called by the buttonBox rejected signal.
         """
         self.close()
-        self.emit(SIGNAL("rejected()"))
+        self.rejected.emit()
     
     @pyqtSlot(str)
     def on_recentComboBox_activated(self, txt):

--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import pyqtSlot, QProcess, SIGNAL, QTimer, QUrl, QByteArray
+from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QUrl, QByteArray
 from PyQt4.QtGui import QWidget, QDialogButtonBox, QApplication, QMessageBox, \
     QLineEdit, QTextCursor
 
@@ -57,8 +57,7 @@
         self.process.readyReadStandardOutput.connect(self.__readStdout)
         self.process.readyReadStandardError.connect(self.__readStderr)
         
-        self.connect(self.contents, SIGNAL('anchorClicked(const QUrl&)'),
-            self.__sourceChanged)
+        self.contents.anchorClicked.connect(self.__sourceChanged)
         
         self.revisions = []  # stack of remembered revisions
         self.revString = self.trUtf8('Revision')

--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import pyqtSlot, SIGNAL, Qt, QProcess, QTimer
+from PyQt4.QtCore import pyqtSlot, Qt, QProcess, QTimer
 from PyQt4.QtGui import QWidget, QDialogButtonBox, QMenu, QHeaderView, QTreeWidgetItem, \
     QMessageBox, QLineEdit
 
@@ -46,7 +46,7 @@
         
         self.process = None
         self.vcs = vcs
-        self.connect(self.vcs, SIGNAL("committed()"), self.__committed)
+        self.vcs.committed.connect(self.__committed)
         
         self.statusList.headerItem().setText(self.__lastColumn, "")
         self.statusList.header().setSortIndicator(self.__pathColumn, Qt.AscendingOrder)

--- a/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/ProjectBrowserHelper.py	Wed Aug 11 19:55:34 2010 +0200
@@ -9,7 +9,6 @@
 
 import os
 
-from PyQt4.QtCore import SIGNAL
 from PyQt4.QtGui import QMenu, QDialog
 
 from Project.ProjectBrowserModel import ProjectBrowserFileItem
@@ -541,10 +540,10 @@
         movefiles = self.browser.project.getFiles(fn)
         if self.vcs.vcsMove(fn, self.project):
             if isFile:
-                self.browser.emit(SIGNAL('closeSourceWindow'), fn)
+                self.browser.closeSourceWindow.emit(fn)
             else:
                 for mf in movefiles:
-                    self.browser.emit(SIGNAL('closeSourceWindow'), mf)
+                    self.browser.closeSourceWindow.emit(mf)
     
     def __HgExtendedDiff(self):
         """

--- a/Plugins/VcsPlugins/vcsMercurial/hg.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/hg.py	Wed Aug 11 19:55:34 2010 +0200
@@ -11,7 +11,7 @@
 import shutil
 import urllib.request, urllib.parse, urllib.error
 
-from PyQt4.QtCore import QProcess, SIGNAL, QFileInfo
+from PyQt4.QtCore import QProcess, pyqtSignal, QFileInfo
 from PyQt4.QtGui import QMessageBox, QApplication, QDialog, QInputDialog, QFileDialog
 
 from E5Gui.E5Application import e5App
@@ -53,6 +53,8 @@
     
     @signal committed() emitted after the commit action has completed
     """
+    committed = pyqtSignal()
+    
     def __init__(self, plugin, parent = None, name = None):
         """
         Constructor
@@ -317,8 +319,7 @@
             # call CommitDialog and get message from there
             if self.__commitDialog is None:
                 self.__commitDialog = HgCommitDialog(self, self.__ui)
-                self.connect(self.__commitDialog, SIGNAL("accepted()"), 
-                             self.__vcsCommit_Step2)
+                self.__commitDialog.accepted.connect(self.__vcsCommit_Step2)
             self.__commitDialog.show()
             self.__commitDialog.raise_()
             self.__commitDialog.activateWindow()
@@ -342,8 +343,7 @@
         
         if self.__commitDialog is not None:
             msg = self.__commitDialog.logMessage()
-            self.disconnect(self.__commitDialog, SIGNAL("accepted()"), 
-                            self.__vcsCommit_Step2)
+            self.__commitDialog.accepted.disconnect(self.__vcsCommit_Step2)
             self.__commitDialog = None
         
         if not msg:
@@ -383,7 +383,7 @@
             res = dia.startProcess(args, dname)
             if res:
                 dia.exec_()
-        self.emit(SIGNAL("committed()"))
+        self.committed.emit()
         if self.__forgotNames:
             model = e5App().getObject("Project").getModel()
             for name in self.__forgotNames:

--- a/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/ProjectBrowserHelper.py	Wed Aug 11 19:55:34 2010 +0200
@@ -690,10 +690,10 @@
         movefiles = self.browser.project.getFiles(fn)
         if self.vcs.vcsMove(fn, self.project):
             if isFile:
-                self.browser.emit(SIGNAL('closeSourceWindow'), fn)
+                self.browser.closeSourceWindow.emit(fn)
             else:
                 for mf in movefiles:
-                    self.browser.emit(SIGNAL('closeSourceWindow'), mf)
+                    self.browser.closeSourceWindow.emit(mf)
         
     def __SVNResolve(self):
         """
@@ -908,4 +908,4 @@
         for itm in items:
             if isinstance(itm, ProjectBrowserFileItem):
                 return True
-        return False
\ No newline at end of file
+        return False

--- a/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnCommitDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -109,14 +109,14 @@
         Private slot called by the buttonBox accepted signal.
         """
         self.close()
-        self.emit(SIGNAL("accepted()"))
+        self.accepted.emit()
         
     def on_buttonBox_rejected(self):
         """
         Private slot called by the buttonBox rejected signal.
         """
         self.close()
-        self.emit(SIGNAL("rejected()"))
+        self.rejected.emit()
     
     @pyqtSlot(str)
     def on_recentComboBox_activated(self, txt):

--- a/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnLogDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -48,8 +48,7 @@
         self.contents.setHtml(\
             self.trUtf8('<b>Processing your request, please wait...</b>'))
         
-        self.connect(self.contents, SIGNAL('anchorClicked(const QUrl&)'),
-            self.__sourceChanged)
+        self.contents.anchorClicked.connect(self.__sourceChanged)
         
         self.flags = {
             'A' : self.trUtf8('Added'),

--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -52,7 +52,7 @@
         self.buttonBox.button(QDialogButtonBox.Cancel).setDefault(True)
         
         self.vcs = vcs
-        self.connect(self.vcs, SIGNAL("committed()"), self.__committed)
+        self.vcs.committed.connect(self.__committed)
         
         self.statusList.headerItem().setText(self.__lastColumn, "")
         self.statusList.header().setSortIndicator(self.__pathColumn, Qt.AscendingOrder)

--- a/Plugins/VcsPlugins/vcsPySvn/subversion.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/subversion.py	Wed Aug 11 19:55:34 2010 +0200
@@ -58,6 +58,8 @@
     
     @signal committed() emitted after the commit action has completed
     """
+    committed = pyqtSignal()
+    
     def __init__(self, plugin, parent = None, name = None):
         """
         Constructor
@@ -464,8 +466,7 @@
             # call CommitDialog and get message from there
             if self.__commitDialog is None:
                 self.__commitDialog = SvnCommitDialog(self.__ui)
-                self.connect(self.__commitDialog, SIGNAL("accepted()"), 
-                             self.__vcsCommit_Step2)
+                self.__commitDialog.accepted.connect(self.__vcsCommit_Step2)
             self.__commitDialog.show()
             self.__commitDialog.raise_()
             self.__commitDialog.activateWindow()
@@ -491,8 +492,7 @@
                 changelists, keepChangelists = self.__commitDialog.changelistsData()
             else:
                 changelists, keepChangelists = [], False
-            self.disconnect(self.__commitDialog, SIGNAL("accepted()"), 
-                            self.__vcsCommit_Step2)
+            self.__commitDialog.accepted.disconnect(self.__vcsCommit_Step2)
             self.__commitDialog = None
         else:
             changelists, keepChangelists = [], False
@@ -549,7 +549,7 @@
             dlg.finish()
             dlg.exec_()
         os.chdir(cwd)
-        self.emit(SIGNAL("committed()"))
+        self.committed.emit()
         self.checkVCSStatus()
         
     def vcsUpdate(self, name, noDialog = False):

--- a/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/ProjectBrowserHelper.py	Wed Aug 11 19:55:34 2010 +0200
@@ -686,10 +686,10 @@
         movefiles = self.browser.project.getFiles(fn)
         if self.vcs.vcsMove(fn, self.project):
             if isFile:
-                self.browser.emit(SIGNAL('closeSourceWindow'), fn)
+                self.browser.closeSourceWindow.emit(fn)
             else:
                 for mf in movefiles:
-                    self.browser.emit(SIGNAL('closeSourceWindow'), mf)
+                    self.browser.closeSourceWindow.emit(mf)
         
     def __SVNResolve(self):
         """

--- a/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnCommitDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -105,14 +105,14 @@
         Private slot called by the buttonBox accepted signal.
         """
         self.close()
-        self.emit(SIGNAL("accepted()"))
+        self.accepted.emit()
         
     def on_buttonBox_rejected(self):
         """
         Private slot called by the buttonBox rejected signal.
         """
         self.close()
-        self.emit(SIGNAL("rejected()"))
+        self.rejected.emit()
     
     @pyqtSlot(str)
     def on_recentComboBox_activated(self, txt):

--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -47,8 +47,7 @@
         self.process.readyReadStandardOutput.connect(self.__readStdout)
         self.process.readyReadStandardError.connect(self.__readStderr)
         
-        self.connect(self.contents, SIGNAL('anchorClicked(const QUrl&)'),
-            self.__sourceChanged)
+        self.contents.anchorClicked.connect(self.__sourceChanged)
         
         self.rx_sep = QRegExp('\\-+\\s*')
         self.rx_sep2 = QRegExp('=+\\s*')

--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Wed Aug 11 19:55:34 2010 +0200
@@ -48,7 +48,7 @@
         
         self.process = None
         self.vcs = vcs
-        self.connect(self.vcs, SIGNAL("committed()"), self.__committed)
+        self.vcs.committed.connect(self.__committed)
         
         self.statusList.headerItem().setText(self.__lastColumn, "")
         self.statusList.header().setSortIndicator(self.__pathColumn, Qt.AscendingOrder)

--- a/Plugins/VcsPlugins/vcsSubversion/subversion.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/subversion.py	Wed Aug 11 19:55:34 2010 +0200
@@ -52,6 +52,8 @@
     
     @signal committed() emitted after the commit action has completed
     """
+    committed = pyqtSignal()
+    
     def __init__(self, plugin, parent=None, name=None):
         """
         Constructor
@@ -425,8 +427,7 @@
             # call CommitDialog and get message from there
             if self.__commitDialog is None:
                 self.__commitDialog = SvnCommitDialog(self, self.__ui)
-                self.connect(self.__commitDialog, SIGNAL("accepted()"), 
-                             self.__vcsCommit_Step2)
+                self.__commitDialog.accepted.connect(self.__vcsCommit_Step2)
             self.__commitDialog.show()
             self.__commitDialog.raise_()
             self.__commitDialog.activateWindow()
@@ -452,8 +453,7 @@
                 changelists, keepChangelists = self.__commitDialog.changelistsData()
             else:
                 changelists, keepChangelists = [], False
-            self.disconnect(self.__commitDialog, SIGNAL("accepted()"), 
-                            self.__vcsCommit_Step2)
+            self.__commitDialog.accepted.disconnect(self.__vcsCommit_Step2)
             self.__commitDialog = None
         else:
             changelists, keepChangelists = [], False
@@ -490,7 +490,7 @@
             res = dia.startProcess(args, dname)
             if res:
                 dia.exec_()
-        self.emit(SIGNAL("committed()"))
+        self.committed.emit()
         self.checkVCSStatus()
         
     def vcsUpdate(self, name, noDialog = False):

--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Wed Aug 11 19:55:34 2010 +0200
@@ -123,6 +123,8 @@
     @signal changeCaption(string) emitted if a change of the caption is necessary
     @signal editorChanged(string) emitted when the current editor has changed
     """
+    changeCaption = pyqtSignal(str)
+    editorChanged = pyqtSignal(str)
     editorOpened = pyqtSignal(str)
     lastEditorClosed = pyqtSignal()
     checkActions = pyqtSignal(Editor)
@@ -148,10 +150,8 @@
         self.viewlist.setSizePolicy(policy)
         self.addWidget(self.viewlist)
         self.viewlist.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self.viewlist, SIGNAL("itemActivated(QListWidgetItem*)"),
-                     self.__showSelectedView)
-        self.connect(self.viewlist, SIGNAL("itemClicked(QListWidgetItem*)"),
-                     self.__showSelectedView)
+        self.viewlist.itemActivated.connect(self.__showSelectedView)
+        self.viewlist.itemClicked.connect(self.__showSelectedView)
         self.viewlist.customContextMenuRequested.connect(self.__showMenu)
         
         self.stackArea = QSplitter(self)
@@ -161,8 +161,7 @@
         self.stackArea.addWidget(stack)
         self.stacks.append(stack)
         self.currentStack = stack
-        self.connect(stack, SIGNAL('currentChanged(int)'),
-            self.__currentChanged)
+        stack.currentChanged.connect(self.__currentChanged)
         stack.installEventFilter(self)
         self.setSizes([int(self.width() * 0.2), int(self.width() * 0.8)]) # 20% for viewlist
         self.__inRemoveView = False
@@ -285,10 +284,10 @@
         aw = self.activeWindow()
         fn = aw and aw.getFileName() or None
         if fn:
-            self.emit(SIGNAL('changeCaption'), fn)
-            self.emit(SIGNAL('editorChanged'), fn)
+            self.changeCaption.emit(fn)
+            self.editorChanged.emit(fn)
         else:
-            self.emit(SIGNAL('changeCaption'), "")
+            self.changeCaption.emit("")
         
     def _addView(self, win, fn = None, noName = ""):
         """
@@ -313,17 +312,16 @@
             self.viewlist.addItem(itm)
         self.currentStack.addWidget(win)
         self.currentStack.setCurrentWidget(win)
-        self.connect(win, SIGNAL('captionChanged'),
-            self.__captionChange)
+        win.captionChanged.connect(self.__captionChange)
         
         index = self.editors.index(win)
         self.viewlist.setCurrentRow(index)
         win.setFocus()
         if fn:
-            self.emit(SIGNAL('changeCaption'), fn)
-            self.emit(SIGNAL('editorChanged'), fn)
+            self.changeCaption.emit(fn)
+            self.editorChanged.emit(fn)
         else:
-            self.emit(SIGNAL('changeCaption'), "")
+            self.changeCaption.emit("")
         
     def __captionChange(self, cap, editor):
         """
@@ -355,10 +353,10 @@
         win.setFocus()
         fn = win.getFileName()
         if fn:
-            self.emit(SIGNAL('changeCaption'), fn)
-            self.emit(SIGNAL('editorChanged'), fn)
+            self.changeCaption.emit(fn)
+            self.editorChanged.emit(fn)
         else:
-            self.emit(SIGNAL('changeCaption'), "")
+            self.changeCaption.emit("")
         
     def __showSelectedView(self, itm):
         """
@@ -409,7 +407,7 @@
         itm.setText(txt)
         itm.setToolTip(newName)
         self.viewlist.setCurrentRow(currentRow)
-        self.emit(SIGNAL('changeCaption'), newName)
+        self.changeCaption.emit(newName)
         
     def _modificationStatusChanged(self, m, editor):
         """
@@ -458,8 +456,7 @@
         self.stackArea.addWidget(stack)
         self.stacks.append(stack)
         self.currentStack = stack
-        self.connect(stack, SIGNAL('currentChanged(int)'),
-            self.__currentChanged)
+        stack.currentChanged.connect(self.__currentChanged)
         stack.installEventFilter(self)
         if self.stackArea.orientation() == Qt.Horizontal:
             size = self.stackArea.width()
@@ -612,11 +609,11 @@
         editor.setFocus()
         fn = editor.getFileName()
         if fn:
-            self.emit(SIGNAL('changeCaption'), fn)
+            self.changeCaption.emit(fn)
             if not self.__inRemoveView:
-                self.emit(SIGNAL('editorChanged'), fn)
+                self.editorChanged.emit(fn)
         else:
-            self.emit(SIGNAL('changeCaption'), "")
+            self.changeCaption.emit("")
         
         cindex = self.editors.index(editor)
         self.viewlist.setCurrentRow(cindex)
@@ -651,10 +648,10 @@
                 aw.setFocus()
                 fn = aw.getFileName()
                 if fn:
-                    self.emit(SIGNAL('changeCaption'), fn)
+                    self.changeCaption.emit(fn)
                     if switched:
-                        self.emit(SIGNAL('editorChanged'), fn)
+                        self.editorChanged.emit(fn)
                 else:
-                    self.emit(SIGNAL('changeCaption'), "")
+                    self.changeCaption.emit("")
         
         return False

--- a/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py	Wed Aug 11 19:55:34 2010 +0200
@@ -26,6 +26,7 @@
     
     @signal editorChanged(string) emitted when the current editor has changed
     """
+    editorChanged = pyqtSignal(str)
     editorOpened = pyqtSignal(str)
     lastEditorClosed = pyqtSignal()
     checkActions = pyqtSignal(Editor)
@@ -50,10 +51,8 @@
         
         self.__windowMapper = QSignalMapper(self)
         
-        self.connect(self.__windowMapper, SIGNAL('mapped(QWidget*)'), 
-            self.setActiveSubWindow)
-        self.connect(self, SIGNAL('subWindowActivated(QMdiSubWindow*)'),
-            self.__subWindowActivated)
+        self.__windowMapper.mapped[QWidget].connect(self.setActiveSubWindow)
+        self.subWindowActivated.connect(self.__subWindowActivated)
         
     def canCascade(self):
         """
@@ -339,7 +338,7 @@
             self._checkActions(editor)
             if editor is not None:
                 fn = editor.getFileName()
-                self.emit(SIGNAL('editorChanged'), fn)
+                self.editorChanged.emit(fn)
         
     def eventFilter(self, watched, event):
         """