convert vcl StateChangedType to enum class

Change-Id: Ifa46523619ae7fb8d112525b8df594836e51bb8f
Reviewed-on: https://gerrit.libreoffice.org/11843
Tested-by: LibreOffice gerrit bot <gerrit@libreoffice.org>
Reviewed-by: Noel Grandin <noelgrandin@gmail.com>

7 files changed, 31 insertions, 29 deletions

diff --git a/include/svtools/wizdlg.hxx b/include/svtools/wizdlg.hxx
index 480032d3b896..a4ab0027cc81 100644
--- a/include/svtools/wizdlg.hxx
+++ b/include/svtools/wizdlg.hxx
@@ -249,7 +249,7 @@ public:
     virtual void        ActivatePage();
     virtual long        DeactivatePage();
 
-    virtual void        queue_resize(StateChangedType eReason = STATE_CHANGE_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 9e8b90aac1fe..93b0030127da 100644
--- a/include/svx/sidebar/PanelLayout.hxx
+++ b/include/svx/sidebar/PanelLayout.hxx
@@ -36,7 +36,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 = STATE_CHANGE_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 e8b7dce37ca8..c967c95dc43d 100644
--- a/include/vcl/dialog.hxx
+++ b/include/vcl/dialog.hxx
@@ -87,7 +87,7 @@ public:
     virtual void    StateChanged( StateChangedType nStateChange ) SAL_OVERRIDE;
     virtual void    DataChanged( const DataChangedEvent& rDCEvt ) SAL_OVERRIDE;
 
-    virtual void queue_resize(StateChangedType eReason = STATE_CHANGE_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/layout.hxx b/include/vcl/layout.hxx
index 374a42c6e9fe..0eed7cb6f723 100644
--- a/include/vcl/layout.hxx
+++ b/include/vcl/layout.hxx
@@ -40,7 +40,7 @@ public:
         m_bLayoutDirty = true;
     }
 
-    virtual void queue_resize(StateChangedType eReason = STATE_CHANGE_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 11877a000cbb..1f98a6b1d713 100644
--- a/include/vcl/syswin.hxx
+++ b/include/vcl/syswin.hxx
@@ -189,7 +189,7 @@ public:
     virtual void    Resizing( Size& rSize );
     virtual void    Resize() SAL_OVERRIDE;
     virtual Size    GetOptimalSize() const SAL_OVERRIDE;
-    virtual void    queue_resize(StateChangedType eReason = STATE_CHANGE_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 5351e452e924..526bc25ddfec 100644
--- a/include/vcl/tabctrl.hxx
+++ b/include/vcl/tabctrl.hxx
@@ -189,7 +189,7 @@ public:
         mbLayoutDirty = true;
     }
 
-    virtual void queue_resize(StateChangedType eReason = STATE_CHANGE_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 14c23bdfbcff..3e942872364e 100644
--- a/include/vcl/window.hxx
+++ b/include/vcl/window.hxx
@@ -228,28 +228,30 @@ namespace svt { class PopupWindowControllerImpl; }
 #define AUTOSCROLL_HORZ                 ((sal_uInt16)0x0002)
 
 // Flags for StateChanged()
-typedef sal_uInt16 StateChangedType;
-#define STATE_CHANGE_INITSHOW           ((StateChangedType)1)
-#define STATE_CHANGE_VISIBLE            ((StateChangedType)2)
-#define STATE_CHANGE_UPDATEMODE         ((StateChangedType)3)
-#define STATE_CHANGE_ENABLE             ((StateChangedType)4)
-#define STATE_CHANGE_TEXT               ((StateChangedType)5)
-#define STATE_CHANGE_IMAGE              ((StateChangedType)6)
-#define STATE_CHANGE_DATA               ((StateChangedType)7)
-#define STATE_CHANGE_STATE              ((StateChangedType)8)
-#define STATE_CHANGE_STYLE              ((StateChangedType)9)
-#define STATE_CHANGE_ZOOM               ((StateChangedType)10)
-#define STATE_CHANGE_BORDER             ((StateChangedType)11)
-#define STATE_CHANGE_TRANSPARENT        ((StateChangedType)12)
-#define STATE_CHANGE_CONTROLFONT        ((StateChangedType)13)
-#define STATE_CHANGE_CONTROLFOREGROUND  ((StateChangedType)14)
-#define STATE_CHANGE_CONTROLBACKGROUND  ((StateChangedType)15)
-#define STATE_CHANGE_READONLY           ((StateChangedType)16)
-#define STATE_CHANGE_EXTENDEDSTYLE      ((StateChangedType)17)
-#define STATE_CHANGE_MIRRORING          ((StateChangedType)18)
-#define STATE_CHANGE_LAYOUT             ((StateChangedType)19)
-#define STATE_CHANGE_CONTROL_FOCUS      ((StateChangedType)20)
-#define STATE_CHANGE_USER               ((StateChangedType)10000)
+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,
+    TRANSPARENT        = 12,
+    CONTROLFONT        = 13,
+    CONTROLFOREGROUND  = 14,
+    CONTROLBACKGROUND  = 15,
+    READONLY           = 16,
+    EXTENDEDSTYLE      = 17,
+    MIRRORING          = 18,
+    LAYOUT             = 19,
+    CONTROL_FOCUS      = 20,
+    USER               = 10000
+};
 
 // GetFocusFlags
 #define GETFOCUS_TAB                    ((sal_uInt16)0x0001)
@@ -1226,7 +1228,7 @@ public:
      *
      * akin to gtk_widget_queue_resize
      */
-    virtual void queue_resize(StateChangedType eReason = STATE_CHANGE_LAYOUT);
+    virtual void queue_resize(StateChangedType eReason = StateChangedType::LAYOUT);
 
     /*
      * Sets the "width-request" property