framework/source/uielement/toolbarmanager.cxx | 4 +--
include/vcl/ctrl.hxx | 2 -
include/vcl/dockwin.hxx | 2 -
include/vcl/syswin.hxx | 2 -
include/vcl/toolkit/button.hxx | 2 -
include/vcl/toolkit/dialog.hxx | 2 -
include/vcl/toolkit/edit.hxx | 2 -
include/vcl/toolkit/lstbox.hxx | 2 -
include/vcl/toolkit/spinfld.hxx | 2 -
include/vcl/window.hxx | 4 +--
include/vcl/wrkwin.hxx | 2 -
sfx2/source/sidebar/ControllerFactory.cxx | 4 +--
toolkit/inc/helper/btndlg.hxx | 2 -
toolkit/source/awt/vclxtoolkit.cxx | 34 +++++++++++++-------------
toolkit/source/helper/btndlg.cxx | 4 +--
vcl/inc/window.h | 2 -
vcl/source/accessibility/acc_factory.cxx | 14 +++++-----
vcl/source/control/button.cxx | 4 +--
vcl/source/control/ctrl.cxx | 4 +--
vcl/source/control/edit.cxx | 4 +--
vcl/source/control/listbox.cxx | 4 +--
vcl/source/control/spinfld.cxx | 4 +--
vcl/source/uitest/logger.cxx | 8 +++---
vcl/source/uitest/uiobject.cxx | 8 +++---
vcl/source/window/builder.cxx | 20 +++++++--------
vcl/source/window/dialog.cxx | 4 +--
vcl/source/window/dockwin.cxx | 4 +--
vcl/source/window/legacyaccessibility.cxx | 20 +++++++--------
vcl/source/window/syswin.cxx | 4 +--
vcl/source/window/window.cxx | 10 +++----
vcl/source/window/window2.cxx | 6 ++--
vcl/source/window/wrkwin.cxx | 4 +--
32 files changed, 97 insertions(+), 97 deletions(-)
New commits:
commit b666efedd669d652c05deac4a6f9734b461e5074
Author: Christopher Sherlock <chris.sherloc...@gmail.com>
AuthorDate: Wed Dec 11 00:32:05 2024 +1100
Commit: Michael Weghorn <m.wegh...@posteo.de>
CommitDate: Tue Feb 18 09:44:52 2025 +0100
vcl: nType -> eType
Change-Id: I3e55e6173494f660febc296ec342ab223e5cdec1
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/178227
Reviewed-by: Michael Weghorn <m.wegh...@posteo.de>
Tested-by: Jenkins
diff --git a/framework/source/uielement/toolbarmanager.cxx
b/framework/source/uielement/toolbarmanager.cxx
index 914a0b1b2671..b80d5ee62c56 100644
--- a/framework/source/uielement/toolbarmanager.cxx
+++ b/framework/source/uielement/toolbarmanager.cxx
@@ -1182,8 +1182,8 @@ void ToolBarManager::CreateControllers()
VclPtr<vcl::Window> pItemWin = VCLUnoHelper::GetWindow(
xWindow );
if ( pItemWin )
{
- WindowType nType = pItemWin->GetType();
- if ( m_pToolBar && (nType == WindowType::LISTBOX ||
nType == WindowType::MULTILISTBOX || nType == WindowType::COMBOBOX) )
+ WindowType eType = pItemWin->GetType();
+ if ( m_pToolBar && (eType == WindowType::LISTBOX ||
eType == WindowType::MULTILISTBOX || eType == WindowType::COMBOBOX) )
pItemWin->SetAccessibleName(
m_pToolBar->GetItemText( nId ) );
m_pImpl->SetItemWindow( nId, pItemWin );
}
diff --git a/include/vcl/ctrl.hxx b/include/vcl/ctrl.hxx
index 4e61822abf7a..1f3161ecc45e 100644
--- a/include/vcl/ctrl.hxx
+++ b/include/vcl/ctrl.hxx
@@ -93,7 +93,7 @@ private:
Control & operator= (const Control &) = delete;
protected:
- SAL_DLLPRIVATE Control( WindowType nType );
+ SAL_DLLPRIVATE Control( WindowType eType );
virtual void FillLayoutData() const;
// helper method for composite controls
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 937a956c261e..1fb38276d14c 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -171,7 +171,7 @@ public:
SAL_DLLPRIVATE bool isDeferredInit() const { return mbIsDeferredInit; }
virtual void doDeferredInit(WinBits nBits);
protected:
- SAL_DLLPRIVATE DockingWindow( WindowType nType, const char* pIdleDebugName
= "vcl::DockingWindow maLayoutIdle");
+ SAL_DLLPRIVATE DockingWindow( WindowType eType, const char* pIdleDebugName
= "vcl::DockingWindow maLayoutIdle");
public:
DockingWindow(vcl::Window* pParent, WinBits nStyle, const char*
pIdleDebugName = "vcl::DockingWindow maLayoutIdle");
SAL_DLLPRIVATE DockingWindow(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription,
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index 34cbde005260..1a8ca61ed8e7 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -156,7 +156,7 @@ private:
protected:
// Single argument ctors shall be explicit.
SAL_DLLPRIVATE explicit SystemWindow(
- WindowType nType, const char* pIdleDebugName, bool transferableIdle =
false);
+ WindowType eType, const char* pIdleDebugName, bool transferableIdle =
false);
SAL_DLLPRIVATE void loadUI(vcl::Window* pParent, const OUString& rID,
const OUString& rUIXMLDescription, const
css::uno::Reference<css::frame::XFrame> &rFrame =
css::uno::Reference<css::frame::XFrame>());
SAL_DLLPRIVATE void SetWindowState(const vcl::WindowData& rData);
diff --git a/include/vcl/toolkit/button.hxx b/include/vcl/toolkit/button.hxx
index d9e7380ea031..b28cd61e376d 100644
--- a/include/vcl/toolkit/button.hxx
+++ b/include/vcl/toolkit/button.hxx
@@ -61,7 +61,7 @@ public:
SAL_DLLPRIVATE void ImplSetSeparatorX( tools::Long nX );
protected:
- SAL_DLLPRIVATE explicit Button( WindowType nType );
+ SAL_DLLPRIVATE explicit Button( WindowType eType );
// for drawing RadioButton or CheckButton that has Text and/or Image
SAL_DLLPRIVATE void ImplDrawRadioCheck(OutputDevice* pDev, WinBits
nWinStyle, SystemTextColorFlags nSystemTextColorFlags,
diff --git a/include/vcl/toolkit/dialog.hxx b/include/vcl/toolkit/dialog.hxx
index 7b61ed4c68c7..818b856b67f9 100644
--- a/include/vcl/toolkit/dialog.hxx
+++ b/include/vcl/toolkit/dialog.hxx
@@ -91,7 +91,7 @@ public:
SAL_DLLPRIVATE static vcl::Window* GetDefDialogParent();
protected:
- explicit Dialog( WindowType nType );
+ explicit Dialog( WindowType eType );
explicit Dialog( vcl::Window* pParent, const OUString& rID, const
OUString& rUIXMLDescription);
virtual void Draw( OutputDevice* pDev, const Point& rPos,
SystemTextColorFlags nFlags ) override;
virtual void settingOptimalLayoutSize(Window *pBox) override;
diff --git a/include/vcl/toolkit/edit.hxx b/include/vcl/toolkit/edit.hxx
index 072c85ecd2c0..7d4a866a5888 100644
--- a/include/vcl/toolkit/edit.hxx
+++ b/include/vcl/toolkit/edit.hxx
@@ -137,7 +137,7 @@ protected:
virtual void dragOver(const css::datatransfer::dnd::DropTargetDragEvent&
dtde) override;
protected:
- SAL_DLLPRIVATE Edit(WindowType nType);
+ SAL_DLLPRIVATE Edit(WindowType eType);
virtual void FillLayoutData() const override;
virtual void ApplySettings(vcl::RenderContext& rRenderContext) override;
public:
diff --git a/include/vcl/toolkit/lstbox.hxx b/include/vcl/toolkit/lstbox.hxx
index 9b6842c1212b..406c327faa37 100644
--- a/include/vcl/toolkit/lstbox.hxx
+++ b/include/vcl/toolkit/lstbox.hxx
@@ -114,7 +114,7 @@ protected:
bool IsDropDownBox() const { return mpFloatWin != nullptr; }
protected:
- SAL_DLLPRIVATE explicit ListBox( WindowType nType );
+ SAL_DLLPRIVATE explicit ListBox( WindowType eType );
SAL_DLLPRIVATE virtual void FillLayoutData() const override;
diff --git a/include/vcl/toolkit/spinfld.hxx b/include/vcl/toolkit/spinfld.hxx
index b77ce924acdc..8a8df700b323 100644
--- a/include/vcl/toolkit/spinfld.hxx
+++ b/include/vcl/toolkit/spinfld.hxx
@@ -30,7 +30,7 @@
class VCL_DLLPUBLIC SpinField : public Edit
{
public:
- explicit SpinField( vcl::Window* pParent, WinBits nWinStyle,
WindowType nType = WindowType::SPINFIELD );
+ explicit SpinField( vcl::Window* pParent, WinBits nWinStyle,
WindowType eType = WindowType::SPINFIELD );
virtual ~SpinField() override;
SAL_DLLPRIVATE virtual void dispose() override;
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index f49c33107906..27b8857887c0 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -692,7 +692,7 @@ private:
protected:
// Single argument ctors shall be explicit.
- SAL_DLLPRIVATE explicit Window( WindowType nType );
+ SAL_DLLPRIVATE explicit Window( WindowType eType );
void SetCompoundControl( bool bCompound );
@@ -762,7 +762,7 @@ public:
SAL_DLLPRIVATE WinBits GetPrevStyle() const;
void SetExtendedStyle( WindowExtendedStyle
nExtendedStyle );
WindowExtendedStyle GetExtendedStyle() const;
- void SetType( WindowType nType );
+ void SetType( WindowType eType );
WindowType GetType() const;
bool IsSystemWindow() const;
SAL_DLLPRIVATE bool IsDockingWindow() const;
diff --git a/include/vcl/wrkwin.hxx b/include/vcl/wrkwin.hxx
index 615696f94620..4d0289c871e6 100644
--- a/include/vcl/wrkwin.hxx
+++ b/include/vcl/wrkwin.hxx
@@ -58,7 +58,7 @@ private:
WorkWindow& operator =( const WorkWindow& rWin ) = delete;
protected:
- explicit WorkWindow( WindowType nType );
+ explicit WorkWindow( WindowType eType );
SAL_DLLPRIVATE void ImplInit( vcl::Window* pParent, WinBits nStyle,
SystemParentData* pSystemParentData = nullptr );
SAL_DLLPRIVATE void ImplSetFrameState(vcl::WindowState);
diff --git a/sfx2/source/sidebar/ControllerFactory.cxx
b/sfx2/source/sidebar/ControllerFactory.cxx
index b32df56dfebd..4d819eb5ae23 100644
--- a/sfx2/source/sidebar/ControllerFactory.cxx
+++ b/sfx2/source/sidebar/ControllerFactory.cxx
@@ -118,8 +118,8 @@ Reference<frame::XToolbarController>
ControllerFactory::CreateToolBoxController(
VclPtr<vcl::Window> pItemWindow =
VCLUnoHelper::GetWindow(xItemWindow);
if (pItemWindow != nullptr)
{
- WindowType nType = pItemWindow->GetType();
- if (nType == WindowType::LISTBOX || nType ==
WindowType::MULTILISTBOX || nType == WindowType::COMBOBOX)
+ WindowType eType = pItemWindow->GetType();
+ if (eType == WindowType::LISTBOX || eType ==
WindowType::MULTILISTBOX || eType == WindowType::COMBOBOX)
pItemWindow->SetAccessibleName(pToolBox->GetItemText(nItemId));
if (nWidth > 0)
pItemWindow->SetSizePixel(Size(nWidth,
pItemWindow->GetSizePixel().Height()));
diff --git a/toolkit/inc/helper/btndlg.hxx b/toolkit/inc/helper/btndlg.hxx
index 8894b8dec619..f865d63308bb 100644
--- a/toolkit/inc/helper/btndlg.hxx
+++ b/toolkit/inc/helper/btndlg.hxx
@@ -61,7 +61,7 @@ public:
void RemoveButton( sal_uInt16 nId );
protected:
- ButtonDialog( WindowType nType );
+ ButtonDialog( WindowType eType );
tools::Long ImplGetButtonSize();
private:
diff --git a/toolkit/source/awt/vclxtoolkit.cxx
b/toolkit/source/awt/vclxtoolkit.cxx
index 46367dc8fffb..4edeefabfb1d 100644
--- a/toolkit/source/awt/vclxtoolkit.cxx
+++ b/toolkit/source/awt/vclxtoolkit.cxx
@@ -1377,32 +1377,32 @@ vcl::Window* VCLXToolkit::ImplCreateWindow(
rtl::Reference<VCLXWindow>* ppNewCom
OUString aServiceName = rDescriptor.WindowServiceName.toAsciiLowerCase();
VclPtr<vcl::Window> pNewWindow;
- WindowType nType = ImplGetComponentType( aServiceName );
+ WindowType eType = ImplGetComponentType( aServiceName );
bool bFrameControl = false;
if ( aServiceName == "frame" )
bFrameControl = true;
if ( aServiceName == "tabcontrolnotabs" )
{
nWinBits |= WB_NOBORDER;
- nType = ImplGetComponentType( u"tabcontrol"_ustr );
+ eType = ImplGetComponentType( u"tabcontrol"_ustr );
}
if ( !pParent )
{
// If the component needs a parent, then return NULL,
// some time later css::uno::Exception...
bool bException = true;
- if ( ( nType == WindowType::DIALOG )
- || ( nType == WindowType::MODELESSDIALOG )
- || ( nType == WindowType::MESSBOX )
- || ( nType == WindowType::INFOBOX )
- || ( nType == WindowType::WARNINGBOX )
- || ( nType == WindowType::ERRORBOX )
- || ( nType == WindowType::QUERYBOX )
+ if ( ( eType == WindowType::DIALOG )
+ || ( eType == WindowType::MODELESSDIALOG )
+ || ( eType == WindowType::MESSBOX )
+ || ( eType == WindowType::INFOBOX )
+ || ( eType == WindowType::WARNINGBOX )
+ || ( eType == WindowType::ERRORBOX )
+ || ( eType == WindowType::QUERYBOX )
)
bException = false;
- else if ( ( nType == WindowType::WINDOW ) ||
- ( nType == WindowType::WORKWINDOW ) ||
- ( nType == WindowType::TOOLKIT_FRAMEWINDOW ) )
+ else if ( ( eType == WindowType::WINDOW ) ||
+ ( eType == WindowType::WORKWINDOW ) ||
+ ( eType == WindowType::TOOLKIT_FRAMEWINDOW ) )
{
if ( rDescriptor.Type == css::awt::WindowClass_TOP )
bException = false;
@@ -1415,10 +1415,10 @@ vcl::Window* VCLXToolkit::ImplCreateWindow(
rtl::Reference<VCLXWindow>* ppNewCom
}
}
- if ( nType != WindowType::NONE )
+ if ( eType != WindowType::NONE )
{
SolarMutexGuard aVclGuard;
- switch ( nType )
+ switch ( eType )
{
case WindowType::CANCELBUTTON:
pNewWindow = VclPtr<CancelButton>::Create( pParent, nWinBits );
@@ -1657,7 +1657,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow(
rtl::Reference<VCLXWindow>* ppNewCom
case WindowType::DOCKINGWINDOW:
if ( rDescriptor.Type == css::awt::WindowClass_TOP )
{
- if (nType == WindowType::DOCKINGWINDOW )
+ if (eType == WindowType::DOCKINGWINDOW )
pNewWindow = VclPtr<DockingWindow>::Create( pParent,
nWinBits );
else
{
@@ -1729,7 +1729,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow(
rtl::Reference<VCLXWindow>* ppNewCom
}
else if ( rDescriptor.Type == css::awt::WindowClass_CONTAINER )
{
- if (nType == WindowType::DOCKINGWINDOW )
+ if (eType == WindowType::DOCKINGWINDOW )
pNewWindow = VclPtr<DockingWindow>::Create( pParent,
nWinBits );
else
pNewWindow = VclPtr<vcl::Window>::Create( pParent,
nWinBits );
@@ -1737,7 +1737,7 @@ vcl::Window* VCLXToolkit::ImplCreateWindow(
rtl::Reference<VCLXWindow>* ppNewCom
}
else
{
- if (nType == WindowType::DOCKINGWINDOW )
+ if (eType == WindowType::DOCKINGWINDOW )
pNewWindow = VclPtr<DockingWindow>::Create( pParent,
nWinBits );
else
pNewWindow = VclPtr<vcl::Window>::Create( pParent,
nWinBits );
diff --git a/toolkit/source/helper/btndlg.cxx b/toolkit/source/helper/btndlg.cxx
index a2471c3f92cd..92007425ef9d 100644
--- a/toolkit/source/helper/btndlg.cxx
+++ b/toolkit/source/helper/btndlg.cxx
@@ -42,8 +42,8 @@ void ButtonDialog::ImplInitButtonDialogData()
mbFormat = true;
}
-ButtonDialog::ButtonDialog( WindowType nType ) :
- Dialog( nType )
+ButtonDialog::ButtonDialog( WindowType eType ) :
+ Dialog( eType )
{
ImplInitButtonDialogData();
}
diff --git a/vcl/inc/window.h b/vcl/inc/window.h
index 6d04f20217d3..ea4cd20d6928 100644
--- a/vcl/inc/window.h
+++ b/vcl/inc/window.h
@@ -297,7 +297,7 @@ public:
WinBits mnStyle;
WinBits mnPrevStyle;
WindowExtendedStyle mnExtendedStyle;
- WindowType mnType;
+ WindowType meType;
ControlPart mnNativeBackground;
sal_uInt16 mnWaitCount;
ImplPaintFlags mnPaintFlags;
diff --git a/vcl/source/accessibility/acc_factory.cxx
b/vcl/source/accessibility/acc_factory.cxx
index 6756899685a1..282a8ad126eb 100644
--- a/vcl/source/accessibility/acc_factory.cxx
+++ b/vcl/source/accessibility/acc_factory.cxx
@@ -129,34 +129,34 @@ Reference< XAccessibleContext >
AccessibleFactory::createAccessibleContext(vcl::
if (!pWindow)
return nullptr;
- WindowType nType = pWindow->GetType();
+ WindowType eType = pWindow->GetType();
- if ( nType == WindowType::STATUSBAR )
+ if ( eType == WindowType::STATUSBAR )
{
return new VCLXAccessibleStatusBar(pWindow);
}
- else if ( nType == WindowType::TABCONTROL )
+ else if ( eType == WindowType::TABCONTROL )
{
return new VCLXAccessibleTabControl(pWindow);
}
- else if ( nType == WindowType::TABPAGE &&
pWindow->GetAccessibleParentWindow() &&
pWindow->GetAccessibleParentWindow()->GetType() == WindowType::TABCONTROL )
+ else if ( eType == WindowType::TABPAGE &&
pWindow->GetAccessibleParentWindow() &&
pWindow->GetAccessibleParentWindow()->GetType() == WindowType::TABCONTROL )
{
return new VCLXAccessibleTabPageWindow(pWindow);
}
- else if ( nType == WindowType::FLOATINGWINDOW )
+ else if ( eType == WindowType::FLOATINGWINDOW )
{
return new FloatingWindowAccessible(pWindow);
}
- else if ( nType == WindowType::BORDERWINDOW && hasFloatingChild( pWindow )
)
+ else if ( eType == WindowType::BORDERWINDOW && hasFloatingChild( pWindow )
)
{
return new FloatingWindowAccessible(pWindow);
}
- else if ( ( nType == WindowType::HELPTEXTWINDOW ) || ( nType ==
WindowType::FIXEDLINE ) )
+ else if ( ( eType == WindowType::HELPTEXTWINDOW ) || ( eType ==
WindowType::FIXEDLINE ) )
{
return new VCLXAccessibleFixedText(pWindow);
}
diff --git a/vcl/source/control/button.cxx b/vcl/source/control/button.cxx
index 4f8eafa7a144..522c83500520 100644
--- a/vcl/source/control/button.cxx
+++ b/vcl/source/control/button.cxx
@@ -98,8 +98,8 @@ mbSmallSymbol(false), mbGeneratedTooltip(false),
meImageAlign(ImageAlign::Top),
{
}
-Button::Button( WindowType nType ) :
- Control( nType ),
+Button::Button( WindowType eType ) :
+ Control( eType ),
mpButtonData( std::make_unique<ImplCommonButtonData>() )
{
}
diff --git a/vcl/source/control/ctrl.cxx b/vcl/source/control/ctrl.cxx
index 522d6b8daf8d..2f285c480234 100644
--- a/vcl/source/control/ctrl.cxx
+++ b/vcl/source/control/ctrl.cxx
@@ -36,8 +36,8 @@ void Control::ImplInitControlData()
mbShowAccelerator = false;
}
-Control::Control( WindowType nType ) :
- Window( nType )
+Control::Control(WindowType eType)
+ : Window(eType)
{
ImplInitControlData();
}
diff --git a/vcl/source/control/edit.cxx b/vcl/source/control/edit.cxx
index a29127f5ff40..015a956e4703 100644
--- a/vcl/source/control/edit.cxx
+++ b/vcl/source/control/edit.cxx
@@ -121,8 +121,8 @@ void Impl_IMEInfos::DestroyAttribs()
nLen = 0;
}
-Edit::Edit( WindowType nType )
- : Control( nType )
+Edit::Edit( WindowType eType )
+ : Control( eType )
{
ImplInitEditData();
}
diff --git a/vcl/source/control/listbox.cxx b/vcl/source/control/listbox.cxx
index beaa0cc19c06..86081d5c9672 100644
--- a/vcl/source/control/listbox.cxx
+++ b/vcl/source/control/listbox.cxx
@@ -34,8 +34,8 @@
#include <boost/property_tree/ptree.hpp>
#include <tools/json_writer.hxx>
-ListBox::ListBox(WindowType nType)
- : Control(nType)
+ListBox::ListBox(WindowType eType)
+ : Control(eType)
, mpImplLB(nullptr)
{
ImplInitListBoxData();
diff --git a/vcl/source/control/spinfld.cxx b/vcl/source/control/spinfld.cxx
index b426934572bd..6582c24cec7b 100644
--- a/vcl/source/control/spinfld.cxx
+++ b/vcl/source/control/spinfld.cxx
@@ -337,8 +337,8 @@ void SpinField::ImplInit(vcl::Window* pParent, WinBits
nWinStyle)
SetCompoundControl(true);
}
-SpinField::SpinField(vcl::Window* pParent, WinBits nWinStyle, WindowType
nType) :
- Edit(nType), maRepeatTimer("SpinField maRepeatTimer")
+SpinField::SpinField(vcl::Window* pParent, WinBits nWinStyle, WindowType
eType) :
+ Edit(eType), maRepeatTimer("SpinField maRepeatTimer")
{
ImplInitSpinFieldData();
ImplInit(pParent, nWinStyle);
diff --git a/vcl/source/uitest/logger.cxx b/vcl/source/uitest/logger.cxx
index a034e4da1d5b..31f98cc84ede 100644
--- a/vcl/source/uitest/logger.cxx
+++ b/vcl/source/uitest/logger.cxx
@@ -26,15 +26,15 @@ namespace
{
bool isDialogWindow(vcl::Window const* pWindow)
{
- WindowType nType = pWindow->GetType();
- if (nType == WindowType::DIALOG || nType == WindowType::MODELESSDIALOG)
+ WindowType eType = pWindow->GetType();
+ if (eType == WindowType::DIALOG || eType == WindowType::MODELESSDIALOG)
return true;
// MESSBOX, INFOBOX, WARNINGBOX, ERRORBOX, QUERYBOX
- if (nType >= WindowType::MESSBOX && nType <= WindowType::QUERYBOX)
+ if (eType >= WindowType::MESSBOX && eType <= WindowType::QUERYBOX)
return true;
- if (nType == WindowType::TABDIALOG)
+ if (eType == WindowType::TABDIALOG)
return true;
return false;
diff --git a/vcl/source/uitest/uiobject.cxx b/vcl/source/uitest/uiobject.cxx
index dfb28dd0ff8f..ebfffef5a9d3 100644
--- a/vcl/source/uitest/uiobject.cxx
+++ b/vcl/source/uitest/uiobject.cxx
@@ -99,15 +99,15 @@ namespace {
bool isDialogWindow(vcl::Window const * pWindow)
{
- WindowType nType = pWindow->GetType();
- if (nType == WindowType::DIALOG || nType == WindowType::MODELESSDIALOG)
+ WindowType eType = pWindow->GetType();
+ if (eType == WindowType::DIALOG || eType == WindowType::MODELESSDIALOG)
return true;
// MESSBOX, INFOBOX, WARNINGBOX, ERRORBOX, QUERYBOX
- if (nType >= WindowType::MESSBOX && nType <= WindowType::QUERYBOX)
+ if (eType >= WindowType::MESSBOX && eType <= WindowType::QUERYBOX)
return true;
- if (nType == WindowType::TABDIALOG)
+ if (eType == WindowType::TABDIALOG)
return true;
return false;
diff --git a/vcl/source/window/builder.cxx b/vcl/source/window/builder.cxx
index d626c63d506d..a49341526969 100644
--- a/vcl/source/window/builder.cxx
+++ b/vcl/source/window/builder.cxx
@@ -170,16 +170,16 @@ namespace
void setupFromActionName(Button *pButton, VclBuilder::stringmap &rMap,
const css::uno::Reference<css::frame::XFrame>& rFrame);
#if defined SAL_LOG_WARN
- bool isButtonType(WindowType nType)
- {
- return nType == WindowType::PUSHBUTTON ||
- nType == WindowType::OKBUTTON ||
- nType == WindowType::CANCELBUTTON ||
- nType == WindowType::HELPBUTTON ||
- nType == WindowType::IMAGEBUTTON ||
- nType == WindowType::MENUBUTTON ||
- nType == WindowType::MOREBUTTON ||
- nType == WindowType::SPINBUTTON;
+ bool isButtonType(WindowType eType)
+ {
+ return eType == WindowType::PUSHBUTTON ||
+ eType == WindowType::OKBUTTON ||
+ eType == WindowType::CANCELBUTTON ||
+ eType == WindowType::HELPBUTTON ||
+ eType == WindowType::IMAGEBUTTON ||
+ eType == WindowType::MENUBUTTON ||
+ eType == WindowType::MOREBUTTON ||
+ eType == WindowType::SPINBUTTON;
}
#endif
diff --git a/vcl/source/window/dialog.cxx b/vcl/source/window/dialog.cxx
index b65319e9aea5..112c1b7b5b14 100644
--- a/vcl/source/window/dialog.cxx
+++ b/vcl/source/window/dialog.cxx
@@ -547,8 +547,8 @@ void Dialog::ImplLOKNotifier(vcl::Window* pParent)
}
}
-Dialog::Dialog( WindowType nType )
- : SystemWindow( nType, "vcl::Dialog maLayoutIdle", true )
+Dialog::Dialog( WindowType eType )
+ : SystemWindow( eType, "vcl::Dialog maLayoutIdle", true )
, mnInitFlag(InitFlag::Default)
{
ImplInitDialogData();
diff --git a/vcl/source/window/dockwin.cxx b/vcl/source/window/dockwin.cxx
index fd4f07794de4..29d0f4d9e4c1 100644
--- a/vcl/source/window/dockwin.cxx
+++ b/vcl/source/window/dockwin.cxx
@@ -345,8 +345,8 @@ void DockingWindow::ImplInitSettings()
SetBackground( aColor );
}
-DockingWindow::DockingWindow( WindowType nType, const char* pIdleDebugName ) :
- Window(nType),
+DockingWindow::DockingWindow( WindowType eType, const char* pIdleDebugName ) :
+ Window(eType),
maLayoutIdle( pIdleDebugName )
{
ImplInitDockingWindowData();
diff --git a/vcl/source/window/legacyaccessibility.cxx
b/vcl/source/window/legacyaccessibility.cxx
index dc3275ff84ff..4d4231f9055d 100644
--- a/vcl/source/window/legacyaccessibility.cxx
+++ b/vcl/source/window/legacyaccessibility.cxx
@@ -66,14 +66,14 @@ static vcl::Window* ImplGetLabelFor(vcl::Window*
pFrameWindow, WindowType nMyTyp
false );
if( pSWindow && isVisibleInLayout(pSWindow) && !
(pSWindow->GetStyle() & WB_NOLABEL) )
{
- WindowType nType = pSWindow->GetType();
- if( nType != WindowType::FIXEDTEXT &&
- nType != WindowType::FIXEDLINE &&
- nType != WindowType::GROUPBOX )
+ WindowType eType = pSWindow->GetType();
+ if( eType != WindowType::FIXEDTEXT &&
+ eType != WindowType::FIXEDLINE &&
+ eType != WindowType::GROUPBOX )
{
pWindow = pSWindow;
}
- else if( bThisIsAGroupControl && ( nType ==
WindowType::FIXEDTEXT ) )
+ else if( bThisIsAGroupControl && ( eType ==
WindowType::FIXEDTEXT ) )
{
pWindow = pSWindow;
}
@@ -142,13 +142,13 @@ static Window* ImplGetLabeledBy(Window* pFrameWindow,
WindowType nMyType, const
false );
if( pSWindow && isVisibleInLayout(pSWindow) &&
!(pSWindow->GetStyle() & WB_NOLABEL) )
{
- WindowType nType = pSWindow->GetType();
- if ( nType == WindowType::FIXEDTEXT ||
- nType == WindowType::FIXEDLINE ||
- nType == WindowType::GROUPBOX )
+ WindowType eType = pSWindow->GetType();
+ if ( eType == WindowType::FIXEDTEXT ||
+ eType == WindowType::FIXEDLINE ||
+ eType == WindowType::GROUPBOX )
{
// a fixed text can't be labelled by a fixed text.
- if ( ( nMyType != WindowType::FIXEDTEXT ) || ( nType
!= WindowType::FIXEDTEXT ) )
+ if ( ( nMyType != WindowType::FIXEDTEXT ) || ( eType
!= WindowType::FIXEDTEXT ) )
pWindow = pSWindow;
break;
}
diff --git a/vcl/source/window/syswin.cxx b/vcl/source/window/syswin.cxx
index 1601501f0571..f894d4910f3e 100644
--- a/vcl/source/window/syswin.cxx
+++ b/vcl/source/window/syswin.cxx
@@ -78,8 +78,8 @@ bool SystemWindow::LayoutIdle::DecideTransferredExecution()
return true;
}
-SystemWindow::SystemWindow(WindowType nType, const char* pIdleDebugName, bool
transferableIdle)
- : Window(nType)
+SystemWindow::SystemWindow(WindowType eType, const char* pIdleDebugName, bool
transferableIdle)
+ : Window(eType)
, mpImplData(new ImplData)
, maLayoutIdle( pIdleDebugName, *this, transferableIdle )
{
diff --git a/vcl/source/window/window.cxx b/vcl/source/window/window.cxx
index 92170e88f385..985d0b298660 100644
--- a/vcl/source/window/window.cxx
+++ b/vcl/source/window/window.cxx
@@ -94,8 +94,8 @@ using namespace ::com::sun::star::datatransfer::dnd;
namespace vcl {
-Window::Window( WindowType nType )
- : mpWindowImpl(new WindowImpl( *this, nType ))
+Window::Window( WindowType eType )
+ : mpWindowImpl(new WindowImpl( *this, eType ))
{
// true: this outdev will be mirrored if RTL window layout (UI mirroring)
is globally active
mpWindowImpl->mxOutDev->mbEnableRTL = AllSettings::GetLayoutRTL();
@@ -586,7 +586,7 @@ bool WindowOutputDevice::CanEnableNativeWidget() const
} /* namespace vcl */
-WindowImpl::WindowImpl( vcl::Window& rWindow, WindowType nType )
+WindowImpl::WindowImpl( vcl::Window& rWindow, WindowType eType )
{
mxOutDev = VclPtr<vcl::WindowOutputDevice>::Create(rWindow);
maZoom = Fraction( 1, 1 );
@@ -637,7 +637,7 @@ WindowImpl::WindowImpl( vcl::Window& rWindow, WindowType
nType )
mnStyle = 0; // style
(init in ImplInitWindow)
mnPrevStyle = 0; //
prevstyle (set in SetStyle)
mnExtendedStyle = WindowExtendedStyle::NONE; //
extended style (init in ImplInitWindow)
- mnType = nType; // type
+ meType = eType; // type
mnGetFocusFlags = GetFocusFlags::NONE; // Flags
for GetFocus()-Call
mnWaitCount = 0; //
Wait-Count (>1 == "wait" mouse pointer)
mnPaintFlags = ImplPaintFlags::NONE; // Flags
for ImplCallPaint
@@ -1022,7 +1022,7 @@ void Window::ImplInit( vcl::Window* pParent, WinBits
nStyle, SystemParentData* p
if( nStyle & WB_SYSTEMCHILDWINDOW )
nFrameStyle |= SalFrameStyleFlags::SYSTEMCHILD;
- switch (mpWindowImpl->mnType)
+ switch (mpWindowImpl->meType)
{
case WindowType::DIALOG:
case WindowType::TABDIALOG:
diff --git a/vcl/source/window/window2.cxx b/vcl/source/window/window2.cxx
index 616ff93da13c..7b1946360a47 100644
--- a/vcl/source/window/window2.cxx
+++ b/vcl/source/window/window2.cxx
@@ -1031,16 +1031,16 @@ WindowExtendedStyle Window::GetExtendedStyle() const
return mpWindowImpl ? mpWindowImpl->mnExtendedStyle :
WindowExtendedStyle::NONE;
}
-void Window::SetType( WindowType nType )
+void Window::SetType( WindowType eType )
{
if (mpWindowImpl)
- mpWindowImpl->mnType = nType;
+ mpWindowImpl->meType = eType;
}
WindowType Window::GetType() const
{
if (mpWindowImpl)
- return mpWindowImpl->mnType;
+ return mpWindowImpl->meType;
else
return WindowType::NONE;
}
diff --git a/vcl/source/window/wrkwin.cxx b/vcl/source/window/wrkwin.cxx
index a04c46ae290e..4e0448335270 100644
--- a/vcl/source/window/wrkwin.cxx
+++ b/vcl/source/window/wrkwin.cxx
@@ -82,8 +82,8 @@ void WorkWindow::ImplInit( vcl::Window* pParent, WinBits
nStyle, const css::uno:
ImplInit( pParent, nStyle );
}
-WorkWindow::WorkWindow( WindowType nType ) :
- SystemWindow( nType, "vcl::WorkWindow maLayoutIdle" )
+WorkWindow::WorkWindow( WindowType eType ) :
+ SystemWindow( eType, "vcl::WorkWindow maLayoutIdle" )
{
ImplInitWorkWindowData();
}
