Merged remote changes.

Tue, 01 Jun 2010 13:21:19 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Tue, 01 Jun 2010 13:21:19 +0200
changeset 326
59b789a13dcb
parent 325
dd7377dbd057 (current diff)
parent 323
75182cd9b2c5 (diff)
child 330
4b4f242bf3f6

Merged remote changes.

--- a/Cooperation/Connection.py	Tue Jun 01 13:19:52 2010 +0200
+++ b/Cooperation/Connection.py	Tue Jun 01 13:21:19 2010 +0200
@@ -74,7 +74,7 @@
         self.__numBytesForCurrentDataType = -1
         self.__transferTimerId = 0
         self.__isGreetingMessageSent = False
-        self.__pingTimer = QTimer()
+        self.__pingTimer = QTimer(self)
         self.__pingTimer.setInterval(PingInterval)
         self.__pongTime = QTime()
         self.__buffer = QByteArray()
--- a/Helpviewer/Bookmarks/DefaultBookmarks.py	Tue Jun 01 13:19:52 2010 +0200
+++ b/Helpviewer/Bookmarks/DefaultBookmarks.py	Tue Jun 01 13:21:19 2010 +0200
@@ -38,6 +38,9 @@
             <bookmark href="http://qt-apps.org/">
                 <title>Qt-Apps.org</title>
             </bookmark>
+            <bookmark href="http://www.diotavelli.net/PyQtWiki/"
+                <title>PyQt Wiki</title>
+            </bookmark>
         </folder>
         <folder folded="no">
             <title>Python Web Sites</title>
--- a/Helpviewer/History/HistoryCompleter.py	Tue Jun 01 13:19:52 2010 +0200
+++ b/Helpviewer/History/HistoryCompleter.py	Tue Jun 01 13:21:19 2010 +0200
@@ -228,7 +228,7 @@
         self.setModelSorting(QCompleter.CaseSensitivelySortedModel)
         
         self.__searchString = ""
-        self.__filterTimer = QTimer()
+        self.__filterTimer = QTimer(self)
         self.__filterTimer.setSingleShot(True)
         self.connect(self.__filterTimer, SIGNAL("timeout()"), self.__updateFilter)
     
--- a/Helpviewer/History/HistoryManager.py	Tue Jun 01 13:19:52 2010 +0200
+++ b/Helpviewer/History/HistoryManager.py	Tue Jun 01 13:21:19 2010 +0200
@@ -95,12 +95,12 @@
         self.__history = []
         self.__lastSavedUrl = ""
         
-        self.__expiredTimer = QTimer()
+        self.__expiredTimer = QTimer(self)
         self.__expiredTimer.setSingleShot(True)
         self.connect(self.__expiredTimer, SIGNAL("timeout()"), 
                      self.__checkForExpired)
         
-        self.__frequencyTimer = QTimer()
+        self.__frequencyTimer = QTimer(self)
         self.__frequencyTimer.setSingleShot(True)
         self.connect(self.__frequencyTimer, SIGNAL("timeout()"), 
                      self.__refreshFrequencies)

eric ide

mercurial