include/vcl/timer.hxx | 17 ++------
vcl/source/app/timer.cxx | 92 ++++++++++++++---------------------------------
2 files changed, 34 insertions(+), 75 deletions(-)
New commits:
commit 205b77054a03e7d665167d6693ebaf476773aaf2
Author: Rodolfo Ribeiro Gomes <rodolf...@gmail.com>
Date: Sun Nov 17 00:35:56 2013 -0200
sal_Bool to bool in VCL Timer and minor cleanups
Change-Id: I72e3987af4509239b2e989483b7396512c17e48b
Signed-off-by: Rodolfo Ribeiro Gomes <rodolf...@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/6695
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index fc37a0e..ff9a4cf 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -27,17 +27,13 @@
struct ImplTimerData;
struct ImplSVData;
-// ---------
-// - Timer -
-// ---------
-
class VCL_DLLPUBLIC Timer
{
protected:
ImplTimerData* mpTimerData;
- sal_uLong mnTimeout;
- sal_Bool mbActive;
- sal_Bool mbAuto;
+ sal_uLong mnTimeout;
+ bool mbActive;
+ bool mbAuto;
Link maTimeoutHdl;
public:
@@ -51,8 +47,8 @@ public:
void Stop();
void SetTimeout( sal_uLong nTimeout );
- sal_uLong GetTimeout() const { return mnTimeout; }
- sal_Bool IsActive() const { return mbActive; }
+ sal_uLong GetTimeout() const { return mnTimeout; }
+ sal_Bool IsActive() const { return mbActive ? sal_True : sal_False;
}
void SetTimeoutHdl( const Link& rLink ) { maTimeoutHdl = rLink;
}
const Link& GetTimeoutHdl() const { return maTimeoutHdl; }
@@ -63,9 +59,6 @@ public:
static void ImplTimerCallbackProc();
};
-// -------------
-// - AutoTimer -
-// -------------
class VCL_DLLPUBLIC AutoTimer : public Timer
{
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index de5efca..dab9927 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -28,26 +28,18 @@
#include <salinst.hxx>
-// =======================================================================
-
#define MAX_TIMER_PERIOD ((sal_uLong)0xFFFFFFFF)
-// ---------------------
-// - TimeManager-Types -
-// ---------------------
-
struct ImplTimerData
{
ImplTimerData* mpNext; // Pointer to the next Instance
- Timer* mpSVTimer; // Pointer to SV Timer instance
- sal_uLong mnUpdateTime; // Last Update Time
- sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack
+ Timer* mpTimer; // Pointer to VCL Timer instance
+ sal_uLong mnUpdateTime; // Last Update Time
+ sal_uLong mnTimerUpdate; // TimerCallbackProcs on stack
bool mbDelete; // Was timer deleted during Update()?
bool mbInTimeout; // Are we in a timeout handler?
};
-// =======================================================================
-
void Timer::ImplDeInitTimer()
{
ImplSVData* pSVData = ImplGetSVData();
@@ -58,10 +50,10 @@ void Timer::ImplDeInitTimer()
do
{
ImplTimerData* pTempTimerData = pTimerData;
- if ( pTimerData->mpSVTimer )
+ if ( pTimerData->mpTimer )
{
- pTimerData->mpSVTimer->mbActive = sal_False;
- pTimerData->mpSVTimer->mpTimerData = NULL;
+ pTimerData->mpTimer->mbActive = false;
+ pTimerData->mpTimer->mpTimerData = NULL;
}
pTimerData = pTimerData->mpNext;
delete pTempTimerData;
@@ -75,8 +67,6 @@ void Timer::ImplDeInitTimer()
}
}
-// -----------------------------------------------------------------------
-
static void ImplStartTimer( ImplSVData* pSVData, sal_uLong nMS )
{
if ( !nMS )
@@ -89,16 +79,14 @@ static void ImplStartTimer( ImplSVData* pSVData, sal_uLong
nMS )
}
}
-// -----------------------------------------------------------------------
-
void Timer::ImplTimerCallbackProc()
{
ImplSVData* pSVData = ImplGetSVData();
ImplTimerData* pTimerData;
ImplTimerData* pPrevTimerData;
- sal_uLong nMinPeriod = MAX_TIMER_PERIOD;
- sal_uLong nDeltaTime;
- sal_uLong nTime = Time::GetSystemTicks();
+ sal_uLong nMinPeriod = MAX_TIMER_PERIOD;
+ sal_uLong nDeltaTime;
+ sal_uLong nTime = Time::GetSystemTicks();
if ( pSVData->mbNoCallTimer )
return;
@@ -116,21 +104,21 @@ void Timer::ImplTimerCallbackProc()
!pTimerData->mbDelete && !pTimerData->mbInTimeout )
{
// time has expired
- if ( (pTimerData->mnUpdateTime+pTimerData->mpSVTimer->mnTimeout)
<= nTime )
+ if ( (pTimerData->mnUpdateTime+pTimerData->mpTimer->mnTimeout) <=
nTime )
{
// set new update time
pTimerData->mnUpdateTime = nTime;
// if no AutoTimer than stop
- if ( !pTimerData->mpSVTimer->mbAuto )
+ if ( !pTimerData->mpTimer->mbAuto )
{
- pTimerData->mpSVTimer->mbActive = sal_False;
+ pTimerData->mpTimer->mbActive = false;
pTimerData->mbDelete = true;
}
// call Timeout
pTimerData->mbInTimeout = true;
- pTimerData->mpSVTimer->Timeout();
+ pTimerData->mpTimer->Timeout();
pTimerData->mbInTimeout = false;
}
}
@@ -157,8 +145,8 @@ void Timer::ImplTimerCallbackProc()
pPrevTimerData->mpNext = pTimerData->mpNext;
else
pSVData->mpFirstTimerData = pTimerData->mpNext;
- if ( pTimerData->mpSVTimer )
- pTimerData->mpSVTimer->mpTimerData = NULL;
+ if ( pTimerData->mpTimer )
+ pTimerData->mpTimer->mpTimerData = NULL;
ImplTimerData* pTempTimerData = pTimerData;
pTimerData = pTimerData->mpNext;
delete pTempTimerData;
@@ -169,13 +157,13 @@ void Timer::ImplTimerCallbackProc()
// determine smallest time slot
if ( pTimerData->mnUpdateTime == nTime )
{
- nDeltaTime = pTimerData->mpSVTimer->mnTimeout;
+ nDeltaTime = pTimerData->mpTimer->mnTimeout;
if ( nDeltaTime < nMinPeriod )
nMinPeriod = nDeltaTime;
}
else
{
- nDeltaTime = pTimerData->mnUpdateTime +
pTimerData->mpSVTimer->mnTimeout;
+ nDeltaTime = pTimerData->mnUpdateTime +
pTimerData->mpTimer->mnTimeout;
if ( nDeltaTime < nNewTime )
nMinPeriod = 1;
else
@@ -203,50 +191,40 @@ void Timer::ImplTimerCallbackProc()
pSVData->mbNotAllTimerCalled = sal_False;
}
-// =======================================================================
-
Timer::Timer()
{
mpTimerData = NULL;
mnTimeout = 1;
- mbAuto = sal_False;
- mbActive = sal_False;
+ mbAuto = false;
+ mbActive = false;
}
-// -----------------------------------------------------------------------
-
Timer::Timer( const Timer& rTimer )
{
mpTimerData = NULL;
mnTimeout = rTimer.mnTimeout;
- mbAuto = sal_False;
- mbActive = sal_False;
+ mbAuto = false;
+ mbActive = false;
maTimeoutHdl = rTimer.maTimeoutHdl;
if ( rTimer.IsActive() )
Start();
}
-// -----------------------------------------------------------------------
-
Timer::~Timer()
{
if ( mpTimerData )
{
mpTimerData->mbDelete = true;
- mpTimerData->mpSVTimer = NULL;
+ mpTimerData->mpTimer = NULL;
}
}
-// -----------------------------------------------------------------------
-
void Timer::Timeout()
{
maTimeoutHdl.Call( this );
}
-// -----------------------------------------------------------------------
-
void Timer::SetTimeout( sal_uLong nNewTimeout )
{
mnTimeout = nNewTimeout;
@@ -260,11 +238,9 @@ void Timer::SetTimeout( sal_uLong nNewTimeout )
}
}
-// -----------------------------------------------------------------------
-
void Timer::Start()
{
- mbActive = sal_True;
+ mbActive = true;
ImplSVData* pSVData = ImplGetSVData();
if ( !mpTimerData )
@@ -281,7 +257,7 @@ void Timer::Start()
// insert timer and start
mpTimerData = new ImplTimerData;
- mpTimerData->mpSVTimer = this;
+ mpTimerData->mpTimer = this;
mpTimerData->mnUpdateTime = Time::GetSystemTicks();
mpTimerData->mnTimerUpdate = pSVData->mnTimerUpdate;
mpTimerData->mbDelete = false;
@@ -304,7 +280,7 @@ void Timer::Start()
if ( mnTimeout < pSVData->mnTimerPeriod )
ImplStartTimer( pSVData, mnTimeout );
}
- else if( !mpTimerData->mpSVTimer ) // TODO: remove when guilty found
+ else if( !mpTimerData->mpTimer ) // TODO: remove when guilty found
{
OSL_FAIL( "Timer::Start() on a destroyed Timer!" );
}
@@ -316,24 +292,20 @@ void Timer::Start()
}
}
-// -----------------------------------------------------------------------
-
void Timer::Stop()
{
- mbActive = sal_False;
+ mbActive = false;
if ( mpTimerData )
mpTimerData->mbDelete = true;
}
-// -----------------------------------------------------------------------
-
Timer& Timer::operator=( const Timer& rTimer )
{
if ( IsActive() )
Stop();
- mbActive = sal_False;
+ mbActive = false;
mnTimeout = rTimer.mnTimeout;
maTimeoutHdl = rTimer.maTimeoutHdl;
@@ -343,22 +315,16 @@ Timer& Timer::operator=( const Timer& rTimer )
return *this;
}
-// =======================================================================
-
AutoTimer::AutoTimer()
{
- mbAuto = sal_True;
+ mbAuto = true;
}
-// -----------------------------------------------------------------------
-
AutoTimer::AutoTimer( const AutoTimer& rTimer ) : Timer( rTimer )
{
- mbAuto = sal_True;
+ mbAuto = true;
}
-// -----------------------------------------------------------------------
-
AutoTimer& AutoTimer::operator=( const AutoTimer& rTimer )
{
Timer::operator=( rTimer );
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
