From 8bdb56eb730a79e779edecd6fb764fecf0b0510c Mon Sep 17 00:00:00 2001 From: "mkaply%us.ibm.com" Date: Fri, 20 Oct 2000 20:07:16 +0000 Subject: [PATCH] #55888 r=pavlov, rods, a=brendan nsITimer implementation was using platform types (bool) instead of PRBool git-svn-id: svn://10.0.0.236/trunk@81534 18797224-902f-48f8-a5cc-f745e15eee43 --- mozilla/widget/timer/public/nsITimerQueue.h | 4 ++-- .../widget/timer/src/windows/nsTimerManager.cpp | 16 ++++++++-------- .../widget/timer/src/windows/nsTimerManager.h | 4 ++-- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/mozilla/widget/timer/public/nsITimerQueue.h b/mozilla/widget/timer/public/nsITimerQueue.h index 0a081a61e44..a25edf480b1 100644 --- a/mozilla/widget/timer/public/nsITimerQueue.h +++ b/mozilla/widget/timer/public/nsITimerQueue.h @@ -39,8 +39,8 @@ public: NS_DEFINE_STATIC_IID_ACCESSOR(NS_ITIMERQUEUE_IID) NS_IMETHOD_(void) AddReadyQueue(nsITimer* timer)=0; - NS_IMETHOD_(bool) IsTimerInQueue(nsITimer* timer)=0; - NS_IMETHOD_(bool) HasReadyTimers(PRUint32 minTimerPriority)=0; + NS_IMETHOD_(PRBool) IsTimerInQueue(nsITimer* timer)=0; + NS_IMETHOD_(PRBool) HasReadyTimers(PRUint32 minTimerPriority)=0; NS_IMETHOD_(void) FireNextReadyTimer(PRUint32 minTimerPriority)=0; }; diff --git a/mozilla/widget/timer/src/windows/nsTimerManager.cpp b/mozilla/widget/timer/src/windows/nsTimerManager.cpp index 6eaf827e86b..7d4407b45dd 100644 --- a/mozilla/widget/timer/src/windows/nsTimerManager.cpp +++ b/mozilla/widget/timer/src/windows/nsTimerManager.cpp @@ -62,14 +62,14 @@ nsresult nsTimerManager::Init() } -NS_IMETHODIMP_(bool) nsTimerManager::IsTimerInQueue(nsITimer* timer) +NS_IMETHODIMP_(PRBool) nsTimerManager::IsTimerInQueue(nsITimer* timer) { - if (mReadyQueue == nsnull) return false; + if (mReadyQueue == nsnull) return PR_FALSE; for (int i=0; iCount(); i++) { - if (mReadyQueue->ElementAt(i) == timer) return true; + if (mReadyQueue->ElementAt(i) == timer) return PR_TRUE; } - return false; + return PR_FALSE; } @@ -89,12 +89,12 @@ NS_IMETHODIMP_(void) nsTimerManager::AddReadyQueue(nsITimer* timer) } -NS_IMETHODIMP_(bool) nsTimerManager::HasReadyTimers(PRUint32 minTimerPriority) +NS_IMETHODIMP_(PRBool) nsTimerManager::HasReadyTimers(PRUint32 minTimerPriority) { - if (mReadyQueue == nsnull || mReadyQueue->Count() == 0) return false; + if (mReadyQueue == nsnull || mReadyQueue->Count() == 0) return PR_FALSE; nsTimer* timer = (nsTimer*) mReadyQueue->ElementAt(0); - if (timer == nsnull) return false; + if (timer == nsnull) return PR_FALSE; return timer->GetPriority() >= minTimerPriority; } @@ -102,7 +102,7 @@ NS_IMETHODIMP_(bool) nsTimerManager::HasReadyTimers(PRUint32 minTimerPriority) NS_IMETHODIMP_(void) nsTimerManager::FireNextReadyTimer(PRUint32 minTimerPriority) { - PR_ASSERT(HasReadyTimers(minTimerPriority) == true); + PR_ASSERT(HasReadyTimers(minTimerPriority) == PR_TRUE); if (mReadyQueue == nsnull) return; diff --git a/mozilla/widget/timer/src/windows/nsTimerManager.h b/mozilla/widget/timer/src/windows/nsTimerManager.h index 99652729e5f..4aae5a8e857 100644 --- a/mozilla/widget/timer/src/windows/nsTimerManager.h +++ b/mozilla/widget/timer/src/windows/nsTimerManager.h @@ -61,9 +61,9 @@ public: // --- manage priority queue of ready timers --- NS_IMETHOD_(void) AddReadyQueue(nsITimer* timer); // is this timer in the ready queue? - NS_IMETHOD_(bool) IsTimerInQueue(nsITimer* timer); + NS_IMETHOD_(PRBool) IsTimerInQueue(nsITimer* timer); // does a timer above a priority level exist in the ready queue? - NS_IMETHOD_(bool) HasReadyTimers(PRUint32 minTimerPriority); + NS_IMETHOD_(PRBool) HasReadyTimers(PRUint32 minTimerPriority); // fire the next timer above a priority level in the ready queue NS_IMETHOD_(void) FireNextReadyTimer(PRUint32 minTimerPriority); };