Scheduler: removed variable priority

Change-Id: I6676c1012c4321b53b6ba01ebd4bfa32d56afcf9

3 files changed, 15 insertions, 27 deletions

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 30f2e1ab4bc8..1e7b3edc91c9 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -27,11 +27,11 @@ class Scheduler;
 struct ImplSchedulerData
 {
     ImplSchedulerData*  mpNext;      // Pointer to the next element in list
-    Scheduler*          mpScheduler;      // Pointer to VCL Idle instance
-    bool                mbDelete;    // Destroy this idle?
-    bool                mbInScheduler;    // Idle handler currently processed?
+    Scheduler*          mpScheduler;      // Pointer to VCL Scheduler instance
+    bool                mbDelete;    // Destroy this scheduler?
+    bool                mbInScheduler;    // Scheduler currently processed?
     sal_uLong           mnUpdateTime;   // Last Update Time
-    sal_uLong           mnUpdateStack;  // Update Stack on stack
+    sal_uLong           mnUpdateStack;  // Update Stack
 
     void Invoke();
 
@@ -52,9 +52,8 @@ enum class SchedulerPriority {
 class VCL_DLLPUBLIC Scheduler
 {
 protected:
-    ImplSchedulerData*  mpSchedulerData;    // Pointer to element in idle list
-    sal_Int32           miPriority;         // Idle priority ( maybe divergent to default)
-    SchedulerPriority   meDefaultPriority;  // Default idle priority
+    ImplSchedulerData*  mpSchedulerData;    // Pointer to element in scheduler list
+    SchedulerPriority   mePriority;         // Scheduler priority
     bool                mbActive;           // Currently in the scheduler
 
     friend struct ImplSchedulerData;
@@ -68,11 +67,9 @@ public:
     virtual ~Scheduler();
 
     void SetPriority( SchedulerPriority ePriority );
-    void SetSchedulingPriority( sal_Int32 iPriority );
-    sal_Int32    GetPriority() const { return miPriority; }
-    SchedulerPriority GetDefaultPriority() const { return meDefaultPriority; }
+    SchedulerPriority GetPriority() const { return mePriority; }
 
-    // Call idle handler
+    // Call handler
     virtual void    Invoke() = 0;
 
     virtual void    Start();
@@ -83,8 +80,9 @@ public:
     Scheduler&          operator=( const Scheduler& rScheduler );
     static void ImplDeInitScheduler();
 
-    /// Process all pending idle tasks ahead of time in priority order.
+    // Process one pending Timer with highhest priority
     static void CallbackTaskScheduling( bool ignore );
+    /// Process one pending task ahead of time with highhest priority.
     static void ProcessTaskScheduling( bool bTimer );
 };
 
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)