From ff65ea953015d3387bc6fa2027102e875198dc26 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Olivier=20Teuli=C3=A8re?= <ipkiss@videolan.org>
Date: Sun, 4 Jun 2006 14:03:54 +0000
Subject: [PATCH]  * modules/gui/skins2/*: More simplifications of the same
 kind

---
 modules/gui/skins2/controls/ctrl_button.hpp       | 2 +-
 modules/gui/skins2/controls/ctrl_checkbox.hpp     | 2 +-
 modules/gui/skins2/controls/ctrl_generic.hpp      | 2 +-
 modules/gui/skins2/controls/ctrl_list.hpp         | 4 ++--
 modules/gui/skins2/controls/ctrl_radialslider.hpp | 2 +-
 modules/gui/skins2/controls/ctrl_slider.hpp       | 4 ++--
 modules/gui/skins2/controls/ctrl_text.hpp         | 2 +-
 modules/gui/skins2/controls/ctrl_tree.hpp         | 2 +-
 modules/gui/skins2/controls/ctrl_video.hpp        | 2 +-
 modules/gui/skins2/src/generic_window.hpp         | 2 +-
 modules/gui/skins2/src/tooltip.hpp                | 2 +-
 modules/gui/skins2/utils/var_bool.hpp             | 6 +++---
 modules/gui/skins2/utils/var_text.hpp             | 4 ++--
 modules/gui/skins2/vars/equalizer.hpp             | 2 +-
 14 files changed, 19 insertions(+), 19 deletions(-)

diff --git a/modules/gui/skins2/controls/ctrl_button.hpp b/modules/gui/skins2/controls/ctrl_button.hpp
index c315e2c7b0..5d11290ebd 100644
--- a/modules/gui/skins2/controls/ctrl_button.hpp
+++ b/modules/gui/skins2/controls/ctrl_button.hpp
@@ -34,7 +34,7 @@ class CmdGeneric;
 
 
 /// Base class for button controls
-class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap, void*>
+class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap>
 {
     public:
         /// Create a button with 3 images
diff --git a/modules/gui/skins2/controls/ctrl_checkbox.hpp b/modules/gui/skins2/controls/ctrl_checkbox.hpp
index d6c2bdf29b..dfa4c16458 100644
--- a/modules/gui/skins2/controls/ctrl_checkbox.hpp
+++ b/modules/gui/skins2/controls/ctrl_checkbox.hpp
@@ -36,7 +36,7 @@ class CmdGeneric;
 
 
 /// Base class for checkbox controls
-class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap, void*>
+class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap>
 {
     public:
         /// Create a checkbox with 6 images
diff --git a/modules/gui/skins2/controls/ctrl_generic.hpp b/modules/gui/skins2/controls/ctrl_generic.hpp
index 0889fa14bd..c3c491ac5c 100644
--- a/modules/gui/skins2/controls/ctrl_generic.hpp
+++ b/modules/gui/skins2/controls/ctrl_generic.hpp
@@ -41,7 +41,7 @@ class VarBool;
 
 
 /// Base class for controls
-class CtrlGeneric: public SkinObject, public Observer<VarBool, void*>
+class CtrlGeneric: public SkinObject, public Observer<VarBool>
 {
     public:
         virtual ~CtrlGeneric();
diff --git a/modules/gui/skins2/controls/ctrl_list.hpp b/modules/gui/skins2/controls/ctrl_list.hpp
index fbbe458dd8..b0c9363d71 100644
--- a/modules/gui/skins2/controls/ctrl_list.hpp
+++ b/modules/gui/skins2/controls/ctrl_list.hpp
@@ -35,8 +35,8 @@ class GenericBitmap;
 
 
 /// Class for control list
-class CtrlList: public CtrlGeneric, public Observer<VarList, void*>,
-    public Observer<VarPercent, void *>
+class CtrlList: public CtrlGeneric, public Observer<VarList>,
+    public Observer<VarPercent>
 {
     public:
         CtrlList( intf_thread_t *pIntf, VarList &rList,
diff --git a/modules/gui/skins2/controls/ctrl_radialslider.hpp b/modules/gui/skins2/controls/ctrl_radialslider.hpp
index 26747189f9..0c61445a96 100644
--- a/modules/gui/skins2/controls/ctrl_radialslider.hpp
+++ b/modules/gui/skins2/controls/ctrl_radialslider.hpp
@@ -36,7 +36,7 @@ class VarPercent;
 
 
 /// Radial slider
-class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent, void*>
+class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent>
 {
     public:
         /// Create a radial slider with the given image, which must be
diff --git a/modules/gui/skins2/controls/ctrl_slider.hpp b/modules/gui/skins2/controls/ctrl_slider.hpp
index 0597d59845..ec9a8a969e 100644
--- a/modules/gui/skins2/controls/ctrl_slider.hpp
+++ b/modules/gui/skins2/controls/ctrl_slider.hpp
@@ -37,7 +37,7 @@ class VarPercent;
 
 
 /// Cursor of a slider
-class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent, void*>
+class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
 {
     public:
         /// Create a cursor with 3 images (which are NOT copied, be careful)
@@ -109,7 +109,7 @@ class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent, void*>
 
 
 /// Slider background
-class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent, void*>
+class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent>
 {
     public:
         CtrlSliderBg( intf_thread_t *pIntf,
diff --git a/modules/gui/skins2/controls/ctrl_text.hpp b/modules/gui/skins2/controls/ctrl_text.hpp
index 1065b1c6cd..45b75cd6fb 100644
--- a/modules/gui/skins2/controls/ctrl_text.hpp
+++ b/modules/gui/skins2/controls/ctrl_text.hpp
@@ -38,7 +38,7 @@ class VarText;
 
 
 /// Class for control text
-class CtrlText: public CtrlGeneric, public Observer<VarText, void*>
+class CtrlText: public CtrlGeneric, public Observer<VarText>
 {
     public:
         enum Align_t
diff --git a/modules/gui/skins2/controls/ctrl_tree.hpp b/modules/gui/skins2/controls/ctrl_tree.hpp
index dbf5fb9983..26e6439173 100644
--- a/modules/gui/skins2/controls/ctrl_tree.hpp
+++ b/modules/gui/skins2/controls/ctrl_tree.hpp
@@ -34,7 +34,7 @@ class GenericBitmap;
 
 /// Class for control tree
 class CtrlTree: public CtrlGeneric, public Observer<VarTree, tree_update*>,
-    public Observer<VarPercent, void*>
+    public Observer<VarPercent>
 {
     public:
         CtrlTree( intf_thread_t *pIntf,
diff --git a/modules/gui/skins2/controls/ctrl_video.hpp b/modules/gui/skins2/controls/ctrl_video.hpp
index 1390707b96..7869bd1e26 100644
--- a/modules/gui/skins2/controls/ctrl_video.hpp
+++ b/modules/gui/skins2/controls/ctrl_video.hpp
@@ -30,7 +30,7 @@
 class VoutWindow;
 
 /// Control video
-class CtrlVideo: public CtrlGeneric, public Observer<VarBox, void*>
+class CtrlVideo: public CtrlGeneric, public Observer<VarBox>
 {
     public:
         CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
diff --git a/modules/gui/skins2/src/generic_window.hpp b/modules/gui/skins2/src/generic_window.hpp
index cae9d39340..f3c5bfece0 100644
--- a/modules/gui/skins2/src/generic_window.hpp
+++ b/modules/gui/skins2/src/generic_window.hpp
@@ -42,7 +42,7 @@ class WindowManager;
 
 
 /// Generic window class
-class GenericWindow: public SkinObject, public Observer<VarBool, void*>
+class GenericWindow: public SkinObject, public Observer<VarBool>
 {
     private:
         friend class WindowManager;
diff --git a/modules/gui/skins2/src/tooltip.hpp b/modules/gui/skins2/src/tooltip.hpp
index 63e011df01..eb57d007e7 100644
--- a/modules/gui/skins2/src/tooltip.hpp
+++ b/modules/gui/skins2/src/tooltip.hpp
@@ -35,7 +35,7 @@ class OSGraphics;
 class UString;
 
 
-class Tooltip: public SkinObject, public Observer<VarText, void*>
+class Tooltip: public SkinObject, public Observer<VarText>
 {
     public:
         /// Create a tooltip with the given font and delay (in milliseconds)
diff --git a/modules/gui/skins2/utils/var_bool.hpp b/modules/gui/skins2/utils/var_bool.hpp
index 4da4b7f3e5..5b3cab356d 100644
--- a/modules/gui/skins2/utils/var_bool.hpp
+++ b/modules/gui/skins2/utils/var_bool.hpp
@@ -89,7 +89,7 @@ class VarBoolImpl: public VarBool
 
 
 /// Conjunction of two boolean variables (AND)
-class VarBoolAndBool: public VarBool, public Observer<VarBool, void*>
+class VarBoolAndBool: public VarBool, public Observer<VarBool>
 {
     public:
         VarBoolAndBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 );
@@ -108,7 +108,7 @@ class VarBoolAndBool: public VarBool, public Observer<VarBool, void*>
 
 
 /// Disjunction of two boolean variables (OR)
-class VarBoolOrBool: public VarBool, public Observer<VarBool, void*>
+class VarBoolOrBool: public VarBool, public Observer<VarBool>
 {
     public:
         VarBoolOrBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 );
@@ -127,7 +127,7 @@ class VarBoolOrBool: public VarBool, public Observer<VarBool, void*>
 
 
 /// Negation of a boolean variable (NOT)
-class VarNotBool: public VarBool, public Observer<VarBool, void*>
+class VarNotBool: public VarBool, public Observer<VarBool>
 {
     public:
         VarNotBool( intf_thread_t *pIntf, VarBool &rVar );
diff --git a/modules/gui/skins2/utils/var_text.hpp b/modules/gui/skins2/utils/var_text.hpp
index b0c1419697..0c4e34aa9c 100644
--- a/modules/gui/skins2/utils/var_text.hpp
+++ b/modules/gui/skins2/utils/var_text.hpp
@@ -33,8 +33,8 @@
 
 /// String variable
 class VarText: public Variable, public Subject<VarText>,
-               public Observer<VarPercent, void*>,
-               public Observer< VarText,void*>
+               public Observer<VarPercent>,
+               public Observer<VarText>
 {
     public:
         // Set substVars to true to replace "$X" variables in the text
diff --git a/modules/gui/skins2/vars/equalizer.hpp b/modules/gui/skins2/vars/equalizer.hpp
index d08372413e..18c59d931a 100644
--- a/modules/gui/skins2/vars/equalizer.hpp
+++ b/modules/gui/skins2/vars/equalizer.hpp
@@ -29,7 +29,7 @@
 
 
 /// Variable for graphical equalizer
-class EqualizerBands: public SkinObject, public Observer<VarPercent, void*>
+class EqualizerBands: public SkinObject, public Observer<VarPercent>
 {
     public:
         /// Number of bands
-- 
2.39.5