[Libreoffice-commits] core.git: include/vcl vcl/source

[Tor Lillqvist]

 include/vcl/scheduler.hxx    |    5 -----
 include/vcl/svapp.hxx        |    3 ---
 vcl/source/app/scheduler.cxx |   13 +++++++++++--
 vcl/source/app/svapp.cxx     |   10 +++++++++-
 4 files changed, 20 insertions(+), 11 deletions(-)

New commits:
commit 0cdf09089d3c7a790a7c4b20f4cc115d038c75f1
Author: Tor Lillqvist <tml at collabora.com>
Date:   Tue Dec 8 15:55:27 2015 +0200

    Make ImplSVData private to vcl
    
    Change-Id: I1df6ba8a269be3e165ff5948af1dd12e0bdc6f7d

diff --git a/include/vcl/scheduler.hxx b/include/vcl/scheduler.hxx
index 13d1687..8e75f33 100644
--- a/include/vcl/scheduler.hxx
+++ b/include/vcl/scheduler.hxx
@@ -23,7 +23,6 @@
 #include <vcl/dllapi.h>
 
 class Scheduler;
-struct ImplSVData;
 struct ImplSchedulerData;
 
 enum class SchedulerPriority {
@@ -39,9 +38,6 @@ enum class SchedulerPriority {
 
 class VCL_DLLPUBLIC Scheduler
 {
-private:
-    static void InitSystemTimer(ImplSVData* pSVData);
-
 protected:
     ImplSchedulerData*  mpSchedulerData;    /// Pointer to element in scheduler list
     const sal_Char     *mpDebugName;        /// Useful for debugging
@@ -50,7 +46,6 @@ protected:
 
     // These should be constexpr static, when supported.
     static const sal_uInt64 ImmediateTimeoutMs = 1;
-    static const sal_uInt64 MaximumTimeoutMs = 1000 * 60; // 1 minute
 
     static void ImplStartTimer(sal_uInt64 nMS, bool bForce = false);
 
diff --git a/include/vcl/svapp.hxx b/include/vcl/svapp.hxx
index c5b52ca..ce26f94 100644
--- a/include/vcl/svapp.hxx
+++ b/include/vcl/svapp.hxx
@@ -1450,9 +1450,6 @@ public:
     static void setDeInitHook(Link<LinkParamNone*,void> const & hook);
 
 private:
-
-    static void InitSettings(ImplSVData* pSVData);
-
     DECL_STATIC_LINK_TYPED( Application, PostEventHandler, void*, void );
 };
 
diff --git a/vcl/source/app/scheduler.cxx b/vcl/source/app/scheduler.cxx
index 9450393..b1f3fb1 100644
--- a/vcl/source/app/scheduler.cxx
+++ b/vcl/source/app/scheduler.cxx
@@ -24,6 +24,11 @@
 #include <svdata.hxx>
 #include <salinst.hxx>
 
+namespace {
+const sal_uInt64 MaximumTimeoutMs = 1000 * 60; // 1 minute
+void InitSystemTimer(ImplSVData* pSVData);
+}
+
 void ImplSchedulerData::Invoke()
 {
     if (mbDelete || mbInScheduler )
@@ -135,21 +140,25 @@ void Scheduler::ImplStartTimer(sal_uInt64 nMS, bool bForce)
     }
 }
 
+namespace {
+
 /**
 * Initialize the platform specific timer on which all the
 * platform independent timers are built
 */
-void Scheduler::InitSystemTimer(ImplSVData* pSVData)
+void InitSystemTimer(ImplSVData* pSVData)
 {
     assert(pSVData != nullptr);
     if (!pSVData->mpSalTimer)
     {
         pSVData->mnTimerPeriod = MaximumTimeoutMs;
         pSVData->mpSalTimer = pSVData->mpDefInst->CreateSalTimer();
-        pSVData->mpSalTimer->SetCallback(CallbackTaskScheduling);
+        pSVData->mpSalTimer->SetCallback(Scheduler::CallbackTaskScheduling);
     }
 }
 
+}
+
 void Scheduler::CallbackTaskScheduling(bool ignore)
 {
     // this function is for the saltimer callback
diff --git a/vcl/source/app/svapp.cxx b/vcl/source/app/svapp.cxx
index e9c4b01..1d2e09c 100644
--- a/vcl/source/app/svapp.cxx
+++ b/vcl/source/app/svapp.cxx
@@ -80,6 +80,10 @@
 using namespace ::com::sun::star;
 using namespace ::com::sun::star::uno;
 
+namespace {
+void InitSettings(ImplSVData* pSVData);
+}
+
 // keycodes handled internally by VCL
 class ImplReservedKey
 {
@@ -769,7 +773,9 @@ const AllSettings& Application::GetSettings()
     return *(pSVData->maAppData.mpSettings);
 }
 
-void Application::InitSettings(ImplSVData* pSVData)
+namespace {
+
+void InitSettings(ImplSVData* pSVData)
 {
     assert(!pSVData->maAppData.mpSettings && "initialization should not happen twice!");
 
@@ -781,6 +787,8 @@ void Application::InitSettings(ImplSVData* pSVData)
     }
 }
 
+}
+
 void Application::NotifyAllWindows( DataChangedEvent& rDCEvt )
 {
     ImplSVData* pSVData = ImplGetSVData();