vcl: rename other members of StateChangedType for consistency

Change-Id: Ifd3339813e5d3dfb54566fd226aaf2d2a199d59a

8 files changed, 28 insertions, 28 deletions

diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 5fb9f5c57346..70d7cb196628 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -251,7 +251,7 @@ public:
     virtual void        ActivatePage();
     virtual bool        DeactivatePage();
 
-    virtual void        queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE;
+    virtual void        queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE;
 
     bool                ShowPrevPage();
     bool                ShowNextPage();
diff --git a/include/svx/sidebar/PanelLayout.hxx b/include/svx/sidebar/PanelLayout.hxx
index d479668067cd..9c58248f9deb 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -39,7 +39,7 @@ public:
 
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
     virtual void setPosSizePixel(long nX, long nY, long nWidth, long nHeight, sal_uInt16 nFlags = WINDOW_POSSIZE_ALL) SAL_OVERRIDE;
-    virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE;
+    virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE;
 
 };
 
diff --git a/include/vcl/dialog.hxx b/include/vcl/dialog.hxx
index 0587aefb7b3e..cf71d70d3443 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -88,7 +88,7 @@ public:
     virtual void    StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
-    virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE;
+    virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE;
     virtual bool set_property(const OString &rKey, const OString &rValue) SAL_OVERRIDE;
     VclButtonBox* get_action_area() { return mpActionArea; }
     VclBox* get_content_area() { return mpContentArea; }
diff --git a/include/vcl/dockwin.hxx b/include/vcl/dockwin.hxx
index 0456c8599b5a..a1617d111ae2 100644
--- a/include/vcl/dockwin.hxx
+++ b/include/vcl/dockwin.hxx
@@ -359,7 +359,7 @@ public:
     virtual void SetText( const OUString& rStr ) SAL_OVERRIDE;
     virtual OUString GetText() const SAL_OVERRIDE;
     virtual Size GetOptimalSize() const SAL_OVERRIDE;
-    virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE;
+    virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE;
 };
 
 inline void DockingWindow::SetPin( bool bPin )
diff --git a/include/vcl/layout.hxx b/include/vcl/layout.hxx
index 85c613919020..e73399c1abf1 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -41,7 +41,7 @@ public:
         m_bLayoutDirty = true;
     }
 
-    virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE;
+    virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE;
 protected:
     //these are the two that need to be implemented by
     //containers, figure out how much space you want...
diff --git a/include/vcl/syswin.hxx b/include/vcl/syswin.hxx
index db30b5a2bac0..7aef2eaa8927 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -185,7 +185,7 @@ public:
     virtual void    Resizing( Size& rSize );
     virtual void    Resize() SAL_OVERRIDE;
     virtual Size    GetOptimalSize() const SAL_OVERRIDE;
-    virtual void    queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE;
+    virtual void    queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE;
     bool            isLayoutEnabled() const;
     void            setOptimalLayoutSize();
     bool            isCalculatingInitialLayoutSize() const { return mbIsCalculatingInitialLayoutSize; }
diff --git a/include/vcl/tabctrl.hxx b/include/vcl/tabctrl.hxx
index 82c3e96a3e22..3d38996b6496 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -189,7 +189,7 @@ public:
         mbLayoutDirty = true;
     }
 
-    virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT) SAL_OVERRIDE;
+    virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout) SAL_OVERRIDE;
 };
 
 #endif // INCLUDED_VCL_TABCTRL_HXX
diff --git a/include/vcl/window.hxx b/include/vcl/window.hxx
index 68a16093ab79..3209906ff085 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -234,27 +234,27 @@ template<class T> class VclPtr;
 // Flags for StateChanged()
 enum class StateChangedType : sal_uInt16
 {
-    INITSHOW           = 1,
-    VISIBLE            = 2,
-    UPDATEMODE         = 3,
-    ENABLE             = 4,
-    TEXT               = 5,
-    IMAGE              = 6,
-    DATA               = 7,
-    STATE              = 8,
-    STYLE              = 9,
-    ZOOM               = 10,
-    BORDER             = 11,
+    InitShow           = 1,
+    Visible            = 2,
+    UpdateMode         = 3,
+    Enable             = 4,
+    Text               = 5,
+    Image              = 6,
+    Data               = 7,
+    State              = 8,
+    Style              = 9,
+    Zoom               = 10,
+    Border             = 11,
     Transparent        = 12,
-    CONTROLFONT        = 13,
-    CONTROLFOREGROUND  = 14,
-    CONTROLBACKGROUND  = 15,
-    READONLY           = 16,
-    EXTENDEDSTYLE      = 17,
-    MIRRORING          = 18,
-    LAYOUT             = 19,
-    CONTROL_FOCUS      = 20,
-    USER               = 10000
+    ControlFont        = 13,
+    ControlForeground  = 14,
+    ControlBackground  = 15,
+    ReadOnly           = 16,
+    ExtendedStyle      = 17,
+    Mirroring          = 18,
+    Layout             = 19,
+    ControlFocus       = 20,
+    User               = 10000
 };
 
 // GetFocusFlags
@@ -1246,7 +1246,7 @@ public:
      *
      * akin to gtk_widget_queue_resize
      */
-    virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT);
+    virtual void queue_resize(StateChangedType eReason = StateChangedType::Layout);
 
     /*
      * Sets the "width-request" property