summaryrefslogtreecommitdiff
path: root/vcl
diff options
context:
space:
mode:
authorTobias Madl <tobias.madl.dev@gmail.com>2015-03-06 10:13:53 +0000
committerTobias Madl <tobias.madl.dev@gmail.com>2015-03-06 12:27:12 +0000
commitb6bb2e9315c9bc3338eaf066df40a969eb4774aa (patch)
treeb57abc5075b774475e4df967723daa66d1734e03 /vcl
parentd851e1e3c29afd3315cc763144c6eb92fbef5054 (diff)
Scheduler: removed variable priority
Change-Id: I6676c1012c4321b53b6ba01ebd4bfa32d56afcf9
Diffstat (limited to 'vcl')
-rw-r--r--vcl/source/app/scheduler.cxx17
-rw-r--r--vcl/source/app/timer.cxx3
2 files changed, 5 insertions, 15 deletions
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index ef5e1f0182c0..fc52b905426c 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -28,7 +28,6 @@ void ImplSchedulerData::Invoke()
if (mbDelete || mbInScheduler )
return;
- mpScheduler->SetSchedulingPriority(static_cast<sal_Int32>(mpScheduler->GetDefaultPriority()));
mpScheduler->SetDeletionFlags();
// invoke it
@@ -172,12 +171,7 @@ sal_uLong Scheduler::UpdateMinPeriod( sal_uLong nMinPeriod, sal_uLong nTime )
void Scheduler::SetPriority( SchedulerPriority ePriority )
{
- meDefaultPriority = ePriority;
-}
-
-void Scheduler::SetSchedulingPriority( sal_Int32 iPriority )
-{
- miPriority = iPriority;
+ mePriority = ePriority;
}
void Scheduler::Start()
@@ -226,8 +220,7 @@ Scheduler& Scheduler::operator=( const Scheduler& rScheduler )
Stop();
mbActive = false;
- miPriority = rScheduler.miPriority;
- meDefaultPriority = rScheduler.meDefaultPriority;
+ mePriority = rScheduler.mePriority;
if ( rScheduler.IsActive() )
Start();
@@ -237,16 +230,14 @@ Scheduler& Scheduler::operator=( const Scheduler& rScheduler )
Scheduler::Scheduler():
mpSchedulerData(NULL),
- miPriority(static_cast<sal_Int32>(SchedulerPriority::HIGH)),
- meDefaultPriority(SchedulerPriority::HIGH),
+ mePriority(SchedulerPriority::HIGH),
mbActive(false)
{
}
Scheduler::Scheduler( const Scheduler& rScheduler ):
mpSchedulerData(NULL),
- miPriority(rScheduler.miPriority),
- meDefaultPriority(rScheduler.meDefaultPriority),
+ mePriority(rScheduler.mePriority),
mbActive(false)
{
if ( rScheduler.IsActive() )
diff --git a/vcl/source/app/timer.cxx b/vcl/source/app/timer.cxx
index 4dec9af84eb2..ac7bb5ffd306 100644
--- a/vcl/source/app/timer.cxx
+++ b/vcl/source/app/timer.cxx
@@ -86,8 +86,7 @@ Timer::Timer() : Scheduler()
{
mnTimeout = 1;
mbAuto = false;
- miPriority= static_cast<sal_Int32>(SchedulerPriority::HIGHEST);
- meDefaultPriority = SchedulerPriority::HIGHEST;
+ mePriority = SchedulerPriority::HIGHEST;
}
Timer::Timer( const Timer& rTimer ) : Scheduler(rTimer)