diff options
| author | Caolán McNamara <caolanm@redhat.com> | 2019-11-07 10:33:28 +0000 |
|---|---|---|
| committer | Caolán McNamara <caolanm@redhat.com> | 2019-11-07 12:51:00 +0100 |
| commit | 1789ccc861e78a7db87cf8a2acd10bbc19d4d650 (patch) | |
| tree | f1281332f922612f62108e6b345518ee6b4e9fca /vcl | |
| parent | 4ea43e887498f9d78f70b40bcdc53865057a78c0 (diff) | |
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@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
Diffstat (limited to 'vcl')
| -rw-r--r-- | vcl/source/window/dialog.cxx | 12 | ||||
| -rw-r--r-- | vcl/source/window/tabdlg.cxx | 2 |
2 files changed, 7 insertions, 7 deletions
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() |