* modules/gui/skins2/*: More simplifications of the same kind

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

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

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();

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,

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

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,

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

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,

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,

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;

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)

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 );

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

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