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

[Caolán McNamara (via logerrit)]

 include/vcl/dialog.hxx             |    3 +--
 toolkit/source/awt/vclxtoolkit.cxx |    2 +-
 vcl/source/window/dialog.cxx       |   12 ++++++------
 vcl/source/window/tabdlg.cxx       |    2 +-
 4 files changed, 9 insertions(+), 10 deletions(-)

New commits:
commit 1789ccc861e78a7db87cf8a2acd10bbc19d4d650
Author:     Caolán McNamara <caolanm at redhat.com>
AuthorDate: Thu Nov 7 10:33:28 2019 +0000
Commit:     Caolán McNamara <caolanm at redhat.com>
CommitDate: Thu Nov 7 12:51:00 2019 +0100

    rename Dialog::ImplInit so no need for using directive
    
    Change-Id: I01a8591def7a559d3152e9c4875c6785940331f7
    Reviewed-on: https://gerrit.libreoffice.org/82202
    Tested-by: Jenkins
    Reviewed-by: Caolán McNamara <caolanm at redhat.com>
    Tested-by: Caolán McNamara <caolanm at redhat.com>

diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 0645ebb434cf..1840635f151f 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -69,8 +69,7 @@ private:
     DECL_DLLPRIVATE_LINK(ResponseHdl, Button*, void);
 
 protected:
-    using Window::ImplInit;
-    void    ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag = InitFlag::Default );
+    void    ImplInitDialog( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag = InitFlag::Default );
 
     /// Find and set the LOK notifier according to the pParent.
     void ImplLOKNotifier(vcl::Window* pParent);
diff --git a/toolkit/source/awt/vclxtoolkit.cxx b/toolkit/source/awt/vclxtoolkit.cxx
index c73e2fca05fd..dced58ba0b53 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -220,7 +220,7 @@ MessBox::MessBox(vcl::Window* pParent, MessBoxStyle nMessBoxStyle, WinBits nWinB
     maMessText( rMessage )
 {
     ImplLOKNotifier(pParent);
-    ImplInit(pParent, nWinBits | WB_MOVEABLE | WB_HORZ | WB_CENTER);
+    ImplInitDialog(pParent, nWinBits | WB_MOVEABLE | WB_HORZ | WB_CENTER);
     ImplInitButtons();
 
     if ( !rTitle.isEmpty() )
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index 14ea8dae4fdc..393ab24d4f90 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -419,7 +419,7 @@ vcl::Window* Dialog::GetDefaultParent(WinBits nStyle)
 VclPtr<vcl::Window> Dialog::AddBorderWindow(vcl::Window* pParent, WinBits nStyle)
 {
     VclPtrInstance<ImplBorderWindow> pBorderWin( pParent, nStyle, BorderWindowStyle::Frame );
-    SystemWindow::ImplInit( pBorderWin, nStyle & ~WB_BORDER, nullptr );
+    ImplInit( pBorderWin, nStyle & ~WB_BORDER, nullptr );
     pBorderWin->mpWindowImpl->mpClientWindow = this;
     pBorderWin->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder );
     mpWindowImpl->mpBorderWindow  = pBorderWin;
@@ -428,7 +428,7 @@ VclPtr<vcl::Window> Dialog::AddBorderWindow(vcl::Window* pParent, WinBits nStyle
     return pBorderWin;
 }
 
-void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag )
+void Dialog::ImplInitDialog( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag )
 {
     SystemWindowFlags nSysWinMode = Application::GetSystemWindowMode();
 
@@ -461,7 +461,7 @@ void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag )
         {
             mpWindowImpl->mbFrame         = true;
             mpWindowImpl->mbOverlapWin    = true;
-            SystemWindow::ImplInit( pParent, (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_STANDALONE)) | WB_CLOSEABLE, nullptr );
+            ImplInit( pParent, (nStyle & (WB_MOVEABLE | WB_SIZEABLE | WB_ROLLABLE | WB_STANDALONE)) | WB_CLOSEABLE, nullptr );
             // Now set all style bits
             mpWindowImpl->mnStyle = nStyle;
         }
@@ -469,7 +469,7 @@ void Dialog::ImplInit( vcl::Window* pParent, WinBits nStyle, InitFlag eFlag )
     else
     {
         VclPtrInstance<ImplBorderWindow> pBorderWin( pParent, nStyle, BorderWindowStyle::Overlap );
-        SystemWindow::ImplInit( pBorderWin, nStyle & ~WB_BORDER, nullptr );
+        ImplInit( pBorderWin, nStyle & ~WB_BORDER, nullptr );
         pBorderWin->mpWindowImpl->mpClientWindow = this;
         pBorderWin->GetBorder( mpWindowImpl->mnLeftBorder, mpWindowImpl->mnTopBorder, mpWindowImpl->mnRightBorder, mpWindowImpl->mnBottomBorder );
         mpWindowImpl->mpBorderWindow  = pBorderWin;
@@ -554,7 +554,7 @@ void Dialog::doDeferredInit(WinBits nBits)
 {
     VclPtr<vcl::Window> pParent = mpDialogParent;
     mpDialogParent = nullptr;
-    ImplInit(pParent, nBits | WB_BORDER, mnInitFlag);
+    ImplInitDialog(pParent, nBits | WB_BORDER, mnInitFlag);
     mbIsDeferredInit = false;
 }
 
@@ -573,7 +573,7 @@ Dialog::Dialog(vcl::Window* pParent, WinBits nStyle, InitFlag eFlag)
 {
     ImplLOKNotifier(pParent);
     ImplInitDialogData();
-    ImplInit( pParent, nStyle, eFlag );
+    ImplInitDialog( pParent, nStyle, eFlag );
 }
 
 void Dialog::set_action_area(VclButtonBox* pBox)
diff --git a/vcl/source/window/tabdlg.cxx b/vcl/source/window/tabdlg.cxx
index ff621de78fba..ab0f026d0a48 100644
--- a/vcl/source/window/tabdlg.cxx
+++ b/vcl/source/window/tabdlg.cxx
@@ -156,7 +156,7 @@ TabDialog::TabDialog( vcl::Window* pParent, WinBits nStyle ) :
     Dialog( WindowType::TABDIALOG )
 {
     ImplInitTabDialogData();
-    ImplInit( pParent, nStyle );
+    ImplInitDialog( pParent, nStyle );
 }
 
 TabDialog::~TabDialog()