Mon, 09 Aug 2010 18:31:43 +0200
Merged remote changes.
--- a/Debugger/BreakPointViewer.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Debugger/BreakPointViewer.py Mon Aug 09 18:31:43 2010 +0200 @@ -44,8 +44,7 @@ self.setContextMenuPolicy(Qt.CustomContextMenu) self.customContextMenuRequested.connect(self.__showContextMenu) - self.connect(self,SIGNAL('doubleClicked(const QModelIndex &)'), - self.__doubleClicked) + self.doubleClicked.connect(self.__doubleClicked) self.__createPopupMenus()
--- a/Debugger/DebugServer.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Debugger/DebugServer.py Mon Aug 09 18:31:43 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( @@ -287,10 +287,10 @@ # only start the client, if we are not in passive mode if not self.passive: if self.clientProcess: - self.disconnect(self.clientProcess, SIGNAL("readyReadStandardError()"), - self.__clientProcessError) - self.disconnect(self.clientProcess, SIGNAL("readyReadStandardOutput()"), - self.__clientProcessOutput) + self.clientProcess.readyReadStandardError.disconnect( + self.__clientProcessError) + self.clientProcess.readyReadStandardOutput.disconnect( + self.__clientProcessOutput) self.clientProcess.close() self.clientProcess.kill() self.clientProcess.waitForFinished(10000) @@ -312,10 +312,10 @@ self.debuggerInterface.startRemote(self.serverPort(), runInConsole) if self.clientProcess: - self.connect(self.clientProcess, SIGNAL("readyReadStandardError()"), - self.__clientProcessError) - self.connect(self.clientProcess, SIGNAL("readyReadStandardOutput()"), - self.__clientProcessOutput) + self.clientProcess.readyReadStandardError.connect( + self.__clientProcessError) + self.clientProcess.readyReadStandardOutput.connect( + self.__clientProcessOutput) if not isNetworked: # the client is connected through stdin and stdout
--- a/Debugger/DebugViewer.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Debugger/DebugViewer.py Mon Aug 09 18:31:43 2010 +0200 @@ -125,8 +125,7 @@ UI.PixmapCache.getIcon("globalVariables.png"), '') self.__tabWidget.setTabToolTip(index, self.globalsViewer.windowTitle()) - self.connect(self.setGlobalsFilterButton, SIGNAL('clicked()'), - self.__setGlobalsFilter) + self.setGlobalsFilterButton.clicked[()].connect(self.__setGlobalsFilter) self.connect(self.globalsFilterEdit, SIGNAL('returnPressed()'), self.__setGlobalsFilter) @@ -174,12 +173,10 @@ UI.PixmapCache.getIcon("localVariables.png"), '') self.__tabWidget.setTabToolTip(index, self.localsViewer.windowTitle()) - self.connect(self.sourceButton, SIGNAL('clicked()'), - self.__showSource) + self.sourceButton.clicked[()].connect(self.__showSource) self.connect(self.stackComboBox, SIGNAL('activated(int)'), self.__frameSelected) - self.connect(self.setLocalsFilterButton, SIGNAL('clicked()'), - self.__setLocalsFilter) + self.setLocalsFilterButton.clicked[()].connect(self.__setLocalsFilter) self.connect(self.localsFilterEdit, SIGNAL('returnPressed()'), self.__setLocalsFilter) @@ -432,4 +429,4 @@ """ if current is not None and self.__doThreadListUpdate: tid = int(current.text(0)) - self.debugServer.remoteSetThread(tid) + self.debugServer.remoteSetThread(tid) \ No newline at end of file
--- a/Debugger/DebuggerInterfacePython.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Debugger/DebuggerInterfacePython.py Mon Aug 09 18:31:43 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 Fri Aug 06 18:54:40 2010 +0200 +++ b/Debugger/DebuggerInterfacePython3.py Mon Aug 09 18:31:43 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 Fri Aug 06 18:54:40 2010 +0200 +++ b/Debugger/DebuggerInterfaceRuby.py Mon Aug 09 18:31:43 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/Debugger/WatchPointViewer.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Debugger/WatchPointViewer.py Mon Aug 09 18:31:43 2010 +0200 @@ -44,8 +44,7 @@ self.setContextMenuPolicy(Qt.CustomContextMenu) self.customContextMenuRequested.connect(self.__showContextMenu) - self.connect(self,SIGNAL('doubleClicked(const QModelIndex &)'), - self.__doubleClicked) + self.doubleClicked.connect(self.__doubleClicked) self.__createPopupMenus()
--- a/E5Network/E5NetworkMonitor.py Fri Aug 06 18:54:40 2010 +0200 +++ b/E5Network/E5NetworkMonitor.py Mon Aug 09 18:31:43 2010 +0200 @@ -81,18 +81,14 @@ [self.trUtf8("Name"), self.trUtf8("Value")]) self.requestHeadersList.setModel(self.__requestHeaders) self.requestHeadersList.horizontalHeader().setStretchLastSection(True) - self.connect(self.requestHeadersList, - SIGNAL("doubleClicked(const QModelIndex&)"), - self.__showHeaderDetails) + self.requestHeadersList.doubleClicked.connect(self.__showHeaderDetails) self.__replyHeaders = QStandardItemModel(self) self.__replyHeaders.setHorizontalHeaderLabels( [self.trUtf8("Name"), self.trUtf8("Value")]) self.responseHeadersList.setModel(self.__replyHeaders) self.responseHeadersList.horizontalHeader().setStretchLastSection(True) - self.connect(self.responseHeadersList, - SIGNAL("doubleClicked(const QModelIndex&)"), - self.__showHeaderDetails) + self.responseHeadersList.doubleClicked.connect(self.__showHeaderDetails) self.requestsList.horizontalHeader().setStretchLastSection(True) self.requestsList.verticalHeader().setMinimumSectionSize(-1) @@ -102,10 +98,8 @@ self.connect(self.searchEdit, SIGNAL("textChanged(QString)"), self.__proxyModel.setFilterFixedString) - self.connect(self.removeButton, SIGNAL("clicked()"), - self.requestsList.removeSelected) - self.connect(self.removeAllButton, SIGNAL("clicked()"), - self.requestsList.removeAll) + self.removeButton.clicked[()].connect(self.requestsList.removeSelected) + self.removeAllButton.clicked[()].connect(self.requestsList.removeAll) self.__model = E5RequestModel(networkAccessManager, self) self.__proxyModel.setSourceModel(self.__model) @@ -260,7 +254,7 @@ """ self.beginInsertRows(QModelIndex(), len(self.requests), len(self.requests)) self.requests.append(req) - self.connect(req.reply, SIGNAL("finished()"), self.__addReply) + req.reply.finished[()].connect(self.__addReply) self.endInsertRows() def __addReply(self): @@ -380,4 +374,4 @@ self.beginRemoveRows(parent, row, lastRow) del self.requests[row:lastRow + 1] self.endRemoveRows() - return True + return True \ No newline at end of file
--- a/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/AdBlock/AdBlockBlockedNetworkReply.py Mon Aug 09 18:31:43 2010 +0200 @@ -34,9 +34,8 @@ """ Private method to send some signals to end the connection. """ - self.emit(SIGNAL("error(QNetworkReply::NetworkError)"), - QNetworkReply.ContentAccessDenied) - self.emit(SIGNAL("finished()")) + self.error[QNetworkReply.NetworkError].emit(QNetworkReply.ContentAccessDenied) + self.finished.emit() def readData(self, maxlen): """
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Mon Aug 09 18:31:43 2010 +0200 @@ -243,7 +243,7 @@ request = QNetworkRequest(self.location()) self.__downloading = \ Helpviewer.HelpWindow.HelpWindow.networkAccessManager().get(request) - self.connect(self.__downloading, SIGNAL("finished()"), self.__rulesDownloaded) + self.__downloading.finished[()].connect(self.__rulesDownloaded) def __rulesDownloaded(self): """ @@ -267,7 +267,7 @@ request = QNetworkRequest(redirect) self.__downloading = \ Helpviewer.HelpWindow.HelpWindow.networkAccessManager().get(request) - self.connect(self.__downloading, SIGNAL("finished()"), self.__rulesDownloaded) + self.__downloading.finished[()].connect(self.__rulesDownloaded) return if response.isEmpty(): @@ -404,4 +404,4 @@ elif rule.isException(): self.__networkExceptionRules.append(rule) else: - self.__networkBlockRules.append(rule) + self.__networkBlockRules.append(rule) \ No newline at end of file
--- a/Helpviewer/Bookmarks/BookmarksDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/Bookmarks/BookmarksDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -65,10 +65,8 @@ self.bookmarksTree.customContextMenuRequested.connect( self.__customContextMenuRequested) - self.connect(self.removeButton, SIGNAL("clicked()"), - self.bookmarksTree.removeSelected) - self.connect(self.addFolderButton, SIGNAL("clicked()"), - self.__newFolder) + self.removeButton.clicked[()].connect(self.bookmarksTree.removeSelected) + self.addFolderButton.clicked[()].connect(self.__newFolder) self.__expandNodes(self.__bookmarksManager.bookmarks()) @@ -236,4 +234,4 @@ parent = self.__bookmarksModel.node(idx) node = BookmarkNode(BookmarkNode.Folder) node.title = self.trUtf8("New Folder") - self.__bookmarksManager.addBookmark(parent, node, row) + self.__bookmarksManager.addBookmark(parent, node, row) \ No newline at end of file
--- a/Helpviewer/CookieJar/CookiesDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/CookieJar/CookiesDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -37,10 +37,8 @@ self.__cookieJar = cookieJar - self.connect(self.removeButton, SIGNAL("clicked()"), - self.cookiesTable.removeSelected) - self.connect(self.removeAllButton, SIGNAL("clicked()"), - self.cookiesTable.removeAll) + self.removeButton.clicked[()].connect(self.cookiesTable.removeSelected) + self.removeAllButton.clicked[()].connect(self.cookiesTable.removeAll) self.cookiesTable.verticalHeader().hide() model = CookieModel(cookieJar, self) @@ -49,9 +47,7 @@ self.connect(self.searchEdit, SIGNAL("textChanged(QString)"), self.__proxyModel.setFilterFixedString) self.cookiesTable.setModel(self.__proxyModel) - self.connect(self.cookiesTable, - SIGNAL("doubleClicked(const QModelIndex&)"), - self.__showCookieDetails) + self.cookiesTable.doubleClicked.connect(self.__showCookieDetails) self.connect(self.cookiesTable.selectionModel(), SIGNAL("selectionChanged(const QItemSelection&, const QItemSelection&)"), self.__tableSelectionChanged) @@ -139,4 +135,4 @@ """ Private slot to handle a reset of the cookies table. """ - self.addButton.setEnabled(False) + self.addButton.setEnabled(False) \ No newline at end of file
--- a/Helpviewer/CookieJar/CookiesExceptionsDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/CookieJar/CookiesExceptionsDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -36,10 +36,8 @@ self.__cookieJar = cookieJar - self.connect(self.removeButton, SIGNAL("clicked()"), - self.exceptionsTable.removeSelected) - self.connect(self.removeAllButton, SIGNAL("clicked()"), - self.exceptionsTable.removeAll) + self.removeButton.clicked[()].connect(self.exceptionsTable.removeSelected) + self.removeAllButton.clicked[()].connect(self.exceptionsTable.removeAll) self.exceptionsTable.verticalHeader().hide() self.__exceptionsModel = CookieExceptionsModel(cookieJar) @@ -107,4 +105,4 @@ """ Private slot to allow cookies of a domain. """ - self.__exceptionsModel.addRule(self.domainEdit.text(), CookieJar.Allow) + self.__exceptionsModel.addRule(self.domainEdit.text(), CookieJar.Allow) \ No newline at end of file
--- a/Helpviewer/DownloadDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/DownloadDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -82,14 +82,14 @@ 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)"), self.__downloadProgress) self.connect(self.__reply, SIGNAL("metaDataChanged()"), self.__metaDataChanged) - self.connect(self.__reply, SIGNAL("finished()"), self.__finished) + self.__reply.finished[()].connect(self.__finished) # reset info self.infoLabel.clear() @@ -425,15 +425,12 @@ """ self.__output.close() - self.disconnect(self.__reply, SIGNAL("readyRead()"), self.__readyRead) - self.disconnect(self.__reply, SIGNAL("error(QNetworkReply::NetworkError)"), - self.__networkError) - self.disconnect(self.__reply, SIGNAL("downloadProgress(qint64, qint64)"), - self.__downloadProgress) - self.disconnect(self.__reply, SIGNAL("metaDataChanged()"), - self.__metaDataChanged) - self.disconnect(self.__reply, SIGNAL("finished()"), self.__finished) + self.__reply.readyRead[()].disconnect(self.__readyRead) + self.__reply.error[QNetworkReply.NetworkError].disconnect(self.__networkError) + self.__reply.downloadProgress[int, int].disconnect(self.__downloadProgress) + self.__reply.metaDataChanged[()].disconnect(self.__metaDataChanged) + self.__reply.finished[()].disconnect(self.__finished) self.__reply.close() self.__reply.deleteLater() - self.done.emit() + self.done.emit() \ No newline at end of file
--- a/Helpviewer/HelpWebSearchWidget.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/HelpWebSearchWidget.py Mon Aug 09 18:31:43 2010 +0200 @@ -72,11 +72,11 @@ self.__completer.setCompletionMode(QCompleter.UnfilteredPopupCompletion) self.__completer.setWidget(self.__searchEdit) - self.connect(self.__searchButton, SIGNAL("clicked()"), self.__searchButtonClicked) + self.__searchButton.clicked[()].connect(self.__searchButtonClicked) self.connect(self.__searchEdit, SIGNAL("textEdited(const QString&)"), self.__textEdited) - self.connect(self.__clearButton, SIGNAL("clicked()"), self.__searchEdit.clear) - self.connect(self.__searchEdit, SIGNAL("returnPressed()"), self.__searchNow) + self.__clearButton.clicked[()].connect(self.__searchEdit.clear) + self.__searchEdit.returnPressed[()].connect(self.__searchNow) self.connect(self.__completer, SIGNAL("activated(const QModelIndex &)"), self.__completerActivated) self.connect(self.__completer, SIGNAL("highlighted(const QModelIndex &)"), @@ -386,4 +386,4 @@ Private slot to handle a change of the current search engine icon. """ self.__engineButton.setIcon( - QIcon(QPixmap.fromImage(self.__openSearchManager.currentEngine().image()))) + QIcon(QPixmap.fromImage(self.__openSearchManager.currentEngine().image()))) \ No newline at end of file
--- a/Helpviewer/HelpWindow.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/HelpWindow.py Mon Aug 09 18:31:43 2010 +0200 @@ -190,7 +190,7 @@ self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) self.closeButton.setToolTip(self.trUtf8("Close the current help window")) self.closeButton.setEnabled(False) - self.connect(self.closeButton, SIGNAL("clicked(bool)"), self.__close) + self.closeButton.clicked[bool].connect(self.__close) self.rightCornerWidgetLayout.addWidget(self.closeButton) else: self.tabWidget.setTabsClosable(True) @@ -204,7 +204,7 @@ self.newTabButton.setIcon(UI.PixmapCache.getIcon("new.png")) self.newTabButton.setToolTip(self.trUtf8("Open a new help window tab")) self.tabWidget.setCornerWidget(self.newTabButton, Qt.TopLeftCorner) - self.connect(self.newTabButton, SIGNAL("clicked(bool)"), self.newTab) + self.newTabButton.clicked[bool].connect(self.newTab) if Preferences.getHelp("SaveGeometry"): g = Preferences.getGeometry("HelpViewerGeometry") @@ -3013,4 +3013,4 @@ else: print(codecs[offset]) QWebSettings.globalSettings().setDefaultTextEncoding(codecs[offset]) - Preferences.setHelp("DefaultTextEncoding", codecs[offset]) + Preferences.setHelp("DefaultTextEncoding", codecs[offset]) \ No newline at end of file
--- a/Helpviewer/History/HistoryDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/History/HistoryDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -63,10 +63,8 @@ self.connect(self.searchEdit, SIGNAL("textChanged(QString)"), self.__proxyModel.setFilterFixedString) - self.connect(self.removeButton, SIGNAL("clicked()"), - self.historyTree.removeSelected) - self.connect(self.removeAllButton, SIGNAL("clicked()"), - self.__historyManager.clear) + self.removeButton.clicked[()].connect(self.historyTree.removeSelected) + self.removeAllButton.clicked[()].connect(self.__historyManager.clear) self.connect(self.__proxyModel, SIGNAL("modelReset()"), self.__modelReset) @@ -140,4 +138,4 @@ url = idx.data(HistoryModel.UrlStringRole) clipboard = QApplication.clipboard() - clipboard.setText(url) + clipboard.setText(url) \ No newline at end of file
--- a/Helpviewer/Network/NetworkAccessManagerProxy.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/Network/NetworkAccessManagerProxy.py Mon Aug 09 18:31:43 2010 +0200 @@ -8,7 +8,7 @@ """ from PyQt4.QtCore import SIGNAL -from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest +from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply class NetworkAccessManagerProxy(QNetworkAccessManager): """ @@ -60,8 +60,7 @@ SIGNAL('authenticationRequired(QNetworkReply *, QAuthenticator *)'), self.__class__.primaryManager, SIGNAL('authenticationRequired(QNetworkReply *, QAuthenticator *)')) - self.connect(self, SIGNAL("finished(QNetworkReply *)"), - self.__class__.primaryManager, SIGNAL("finished(QNetworkReply *)")) + self.finished[QNetworkReply].connect(self.__class__.primaryManager.finished) def createRequest(self, op, request, outgoingData = None): """
--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py Mon Aug 09 18:31:43 2010 +0200 @@ -32,7 +32,7 @@ """ self.emit(SIGNAL("error(QNetworkReply::NetworkError)"), QNetworkReply.ProtocolUnknownError) - self.emit(SIGNAL("finished()")) + self.finished[()].emit() def abort(self): """
--- a/Helpviewer/OpenSearch/OpenSearchEngine.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchEngine.py Mon Aug 09 18:31:43 2010 +0200 @@ -307,7 +307,7 @@ reply = self.__networkAccessManager.get( QNetworkRequest(QUrl.fromEncoded(self._imageUrl))) - self.connect(reply, SIGNAL("finished()"), self.__imageObtained) + reply.finished[()].connect(self.__imageObtained) self.__replies.append(reply) def __imageObtained(self): @@ -413,8 +413,7 @@ return if self.__suggestionsReply is not None: - self.disconnect(self.__suggestionsReply, SIGNAL("finished()"), - self.__suggestionsObtained) + self.__suggestionsReply.finished[()].disconnect(self.__suggestionsObtained) self.__suggestionsReply.abort() self.__suggestionsReply = None @@ -432,8 +431,7 @@ data = "&".join(parameters) self.__suggestionsReply = self.networkAccessManager().post( QNetworkRequest(self.suggestionsUrl(searchTerm)), data) - self.connect(self.__suggestionsReply, SIGNAL("finished()"), - self.__suggestionsObtained) + self.__suggestionsReply.finished[()].connect(self.__suggestionsObtained) def __suggestionsObtained(self): """
--- a/Helpviewer/OpenSearch/OpenSearchManager.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/OpenSearch/OpenSearchManager.py Mon Aug 09 18:31:43 2010 +0200 @@ -170,7 +170,7 @@ from Helpviewer.HelpWindow import HelpWindow reply = HelpWindow.networkAccessManager().get(QNetworkRequest(url)) - self.connect(reply, SIGNAL("finished()"), self.__engineFromUrlAvailable) + reply.finished[()].connect(self.__engineFromUrlAvailable) reply.setParent(self) self.__replies.append(reply) @@ -514,4 +514,4 @@ """ Public slot to tell the search engine manager, that something has changed. """ - self.emit(SIGNAL("changed()")) + self.emit(SIGNAL("changed()")) \ No newline at end of file
--- a/Helpviewer/Passwords/PasswordsDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Helpviewer/Passwords/PasswordsDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -37,10 +37,8 @@ self.__hidePasswordsText = self.trUtf8("Hide Passwords") self.passwordsButton.setText(self.__showPasswordsText) - self.connect(self.removeButton, SIGNAL("clicked()"), - self.passwordsTable.removeSelected) - self.connect(self.removeAllButton, SIGNAL("clicked()"), - self.passwordsTable.removeAll) + self.removeButton.clicked[()].connect(self.passwordsTable.removeSelected) + self.removeAllButton.clicked[()].connect(self.passwordsTable.removeAll) self.passwordsTable.verticalHeader().hide() self.__passwordModel = \ @@ -95,4 +93,4 @@ if res == QMessageBox.Yes: self.__passwordModel.setShowPasswords(True) self.passwordsButton.setText(self.__hidePasswordsText) - self.__calculateHeaderSizes() + self.__calculateHeaderSizes() \ No newline at end of file
--- a/IconEditor/IconEditorPalette.py Fri Aug 06 18:54:40 2010 +0200 +++ b/IconEditor/IconEditorPalette.py Mon Aug 09 18:31:43 2010 +0200 @@ -64,7 +64,7 @@ """<b>Select Color</b>""" """<p>Select the current drawing color via a color selection dialog.</p>""" )) - self.connect(self.__colorButton, SIGNAL("clicked()"), self.__selectColor) + self.__colorButton.clicked[()].connect(self.__selectColor) self.__layout.addWidget(self.__colorButton) self.__colorAlpha = QSpinBox(self) @@ -122,4 +122,4 @@ if val != self.__currentAlpha: col = QColor(self.__currentColor) col.setAlpha(val) - self.emit(SIGNAL("colorSelected(QColor)"), col) + self.emit(SIGNAL("colorSelected(QColor)"), col) \ No newline at end of file
--- a/PluginManager/PluginInstallDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/PluginManager/PluginInstallDialog.py Mon Aug 09 18:31:43 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 Fri Aug 06 18:54:40 2010 +0200 +++ b/PluginManager/PluginRepositoryDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -344,7 +344,7 @@ self.__downloadCancelled = False reply = self.__networkManager.get(QNetworkRequest(QUrl(url))) - self.connect(reply, SIGNAL("finished()"), self.__downloadFileDone) + reply.finished[()].connect(self.__downloadFileDone) self.connect(reply, SIGNAL("downloadProgress(qint64, qint64)"), self.__downloadProgress) self.__replies.append(reply) @@ -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): @@ -603,4 +603,4 @@ ).format(applPath), self.trUtf8('OK')) - self.close() + self.close() \ No newline at end of file
--- a/PluginManager/PluginUninstallDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/PluginManager/PluginUninstallDialog.py Mon Aug 09 18:31:43 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/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/CheckerPlugins/SyntaxChecker/SyntaxCheckerDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -130,7 +130,7 @@ try: source = Utilities.readEncodedFile(file)[0] # convert eols - source = Utilities.convertLineEnds(source, os.linesep) + source = Utilities.convertLineEnds(source, "\n") except (UnicodeDecodeError, IOError): continue # just ignore it
--- a/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/DocumentationPlugins/Ericapi/EricapiExecDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -71,12 +71,9 @@ self.process = QProcess() self.process.setWorkingDirectory(dname) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__finish) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + self.process.finished.connect(self.__finish) self.setWindowTitle(self.trUtf8('{0} - {1}').format(self.cmdname, self.filename)) self.process.start(program, args)
--- a/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/DocumentationPlugins/Ericdoc/EricdocExecDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -71,13 +71,10 @@ self.process = QProcess() self.process.setWorkingDirectory(dname) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__finish) - + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) + self.process.finished.connect(self.__finish) + self.setWindowTitle(self.trUtf8('{0} - {1}').format(self.cmdname, self.filename)) self.process.start(program, args) procStarted = self.process.waitForStarted() @@ -155,4 +152,4 @@ Preferences.getSystem("IOEncoding"), 'replace') self.errors.insertPlainText(s) - self.errors.ensureCursorVisible() \ No newline at end of file + self.errors.ensureCursorVisible()
--- a/Plugins/PluginAbout.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/PluginAbout.py Mon Aug 09 18:31:43 2010 +0200 @@ -7,7 +7,7 @@ Module implementing the About plugin. """ -from PyQt4.QtCore import QObject, SIGNAL +from PyQt4.QtCore import QObject from PyQt4.QtGui import QMessageBox from UI.Info import * @@ -124,4 +124,4 @@ """ Private slot to handle the About Qt dialog. """ - QMessageBox.aboutQt(self.__ui, Program) \ No newline at end of file + QMessageBox.aboutQt(self.__ui, Program)
--- a/Plugins/PluginWizardPyRegExp.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/PluginWizardPyRegExp.py Mon Aug 09 18:31:43 2010 +0200 @@ -7,7 +7,7 @@ Module implementing the Python re wizard plugin. """ -from PyQt4.QtCore import QObject, SIGNAL +from PyQt4.QtCore import QObject from PyQt4.QtGui import QDialog, QMessageBox from E5Gui.E5Application import e5App @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() \ No newline at end of file + editor.endUndoAction()
--- a/Plugins/PluginWizardQColorDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/PluginWizardQColorDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -7,7 +7,7 @@ Module implementing the QColorDialog wizard plugin. """ -from PyQt4.QtCore import QObject, SIGNAL +from PyQt4.QtCore import QObject from PyQt4.QtGui import QDialog, QMessageBox from E5Gui.E5Application import e5App @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() \ No newline at end of file + editor.endUndoAction()
--- a/Plugins/PluginWizardQFileDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/PluginWizardQFileDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -7,7 +7,7 @@ Module implementing the QFileDialog wizard plugin. """ -from PyQt4.QtCore import QObject, SIGNAL +from PyQt4.QtCore import QObject from PyQt4.QtGui import QDialog, QMessageBox from E5Gui.E5Application import e5App @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() \ No newline at end of file + editor.endUndoAction()
--- a/Plugins/PluginWizardQFontDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/PluginWizardQFontDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -7,7 +7,7 @@ Module implementing the QFontDialog wizard plugin. """ -from PyQt4.QtCore import QObject, SIGNAL +from PyQt4.QtCore import QObject from PyQt4.QtGui import QDialog, QMessageBox from E5Gui.E5Application import e5App @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() \ No newline at end of file + editor.endUndoAction()
--- a/Plugins/PluginWizardQInputDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/PluginWizardQInputDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -7,7 +7,7 @@ Module implementing the QInputDialog wizard plugin. """ -from PyQt4.QtCore import QObject, SIGNAL +from PyQt4.QtCore import QObject from PyQt4.QtGui import QDialog, QMessageBox from E5Gui.E5Application import e5App @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() \ No newline at end of file + editor.endUndoAction()
--- a/Plugins/PluginWizardQMessageBox.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/PluginWizardQMessageBox.py Mon Aug 09 18:31:43 2010 +0200 @@ -7,7 +7,7 @@ Module implementing the QMessageBox wizard plugin. """ -from PyQt4.QtCore import QObject, SIGNAL +from PyQt4.QtCore import QObject from PyQt4.QtGui import QDialog, QMessageBox from E5Gui.E5Application import e5App @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() \ No newline at end of file + editor.endUndoAction()
--- a/Plugins/PluginWizardQRegExp.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/PluginWizardQRegExp.py Mon Aug 09 18:31:43 2010 +0200 @@ -7,7 +7,7 @@ Module implementing the QRegExp wizard plugin. """ -from PyQt4.QtCore import QObject, SIGNAL +from PyQt4.QtCore import QObject from PyQt4.QtGui import QDialog, QMessageBox from E5Gui.E5Application import e5App @@ -126,4 +126,4 @@ # It should be done on this way to allow undo editor.beginUndoAction() editor.insertAt(code, line, index) - editor.endUndoAction() \ No newline at end of file + editor.endUndoAction()
--- a/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgAnnotateDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import pyqtSlot, SIGNAL, QProcess, QTimer, Qt +from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, Qt from PyQt4.QtGui import QDialog, QDialogButtonBox, QFont, QMessageBox, QHeaderView, \ QTreeWidgetItem, QLineEdit @@ -48,12 +48,9 @@ self.__ioEncoding = Preferences.getSystem("IOEncoding") - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) def closeEvent(self, e): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import QProcess, QTimer, SIGNAL, pyqtSlot, Qt +from PyQt4.QtCore import QProcess, QTimer, pyqtSlot, Qt from PyQt4.QtGui import QDialog, QDialogButtonBox, QMessageBox, QLineEdit from .Ui_HgDialog import Ui_HgDialog @@ -119,12 +119,9 @@ self.resultbox.append(' '.join(args)) self.resultbox.append('') - self.connect(self.proc, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.proc, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.proc, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.proc.finished.connect(self.__procFinished) + self.proc.readyReadStandardOutput.connect(self.__readStdout) + self.proc.readyReadStandardError.connect(self.__readStderr) if workingDir: self.proc.setWorkingDirectory(workingDir)
--- a/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgDiffDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import pyqtSlot, QProcess, SIGNAL, QTimer, QFileInfo +from PyQt4.QtCore import pyqtSlot, QProcess, QTimer, QFileInfo from PyQt4.QtGui import QWidget, QDialogButtonBox, QBrush, QColor, QMessageBox, \ QTextCursor, QFileDialog, QLineEdit @@ -51,12 +51,9 @@ self.cLineNoFormat = self.contents.currentCharFormat() self.cLineNoFormat.setBackground(QBrush(QColor(255, 220, 168))) - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) def closeEvent(self, e): """
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogBrowserDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import pyqtSlot, SIGNAL, Qt, QDate, QProcess, QTimer, QRegExp, QSize +from PyQt4.QtCore import pyqtSlot, Qt, QDate, QProcess, QTimer, QRegExp, QSize from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, \ QApplication, QMessageBox, QCursor, QWidget, QLineEdit, QColor, QPixmap, \ QPainter, QPen, QBrush, QIcon @@ -84,12 +84,9 @@ self.__parentsRole = Qt.UserRole + 3 self.process = QProcess() - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) self.flags = { 'A' : self.trUtf8('Added'),
--- a/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgLogDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -53,12 +53,9 @@ self.contents.setHtml(\ self.trUtf8('<b>Processing your request, please wait...</b>')) - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) self.connect(self.contents, SIGNAL('anchorClicked(const QUrl&)'), self.__sourceChanged)
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -153,12 +153,9 @@ self.process.kill() else: self.process = QProcess() - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) args = [] args.append('status')
--- a/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgTagBranchListDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -9,7 +9,7 @@ import os -from PyQt4.QtCore import pyqtSlot, SIGNAL, QProcess, Qt, QTimer +from PyQt4.QtCore import pyqtSlot, QProcess, Qt, QTimer from PyQt4.QtGui import QDialog, QDialogButtonBox, QHeaderView, QTreeWidgetItem, \ QMessageBox, QLineEdit @@ -42,12 +42,9 @@ self.tagList.headerItem().setText(self.tagList.columnCount(), "") self.tagList.header().setSortIndicator(3, Qt.AscendingOrder) - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) def closeEvent(self, e): """
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon Aug 09 18:31:43 2010 +0200 @@ -9,7 +9,6 @@ import os -from PyQt4.QtCore import SIGNAL from PyQt4.QtGui import QMenu from E5Gui.E5Application import e5App @@ -1060,4 +1059,4 @@ """ Protected slot used to serve the project. """ - self.vcs.hgServe(self.project.ppath) \ No newline at end of file + self.vcs.hgServe(self.project.ppath)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnBlameDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -45,12 +45,9 @@ self.__ioEncoding = Preferences.getSystem("IOEncoding") - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) def closeEvent(self, e): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -116,12 +116,9 @@ self.resultbox.append(' '.join(nargs)) self.resultbox.append('') - self.connect(self.proc, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.proc, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.proc, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.proc.finished.connect(self.__procFinished) + self.proc.readyReadStandardOutput.connect(self.__readStdout) + self.proc.readyReadStandardError.connect(self.__readStderr) if workingDir: self.proc.setWorkingDirectory(workingDir)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnDiffDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -52,12 +52,9 @@ self.cLineNoFormat = self.contents.currentCharFormat() self.cLineNoFormat.setBackground(QBrush(QColor(255, 220, 168))) - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) def closeEvent(self, e): """
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogBrowserDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -59,12 +59,9 @@ self.__changesRole = Qt.UserRole + 1 self.process = QProcess() - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) self.rx_sep1 = QRegExp('\\-+\\s*') self.rx_sep2 = QRegExp('=+\\s*')
--- a/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnLogDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -43,12 +43,9 @@ self.contents.setHtml(\ self.trUtf8('<b>Processing your request, please wait...</b>')) - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) self.connect(self.contents, SIGNAL('anchorClicked(const QUrl&)'), self.__sourceChanged)
--- a/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnPropListDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -37,12 +37,9 @@ self.propsList.headerItem().setText(self.propsList.columnCount(), "") self.propsList.header().setSortIndicator(0, Qt.AscendingOrder) - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) self.rx_path = QRegExp(r"Properties on '([^']+)':\s*") self.rx_prop = QRegExp(r" (.*) : (.*)[\r\n]")
--- a/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnRepoBrowserDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -219,12 +219,9 @@ self.process.kill() else: self.process = QProcess() - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) args = [] args.append('list') @@ -455,4 +452,3 @@ evt.accept() return QWidget.keyPressEvent(self, evt) -
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -268,12 +268,9 @@ self.process.kill() else: self.process = QProcess() - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) args = [] args.append('status')
--- a/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnTagBranchListDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -39,12 +39,9 @@ self.tagList.headerItem().setText(self.tagList.columnCount(), "") self.tagList.header().setSortIndicator(3, Qt.AscendingOrder) - self.connect(self.process, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__procFinished) - self.connect(self.process, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.process, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.process.finished.connect(self.__procFinished) + self.process.readyReadStandardOutput.connect(self.__readStdout) + self.process.readyReadStandardError.connect(self.__readStderr) self.rx_list = \ QRegExp(r"""\w*\s*(\d+)\s+(\w+)\s+\d*\s*((?:\w+\s+\d+|[0-9.]+\s+\w+)\s+[0-9:]+)\s+(.+)/\s*""")
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Mon Aug 09 18:31:43 2010 +0200 @@ -189,8 +189,7 @@ self.closeButton.setIcon(UI.PixmapCache.getIcon("close.png")) self.closeButton.setToolTip(self.trUtf8("Close the current editor")) self.closeButton.setEnabled(False) - self.connect(self.closeButton, SIGNAL("clicked(bool)"), - self.__closeButtonClicked) + self.closeButton.clicked[bool].connect(self.__closeButtonClicked) self.rightCornerWidgetLayout.addWidget(self.closeButton) else: self.connect(self, SIGNAL("tabCloseRequested(int)"), @@ -1096,4 +1095,4 @@ for tw in self.tabWidgets: if id(tw) == id_: return tw - return None + return None \ No newline at end of file
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardCharactersDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -84,7 +84,7 @@ hspacer0 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) hlayout0.addItem(hspacer0) self.singlesBoxLayout.addLayout(hlayout0) - self.connect(self.moreSinglesButton, SIGNAL("clicked()"), self.__addSinglesLine) + self.moreSinglesButton.clicked[()].connect(self.__addSinglesLine) # generate dialog part for character ranges self.rangesBoxLayout = QVBoxLayout(self.rangesBox) @@ -117,7 +117,7 @@ hspacer1 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) hlayout1.addItem(hspacer1) self.rangesBoxLayout.addLayout(hlayout1) - self.connect(self.moreRangesButton, SIGNAL("clicked()"), self.__addRangesLine) + self.moreRangesButton.clicked[()].connect(self.__addRangesLine) def __addSinglesLine(self): """ @@ -306,4 +306,4 @@ else: return "[{0}]".format(regexp) else: - return "" + return "" \ No newline at end of file
--- a/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/WizardPlugins/PyRegExpWizard/PyRegExpWizardDialog.py Mon Aug 09 18:31:43 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/QRegExpWizardCharactersDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardCharactersDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -84,7 +84,7 @@ hspacer0 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) hlayout0.addItem(hspacer0) self.singlesBoxLayout.addLayout(hlayout0) - self.connect(self.moreSinglesButton, SIGNAL("clicked()"), self.__addSinglesLine) + self.moreSinglesButton.clicked[()].connect(self.__addSinglesLine) # generate dialog part for character ranges self.rangesBoxLayout = QVBoxLayout(self.rangesBox) @@ -117,7 +117,7 @@ hspacer1 = QSpacerItem(30,20,QSizePolicy.Expanding,QSizePolicy.Minimum) hlayout1.addItem(hspacer1) self.rangesBoxLayout.addLayout(hlayout1) - self.connect(self.moreRangesButton, SIGNAL("clicked()"), self.__addRangesLine) + self.moreRangesButton.clicked[()].connect(self.__addRangesLine) def __addSinglesLine(self): """ @@ -306,4 +306,4 @@ else: return "[{0}]".format(regexp) else: - return "" + return "" \ No newline at end of file
--- a/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Plugins/WizardPlugins/QRegExpWizard/QRegExpWizardDialog.py Mon Aug 09 18:31:43 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 Fri Aug 06 18:54:40 2010 +0200 +++ b/Preferences/ConfigurationDialog.py Mon Aug 09 18:31:43 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/Preferences/ConfigurationPages/EditorKeywordsPage.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Preferences/ConfigurationPages/EditorKeywordsPage.py Mon Aug 09 18:31:43 2010 +0200 @@ -8,7 +8,6 @@ """ from PyQt4.QtCore import pyqtSlot -from PyQt4.QtGui import QWidget from .ConfigurationPageBase import ConfigurationPageBase from .Ui_EditorKeywordsPage import Ui_EditorKeywordsPage
--- a/Preferences/ShortcutDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Preferences/ShortcutDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -38,10 +38,10 @@ self.noCheck = False self.objectType = None - self.connect(self.primaryClearButton, SIGNAL("clicked()"), self.__clear) - self.connect(self.alternateClearButton, SIGNAL("clicked()"), self.__clear) - self.connect(self.primaryButton, SIGNAL("clicked()"), self.__typeChanged) - self.connect(self.alternateButton, SIGNAL("clicked()"), self.__typeChanged) + self.primaryClearButton.clicked[()].connect(self.__clear) + self.alternateClearButton.clicked[()].connect(self.__clear) + self.primaryButton.clicked[()].connect(self.__typeChanged) + self.alternateButton.clicked[()].connect(self.__typeChanged) self.shortcutsGroup.installEventFilter(self) self.primaryButton.installEventFilter(self) @@ -166,4 +166,4 @@ self.keys[2]).toString()) elif self.keyIndex == 4: self.__setKeyLabelText(QKeySequence(self.keys[0], self.keys[1], - self.keys[2], self.keys[3]).toString()) + self.keys[2], self.keys[3]).toString()) \ No newline at end of file
--- a/Project/ProjectFormsBrowser.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Project/ProjectFormsBrowser.py Mon Aug 09 18:31:43 2010 +0200 @@ -686,12 +686,9 @@ args.append('-x') args.append(fn) - self.connect(self.compileProc, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__compileUIDone) - self.connect(self.compileProc, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.compileProc, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.compileProc.finished.connect(self.__compileUIDone) + self.compileProc.readyReadStandardOutput.connect(self.__readStdout) + self.compileProc.readyReadStandardError.connect(self.__readStderr) self.noDialog = noDialog self.compileProc.start(uic, args)
--- a/Project/ProjectInterfacesBrowser.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Project/ProjectInterfacesBrowser.py Mon Aug 09 18:31:43 2010 +0200 @@ -475,12 +475,9 @@ args.append("-C{0}".format(os.path.dirname(fn))) args.append(fn) - self.connect(self.compileProc, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__compileIDLDone) - self.connect(self.compileProc, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.compileProc, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.compileProc.finished.connect(self.__compileIDLDone) + self.compileProc.readyReadStandardOutput.connect(self.__readStdout) + self.compileProc.readyReadStandardError.connect(self.__readStderr) self.noDialog = noDialog self.compileProc.start(self.omniidl, args)
--- a/Project/ProjectResourcesBrowser.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Project/ProjectResourcesBrowser.py Mon Aug 09 18:31:43 2010 +0200 @@ -586,12 +586,9 @@ dirname, self.RCFilenameFormatRuby.format(filename)) args.append(fn) - self.connect(self.compileProc, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__compileQRCDone) - self.connect(self.compileProc, SIGNAL('readyReadStandardOutput()'), - self.__readStdout) - self.connect(self.compileProc, SIGNAL('readyReadStandardError()'), - self.__readStderr) + self.compileProc.finished.connect(self.__compileQRCDone) + self.compileProc.readyReadStandardOutput.connect(self.__readStdout) + self.compileProc.readyReadStandardError.connect(self.__readStderr) self.noDialog = noDialog self.compileProc.start(rcc, args)
--- a/Project/ProjectTranslationsBrowser.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Project/ProjectTranslationsBrowser.py Mon Aug 09 18:31:43 2010 +0200 @@ -906,12 +906,9 @@ args.append('-verbose') args.append(self.tmpProject) self.pylupdateProc.setWorkingDirectory(self.project.ppath) - self.connect(self.pylupdateProc, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__generateTSFileDone) - self.connect(self.pylupdateProc, SIGNAL('readyReadStandardOutput()'), - self.__readStdoutLupdate) - self.connect(self.pylupdateProc, SIGNAL('readyReadStandardError()'), - self.__readStderrLupdate) + self.pylupdateProc.finished.connect(self.__generateTSFileDone) + self.pylupdateProc.readyReadStandardOutput.connect(self.__readStdoutLupdate) + self.pylupdateProc.readyReadStandardError.connect(self.__readStderrLupdate) self.pylupdateProc.start(self.pylupdate, args) procStarted = self.pylupdateProc.waitForStarted() @@ -1038,12 +1035,9 @@ args.append('-verbose') args.append(self.tmpProject) self.lreleaseProc.setWorkingDirectory(self.project.ppath) - self.connect(self.lreleaseProc, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__releaseTSFileDone) - self.connect(self.lreleaseProc, SIGNAL('readyReadStandardOutput()'), - self.__readStdoutLrelease) - self.connect(self.lreleaseProc, SIGNAL('readyReadStandardError()'), - self.__readStderrLrelease) + self.lreleaseProc.finished.connect(self.__releaseTSFileDone) + self.lreleaseProc.readyReadStandardOutput.connect(self.__readStdoutLrelease) + self.lreleaseProc.readyReadStandardError.connect(self.__readStderrLrelease) self.lreleaseProc.start(lrelease, args) procStarted = self.lreleaseProc.waitForStarted()
--- a/PyUnit/UnittestDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/PyUnit/UnittestDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -480,8 +480,7 @@ # one more button if called from eric if self.dbs: - self.dlg.connect(ui.showButton, SIGNAL("clicked()"), - self.__showSource) + ui.showButton.clicked[()].connect(self.__showSource) else: ui.showButton.hide()
--- a/QScintilla/Terminal.py Fri Aug 06 18:54:40 2010 +0200 +++ b/QScintilla/Terminal.py Mon Aug 09 18:31:43 2010 +0200 @@ -161,10 +161,9 @@ self.__process.setProcessChannelMode(QProcess.MergedChannels) self.__process.setReadChannel(QProcess.StandardOutput) - self.connect(self.__process, SIGNAL("readyReadStandardOutput()"), - self.__readOutput) - self.connect(self.__process, SIGNAL("started()"), self.__started) - self.connect(self.__process, SIGNAL("finished(int)"), self.__finished) + self.__process.readyReadStandardOutput.connect(self.__readOutput) + self.__process.started.connect(self.__started) + self.__process.finished.connect(self.__finished) self.__ctrl = {} for ascii_number, letter in enumerate("abcdefghijklmnopqrstuvwxyz"): @@ -931,4 +930,4 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("terminalPage") \ No newline at end of file + e5App().getObject("UserInterface").showPreferences("terminalPage")
--- a/Templates/TemplateMultipleVariablesDialog.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Templates/TemplateMultipleVariablesDialog.py Mon Aug 09 18:31:43 2010 +0200 @@ -100,8 +100,8 @@ # polish up the dialog self.resize(QSize(400, 480).expandedTo(self.minimumSizeHint())) - self.connect(self.okButton, SIGNAL("clicked()"), self.accept) - self.connect(self.cancelButton, SIGNAL("clicked()"), self.reject) + self.okButton.clicked[()].connect(self.accept) + self.cancelButton.clicked[()].connect(self.reject) def getVariables(self): """ @@ -115,4 +115,4 @@ values[var] = textEdit.text() except AttributeError: values[var] = textEdit.toPlainText() - return values + return values \ No newline at end of file
--- a/UI/UserInterface.py Fri Aug 06 18:54:40 2010 +0200 +++ b/UI/UserInterface.py Mon Aug 09 18:31:43 2010 +0200 @@ -4459,13 +4459,10 @@ .format(program, tool['arguments']) self.appendToStdout(t) - self.connect(proc, SIGNAL('finished(int, QProcess::ExitStatus)'), - self.__toolFinished) + proc.finished.connect(self.__toolFinished) if tool['redirect'] != 'no': - self.connect(proc, SIGNAL('readyReadStandardOutput()'), - self.__processToolStdout) - self.connect(proc, SIGNAL('readyReadStandardError()'), - self.__processToolStderr) + proc.readyReadStandardOutput.connect(self.__processToolStdout) + proc.readyReadStandardError.connect(self.__processToolStderr) if tool['redirect'] in ["insert", "replaceSelection"]: aw = self.viewmanager.activeWindow() procData = (aw, tool['redirect'], []) @@ -5527,7 +5524,7 @@ .format(url.host())) self.__versionCheckProgress.setValue(alternative) reply = self.__networkManager.get(QNetworkRequest(url)) - self.connect(reply, SIGNAL("finished()"), self.__versionsDownloadDone) + reply.finished[()].connect(self.__versionsDownloadDone) self.__replies.append(reply) def __versionsDownloadDone(self):
--- a/Utilities/SingleApplication.py Fri Aug 06 18:54:40 2010 +0200 +++ b/Utilities/SingleApplication.py Mon Aug 09 18:31:43 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 Fri Aug 06 18:54:40 2010 +0200 +++ b/eric5.py Mon Aug 09 18:31:43 2010 +0200 @@ -18,8 +18,7 @@ import time import logging -from PyQt4.QtCore import QTextCodec, SIGNAL, SLOT, qWarning, \ - QLibraryInfo, QTimer +from PyQt4.QtCore import QTextCodec, qWarning, QLibraryInfo, QTimer from PyQt4.QtGui import QApplication, QErrorMessage # some global variables needed to start the application @@ -229,7 +228,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)