From a802108cf735016150403aec79649ad6b4c70b7e Mon Sep 17 00:00:00 2001 From: "ramiro%netscape.com" Date: Wed, 25 Aug 1999 11:45:14 +0000 Subject: [PATCH] Remove extraneous AddRef(). git-svn-id: svn://10.0.0.236/trunk@44489 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/timer/src/unix/qt/nsTimerQt.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/mozilla/widget/timer/src/unix/qt/nsTimerQt.cpp b/mozilla/widget/timer/src/unix/qt/nsTimerQt.cpp index 0501fdb328d..3badd5d3e6f 100644 --- a/mozilla/widget/timer/src/unix/qt/nsTimerQt.cpp +++ b/mozilla/widget/timer/src/unix/qt/nsTimerQt.cpp @@ -41,15 +41,19 @@ nsTimerQt::~nsTimerQt() { //debug("nsTimerQt::~nsTimerQt called for %p", this); Cancel(); + NS_IF_RELEASE(mCallback); + if (mEventHandler); { - delete mEventHandler; + delete mEventHandler; + mEventHandler = nsnull; } if (mTimer) { delete mTimer; + mTimer = nsnull; } } @@ -101,20 +105,23 @@ nsTimerQt::Init(PRUint32 aDelay) mEventHandler = new nsTimerEventHandler(this, mFunc, mClosure, mCallback); +// NS_ADDREF(this); + mTimer = new QTimer(); if (!mTimer) { return NS_ERROR_NOT_INITIALIZED; } + QObject::connect((QTimer *)mTimer, SIGNAL(timeout()), mEventHandler, SLOT(FireTimeout())); + mTimer->start(aDelay); mDelay = aDelay; - NS_ADDREF(this); return NS_OK; }