Mercurial Repositories > eric / changeset
changeset
Continued porting signal/slot usage to the new API.
Mon, 09 Aug 2010 15:49:03 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Mon, 09 Aug 2010 15:49:03 +0200
- changeset 465
- c20e25deb33a
- parent 464
- a2b1d1770ef0
- child 466
- e6a4bc9e1043
Continued porting signal/slot usage to the new API.
--- a/Debugger/DebugServer.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Debugger/DebugServer.py Mon Aug 09 15:49:03 2010 +0200 @@ -129,7 +129,7 @@ self.connect(self, SIGNAL("clientClearBreak"), self.__clientClearBreakPoint) self.connect(self, SIGNAL("clientClearWatch"), self.__clientClearWatchPoint) - self.connect(self, SIGNAL("newConnection()"), self.__newConnection) + self.newConnection[()].connect(self.__newConnection) self.breakpointModel.rowsAboutToBeRemoved.connect(self.__deleteBreakPoints) self.breakpointModel.dataAboutToBeChanged.connect(
--- a/Debugger/DebuggerInterfacePython.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Debugger/DebuggerInterfacePython.py Mon Aug 09 15:49:03 2010 +0200 @@ -353,8 +353,8 @@ if self.qsock is not None: return False - self.connect(sock, SIGNAL('disconnected()'), self.debugServer.startClient) - self.connect(sock, SIGNAL('readyRead()'), self.__parseClientLine) + sock.disconnected[()].connect(self.debugServer.startClient) + sock.readyRead[()].connect(self.__parseClientLine) self.qsock = sock @@ -385,7 +385,7 @@ # do not want any slots called during shutdown self.disconnect(self.qsock, SIGNAL('disconnected()'), self.debugServer.startClient) - self.disconnect(self.qsock, SIGNAL('readyRead()'), self.__parseClientLine) + self.qsock.readyRead[()].disconnect(self.__parseClientLine) # close down socket, and shut down client as well. self.__sendCommand('{0}\n'.format(RequestShutdown)) @@ -945,4 +945,4 @@ if self.qsock is not None: self.qsock.write(cmd.encode('utf8')) else: - self.queue.append(cmd) + self.queue.append(cmd) \ No newline at end of file
--- a/Debugger/DebuggerInterfacePython3.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Debugger/DebuggerInterfacePython3.py Mon Aug 09 15:49:03 2010 +0200 @@ -352,8 +352,8 @@ if self.qsock is not None: return False - self.connect(sock, SIGNAL('disconnected()'), self.debugServer.startClient) - self.connect(sock, SIGNAL('readyRead()'), self.__parseClientLine) + sock.disconnected[()].connect(self.debugServer.startClient) + sock.readyRead[()].connect(self.__parseClientLine) self.qsock = sock @@ -384,7 +384,7 @@ # do not want any slots called during shutdown self.disconnect(self.qsock, SIGNAL('disconnected()'), self.debugServer.startClient) - self.disconnect(self.qsock, SIGNAL('readyRead()'), self.__parseClientLine) + self.qsock.readyRead[()].disconnect(self.__parseClientLine) # close down socket, and shut down client as well. self.__sendCommand('{0}\n'.format(RequestShutdown)) @@ -944,4 +944,4 @@ if self.qsock is not None: self.qsock.write(cmd.encode('utf8', 'backslashreplace')) else: - self.queue.append(cmd) + self.queue.append(cmd) \ No newline at end of file
--- a/Debugger/DebuggerInterfaceRuby.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Debugger/DebuggerInterfaceRuby.py Mon Aug 09 15:49:03 2010 +0200 @@ -329,8 +329,8 @@ if self.qsock is not None: return False - self.connect(sock, SIGNAL('disconnected()'), self.debugServer.startClient) - self.connect(sock, SIGNAL('readyRead()'), self.__parseClientLine) + sock.disconnected[()].connect(self.debugServer.startClient) + sock.readyRead[()].connect(self.__parseClientLine) self.qsock = sock @@ -361,7 +361,7 @@ # do not want any slots called during shutdown self.disconnect(self.qsock, SIGNAL('disconnected()'), self.debugServer.startClient) - self.disconnect(self.qsock, SIGNAL('readyRead()'), self.__parseClientLine) + self.qsock.readyRead[()].disconnect(self.__parseClientLine) # close down socket, and shut down client as well. self.__sendCommand('{0}\n'.format(RequestShutdown)) @@ -835,4 +835,4 @@ if self.qsock is not None: self.qsock.write(cmd.encode('utf8')) else: - self.queue.append(cmd) + self.queue.append(cmd) \ No newline at end of file
--- a/Helpviewer/DownloadDialog.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Helpviewer/DownloadDialog.py Mon Aug 09 15:49:03 2010 +0200 @@ -82,7 +82,7 @@ self.__url = self.__reply.url() self.__reply.setParent(self) - self.connect(self.__reply, SIGNAL("readyRead()"), self.__readyRead) + self.__reply.readyRead[()].connect(self.__readyRead) self.connect(self.__reply, SIGNAL("error(QNetworkReply::NetworkError)"), self.__networkError) self.connect(self.__reply, SIGNAL("downloadProgress(qint64, qint64)"), @@ -433,4 +433,4 @@ self.__reply.close() self.__reply.deleteLater() - self.done.emit() + self.done.emit() \ No newline at end of file
--- a/Helpviewer/HelpWebSearchWidget.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Helpviewer/HelpWebSearchWidget.py Mon Aug 09 15:49:03 2010 +0200 @@ -76,7 +76,7 @@ self.connect(self.__searchEdit, SIGNAL("textEdited(const QString&)"), self.__textEdited) self.__clearButton.clicked[()].connect(self.__searchEdit.clear) - self.connect(self.__searchEdit, SIGNAL("returnPressed()"), self.__searchNow) + self.__searchEdit.returnPressed[()].connect(self.__searchNow) self.connect(self.__completer, SIGNAL("activated(const QModelIndex &)"), self.__completerActivated) self.connect(self.__completer, SIGNAL("highlighted(const QModelIndex &)"),
--- a/PluginManager/PluginInstallDialog.py Mon Aug 09 15:36:47 2010 +0200 +++ b/PluginManager/PluginInstallDialog.py Mon Aug 09 15:49:03 2010 +0200 @@ -527,8 +527,8 @@ self.__layout.addWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.accept) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.reject) + self.cw.buttonBox.accepted[()].connect(self.accept) + self.cw.buttonBox.rejected[()].connect(self.reject) def restartNeeded(self): """ @@ -556,5 +556,5 @@ self.setCentralWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.close) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close) + self.cw.buttonBox.accepted[()].connect(self.close) + self.cw.buttonBox.rejected[()].connect(self.close) \ No newline at end of file
--- a/PluginManager/PluginRepositoryDialog.py Mon Aug 09 15:36:47 2010 +0200 +++ b/PluginManager/PluginRepositoryDialog.py Mon Aug 09 15:49:03 2010 +0200 @@ -545,8 +545,8 @@ self.__layout.addWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.accept) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.reject) + self.cw.buttonBox.accepted[()].connect(self.accept) + self.cw.buttonBox.rejected[()].connect(self.reject) self.connect(self.cw, SIGNAL("closeAndInstall"), self.__closeAndInstall) def __closeAndInstall(self): @@ -579,8 +579,8 @@ self.setCentralWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.close) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close) + self.cw.buttonBox.accepted[()].connect(self.close) + self.cw.buttonBox.rejected[()].connect(self.close) self.connect(self.cw, SIGNAL("closeAndInstall"), self.__startPluginInstall) def __startPluginInstall(self):
--- a/PluginManager/PluginUninstallDialog.py Mon Aug 09 15:36:47 2010 +0200 +++ b/PluginManager/PluginUninstallDialog.py Mon Aug 09 15:49:03 2010 +0200 @@ -180,8 +180,8 @@ self.__layout.addWidget(self.cw) self.resize(size) - self.connect(self.cw, SIGNAL("accepted()"), self.accept) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.reject) + self.cw.accepted[()].connect(self.accept) + self.cw.buttonBox.rejected[()].connect(self.reject) class PluginUninstallWindow(QMainWindow): """ @@ -199,5 +199,5 @@ self.setCentralWidget(self.cw) self.resize(size) - self.connect(self.cw, SIGNAL("accepted()"), self.close) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close) + self.cw.accepted[()].connect(self.close) + self.cw.buttonBox.rejected[()].connect(self.close) \ No newline at end of file
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Mon Aug 09 15:49:03 2010 +0200 @@ -648,8 +648,8 @@ self.__layout.addWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.accept) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.reject) + self.cw.buttonBox.accepted[()].connect(self.accept) + self.cw.buttonBox.rejected[()].connect(self.reject) def getCode(self, indLevel, indString): """ @@ -677,5 +677,5 @@ self.setCentralWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.close) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close) + self.cw.buttonBox.accepted[()].connect(self.close) + self.cw.buttonBox.rejected[()].connect(self.close) \ No newline at end of file
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Mon Aug 09 15:49:03 2010 +0200 @@ -496,8 +496,8 @@ self.__layout.addWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.accept) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.reject) + self.cw.buttonBox.accepted[()].connect(self.accept) + self.cw.buttonBox.rejected[()].connect(self.reject) def getCode(self, indLevel, indString): """ @@ -525,5 +525,5 @@ self.setCentralWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.close) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close) + self.cw.buttonBox.accepted[()].connect(self.close) + self.cw.buttonBox.rejected[()].connect(self.close) \ No newline at end of file
--- a/Preferences/ConfigurationDialog.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Preferences/ConfigurationDialog.py Mon Aug 09 15:49:03 2010 +0200 @@ -610,8 +610,8 @@ self.layout.addWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.accept) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.reject) + self.cw.buttonBox.accepted[()].connect(self.accept) + self.cw.buttonBox.rejected[()].connect(self.reject) self.connect(self.cw, SIGNAL('preferencesChanged'), self.__preferencesChanged) @@ -652,8 +652,8 @@ self.setCentralWidget(self.cw) self.resize(size) - self.connect(self.cw.buttonBox, SIGNAL("accepted()"), self.accept) - self.connect(self.cw.buttonBox, SIGNAL("rejected()"), self.close) + self.cw.buttonBox.accepted[()].connect(self.accept) + self.cw.buttonBox.rejected[()].connect(self.close) def showConfigurationPageByName(self, pageName): """ @@ -670,4 +670,4 @@ self.cw.setPreferences() Preferences.saveResetLayout() Preferences.syncPreferences() - self.close() + self.close() \ No newline at end of file
--- a/Utilities/SingleApplication.py Mon Aug 09 15:36:47 2010 +0200 +++ b/Utilities/SingleApplication.py Mon Aug 09 15:49:03 2010 +0200 @@ -28,7 +28,7 @@ self.removeServer(name) self.listen(name) - self.connect(self, SIGNAL("newConnection()"), self.__newConnection) + self.newConnection[()].connect(self.__newConnection) self.qsock = None @@ -45,8 +45,8 @@ self.qsock = sock - self.connect(self.qsock, SIGNAL('readyRead()'), self.__parseLine) - self.connect(self.qsock, SIGNAL('disconnected()'), self.__disconnected) + self.qsock.readyRead[()].connect(self.__parseLine) + self.qsock.disconnected[()].connect(self.__disconnected) def __parseLine(self): """ @@ -78,7 +78,7 @@ Public method used to shut down the server. """ if self.qsock is not None: - self.disconnect(self.qsock, SIGNAL('readyRead()'), self.__parseLine) + self.qsock.readyRead[()].disconnect(self.__parseLine) self.disconnect(self.qsock, SIGNAL('disconnected()'), self.__disconnected) self.qsock = None @@ -164,4 +164,4 @@ @return error string for the last error (string) """ - return self.sock.errorString() + return self.sock.errorString() \ No newline at end of file
--- a/eric5.py Mon Aug 09 15:36:47 2010 +0200 +++ b/eric5.py Mon Aug 09 15:49:03 2010 +0200 @@ -229,7 +229,7 @@ splash.showMessage(QApplication.translate("eric5", "Generating Main Window...")) try: mainWindow = UserInterface(app, loc, splash, pluginFile, noopen, restartArgs) - app.connect(app, SIGNAL("lastWindowClosed()"), app, SLOT("quit()")) + app.lastWindowClosed.connect(app.quit) mainWindow.show() QTimer.singleShot(0, uiStartUp)
