Mercurial Repositories > eric / changeset

--- a/Helpviewer/Network/NetworkAccessManager.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/Network/NetworkAccessManager.py	Wed Aug 11 14:54:13 2010 +0200
@@ -11,7 +11,7 @@
 
 from PyQt4.QtCore import *
 from PyQt4.QtGui import QDialog, QMessageBox
-from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
+from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 try:
     from PyQt4.QtNetwork import QSsl, QSslCertificate, QSslConfiguration, QSslSocket
     SSL_AVAILABLE = True
@@ -46,6 +46,9 @@
     @signal requestCreated(QNetworkAccessManager::Operation, const QNetworkRequest&, QNetworkReply*)
         emitted after the request has been created
     """
+    requestCreated = pyqtSignal(
+        QNetworkAccessManager.Operation, QNetworkRequest, QNetworkReply)
+    
     def __init__(self, engine, parent = None):
         """
         Constructor
@@ -75,16 +78,10 @@
             sslCfg.setCaCertificates(caList)
             QSslConfiguration.setDefaultConfiguration(sslCfg)
             
-            self.connect(self, 
-                SIGNAL('sslErrors(QNetworkReply *, const QList<QSslError> &)'), 
-                self.__sslErrors)
+            self.sslErrors.connect(self.__sslErrors)
         
-        self.connect(self, 
-            SIGNAL('proxyAuthenticationRequired(const QNetworkProxy&, QAuthenticator*)'),
-            proxyAuthenticationRequired)
-        self.connect(self, 
-            SIGNAL('authenticationRequired(QNetworkReply *, QAuthenticator *)'), 
-            self.__authenticationRequired)
+        self.proxyAuthenticationRequired.connect(proxyAuthenticationRequired)
+        self.authenticationRequired.connect(self.__authenticationRequired)
         
         # register scheme handlers
         self.setSchemeHandler("qthelp", QtHelpAccessHandler(engine, self))
@@ -144,8 +141,7 @@
                 return reply
         
         reply = QNetworkAccessManager.createRequest(self, op, req, outgoingData)
-        self.emit(SIGNAL("requestCreated(QNetworkAccessManager::Operation, const QNetworkRequest&, QNetworkReply*)"), 
-                  op, req, reply)
+        self.requestCreated.emit(op, req, reply)
         
         return reply
     

--- a/Helpviewer/Network/NetworkAccessManagerProxy.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/Network/NetworkAccessManagerProxy.py	Wed Aug 11 14:54:13 2010 +0200
@@ -7,7 +7,6 @@
 Module implementing a network access manager proxy for web pages.
 """
 
-from PyQt4.QtCore import SIGNAL
 from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 
 class NetworkAccessManagerProxy(QNetworkAccessManager):
@@ -48,18 +47,11 @@
         # do not steal ownership
         self.cookieJar().setParent(self.__class__.primaryManager)
         
-        self.connect(self, 
-            SIGNAL('sslErrors(QNetworkReply *, const QList<QSslError> &)'), 
-            self.__class__.primaryManager, 
-            SIGNAL('sslErrors(QNetworkReply *, const QList<QSslError> &)'))
-        self.connect(self, 
-            SIGNAL('proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)'),
-            self.__class__.primaryManager, 
-            SIGNAL('proxyAuthenticationRequired(const QNetworkProxy &, QAuthenticator *)'))
-        self.connect(self, 
-            SIGNAL('authenticationRequired(QNetworkReply *, QAuthenticator *)'), 
-            self.__class__.primaryManager, 
-            SIGNAL('authenticationRequired(QNetworkReply *, QAuthenticator *)'))
+        self.sslErrors.connect(self.__class__.primaryManager.sslErrors)
+        self.proxyAuthenticationRequired.connect(
+            self.__class__.primaryManager.proxyAuthenticationRequired)
+        self.authenticationRequired.connect(
+            self.__class__.primaryManager.authenticationRequired)
         self.finished[QNetworkReply].connect(self.__class__.primaryManager.finished)
     
     def createRequest(self, op, request, outgoingData = None):

--- a/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/Network/NetworkProtocolUnknownErrorReply.py	Wed Aug 11 14:54:13 2010 +0200
@@ -30,8 +30,7 @@
         """
         Private method to send some signals to end the connection.
         """
-        self.emit(SIGNAL("error(QNetworkReply::NetworkError)"), 
-                         QNetworkReply.ProtocolUnknownError)
+        self.error.emit(QNetworkReply.ProtocolUnknownError)
         self.finished[()].emit()
     
     def abort(self):

--- a/Helpviewer/OpenSearch/OpenSearchDialog.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchDialog.py	Wed Aug 11 14:54:13 2010 +0200
@@ -8,7 +8,7 @@
 """
 
 from PyQt4.QtGui import QDialog, QFileDialog, QMessageBox
-from PyQt4.QtCore import pyqtSlot, SIGNAL
+from PyQt4.QtCore import pyqtSlot
 
 from .OpenSearchEngineModel import OpenSearchEngineModel
 from .OpenSearchEditDialog import OpenSearchEditDialog
@@ -39,9 +39,8 @@
         self.enginesTable.verticalHeader().setDefaultSectionSize(
             1.2 * self.fontMetrics().height())
         
-        self.connect(self.enginesTable.selectionModel(), 
-                     SIGNAL("selectionChanged(const QItemSelection&, const QItemSelection&)"), 
-                     self.__selectionChanged)
+        self.enginesTable.selectionModel().selectionChanged.connect(
+            self.__selectionChanged)
         self.editButton.setEnabled(False)
     
     @pyqtSlot()

--- a/Helpviewer/OpenSearch/OpenSearchEngine.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngine.py	Wed Aug 11 14:54:13 2010 +0200
@@ -336,7 +336,7 @@
             self.__image = QImage()
         else:
             self.__image.loadFromData(response)
-        self.emit(SIGNAL("imageChanged()"))
+        self.imageChanged.emit()
     
     def image(self):
         """
@@ -363,7 +363,7 @@
                                 .format(bytes(imageBuffer.buffer().toBase64()).decode())
         
         self.__image = QImage(image)
-        self.emit(SIGNAL("imageChanged()"))
+        self.imageChanged.emit()
     
     def isValid(self):
         """
@@ -459,7 +459,7 @@
         except IndexError:
             return
         
-        self.emit(SIGNAL("suggestions(const QStringList&)"), suggestions)
+        self.suggestions.emit(suggestions)
     
     def networkAccessManager(self):
         """

--- a/Helpviewer/OpenSearch/OpenSearchEngineAction.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngineAction.py	Wed Aug 11 14:54:13 2010 +0200
@@ -7,7 +7,7 @@
 Module implementing a QAction subclass for open search.
 """
 
-from PyQt4.QtCore import SIGNAL, QUrl
+from PyQt4.QtCore import QUrl
 from PyQt4.QtGui import QPixmap, QIcon, QAction
 
 import Helpviewer.HelpWindow
@@ -33,7 +33,7 @@
         self.setText(engine.name())
         self.__imageChanged()
         
-        self.connect(engine, SIGNAL("imageChanged()"), self.__imageChanged)
+        engine.imageChanged.connect(self.__imageChanged)
     
     def __imageChanged(self):
         """

--- a/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchEngineModel.py	Wed Aug 11 14:54:13 2010 +0200
@@ -26,7 +26,7 @@
         QAbstractTableModel.__init__(self, parent)
         
         self.__manager = manager
-        self.connect(manager, SIGNAL("changed()"), self.__enginesChanged)
+        manager.changed.connect(self.__enginesChanged)
         
         self.__headers = [
             self.trUtf8("Name"), 

--- a/Helpviewer/Passwords/PasswordModel.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/Passwords/PasswordModel.py	Wed Aug 11 14:54:13 2010 +0200
@@ -23,7 +23,7 @@
         QAbstractTableModel.__init__(self, parent)
         
         self.__manager = manager
-        self.connect(manager, SIGNAL("changed()"), self.__passwordsChanged)
+        manager.changed.connect(self.__passwordsChanged)
         
         self.__headers = [
             self.trUtf8("Website"), 

--- a/Helpviewer/Passwords/PasswordsDialog.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/Passwords/PasswordsDialog.py	Wed Aug 11 14:54:13 2010 +0200
@@ -45,8 +45,7 @@
             PasswordModel(Helpviewer.HelpWindow.HelpWindow.passwordManager(), self)
         self.__proxyModel = QSortFilterProxyModel(self)
         self.__proxyModel.setSourceModel(self.__passwordModel)
-        self.connect(self.searchEdit, SIGNAL("textChanged(QString)"), 
-                     self.__proxyModel.setFilterFixedString)
+        self.searchEdit.textChanged.connect(self.__proxyModel.setFilterFixedString)
         self.passwordsTable.setModel(self.__proxyModel)
         
         fm = QFontMetrics(QFont())
@@ -93,4 +92,4 @@
             if res == QMessageBox.Yes:
                 self.__passwordModel.setShowPasswords(True)
                 self.passwordsButton.setText(self.__hidePasswordsText)
-        self.__calculateHeaderSizes()
\ No newline at end of file
+        self.__calculateHeaderSizes()

--- a/Helpviewer/SearchWidget.py	Wed Aug 11 14:39:46 2010 +0200
+++ b/Helpviewer/SearchWidget.py	Wed Aug 11 14:54:13 2010 +0200
@@ -46,8 +46,7 @@
         self.__findBackwards = False
         
         self.findtextCombo.lineEdit().returnPressed.connect(self.__findByReturnPressed)
-        self.connect(self.findtextCombo.lineEdit(), SIGNAL("textEdited(const QString&)"),
-                     self.__searchTextEdited)
+        self.findtextCombo.lineEdit().textEdited.connect(self.__searchTextEdited)
         
         if hasattr(QWebPage, "HighlightAllOccurrences"):
             self.highlightAllCheckBox.setChecked(True)