gives names to all the Idles and Tasks

enforce it by making the constructor parameter non-default.

Change-Id: I321543e4dcf15ea0a43ad8cce91d2f8dc22df6ec
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/122766
Tested-by: Jenkins
Reviewed-by: Noel Grandin <noel.grandin@collabora.co.uk>

5 files changed, 7 insertions, 18 deletions

diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index afca81622a2f..e6ce2b30830e 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -153,8 +153,6 @@ private:
                            DockingWindow & operator= (const DockingWindow &) = delete;
 
 protected:
-    SAL_DLLPRIVATE void    SetIdleDebugName( const char *pDebugName );
-
     using Window::ImplInit;
     SAL_DLLPRIVATE void    ImplInit( vcl::Window* pParent, WinBits nStyle );
     SAL_DLLPRIVATE void    ImplInitSettings();
@@ -173,11 +171,11 @@ public:
     SAL_DLLPRIVATE bool    isDeferredInit() const { return mbIsDeferredInit; }
     virtual        void    doDeferredInit(WinBits nBits);
 protected:
-                    DockingWindow( WindowType nType );
-
+    DockingWindow( WindowType nType, const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle");
 public:
-    DockingWindow(vcl::Window* pParent, WinBits nStyle);
+    DockingWindow(vcl::Window* pParent, WinBits nStyle, const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle");
     DockingWindow(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription,
+        const char* pIdleDebugName = "vcl::DockingWindow maLayoutIdle",
         const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
     virtual ~DockingWindow() override;
     virtual void dispose() override;
diff --git a/include/vcl/idle.hxx b/include/vcl/idle.hxx
index 9abafae440d8..d5162efcb70f 100644
--- a/include/vcl/idle.hxx
+++ b/include/vcl/idle.hxx
@@ -44,7 +44,7 @@ protected:
     Idle( bool bAuto, const char *pDebugName );
 
 public:
-    Idle( const char *pDebugName = nullptr );
+    Idle( const char *pDebugName );
 
     virtual void Start(bool bStartTimer = true) override;
 };
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 7108bc2ba927..0c35073aec09 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -135,7 +135,7 @@ private:
 
 protected:
     // Single argument ctors shall be explicit.
-    explicit SystemWindow(WindowType nType);
+    explicit SystemWindow(WindowType nType, const char* pIdleDebugName);
     void loadUI(vcl::Window* pParent, const OString& rID, const OUString& rUIXMLDescription, const css::uno::Reference<css::frame::XFrame> &rFrame = css::uno::Reference<css::frame::XFrame>());
 
     void     SetWindowStateData( const WindowStateData& rData );
@@ -144,8 +144,6 @@ protected:
 
     SAL_DLLPRIVATE void DoInitialLayout();
 
-    SAL_DLLPRIVATE void SetIdleDebugName( const char *pDebugName );
-
 public:
     virtual         ~SystemWindow() override;
     virtual void    dispose() override;
@@ -247,10 +245,4 @@ public:
     VclPtr<VirtualDevice> createScreenshot();
 };
 
-inline void SystemWindow::SetIdleDebugName( const char *pDebugName )
-{
-    maLayoutIdle.SetDebugName( pDebugName );
-}
-
-
 /* vim:set shiftwidth=4 softtabstop=4 expandtab: */
diff --git a/include/vcl/task.hxx b/include/vcl/task.hxx
index 3785e37fba53..5ed8cde7ff21 100644
--- a/include/vcl/task.hxx
+++ b/include/vcl/task.hxx
@@ -79,7 +79,6 @@ public:
     void            SetPriority(TaskPriority ePriority);
     TaskPriority    GetPriority() const { return mePriority; }
 
-    void            SetDebugName( const char *pDebugName ) { mpDebugName = pDebugName; }
     const char     *GetDebugName() const { return mpDebugName; }
 
     // Call handler
diff --git a/include/vcl/timer.hxx b/include/vcl/timer.hxx
index cd8733518093..89cc623a180e 100644
--- a/include/vcl/timer.hxx
+++ b/include/vcl/timer.hxx
@@ -36,7 +36,7 @@ protected:
     Timer( bool bAuto, const char *pDebugName );
 
 public:
-    Timer( const char *pDebugName = nullptr );
+    Timer( const char *pDebugName );
     Timer( const Timer& rTimer );
     virtual ~Timer() override;
     Timer& operator=( const Timer& rTimer );
@@ -66,7 +66,7 @@ public:
 class VCL_DLLPUBLIC AutoTimer : public Timer
 {
 public:
-    AutoTimer( const char *pDebugName = nullptr );
+    AutoTimer( const char *pDebugName );
 };
 
 /// Value suitable as a timeout user input into an EditBox to an expensive update