* skins2/*: cosmetic changes

diff --git a/modules/gui/skins2/controls/ctrl_image.hpp b/modules/gui/skins2/controls/ctrl_image.hpp
index 7eb3015e326a7de89cad44cbfeaaa25dec3baec2..effb253d7c4633b7eaead36a619f0853c6050822 100644 (file)
--- a/modules/gui/skins2/controls/ctrl_image.hpp
+++ b/modules/gui/skins2/controls/ctrl_image.hpp
@@ -37,11 +37,11 @@ class CtrlImage: public CtrlFlat
 {
     public:
         /// Resize methods
-        typedef enum
+        enum resize_t
         {
             kMosaic,  // Repeat the base image in a mosaic
             kScale    // Scale the base image
-        } resize_t;
+        };
 
         // Create an image with the given bitmap (which is NOT copied)
         CtrlImage( intf_thread_t *pIntf, const GenericBitmap &rBitmap,

diff --git a/modules/gui/skins2/events/evt_key.hpp b/modules/gui/skins2/events/evt_key.hpp
index b782e752adbe7e6488fc3b44531603271ab948ff..d40ac0b2a1fff0296ab9cec8d96b9dc1c366111b 100644 (file)
--- a/modules/gui/skins2/events/evt_key.hpp
+++ b/modules/gui/skins2/events/evt_key.hpp
@@ -32,11 +32,11 @@
 class EvtKey: public EvtInput
 {
     public:
-        typedef enum
+        enum ActionType_t
         {
             kDown,
             kUp
-        } ActionType_t;
+        };
 
         EvtKey( intf_thread_t *pIntf, int key, ActionType_t action,
                 int mod = kModNone ):

diff --git a/modules/gui/skins2/events/evt_mouse.hpp b/modules/gui/skins2/events/evt_mouse.hpp
index e0fe38b95e4c0298822d083aa6d0bae1af3bd8a2..8a9004eb15794e104d22a8df01b688961f753193 100644 (file)
--- a/modules/gui/skins2/events/evt_mouse.hpp
+++ b/modules/gui/skins2/events/evt_mouse.hpp
@@ -32,19 +32,19 @@
 class EvtMouse: public EvtInput
 {
     public:
-        typedef enum
+        enum ButtonType_t
         {
             kLeft,
             kMiddle,
             kRight
-        } ButtonType_t;
+        };
 
-        typedef enum
+        enum ActionType_t
         {
             kDown,
             kUp,
             kDblClick
-        } ActionType_t;
+        };
 
         EvtMouse( intf_thread_t *pIntf, int xPos, int yPos, ButtonType_t button,
                   ActionType_t action, int mod = kModNone ):

diff --git a/modules/gui/skins2/events/evt_scroll.hpp b/modules/gui/skins2/events/evt_scroll.hpp
index e7818150104ccd3a6c93aae024a1ea4b45976f0c..56bbcf30d96a8c549913e09a875cb4037c549938 100644 (file)
--- a/modules/gui/skins2/events/evt_scroll.hpp
+++ b/modules/gui/skins2/events/evt_scroll.hpp
@@ -32,11 +32,11 @@
 class EvtScroll: public EvtInput
 {
     public:
-        typedef enum
+        enum Direction_t
         {
             kUp,
             kDown
-        } Direction_t;
+        };
 
         EvtScroll( intf_thread_t *pIntf, int xPos, int yPos,
                    Direction_t direction, int mod = kModNone ):

diff --git a/modules/gui/skins2/events/evt_special.hpp b/modules/gui/skins2/events/evt_special.hpp
index 86392b450b3996ba3323e309315bd3b2c99f2a86..7cbcce55c7be4f83f1b264a82b10e69aa1adb98a 100644 (file)
--- a/modules/gui/skins2/events/evt_special.hpp
+++ b/modules/gui/skins2/events/evt_special.hpp
@@ -32,13 +32,13 @@
 class EvtSpecial: public EvtGeneric
 {
     public:
-        typedef enum
+        enum ActionType_t
         {
             kShow,
             kHide,
             kEnable,
             kDisable
-        } ActionType_t;
+        };
 
         EvtSpecial( intf_thread_t *pIntf, ActionType_t action ):
             EvtGeneric( pIntf ), m_action( action ) {}

diff --git a/modules/gui/skins2/src/dialogs.hpp b/modules/gui/skins2/src/dialogs.hpp
index 239f7339986446c20c3c459fa5167ded808ed180..d3689aeb25585968ecfd40be1c1ca457e0cc9b16 100644 (file)
--- a/modules/gui/skins2/src/dialogs.hpp
+++ b/modules/gui/skins2/src/dialogs.hpp
@@ -97,12 +97,12 @@ class Dialogs: public SkinObject
         typedef void DlgCallback( intf_dialog_args_t *pArg );
 
         /// Possible flags for the open/save dialog
-        typedef enum
+        enum flags_t
         {
             kOPEN     = 0x01,
             kSAVE     = 0x02,
             kMULTIPLE = 0x04
-        } flags_t;
+        };
 
         /// Initialization method
         bool init();

diff --git a/modules/gui/skins2/src/os_factory.hpp b/modules/gui/skins2/src/os_factory.hpp
index 73fe300e3b3eade835e98b689fef87a776b99213..49f4e07d8b10fecc9f4a1445035999448f54f1f7 100644 (file)
--- a/modules/gui/skins2/src/os_factory.hpp
+++ b/modules/gui/skins2/src/os_factory.hpp
@@ -44,14 +44,14 @@ class OSTimer;
 class OSFactory: public SkinObject
 {
     public:
-        typedef enum
+        enum CursorType_t
         {
             kDefaultArrow,
             kResizeNS,
             kResizeWE,
             kResizeNWSE,
             kResizeNESW
-        } CursorType_t;
+        };
 
         /// Initialization method overloaded in derived classes.
         /// It must return false if the init failed.

diff --git a/modules/gui/skins2/utils/bezier.hpp b/modules/gui/skins2/utils/bezier.hpp
index 2657e3d96aa62baddedc95526f769783018f3c6b..aa5e96ec43529b07996f3e6fec30e494897bf993 100644 (file)
--- a/modules/gui/skins2/utils/bezier.hpp
+++ b/modules/gui/skins2/utils/bezier.hpp
@@ -38,12 +38,12 @@ class Bezier: public SkinObject
     public:
         /// Values to indicate which coordinate(s) must be checked to consider
         /// that two points are distinct
-        typedef enum
+        enum Flag_t
         {
             kCoordsBoth,    // x or y must be different (default)
             kCoordsX,       // only x is different
             kCoordsY        // only y is different
-        } Flag_t;
+        };
 
         Bezier( intf_thread_t *p_intf,
                 const vector<float> &pAbscissas,

diff --git a/modules/gui/skins2/utils/position.hpp b/modules/gui/skins2/utils/position.hpp
index b1584f98c09325a6437a400d3532cd6e67a1fbde..30baecdf429c432045ebf52d15f2aa5a90507054 100644 (file)
--- a/modules/gui/skins2/utils/position.hpp
+++ b/modules/gui/skins2/utils/position.hpp
@@ -68,7 +68,7 @@ class Position
 {
     public:
         /// Type for reference edge/corner
-        typedef enum
+        enum Ref_t
         {
             /// Coordinates are relative to the upper left corner
             kLeftTop,
@@ -78,7 +78,7 @@ class Position
             kLeftBottom,
             /// Coordinates are relative to the lower right corner
             kRightBottom
-        } Ref_t;
+        };
 
         /// Create a new position relative to the given box
         Position( int left, int top, int right, int bottom, const Box &rBox,