diff options
| author | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-10-31 10:25:49 +0000 |
|---|---|---|
| committer | Tobias Madl <tobias.madl.dev@gmail.com> | 2014-12-09 12:35:02 +0000 |
| commit | cf46a5cf10db5ce330ae7a9a7410f6503300c543 (patch) | |
| tree | d03f2b2110d65ee18b95d4956b1e8a42a746ff29 /include/vcl | |
| parent | 345110ed798a13973ee99935ee134061f965a4e0 (diff) | |
Michael's patch implemented
Change-Id: I3f0802d5001172fc7b8409274bc5a3632e5dad34
Diffstat (limited to 'include/vcl')
| -rw-r--r-- | include/vcl/timer.hxx | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx index 7dd1b814f21d..11e8f3fa875d 100644 --- a/include/vcl/timer.hxx +++ b/include/vcl/timer.hxx @@ -93,16 +93,10 @@ enum IdlePriority { // To port from Timer -> Idle switch class name, // s/Timeout/DoIdle/ etc. and select priority -<<<<<<< HEAD class VCL_DLLPUBLIC Idle : public Timer { public: Idle(); -======= -class VCL_DLLPUBLIC Idle : private Timer -{ - public: ->>>>>>> applied patch from Michael Meeks Idle( IdlePriority ePriority ); virtual ~Idle(); @@ -116,11 +110,7 @@ class VCL_DLLPUBLIC Idle : private Timer void Start() { Timer::Start(); } void Stop() { Timer::Stop(); } -<<<<<<< HEAD virtual void DoIdle(); -======= - virtual void DoIdle() = 0; ->>>>>>> applied patch from Michael Meeks virtual void Timeout() SAL_OVERRIDE { DoIdle(); } }; |