diff options
| author | Rodolfo Ribeiro Gomes <rodolforg@gmail.com> | 2013-11-17 00:35:56 -0200 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2013-11-20 03:24:06 -0600 |
| commit | 205b77054a03e7d665167d6693ebaf476773aaf2 (patch) | |
| tree | c2e9675224480c8a3bb1550436e9b1ca79aec0b9 /include | |
| parent | bae01385c895a100b5371879889e606927cff877 (diff) | |
sal_Bool to bool in VCL Timer and minor cleanups
Change-Id: I72e3987af4509239b2e989483b7396512c17e48b
Signed-off-by: Rodolfo Ribeiro Gomes <rodolforg@gmail.com>
Reviewed-on: https://gerrit.libreoffice.org/6695
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'include')
| -rw-r--r-- | include/vcl/timer.hxx | 17 |
1 files changed, 5 insertions, 12 deletions
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index fc37a0e92353..ff9a4cf5dcc0 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 { |