diff -r e4711a55e482 -r 4d41d03d3d00 Helpviewer/HelpSearchWidget.py
--- a/Helpviewer/HelpSearchWidget.py Tue Aug 10 19:40:44 2010 +0200
+++ b/Helpviewer/HelpSearchWidget.py Wed Aug 11 09:42:20 2010 +0200
@@ -17,6 +17,9 @@
@signal linkActivated(const QUrl&) emitted when a search result entry is activated
@signal escapePressed() emitted when the ESC key was pressed
"""
+ linkActivated = pyqtSignal(QUrl)
+ escapePressed = pyqtSignal()
+
def __init__(self, engine, mainWindow, parent = None):
"""
Constructor
@@ -40,15 +43,11 @@
self.setFocusProxy(self.__query)
- self.connect(self.__query, SIGNAL("search()"),
- self.__search)
- self.connect(self.__result, SIGNAL("requestShowLink(const QUrl&)"),
- self, SIGNAL("linkActivated(const QUrl&)"))
+ self.__query.search.connect(self.__search)
+ self.__result.requestShowLink.connect(self.linkActivated)
- self.connect(self.__engine, SIGNAL("searchingStarted()"),
- self.__searchingStarted)
- self.connect(self.__engine, SIGNAL("searchingFinished(int)"),
- self.__searchingFinished)
+ self.__engine.searchingStarted.connect(self.__searchingStarted)
+ self.__engine.searchingFinished.connect(self.__searchingFinished)
self.__browser = self.__result.findChildren(QTextBrowser)[0]
if self.__browser:
@@ -101,7 +100,7 @@
@param evt reference to the key press event (QKeyEvent)
"""
if evt.key() == Qt.Key_Escape:
- self.emit(SIGNAL("escapePressed()"))
+ self.escapePressed.emit()
else:
evt.ignore()
@@ -131,6 +130,6 @@
menu.move(evt.globalPos())
act = menu.exec_()
if act == curTab:
- self.emit(SIGNAL("linkActivated(const QUrl&)"), link)
+ self.linkActivated.emit(link)
elif act == newTab:
- self.__mw.newTab(link)
\ No newline at end of file
+ self.__mw.newTab(link)
