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

diff --git a/modules/gui/skins2/controls/ctrl_button.hpp b/modules/gui/skins2/controls/ctrl_button.hpp
index c315e2c7b0c4bd33336d1fb009234cc4a01e803f..5d11290ebda151af03d9828df049ec284897239a 100644 (file)
--- 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 d6c2bdf29b307ae582c9adb523aefae8763bf8f5..dfa4c16458b7ee653399ec30d00b0b0504cd726a 100644 (file)
--- 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 0889fa14bd19f4e5a55f958730fe8b59e082122a..c3c491ac5ce0f1926c74bf64788db763947b9341 100644 (file)
--- 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 fbbe458dd8b38c88be32ec28c271d2b3f0ac9e20..b0c9363d711b1eff60f522c6e366ea10ed935ecd 100644 (file)
--- 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 26747189f96e03d45f5f4e6a1037db809a60fe0f..0c61445a96024afadb0621288f33f10e8bba4709 100644 (file)
--- 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 0597d598454f65723867321f5e29093bff3b8223..ec9a8a969e430483830cc42d5814af4e53c90e77 100644 (file)
--- 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 1065b1c6cdcd260cc5316dd02f3327628d8712dd..45b75cd6fb2cd0638425f8cea8eec152e84a038c 100644 (file)
--- 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 dbf5fb99830827327ea1231125f700470263fc9b..26e6439173609bc34f5d820381cb3f5c594cd5fd 100644 (file)
--- 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 1390707b96c36f98779c72d983abd122b725f8ce..7869bd1e263efd3dc6fb00f146b8549ecb232da3 100644 (file)
--- 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 cae9d393403d16452365c46ac60fe3b72be24e07..f3c5bfece01e6b56bb9f1e72d60277cecb1732e2 100644 (file)
--- 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 63e011df013d6542de8a550068c50234159f21f0..eb57d007e72444dc7d83152403bbb251e21c8d41 100644 (file)
--- 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 4da4b7f3e5a31b0313d12c523eeede5ef72a8a86..5b3cab356d0aa0db0b248116b6467030f6f64304 100644 (file)
--- 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 b0c141969762f8ba5adea0e674d257b382c21cbf..0c4e34aa9ca02466419e828cbd2a65788c5cf9bd 100644 (file)
--- 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 d08372413efd60d23d9ba29c7aa549df22ad88df..18c59d931aa170e4d283a1d2c9e7f535860234a3 100644 (file)
--- 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