Bug #: 3825

Submitted by: eseidel
Reviewed by: mjs
        * kwq/KWQTimer.h:
        * kwq/KWQTimer.mm:
        (QTimer::QTimer): added parent pointer (and warning)
        http://bugzilla.opendarwin.org/show_bug.cgi?id=3825

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@9581 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebCore/ChangeLog-2005-08-23 b/WebCore/ChangeLog-2005-08-23
index 5e6a54dd00b694d13d564ef609a7446c8d34d88b..c821244441b986a9a11e5ca9ed67d6a2ab6a544f 100644 (file)
--- a/WebCore/ChangeLog-2005-08-23
+++ b/WebCore/ChangeLog-2005-08-23
@@ -1,3 +1,12 @@
+2005-07-03  Eric Seidel  <eseidel@apple.com>
+
+        Reviewed by mjs.
+
+        * kwq/KWQTimer.h:
+        * kwq/KWQTimer.mm:
+        (QTimer::QTimer): added parent pointer (and warning)
+        http://bugzilla.opendarwin.org/show_bug.cgi?id=3825
+ 
 2005-07-03  Eric Seidel  <eseidel@apple.com>
 
         Reviewed by mjs.

diff --git a/WebCore/kwq/KWQTimer.h b/WebCore/kwq/KWQTimer.h
index cfd8db2eb0f2dd7b84d0c121ea231f6b2fa0586c..6e3e617ca926b773aad84a9bb19637fee5676da0 100644 (file)
--- a/WebCore/kwq/KWQTimer.h
+++ b/WebCore/kwq/KWQTimer.h
@@ -37,7 +37,7 @@ class NSTimer;
 
 class QTimer : public QObject {
 public:
-    QTimer();
+    QTimer(QObject *parent = 0);
     ~QTimer() { stop(); }
     
     bool isActive() const;

diff --git a/WebCore/kwq/KWQTimer.mm b/WebCore/kwq/KWQTimer.mm
index 79ff0f0d276cc7dc24328df423644edff9cb84cf..f8c941377264cb9755eb3219e4d7aba7a29686e9 100644 (file)
--- a/WebCore/kwq/KWQTimer.mm
+++ b/WebCore/kwq/KWQTimer.mm
@@ -26,6 +26,7 @@
 #import "KWQTimer.h"
 
 #import "KWQAssertions.h"
+#import "KWQLogging.h"
 #import "KWQFoundationExtras.h"
 
 // We know the Cocoa calls in this file are safe because they are all
@@ -92,9 +93,10 @@
 
 @end
 
-QTimer::QTimer()
+QTimer::QTimer(QObject *parent)
     : m_timer(nil), m_monitorFunction(0), m_timeoutSignal(this, SIGNAL(timeout()))
 {
+    if (parent) LOG(NotYetImplemented, "Parent pointer ignored.  QTimer will be leaked and may fire after parent dealloc causing crash.");
 }
 
 bool QTimer::isActive() const