Skins2: Cosmetics, 100% pure. We don't indent for labels in C, we don't in C++.

modules/gui/skins2/commands/async_queue.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef ASYNC_QUEUE_HPP
@@ -36,7 +36,7 @@ class OSTimer;
 /// Asynchronous queue for commands
 class AsyncQueue: public SkinObject
 {
-    public:
+public:
     /// Get the instance of AsyncQueue
     /// Returns NULL if initialization failed.
     static AsyncQueue *instance( intf_thread_t *pIntf );
@@ -54,7 +54,7 @@ class AsyncQueue: public SkinObject
     /// Flush the queue and execute the commands
     void flush();
 
-    private:
+private:
     /// Command queue
     list<CmdGenericPtr> m_cmdList;
     /// Timer

modules/gui/skins2/commands/cmd_add_item.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_ADD_ITEM_HPP
@@ -32,18 +32,14 @@
 /// "Add item" command
 class CmdAddItem: public CmdGeneric
 {
-    public:
-        CmdAddItem( intf_thread_t *pIntf, const string &rName, bool playNow ):
-            CmdGeneric( pIntf ), m_name( rName ), m_playNow( playNow ) {}
-        virtual ~CmdAddItem() {}
-
-        /// This method does the real job of the command
+public:
+    CmdAddItem( intf_thread_t *pIntf, const string &rName, bool playNow )
+              : CmdGeneric( pIntf ), m_name( rName ), m_playNow( playNow ) { }
+    virtual ~CmdAddItem() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "add item"; }
 
-    private:
+private:
     /// Name of the item to enqueue
     string m_name;
     /// Should we play the item immediately?

modules/gui/skins2/commands/cmd_audio.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_AUDIO_HPP
@@ -29,18 +29,14 @@
 /// Command to enable/disable the equalizer
 class CmdSetEqualizer: public CmdGeneric
 {
-    public:
-        CmdSetEqualizer( intf_thread_t *pIntf, bool iEnable ):
-            CmdGeneric( pIntf ), m_enable( iEnable ) {}
-        virtual ~CmdSetEqualizer() {}
-
-        /// This method does the real job of the command
+public:
+    CmdSetEqualizer( intf_thread_t *pIntf, bool iEnable )
+                   : CmdGeneric( pIntf ), m_enable( iEnable ) { }
+    virtual ~CmdSetEqualizer() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "set equalizer"; }
 
-    private:
+private:
     /// Enable or disable the equalizer
     bool m_enable;
 };

modules/gui/skins2/commands/cmd_change_skin.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_CHANGE_SKIN_HPP
@@ -31,18 +31,14 @@
 /// "Change Skin" command
 class CmdChangeSkin: public CmdGeneric
 {
-    public:
+public:
     CmdChangeSkin( intf_thread_t *pIntf, const string &rFile ):
-            CmdGeneric( pIntf ), m_file( rFile ) {}
-        virtual ~CmdChangeSkin() {}
-
-        /// This method does the real job of the command
+        CmdGeneric( pIntf ), m_file( rFile ) { }
+    virtual ~CmdChangeSkin() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "change skin"; }
 
-    private:
+private:
     /// Skin file to load
     string m_file;
 };

modules/gui/skins2/commands/cmd_generic.hpp

@@ -17,30 +17,28 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_GENERIC_HPP
 #define CMD_GENERIC_HPP
 
+#include <string>
+
 #include "../src/skin_common.hpp"
 #include "../utils/pointer.hpp"
 
-#include <string>
-
 
 /// Macro to define the prototype of simple commands
 #define DEFINE_COMMAND( name, type )                           \
 class Cmd##name: public CmdGeneric                             \
-{ \
-    public: \
-        Cmd##name( intf_thread_t *pIntf ): CmdGeneric( pIntf ) {} \
-        virtual ~Cmd##name() {} \
+{   public:                                                    \
+    Cmd##name( intf_thread_t *pIntf ): CmdGeneric( pIntf ) { } \
+    virtual ~Cmd##name() { }                                   \
     virtual void execute();                                    \
     virtual string getType() const { return type; }            \
-\
 };
 
 
@@ -48,15 +46,14 @@ class Cmd##name: public CmdGeneric \
 #define DEFINE_CALLBACK( parent, action )                            \
 class Cmd##action: public CmdGeneric                                 \
 {                                                                    \
-    public: \
+public:                                                              \
     Cmd##action( parent *pParent ):                                  \
-            CmdGeneric( pParent->getIntf() ), m_pParent( pParent ) {} \
-        virtual ~Cmd##action() {} \
+        CmdGeneric( pParent->getIntf() ), m_pParent( pParent ) { }   \
+    virtual ~Cmd##action() { }                                       \
     virtual void execute();                                          \
     virtual string getType() const { return "Cmd" #parent #action; } \
-    private: \
+private:                                                             \
     parent *m_pParent;                                               \
-\
 } m_cmd##action;                                                     \
 friend class Cmd##action;
 
@@ -64,8 +61,8 @@ friend class Cmd##action;
 /// Base class for skins commands
 class CmdGeneric: public SkinObject
 {
-    public:
-        virtual ~CmdGeneric() {}
+public:
+    virtual ~CmdGeneric() { }
 
     /// This method does the real job of the command
     virtual void execute() = 0;
@@ -77,8 +74,8 @@ class CmdGeneric: public SkinObject
     /// this command.
     virtual bool checkRemove( CmdGeneric * ) const { return true; }
 
-    protected:
-        CmdGeneric( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    CmdGeneric( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 

modules/gui/skins2/commands/cmd_layout.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_LAYOUT_HPP
@@ -33,18 +33,14 @@ class GenericLayout;
 /// "Change layout" command
 class CmdLayout: public CmdGeneric
 {
-    public:
+public:
     CmdLayout( intf_thread_t *pIntf, TopWindow &rWindow,
                GenericLayout &rLayout );
-        virtual ~CmdLayout() {}
-
-        /// This method does the real job of the command
+    virtual ~CmdLayout() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "change layout"; }
 
-    private:
+private:
     TopWindow &m_rWindow;
     GenericLayout &m_rLayout;
 };

modules/gui/skins2/commands/cmd_minimize.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_MINIMIZE_HPP
@@ -36,19 +36,15 @@ DEFINE_COMMAND(Restore, "restore" )
 /// Command to maximize a window
 class CmdMaximize: public CmdGeneric
 {
-    public:
+public:
     /// Maximize the given layout
     CmdMaximize( intf_thread_t *pIntf, WindowManager &rWindowManager,
                  TopWindow &rWindow );
-        virtual ~CmdMaximize() {}
-
-        /// This method does the real job of the command
+    virtual ~CmdMaximize() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "maximize"; }
 
-    private:
+private:
     WindowManager &m_rWindowManager;
     TopWindow &m_rWindow;
 };
@@ -57,27 +53,23 @@ class CmdMaximize: public CmdGeneric
 /// Command to unmaximize a window
 class CmdUnmaximize: public CmdGeneric
 {
-    public:
+public:
     /// Unmaximize the given layout
     CmdUnmaximize( intf_thread_t *pIntf, WindowManager &rWindowManager,
                  TopWindow &rWindow );
-        virtual ~CmdUnmaximize() {}
-
-        /// This method does the real job of the command
+    virtual ~CmdUnmaximize() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "unmaximize"; }
 
-    private:
+private:
     WindowManager &m_rWindowManager;
     TopWindow &m_rWindow;
 };
 
 
-DEFINE_COMMAND(AddInTray, "add in tray" )
-DEFINE_COMMAND(RemoveFromTray, "remove from tray" )
-DEFINE_COMMAND(AddInTaskBar, "add in taskbar" )
-DEFINE_COMMAND(RemoveFromTaskBar, "remove from taskbar" )
+DEFINE_COMMAND( AddInTray,         "add in tray" )
+DEFINE_COMMAND( RemoveFromTray,    "remove from tray" )
+DEFINE_COMMAND( AddInTaskBar,      "add in taskbar" )
+DEFINE_COMMAND( RemoveFromTaskBar, "remove from taskbar" )
 
 #endif

modules/gui/skins2/commands/cmd_muxer.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_MUXER_HPP
@@ -31,18 +31,14 @@
 /// This command only contains other commands (composite pattern)
 class CmdMuxer: public CmdGeneric
 {
-    public:
+public:
     CmdMuxer( intf_thread_t *pIntf, const list<CmdGeneric*> &rList ):
-            CmdGeneric( pIntf ), m_list( rList ) {}
-        virtual ~CmdMuxer() {}
-
-        /// This method does the real job of the command
+        CmdGeneric( pIntf ), m_list( rList ) { }
+    virtual ~CmdMuxer() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "muxer"; }
 
-    private:
+private:
     /// List of commands we will execute sequentially
     list<CmdGeneric*> m_list;
 };

modules/gui/skins2/commands/cmd_playlist.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_PLAYLIST_HPP
@@ -32,18 +32,14 @@
 /// Command to delete the selected items from a list
 class CmdPlaylistDel: public CmdGeneric
 {
-    public:
-        CmdPlaylistDel( intf_thread_t *pIntf, VarList &rList ):
-            CmdGeneric( pIntf ), m_rList( rList ) {}
-        virtual ~CmdPlaylistDel() {}
-
-        /// This method does the real job of the command
+public:
+    CmdPlaylistDel( intf_thread_t *pIntf, VarList &rList )
+                  : CmdGeneric( pIntf ), m_rList( rList ) { }
+    virtual ~CmdPlaylistDel() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playlist del"; }
 
-    private:
+private:
     /// List
     VarList &m_rList;
 };
@@ -65,18 +61,14 @@ DEFINE_COMMAND( PlaylistFirst, "playlist first" )
 /// Command to set the random state
 class CmdPlaylistRandom: public CmdGeneric
 {
-    public:
-        CmdPlaylistRandom( intf_thread_t *pIntf, bool value ):
-            CmdGeneric( pIntf ), m_value( value ) {}
-        virtual ~CmdPlaylistRandom() {}
-
-        /// This method does the real job of the command
+public:
+    CmdPlaylistRandom( intf_thread_t *pIntf, bool value )
+                     : CmdGeneric( pIntf ), m_value( value ) { }
+    virtual ~CmdPlaylistRandom() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playlist random"; }
 
-    private:
+private:
     /// Random state
     bool m_value;
 };
@@ -85,18 +77,14 @@ class CmdPlaylistRandom: public CmdGeneric
 /// Command to set the loop state
 class CmdPlaylistLoop: public CmdGeneric
 {
-    public:
-        CmdPlaylistLoop( intf_thread_t *pIntf, bool value ):
-            CmdGeneric( pIntf ), m_value( value ) {}
-        virtual ~CmdPlaylistLoop() {}
-
-        /// This method does the real job of the command
+public:
+    CmdPlaylistLoop( intf_thread_t *pIntf, bool value )
+                   : CmdGeneric( pIntf ), m_value( value ) { }
+    virtual ~CmdPlaylistLoop() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playlist loop"; }
 
-    private:
+private:
     /// Loop state
     bool m_value;
 };
@@ -105,18 +93,14 @@ class CmdPlaylistLoop: public CmdGeneric
 /// Command to set the repeat state
 class CmdPlaylistRepeat: public CmdGeneric
 {
-    public:
-        CmdPlaylistRepeat( intf_thread_t *pIntf, bool value ):
-            CmdGeneric( pIntf ), m_value( value ) {}
-        virtual ~CmdPlaylistRepeat() {}
-
-        /// This method does the real job of the command
+public:
+    CmdPlaylistRepeat( intf_thread_t *pIntf, bool value )
+                     : CmdGeneric( pIntf ), m_value( value ) { }
+    virtual ~CmdPlaylistRepeat() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playlist repeat"; }
 
-    private:
+private:
     /// Repeat state
     bool m_value;
 };
@@ -125,18 +109,14 @@ class CmdPlaylistRepeat: public CmdGeneric
 /// Command to load a playlist
 class CmdPlaylistLoad: public CmdGeneric
 {
-    public:
-        CmdPlaylistLoad( intf_thread_t *pIntf, const string& rFile ):
-            CmdGeneric( pIntf ), m_file( rFile ) {}
-        virtual ~CmdPlaylistLoad() {}
-
-        /// This method does the real job of the command
+public:
+    CmdPlaylistLoad( intf_thread_t *pIntf, const string& rFile )
+                   : CmdGeneric( pIntf ), m_file( rFile ) { }
+    virtual ~CmdPlaylistLoad() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playlist load"; }
 
-    private:
+private:
     /// Playlist file to load
     string m_file;
 };
@@ -145,18 +125,14 @@ class CmdPlaylistLoad: public CmdGeneric
 /// Command to save a playlist
 class CmdPlaylistSave: public CmdGeneric
 {
-    public:
-        CmdPlaylistSave( intf_thread_t *pIntf, const string& rFile ):
-            CmdGeneric( pIntf ), m_file( rFile ) {}
-        virtual ~CmdPlaylistSave() {}
-
-        /// This method does the real job of the command
+public:
+    CmdPlaylistSave( intf_thread_t *pIntf, const string& rFile )
+                   : CmdGeneric( pIntf ), m_file( rFile ) { }
+    virtual ~CmdPlaylistSave() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playlist save"; }
 
-    private:
+private:
     /// Playlist file to save
     string m_file;
 };

modules/gui/skins2/commands/cmd_playtree.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_PLAYTREE_HPP
@@ -33,18 +33,14 @@
 /// Command to delete the selected items from a tree
 class CmdPlaytreeDel: public CmdGeneric
 {
-    public:
-        CmdPlaytreeDel( intf_thread_t *pIntf, VarTree &rTree ):
-            CmdGeneric( pIntf ), m_rTree( rTree ) {}
-        virtual ~CmdPlaytreeDel() {}
-
-        /// This method does the real job of the command
+public:
+    CmdPlaytreeDel( intf_thread_t *pIntf, VarTree &rTree )
+                  : CmdGeneric( pIntf ), m_rTree( rTree ) { }
+    virtual ~CmdPlaytreeDel() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playtree del"; }
 
-    private:
+private:
     /// Tree
     VarTree &m_rTree;
 };

modules/gui/skins2/commands/cmd_resize.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_RESIZE_HPP
@@ -36,19 +36,15 @@ class CtrlVideo;
 /// Command to resize a layout
 class CmdResize: public CmdGeneric
 {
-    public:
+public:
     /// Resize the given layout
     CmdResize( intf_thread_t *pIntf, const WindowManager &rWindowManager,
                GenericLayout &rLayout, int width, int height );
-        virtual ~CmdResize() {}
-
-        /// This method does the real job of the command
+    virtual ~CmdResize() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "resize"; }
 
-    private:
+private:
     const WindowManager &m_rWindowManager;
     GenericLayout &m_rLayout;
     int m_width, m_height;
@@ -58,18 +54,14 @@ class CmdResize: public CmdGeneric
 /// Command to resize the inner vout window
 class CmdResizeInnerVout: public CmdGeneric
 {
-    public:
+public:
     /// Resize the given layout
     CmdResizeInnerVout( intf_thread_t *pIntf, CtrlVideo* pCtrlVideo );
-        virtual ~CmdResizeInnerVout() {}
-
-        /// This method does the real job of the command
+    virtual ~CmdResizeInnerVout() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "resize inner vout"; }
 
-    private:
+private:
     CtrlVideo* m_pCtrlVideo;
 };
 
@@ -77,19 +69,15 @@ class CmdResizeInnerVout: public CmdGeneric
 /// Command to resize the vout window
 class CmdResizeVout: public CmdGeneric
 {
-    public:
+public:
     /// Resize the given layout
     CmdResizeVout( intf_thread_t *pIntf, vout_window_t* pWnd,
                    int width, int height );
-        virtual ~CmdResizeVout() {}
-
-        /// This method does the real job of the command
+    virtual ~CmdResizeVout() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "resize vout"; }
 
-    private:
+private:
     vout_window_t* m_pWnd;
     int m_width, m_height;
 };
@@ -98,19 +86,15 @@ class CmdResizeVout: public CmdGeneric
 /// Command to toggle Fullscreen
 class CmdSetFullscreen: public CmdGeneric
 {
-    public:
+public:
     /// Resize the given layout
     CmdSetFullscreen( intf_thread_t *pIntf, vout_window_t* pWnd,
                       bool fullscreen );
-        virtual ~CmdSetFullscreen() {}
-
-        /// This method does the real job of the command
+    virtual ~CmdSetFullscreen() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "toogle fullscreen"; }
 
-    private:
+private:
     vout_window_t* m_pWnd;
     bool m_bFullscreen;
 };

modules/gui/skins2/commands/cmd_show_window.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_SHOW_WINDOW_HPP
@@ -35,19 +35,15 @@
 /// Command to show a window
 class CmdShowWindow: public CmdGeneric
 {
-    public:
+public:
     CmdShowWindow( intf_thread_t *pIntf, WindowManager &rWinManager,
                    TopWindow &rWin ):
-            CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) {}
-        virtual ~CmdShowWindow() {}
-
-        /// This method does the real job of the command
+        CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) { }
+    virtual ~CmdShowWindow() { }
     virtual void execute() { m_rWinManager.show( m_rWin ); }
-
-        /// Return the type of the command
     virtual string getType() const { return "show window"; }
 
-    private:
+private:
     /// Reference to the window manager
     WindowManager &m_rWinManager;
     /// Reference to the window
@@ -58,19 +54,15 @@ class CmdShowWindow: public CmdGeneric
 /// Command to hide a window
 class CmdHideWindow: public CmdGeneric
 {
-    public:
+public:
     CmdHideWindow( intf_thread_t *pIntf, WindowManager &rWinManager,
                    TopWindow &rWin ):
-            CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) {}
-        virtual ~CmdHideWindow() {}
-
-        /// This method does the real job of the command
+        CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) { }
+    virtual ~CmdHideWindow() { }
     virtual void execute() { m_rWinManager.hide( m_rWin ); }
-
-        /// Return the type of the command
     virtual string getType() const { return "hide window"; }
 
-    private:
+private:
     /// Reference to the window manager
     WindowManager &m_rWinManager;
     /// Reference to the window
@@ -81,18 +73,14 @@ class CmdHideWindow: public CmdGeneric
 /// Command to raise all windows
 class CmdRaiseAll: public CmdGeneric
 {
-    public:
+public:
     CmdRaiseAll( intf_thread_t *pIntf, WindowManager &rWinManager ):
-            CmdGeneric( pIntf ), m_rWinManager( rWinManager ) {}
-        virtual ~CmdRaiseAll() {}
-
-        /// This method does the real job of the command
+        CmdGeneric( pIntf ), m_rWinManager( rWinManager ) { }
+    virtual ~CmdRaiseAll() { }
     virtual void execute() { m_rWinManager.raiseAll(); }
-
-        /// Return the type of the command
     virtual string getType() const { return "raise all windows"; }
 
-    private:
+private:
     /// Reference to the window manager
     WindowManager &m_rWinManager;
 };
@@ -101,12 +89,11 @@ class CmdRaiseAll: public CmdGeneric
 /// Command to show a popup menu
 class CmdShowPopup: public CmdGeneric
 {
-    public:
+public:
     CmdShowPopup( intf_thread_t *pIntf, Popup &rPopup ):
-            CmdGeneric( pIntf ), m_rPopup( rPopup ) {}
-        virtual ~CmdShowPopup() {}
+        CmdGeneric( pIntf ), m_rPopup( rPopup ) { }
+    virtual ~CmdShowPopup() { }
 
-        /// This method does the real job of the command
     virtual void execute()
     {
         int x, y;
@@ -114,10 +101,9 @@ class CmdShowPopup: public CmdGeneric
         m_rPopup.show( x, y );
     }
 
-        /// Return the type of the command
     virtual string getType() const { return "show popup"; }
 
-    private:
+private:
     /// Reference to the popup
     Popup &m_rPopup;
 };

modules/gui/skins2/commands/cmd_update_item.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_UPDATE_ITEM_HPP
@@ -31,18 +31,14 @@
 /// Udate item command
 class CmdUpdateItem: public CmdGeneric
 {
-    public:
-        CmdUpdateItem( intf_thread_t *pIntf, VarText &rStreamName, VarText &rStreamURI ) :
-            CmdGeneric( pIntf ), m_rStreamName(rStreamName), m_rStreamURI(rStreamURI) {}
-        virtual ~CmdUpdateItem() {}
-
-        /// This method does the real job of the command
+public:
+    CmdUpdateItem( intf_thread_t *I,VarText &N,VarText &U )
+                 : CmdGeneric(I), m_rStreamName(N), m_rStreamURI(U) { }
+    virtual ~CmdUpdateItem() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "update item"; }
 
-    private:
+private:
     VarText &m_rStreamName;
     VarText &m_rStreamURI;
 };

modules/gui/skins2/commands/cmd_vars.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_VARS_HPP
@@ -40,21 +40,17 @@ DEFINE_COMMAND( PlaytreeChanged, "playtree changed" )
 /// Command to notify the playtree of an item update
 class CmdPlaytreeUpdate: public CmdGeneric
 {
-    public:
+public:
     CmdPlaytreeUpdate( intf_thread_t *pIntf, int id ):
-            CmdGeneric( pIntf ), m_id( id ) {}
-        virtual ~CmdPlaytreeUpdate() {}
-
-        /// This method does the real job of the command
+        CmdGeneric( pIntf ), m_id( id ) { }
+    virtual ~CmdPlaytreeUpdate() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playtree update"; }
 
     /// Only accept removal of command if they concern the same item
     virtual bool checkRemove( CmdGeneric * ) const;
 
-    private:
+private:
     /// Playlist item ID
     int m_id;
 };
@@ -62,58 +58,43 @@ class CmdPlaytreeUpdate: public CmdGeneric
 /// Command to notify the playtree of an item append
 class CmdPlaytreeAppend: public CmdGeneric
 {
-    public:
-        CmdPlaytreeAppend( intf_thread_t *pIntf, playlist_add_t *p_add ) :
-            CmdGeneric( pIntf ), m_pAdd( p_add ) {}
-        virtual ~CmdPlaytreeAppend() {}
-
-        /// This method does the real job of the command
+public:
+    CmdPlaytreeAppend( intf_thread_t *pIntf, playlist_add_t *p_add ):
+        CmdGeneric( pIntf ), m_pAdd( p_add ) { }
+    virtual ~CmdPlaytreeAppend() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playtree append"; }
 
-    private:
+private:
     playlist_add_t * m_pAdd;
 };
 
 /// Command to notify the playtree of an item deletion
 class CmdPlaytreeDelete: public CmdGeneric
 {
-    public:
-        CmdPlaytreeDelete( intf_thread_t *pIntf, int i_id ) :
-            CmdGeneric( pIntf ), m_id( i_id ) {}
-        virtual ~CmdPlaytreeDelete() {}
-
-        /// This method does the real job of the command
+public:
+    CmdPlaytreeDelete( intf_thread_t *pIntf, int i_id ):
+        CmdGeneric( pIntf ), m_id( i_id ) { }
+    virtual ~CmdPlaytreeDelete() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "playtree append"; }
 
-    private:
+private:
     int m_id;
 };
 
 
-
-
 /// Command to set a text variable
 class CmdSetText: public CmdGeneric
 {
-    public:
-        CmdSetText( intf_thread_t *pIntf, VarText &rText,
-                    const UString &rValue ):
-            CmdGeneric( pIntf ), m_rText( rText ), m_value( rValue ) {}
-        virtual ~CmdSetText() {}
-
-        /// This method does the real job of the command
+public:
+    CmdSetText( intf_thread_t *pIntf, VarText &rText, const UString &rValue ):
+        CmdGeneric( pIntf ), m_rText( rText ), m_value( rValue ) { }
+    virtual ~CmdSetText() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "set text"; }
 
-    private:
+private:
     /// Text variable to set
     VarText &m_rText;
     /// Value to set
@@ -124,19 +105,14 @@ class CmdSetText: public CmdGeneric
 /// Command to set the equalizer preamp
 class CmdSetEqPreamp: public CmdGeneric
 {
-    public:
-        CmdSetEqPreamp( intf_thread_t *pIntf, EqualizerPreamp &rPreamp,
-                       float value ):
-            CmdGeneric( pIntf ), m_rPreamp( rPreamp ), m_value( value ) {}
-        virtual ~CmdSetEqPreamp() {}
-
-        /// This method does the real job of the command
+public:
+    CmdSetEqPreamp( intf_thread_t *I, EqualizerPreamp &P, float v )
+                  : CmdGeneric( I ), m_rPreamp( P ), m_value( v ) { }
+    virtual ~CmdSetEqPreamp() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "set equalizer preamp"; }
 
-    private:
+private:
     /// Preamp variable to set
     EqualizerPreamp &m_rPreamp;
     /// Value to set
@@ -147,19 +123,14 @@ class CmdSetEqPreamp: public CmdGeneric
 /// Command to set the equalizerbands
 class CmdSetEqBands: public CmdGeneric
 {
-    public:
-        CmdSetEqBands( intf_thread_t *pIntf, EqualizerBands &rEqBands,
-                       const string &rValue ):
-            CmdGeneric( pIntf ), m_rEqBands( rEqBands ), m_value( rValue ) {}
-        virtual ~CmdSetEqBands() {}
-
-        /// This method does the real job of the command
+public:
+    CmdSetEqBands( intf_thread_t *I, EqualizerBands &B, const string &V )
+                 : CmdGeneric( I ), m_rEqBands( B ), m_value( V ) { }
+    virtual ~CmdSetEqBands() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "set equalizer bands"; }
 
-    private:
+private:
     /// Equalizer variable to set
     EqualizerBands &m_rEqBands;
     /// Value to set

modules/gui/skins2/commands/cmd_voutwindow.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CMD_VOUTWINDOW_HPP
@@ -31,18 +31,14 @@
 /// Command to create a vout window
 class CmdNewVoutWindow: public CmdGeneric
 {
-    public:
+public:
     /// Create a vout window
     CmdNewVoutWindow( intf_thread_t *pIntf, vout_window_t *pWnd );
-        virtual ~CmdNewVoutWindow() {}
-
-        /// This method does the real job of the command
+    virtual ~CmdNewVoutWindow() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "new vout window"; }
 
-    private:
+private:
     vout_window_t* m_pWnd;
 };
 
@@ -50,18 +46,14 @@ class CmdNewVoutWindow: public CmdGeneric
 /// Command to release a vout window
 class CmdReleaseVoutWindow: public CmdGeneric
 {
-    public:
+public:
     /// Release a vout window
     CmdReleaseVoutWindow( intf_thread_t *pIntf, vout_window_t *pWnd );
-        virtual ~CmdReleaseVoutWindow() {}
-
-        /// This method does the real job of the command
+    virtual ~CmdReleaseVoutWindow() { }
     virtual void execute();
-
-        /// Return the type of the command
     virtual string getType() const { return "new vout window"; }
 
-    private:
+private:
     vout_window_t* m_pWnd;
 };
 

modules/gui/skins2/controls/ctrl_button.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_BUTTON_HPP
@@ -36,11 +36,10 @@ class CmdGeneric;
 /// Base class for button controls
 class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap>
 {
-    public:
+public:
     /// Create a button with 3 images
     CtrlButton( intf_thread_t *pIntf, const GenericBitmap &rBmpUp,
-                    const GenericBitmap &rBmpOver,
-                    const GenericBitmap &rBmpDown,
+                const GenericBitmap &rBmpOver, const GenericBitmap &rBmpDown,
                 CmdGeneric &rCommand, const UString &rTooltip,
                 const UString &rHelp, VarBool *pVisible );
 
@@ -61,7 +60,7 @@ class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap>
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return "button"; }
 
-    private:
+private:
     /// Finite state machine of the control
     FSM m_fsm;
     /// Command triggered by the button

modules/gui/skins2/controls/ctrl_checkbox.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_CHECKBOX_HPP
@@ -38,7 +38,7 @@ class CmdGeneric;
 /// Base class for checkbox controls
 class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap>
 {
-    public:
+public:
     /// Create a checkbox with 6 images
     CtrlCheckbox( intf_thread_t *pIntf,
                   const GenericBitmap &rBmpUp1,
@@ -69,7 +69,7 @@ class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap>
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return "checkbox"; }
 
-    private:
+private:
     /// Finite state machine of the control
     FSM m_fsm;
     /// Observed variable

modules/gui/skins2/controls/ctrl_flat.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_FLAT_HPP
@@ -31,12 +31,11 @@
 /// Base class for "mover controls" and images
 class CtrlFlat: public CtrlGeneric
 {
-    protected:
-        CtrlFlat( intf_thread_t *pIntf, const UString &rHelp,
-                  VarBool *pVisible ):
-            CtrlGeneric( pIntf, rHelp, pVisible ) {}
+protected:
+    CtrlFlat( intf_thread_t *pIntf, const UString &rHelp, VarBool *pVisible )
+            : CtrlGeneric( pIntf, rHelp, pVisible ) { }
 
-        virtual ~CtrlFlat() {}
+    virtual ~CtrlFlat() { }
 };
 
 #endif

modules/gui/skins2/controls/ctrl_generic.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_GENERIC_HPP
@@ -43,17 +43,17 @@ class VarBool;
 /// Base class for controls
 class CtrlGeneric: public SkinObject, public Observer<VarBool>
 {
-    public:
+public:
     virtual ~CtrlGeneric();
 
     /// Handle an event on the control
-        virtual void handleEvent( EvtGeneric &rEvent ) {}
+    virtual void handleEvent( EvtGeneric &rEvent ) { }
 
     /// Check whether coordinates are inside the control
     virtual bool mouseOver( int x, int y ) const { return false; }
 
     /// Draw the control on the given graphics
-        virtual void draw( OSGraphics &rImage, int xDest, int yDest ) {}
+    virtual void draw( OSGraphics &rImage, int xDest, int yDest ) { }
 
     /// Set the position and the associated layout of the control
     virtual void setLayout( GenericLayout *pLayout,
@@ -70,7 +70,7 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool>
      * Overload this method if you want to do something special when
      * the layout is resized
      */
-        virtual void onResize() {}
+    virtual void onResize() { }
 
     /// Get the help text
     virtual const UString &getHelpText() const { return m_help; }
@@ -84,7 +84,7 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool>
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return ""; }
 
-    protected:
+protected:
     // If pVisible is NULL, the control is always visible
     CtrlGeneric( intf_thread_t *pIntf, const UString &rHelp,
                  VarBool *pVisible = NULL );
@@ -120,10 +120,10 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool>
      * Overload this method if you want to do something special when
      * the Position object is set
      */
-        virtual void onPositionChange() {}
+    virtual void onPositionChange() { }
 
     /// Overload this method to get notified of bool variable changes
-        virtual void onVarBoolUpdate( VarBool &rVar ) {}
+    virtual void onVarBoolUpdate( VarBool &rVar ) { }
 
     /// Method called when an observed bool variable is changed
     virtual void onUpdate( Subject<VarBool> &rVariable , void* );
@@ -134,7 +134,7 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool>
     /// Visibility variable
     VarBool *m_pVisible;
 
-    private:
+private:
     /// Position in the layout
     Position *m_pPosition;
     /// Help text

modules/gui/skins2/controls/ctrl_image.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_IMAGE_HPP
@@ -36,7 +36,7 @@ class CmdGeneric;
 /// Control image
 class CtrlImage: public CtrlFlat
 {
-    public:
+public:
     /// Resize methods
     enum resize_t
     {
@@ -62,7 +62,7 @@ class CtrlImage: public CtrlFlat
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return "image"; }
 
-    private:
+private:
     /// Bitmap
     const GenericBitmap &m_rBitmap;
     /// Buffer to stored the rendered bitmap

modules/gui/skins2/controls/ctrl_list.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_LIST_HPP
@@ -38,7 +38,7 @@ class GenericBitmap;
 class CtrlList: public CtrlGeneric, public Observer<VarList>,
     public Observer<VarPercent>
 {
-    public:
+public:
     CtrlList( intf_thread_t *pIntf, VarList &rList,
               const GenericFont &rFont, const GenericBitmap *pBitmap,
               uint32_t fgcolor, uint32_t playcolor, uint32_t bgcolor1,
@@ -64,7 +64,7 @@ class CtrlList: public CtrlGeneric, public Observer<VarList>,
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return "list"; }
 
-    private:
+private:
     /// List associated to the control
     VarList &m_rList;
     /// Font

modules/gui/skins2/controls/ctrl_move.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_MOVE_HPP
@@ -36,11 +36,11 @@ class WindowManager;
 /// Control for moving windows
 class CtrlMove: public CtrlFlat
 {
-    public:
+public:
     CtrlMove( intf_thread_t *pIntf, WindowManager &rWindowManager,
               CtrlFlat &rCtrl, TopWindow &rWindow,
               const UString &rHelp, VarBool *pVisible );
-        virtual ~CtrlMove() {}
+    virtual ~CtrlMove() { }
 
     /// Handle an event
     virtual void handleEvent( EvtGeneric &rEvent );
@@ -64,7 +64,7 @@ class CtrlMove: public CtrlFlat
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return m_rCtrl.getType(); }
 
-    private:
+private:
     FSM m_fsm;
     /// Window manager
     WindowManager &m_rWindowManager;
@@ -81,6 +81,6 @@ class CtrlMove: public CtrlFlat
     DEFINE_CALLBACK( CtrlMove, MovingMoving )
     DEFINE_CALLBACK( CtrlMove, StillMoving )
     DEFINE_CALLBACK( CtrlMove, MovingStill )
- };
+};
 
 #endif

modules/gui/skins2/controls/ctrl_radialslider.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_RADIALSLIDER_HPP
@@ -38,7 +38,7 @@ class VarPercent;
 /// Radial slider
 class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent>
 {
-    public:
+public:
     /// Create a radial slider with the given image, which must be
     /// composed of numImg subimages of the same size
     CtrlRadialSlider( intf_thread_t *pIntf, const GenericBitmap &rBmpSeq,
@@ -60,7 +60,7 @@ class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent>
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return "radial_slider"; }
 
-    private:
+private:
     /// Finite state machine of the control
     FSM m_fsm;
     /// Number of sub-images in the slider image

modules/gui/skins2/controls/ctrl_resize.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_RESIZE_HPP
@@ -36,12 +36,12 @@ class WindowManager;
 /// Control decorator for resizing windows
 class CtrlResize: public CtrlFlat
 {
-    public:
+public:
     CtrlResize( intf_thread_t *pIntf, WindowManager &rWindowManager,
                 CtrlFlat &rCtrl, GenericLayout &rLayout,
                 const UString &rHelp, VarBool *pVisible,
                 WindowManager::Direction_t direction );
-        virtual ~CtrlResize() {}
+    virtual ~CtrlResize() { }
 
     /// Handle an event
     virtual void handleEvent( EvtGeneric &rEvent );
@@ -65,7 +65,7 @@ class CtrlResize: public CtrlFlat
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return m_rCtrl.getType(); }
 
-    private:
+private:
     FSM m_fsm;
     /// Window manager
     WindowManager &m_rWindowManager;

modules/gui/skins2/controls/ctrl_slider.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_SLIDER_HPP
@@ -39,7 +39,7 @@ class VarPercent;
 /// Cursor of a slider
 class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
 {
-    public:
+public:
     /// Create a cursor with 3 images (which are NOT copied, be careful)
     /// If pVisible is NULL, the control is always visible
     CtrlSliderCursor( intf_thread_t *pIntf, const GenericBitmap &rBmpUp,
@@ -66,7 +66,7 @@ class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return "slider_cursor"; }
 
-    private:
+private:
     /// Finite state machine of the control
     FSM m_fsm;
     /// Variable associated to the cursor
@@ -111,7 +111,7 @@ class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
 /// Slider background
 class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent>
 {
-    public:
+public:
     CtrlSliderBg( intf_thread_t *pIntf,
                   const Bezier &rCurve, VarPercent &rVariable,
                   int thickness, GenericBitmap *pBackground, int nbHoriz,
@@ -137,7 +137,7 @@ class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent>
     /// Associate a cursor to this background
     void associateCursor( CtrlSliderCursor &rCursor );
 
-    private:
+private:
     /// Cursor of the slider
     CtrlSliderCursor *m_pCursor;
     /// Variable associated to the slider

modules/gui/skins2/controls/ctrl_text.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_TEXT_HPP
@@ -40,7 +40,7 @@ class VarText;
 /// Class for control text
 class CtrlText: public CtrlGeneric, public Observer<VarText>
 {
-    public:
+public:
     enum Align_t
     {
         kLeft,
@@ -83,7 +83,7 @@ class CtrlText: public CtrlGeneric, public Observer<VarText>
     /// Get the type of control (custom RTTI)
     virtual string getType() const { return "text"; }
 
-    private:
+private:
     /// Finite state machine of the control
     FSM m_fsm;
     /// Variable associated to the control

modules/gui/skins2/controls/ctrl_tree.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_TREE_HPP
@@ -37,7 +37,7 @@ class GenericBitmap;
 class CtrlTree: public CtrlGeneric, public Observer<VarTree, tree_update>,
     public Observer<VarPercent>
 {
-    public:
+public:
     CtrlTree( intf_thread_t *pIntf,
               VarTree &rTree,
               const GenericFont &rFont,
@@ -83,7 +83,7 @@ class CtrlTree: public CtrlGeneric, public Observer<VarTree, tree_update>,
     /// \return true if it changed the position
     bool ensureVisible( int itemIndex );
 
-    private:
+private:
     /// Tree associated to the control
     VarTree &m_rTree;
     /// Font

modules/gui/skins2/controls/ctrl_video.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef CTRL_VIDEO_HPP
@@ -33,7 +33,7 @@
 /// Control video
 class CtrlVideo: public CtrlGeneric, public Observer<VarBox>
 {
-    public:
+public:
     CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
                bool autoResize, const UString &rHelp, VarBool *pVisible );
     virtual ~CtrlVideo();
@@ -91,7 +91,7 @@ class CtrlVideo: public CtrlGeneric, public Observer<VarBox>
     // Is this control used
     virtual bool isUsed() { return m_pVoutWindow ? true : false; }
 
-    private:
+private:
     /// Associated layout
     GenericLayout &m_rLayout;
 

modules/gui/skins2/events/evt_enter.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_ENTER_HPP
@@ -31,11 +31,9 @@
 /// Mouse enter event
 class EvtEnter: public EvtInput
 {
-    public:
-        EvtEnter( intf_thread_t *pIntf ): EvtInput( pIntf ) {}
-        virtual ~EvtEnter() {}
-
-        /// Return the type of event
+public:
+    EvtEnter( intf_thread_t *pIntf ): EvtInput( pIntf ) { }
+    virtual ~EvtEnter() { }
     virtual const string getAsString() const { return "enter"; }
 };
 

modules/gui/skins2/events/evt_focus.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_FOCUS_HPP
@@ -31,18 +31,17 @@
 /// Focus change event
 class EvtFocus: public EvtGeneric
 {
-    public:
-        EvtFocus( intf_thread_t *pIntf, bool focus ): EvtGeneric( pIntf ),
-            m_focus( focus ) {}
-        virtual ~EvtFocus() {}
+public:
+    EvtFocus( intf_thread_t *pIntf, bool focus )
+            : EvtGeneric( pIntf ), m_focus( focus ) { }
+    virtual ~EvtFocus() { }
 
-        /// Return the type of event
     virtual const string getAsString() const
     {
         return ( m_focus ? "focus:in" : "focus:out" );
     }
 
-    private:
+private:
     /// true for a focus in, and false for a focus out
     bool m_focus;
 };

modules/gui/skins2/events/evt_generic.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_GENERIC_HPP
@@ -32,14 +32,14 @@
 /// Base class for OS events
 class EvtGeneric: public SkinObject
 {
-    public:
-        virtual ~EvtGeneric() {}
+public:
+    virtual ~EvtGeneric() { }
 
     /// Return the type of the event
     virtual const string getAsString() const = 0;
 
-    protected:
-        EvtGeneric( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    EvtGeneric( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 

modules/gui/skins2/events/evt_input.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_INPUT_HPP
@@ -31,8 +31,8 @@
 /// Base class for mouse and key events
 class EvtInput: public EvtGeneric
 {
-    public:
-        virtual ~EvtInput() {}
+public:
+    virtual ~EvtInput() { }
 
     /// Masks for modifier keys
     static const int kModNone;
@@ -43,13 +43,13 @@ class EvtInput: public EvtGeneric
     /// Get the modifiers
     virtual int getMod() const { return m_mod; }
 
-    protected:
+protected:
     EvtInput( intf_thread_t *pIntf, int mod = kModNone );
 
     /// Add the modifier to the event string
     virtual void addModifier( string &rEvtString ) const;
 
-    private:
+private:
     /// Modifiers (special key(s) pressed during the mouse event)
     int m_mod;
 };

modules/gui/skins2/events/evt_key.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_KEY_HPP
@@ -31,24 +31,21 @@
 /// Class for keyboard events
 class EvtKey: public EvtInput
 {
-    public:
+public:
     enum ActionType_t
     {
         kDown,
         kUp
     };
 
-        EvtKey( intf_thread_t *pIntf, int key, ActionType_t action,
-                int mod = kModNone ):
-            EvtInput( pIntf, mod ), m_key( key ), m_action( action ) {}
-        virtual ~EvtKey() {}
-
-        /// Return the type of event
+    EvtKey( intf_thread_t *I, int key, ActionType_t actn, int mod = kModNone )
+          : EvtInput( I, mod ), m_key( key ), m_action( actn ) { }
+    virtual ~EvtKey() { }
     virtual const string getAsString() const;
 
     int getKey() const { return m_key; }
 
-    private:
+private:
     /// The concerned key, stored according to the '#define's in vlc_keys.h
     /// but without the modifiers (which are stored in EvtInput)
     int m_key;

modules/gui/skins2/events/evt_leave.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_LEAVE_HPP
@@ -31,11 +31,9 @@
 /// Mouse leave event
 class EvtLeave: public EvtInput
 {
-    public:
-        EvtLeave( intf_thread_t *pIntf ): EvtInput( pIntf ) {}
-        virtual ~EvtLeave() {}
-
-        /// Return the type of event
+public:
+    EvtLeave( intf_thread_t *pIntf ): EvtInput( pIntf ) { }
+    virtual ~EvtLeave() { }
     virtual const string getAsString() const { return "leave"; }
 };
 

modules/gui/skins2/events/evt_menu.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_MENU_HPP
@@ -30,18 +30,15 @@
 /// Mouse move event
 class EvtMenu: public EvtGeneric
 {
-    public:
-        EvtMenu( intf_thread_t *pIntf, int itemId ):
-            EvtGeneric( pIntf ), m_itemId( itemId ) {}
-        virtual ~EvtMenu() {}
-
-        /// Return the type of event
+public:
+    EvtMenu( intf_thread_t *pIntf, int itemId )
+           : EvtGeneric( pIntf ), m_itemId( itemId ) { }
+    virtual ~EvtMenu() { }
     virtual const string getAsString() const { return "menu"; }
 
-        // Getter
     int getItemId() const { return m_itemId; }
 
-    private:
+private:
     /// Coordinates of the mouse (absolute or relative)
     int m_itemId;
 };

modules/gui/skins2/events/evt_motion.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_MOTION_HPP
@@ -31,19 +31,17 @@
 /// Mouse move event
 class EvtMotion: public EvtInput
 {
-    public:
-        EvtMotion( intf_thread_t *pIntf, int xPos, int yPos ):
-            EvtInput( pIntf ), m_xPos( xPos ), m_yPos( yPos ) {}
-        virtual ~EvtMotion() {}
-
-        /// Return the type of event
+public:
+    EvtMotion( intf_thread_t *pIntf, int xPos, int yPos )
+             : EvtInput( pIntf ), m_xPos( xPos ), m_yPos( yPos ) { }
+    virtual ~EvtMotion() { }
     virtual const string getAsString() const { return "motion"; }
 
     // Getters
     int getXPos() const { return m_xPos; }
     int getYPos() const { return m_yPos; }
 
-    private:
+private:
     /// Coordinates of the mouse (absolute or relative)
     /**
      * The coordinates are absolute when the event is sent to the

modules/gui/skins2/events/evt_mouse.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_MOUSE_HPP
@@ -31,7 +31,7 @@
 /// Class for mouse button events
 class EvtMouse: public EvtInput
 {
-    public:
+public:
     enum ButtonType_t
     {
         kLeft,
@@ -47,10 +47,11 @@ class EvtMouse: public EvtInput
     };
 
     EvtMouse( intf_thread_t *pIntf, int xPos, int yPos, ButtonType_t button,
-                  ActionType_t action, int mod = kModNone ):
-            EvtInput( pIntf, mod ), m_xPos( xPos ), m_yPos( yPos ),
-            m_button( button ), m_action( action ) {}
-        virtual ~EvtMouse() {}
+              ActionType_t action, int mod = kModNone )
+            : EvtInput( pIntf, mod ), m_xPos( xPos ), m_yPos( yPos ),
+              m_button( button ), m_action( action ) { }
+    virtual ~EvtMouse() { }
+    virtual const string getAsString() const;
 
     // Return the event coordinates
     int getXPos() const { return m_xPos; }
@@ -60,9 +61,7 @@ class EvtMouse: public EvtInput
     ButtonType_t getButton() const { return m_button; }
     ActionType_t getAction() const { return m_action; }
 
-        virtual const string getAsString() const;
-
-    private:
+private:
     /// Coordinates of the mouse relative to the window
     int m_xPos, m_yPos;
     /// Mouse button involved in the event

modules/gui/skins2/events/evt_refresh.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_REFRESH_HPP
@@ -31,16 +31,14 @@
 /// Refresh window event
 class EvtRefresh: public EvtGeneric
 {
-    public:
+public:
     /// Constructor with the coordinates of the area to refresh
-        EvtRefresh( intf_thread_t *pIntf, int xStart, int yStart, int width,
-                    int height ):
-            EvtGeneric( pIntf ), m_xStart( xStart ), m_yStart( yStart ),
-            m_width( width ), m_height( height ) {}
+    EvtRefresh( intf_thread_t *pIntf, int xStart, int yStart,
+                                      int width, int height )
+              : EvtGeneric( pIntf ), m_xStart( xStart ), m_yStart( yStart ),
+                                     m_width( width ), m_height( height ) { }
 
-        virtual ~EvtRefresh() {}
-
-        /// Return the type of event
+    virtual ~EvtRefresh() { }
     virtual const string getAsString() const { return "refresh"; }
 
     /// Getters
@@ -49,7 +47,7 @@ class EvtRefresh: public EvtGeneric
     int getWidth()  const { return m_width; }
     int getHeight() const { return m_height; }
 
-    private:
+private:
     /// Coordinates and size of the area to refresh
     int m_xStart, m_yStart, m_width, m_height;
 };

modules/gui/skins2/events/evt_scroll.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_SCROLL_HPP
@@ -31,7 +31,7 @@
 /// Class for mouse scroll events
 class EvtScroll: public EvtInput
 {
-    public:
+public:
     enum Direction_t
     {
         kUp,
@@ -39,10 +39,11 @@ class EvtScroll: public EvtInput
     };
 
     EvtScroll( intf_thread_t *pIntf, int xPos, int yPos,
-                   Direction_t direction, int mod = kModNone ):
-            EvtInput( pIntf, mod ), m_xPos( xPos ), m_yPos( yPos ),
-            m_direction( direction ) {}
-        virtual ~EvtScroll() {}
+               Direction_t direction, int mod = kModNone )
+             : EvtInput( pIntf, mod ), m_xPos( xPos ), m_yPos( yPos ),
+               m_direction( direction ) { }
+    virtual ~EvtScroll() { }
+    virtual const string getAsString() const;
 
     // Return the event coordinates
     int getXPos() const { return m_xPos; }
@@ -51,9 +52,7 @@ class EvtScroll: public EvtInput
     // Return the direction
     Direction_t getDirection() const { return m_direction; }
 
-        virtual const string getAsString() const;
-
-    private:
+private:
     /// Coordinates of the mouse relative to the window
     int m_xPos, m_yPos;
     /// Scroll direction

modules/gui/skins2/events/evt_special.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EVT_SPECIAL_HPP
@@ -31,7 +31,7 @@
 /// Class for non-genuine events
 class EvtSpecial: public EvtGeneric
 {
-    public:
+public:
     enum ActionType_t
     {
         kShow,
@@ -40,14 +40,12 @@ class EvtSpecial: public EvtGeneric
         kDisable
     };
 
-        EvtSpecial( intf_thread_t *pIntf, ActionType_t action ):
-            EvtGeneric( pIntf ), m_action( action ) {}
-        virtual ~EvtSpecial() {}
-
-        /// Return the type of event
+    EvtSpecial( intf_thread_t *pIntf, ActionType_t action )
+              : EvtGeneric( pIntf ), m_action( action ) { }
+    virtual ~EvtSpecial() { }
     virtual const string getAsString() const;
 
-    private:
+private:
     /// Type of action
     ActionType_t m_action;
 };

modules/gui/skins2/macosx/macosx_dragdrop.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef MACOSX_DRAGDROP_HPP
@@ -28,13 +28,13 @@
 
 class MacOSXDragDrop: public SkinObject
 {
-    public:
+public:
     typedef long ldata_t[5];
 
     MacOSXDragDrop( intf_thread_t *pIntf, bool playOnDrop );
-        virtual ~MacOSXDragDrop() {}
+    virtual ~MacOSXDragDrop() { }
 
-    private:
+private:
     /// Indicates whether the file(s) must be played immediately
     bool m_playOnDrop;
 };

modules/gui/skins2/macosx/macosx_factory.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef MACOSX_FACTORY_HPP
@@ -30,7 +30,7 @@
 /// Class used to instanciate MacOSX specific objects
 class MacOSXFactory: public OSFactory
 {
-    public:
+public:
     MacOSXFactory( intf_thread_t *pIntf );
     virtual ~MacOSXFactory();
 
@@ -101,7 +101,7 @@ class MacOSXFactory: public OSFactory
     /// Delete a directory recursively
     virtual void rmDir( const string &rPath );
 
-    private:
+private:
     /// Directory separator
     const string m_dirSep;
     /// Resource path

modules/gui/skins2/macosx/macosx_graphics.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef MACOSX_GRAPHICS_HPP
@@ -33,7 +33,7 @@ class GenericBitmap;
 /// MacOSX implementation of OSGraphics
 class MacOSXGraphics: public OSGraphics
 {
-    public:
+public:
     MacOSXGraphics( intf_thread_t *pIntf, int width, int height);
 
     virtual ~MacOSXGraphics();
@@ -75,7 +75,7 @@ class MacOSXGraphics: public OSGraphics
     virtual int getWidth() const { return m_width; }
     virtual int getHeight() const { return m_height; }
 
-    private:
+private:
     /// Size of the image
     int m_width, m_height;
 };

modules/gui/skins2/macosx/macosx_loop.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef MACOSX_LOOP_HPP
@@ -33,7 +33,7 @@ class GenericWindow;
 /// Main event loop for MacOSX (singleton)
 class MacOSXLoop: public OSLoop
 {
-    public:
+public:
     /// Get the instance of MacOSXLoop
     static OSLoop *instance( intf_thread_t *pIntf );
 
@@ -49,7 +49,7 @@ class MacOSXLoop: public OSLoop
     // Handle a window event
     void registerWindow( GenericWindow &rGenWin, WindowRef win );
 
-    private:
+private:
     // Private because it's a singleton
     MacOSXLoop( intf_thread_t *pIntf );
     virtual ~MacOSXLoop();

modules/gui/skins2/macosx/macosx_popup.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef MACOSX_POPUP_HPP
@@ -30,7 +30,7 @@
 /// MacOSX implementation of OSPopup
 class MacOSXPopup: public OSPopup
 {
-    public:
+public:
     MacOSXPopup( intf_thread_t *pIntf );
 
     virtual ~MacOSXPopup();

modules/gui/skins2/macosx/macosx_timer.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef MACOSX_TIMER_HPP
@@ -34,7 +34,7 @@ class CmdGeneric;
 // MacOSX specific timer
 class MacOSXTimer: public OSTimer
 {
-    public:
+public:
     MacOSXTimer( intf_thread_t *pIntf, CmdGeneric &rCmd );
     virtual ~MacOSXTimer();
 
@@ -45,7 +45,7 @@ class MacOSXTimer: public OSTimer
     /// Stop the timer
     virtual void stop();
 
-    private:
+private:
     /// Command to execute
     CmdGeneric &m_rCommand;
 };

modules/gui/skins2/macosx/macosx_tooltip.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef MACOSX_TOOLTIP_HPP
@@ -32,7 +32,7 @@ class MacOSXDisplay;
 /// MacOSX implementation of OSTooltip
 class MacOSXTooltip: public OSTooltip
 {
-    public:
+public:
     MacOSXTooltip( intf_thread_t *pIntf );
 
     virtual ~MacOSXTooltip();
@@ -42,8 +42,6 @@ class MacOSXTooltip: public OSTooltip
 
     /// Hide the tooltip
     virtual void hide();
-
-    private:
 };
 
 

modules/gui/skins2/macosx/macosx_window.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef MACOSX_WINDOW_HPP
@@ -34,7 +34,7 @@ class MacOSXDragDrop;
 /// MacOSX implementation of OSWindow
 class MacOSXWindow: public OSWindow
 {
-    public:
+public:
     MacOSXWindow( intf_thread_t *pIntf, GenericWindow &rWindow,
                   bool dragDrop, bool playOnDrop,
                   MacOSXWindow *pParentWindow );
@@ -63,7 +63,7 @@ class MacOSXWindow: public OSWindow
     /// Get the Carbon window handle
     WindowRef getWindowRef() const { return m_win; };
 
-    private:
+private:
     /// Parent window
     MacOSXWindow *m_pParent;
     /// Indicates whether the window handles drag&drop events

modules/gui/skins2/parser/builder.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -47,7 +47,7 @@ class GenericRect;
 /// Class for skin construction
 class Builder: public SkinObject
 {
-    public:
+public:
     Builder( intf_thread_t *pIntf, const BuilderData &rData,
              const string &rPath );
     virtual ~Builder();
@@ -59,7 +59,7 @@ class Builder: public SkinObject
     /// Parse an action tag and returns a command
     CmdGeneric *parseAction( const string &rAction );
 
-    private:
+private:
     /// Data from the XML
     const BuilderData &m_rData;
     /// Path of the theme

modules/gui/skins2/parser/expr_evaluator.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EXPR_EVALUATOR_HPP
@@ -31,12 +31,9 @@
 /// Expression evaluator using Reverse Polish Notation
 class ExprEvaluator: public SkinObject
 {
-    public:
-        /// Constructor
-        ExprEvaluator( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
-
-        /// Destructor
-        ~ExprEvaluator() {}
+public:
+    ExprEvaluator( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
+    ~ExprEvaluator() { }
 
     /// Clear the RPN stack and parse an expression
     void parse( const string &rExpr );
@@ -45,7 +42,7 @@ class ExprEvaluator: public SkinObject
     /// Return NULL when the stack is empty.
     string getToken();
 
-    private:
+private:
     /// RPN stack
     list<string> m_stack;
 

modules/gui/skins2/parser/interpreter.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef INTERPRETER_HPP
@@ -38,7 +38,7 @@ class VarPercent;
 /// Command interpreter for scripts in the XML
 class Interpreter: public SkinObject
 {
-    public:
+public:
     /// Get the instance of Interpreter
     static Interpreter *instance( intf_thread_t *pIntf );
 
@@ -66,13 +66,13 @@ class Interpreter: public SkinObject
     /// Get a constant value
     string getConstant( const string &rValue );
 
-    private:
+private:
     /// Map of global commands
     map<string, CmdGenericPtr> m_commandMap;
 
     // Private because it is a singleton
     Interpreter( intf_thread_t *pIntf );
-        virtual ~Interpreter() {}
+    virtual ~Interpreter() { }
 };
 
 #endif

modules/gui/skins2/parser/skin_parser.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef SKIN_PARSER_HPP
@@ -32,7 +32,7 @@
 /// Parser for the skin DTD
 class SkinParser: public XMLParser
 {
-    public:
+public:
     SkinParser( intf_thread_t *pIntf, const string &rFileName,
                 const string &rPath, bool useDTD = true,
                 BuilderData *pData = NULL );
@@ -42,7 +42,7 @@ class SkinParser: public XMLParser
 
     static int convertColor( const char *transcolor );
 
-    private:
+private:
     /// Path of the theme
     const string m_path;
     /// Container for mapping data from the XML

modules/gui/skins2/parser/xmlparser.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef XMLPARSER_HPP
@@ -36,7 +36,7 @@
 /// XML parser using libxml2 text reader API
 class XMLParser: public SkinObject
 {
-    public:
+public:
     XMLParser( intf_thread_t *pIntf, const string &rFileName,
                bool useDTD = true );
     virtual ~XMLParser();
@@ -44,7 +44,7 @@ class XMLParser: public SkinObject
     /// Parse the file. Returns true on success
     bool parse();
 
-    protected:
+protected:
     // Key comparison function for type "const char*"
     struct ltstr
     {
@@ -61,10 +61,10 @@ class XMLParser: public SkinObject
 
     /// Callbacks
     virtual void handleBeginElement( const string &rName,
-                                         AttrList_t &attr ) {}
-        virtual void handleEndElement( const string &rName ) {}
+                                     AttrList_t &attr ) { }
+    virtual void handleEndElement( const string &rName ) { }
 
-    private:
+private:
     void LoadCatalog();
 
     /// Reader context

modules/gui/skins2/src/anchor.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef ANCHOR_HPP
@@ -34,13 +34,12 @@
 /// Class for the windows anchors
 class Anchor: public SkinObject
 {
-    public:
+public:
     Anchor( intf_thread_t *pIntf, const Position &rPosition, int range,
-                int priority, const Bezier &rCurve, GenericLayout &rLayout ):
-            SkinObject( pIntf ), m_position( rPosition ),
-            m_rCurve( rCurve ), m_range( range ), m_priority( priority ),
-            m_rLayout( rLayout ) {}
-        virtual ~Anchor() {}
+            int priority, const Bezier &rCurve, GenericLayout &rLayout )
+          : SkinObject( pIntf ), m_position( rPosition ), m_rCurve( rCurve ),
+            m_range( range ), m_priority( priority ), m_rLayout( rLayout ) { }
+    virtual ~Anchor() { }
 
     /**
      * Return true if the given anchor is hanged by this one
@@ -79,7 +78,7 @@ class Anchor: public SkinObject
         return (m_position.getTop() + m_rLayout.getTop());
     }
 
-    private:
+private:
     /// Position in the layout
     Position m_position;
 

modules/gui/skins2/src/anim_bitmap.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef ANIM_BITMAP_HPP
@@ -37,7 +37,7 @@ class OSTimer;
 class AnimBitmap: public SkinObject, public Box,
                   public Subject<AnimBitmap>
 {
-    public:
+public:
     AnimBitmap( intf_thread_t *pIntf, const GenericBitmap &rBitmap );
 
     virtual ~AnimBitmap();
@@ -58,7 +58,7 @@ class AnimBitmap: public SkinObject, public Box,
     virtual int getWidth() const;
     virtual int getHeight() const;
 
-    private:
+private:
     /// Bitmap stored
     const GenericBitmap &m_rBitmap;
     /// Graphics to store the bitmap

modules/gui/skins2/src/bitmap_font.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef BITMAP_FONT_HPP
@@ -33,10 +33,10 @@ class GenericBitmap;
 /// Class to handle bitmap fonts
 class BitmapFont: public GenericFont
 {
-    public:
+public:
     BitmapFont( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
                 const string &rType );
-        virtual ~BitmapFont() {}
+    virtual ~BitmapFont() { }
 
     virtual bool init() { return true; }
 
@@ -48,11 +48,11 @@ class BitmapFont: public GenericFont
     /// Get the font size
     virtual int getSize() const { return m_height; }
 
-    private:
+private:
     /// Description of a glyph
     struct Glyph_t
     {
-            Glyph_t(): m_xPos( -1 ), m_yPos( 0 ) {}
+        Glyph_t(): m_xPos( -1 ), m_yPos( 0 ) { }
         int m_xPos, m_yPos;
     };
 

modules/gui/skins2/src/dialogs.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef DIALOGS_HPP
@@ -33,7 +33,7 @@ struct interaction_dialog_t ;
 // Dialogs provider
 class Dialogs: public SkinObject
 {
-    public:
+public:
     /// Get the instance of Dialogs (or NULL if initialization failed)
     static Dialogs *instance( intf_thread_t *pIntf );
 
@@ -95,7 +95,7 @@ class Dialogs: public SkinObject
     /// Show an interaction dialog
     void showInteraction( interaction_dialog_t * );
 
-    private:
+private:
     // Private because it's a singleton
     Dialogs( intf_thread_t *pIntf );
     ~Dialogs();

modules/gui/skins2/src/file_bitmap.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef FILE_BITMAP_HPP
@@ -32,7 +32,7 @@
 /// Class for file bitmaps
 class FileBitmap: public GenericBitmap
 {
-    public:
+public:
     /// Load a bitmap from a file. aColor is the transparency
     /// color, in the format 0xRRGGBB
     FileBitmap( intf_thread_t *pIntf, image_handler_t *pImageHandler,
@@ -51,7 +51,7 @@ class FileBitmap: public GenericBitmap
     /// Each pixel is stored in 4 bytes in the order B,G,R,A
     virtual uint8_t *getData() const;
 
-    private:
+private:
     /// Size of the bitmap.
     int m_width, m_height;
     /// Buffer containing the image data.

modules/gui/skins2/src/ft2_bitmap.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef FT2_BITMAP_HPP
@@ -34,7 +34,7 @@
 /// Class for rendering freetype glyphs on a bitmap
 class FT2Bitmap: public GenericBitmap
 {
-    public:
+public:
     /// Create an empty bitmap
     FT2Bitmap( intf_thread_t *pIntf, int width, int height );
 
@@ -54,7 +54,7 @@ class FT2Bitmap: public GenericBitmap
     void draw( const FT_Bitmap &rBitmap, int left, int top,
                uint32_t color );
 
-    private:
+private:
     /// Bitmap size
     int m_width, m_height;
     /// Image data buffer

modules/gui/skins2/src/ft2_font.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef FT2_FONT_HPP
@@ -39,7 +39,7 @@ class UString;
 /// Freetype2 font
 class FT2Font: public GenericFont
 {
-    public:
+public:
     FT2Font( intf_thread_t *pIntf, const string &rName, int size );
     virtual ~FT2Font();
 
@@ -54,7 +54,7 @@ class FT2Font: public GenericFont
     /// Get the text height
     virtual int getSize() const { return m_height; }
 
-    private:
+private:
     typedef struct
     {
         FT_Glyph m_glyph;

modules/gui/skins2/src/generic_bitmap.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef GENERIC_BITMAP_HPP
@@ -33,8 +33,8 @@
 /// Generic interface for bitmaps
 class GenericBitmap: public SkinObject, public Box
 {
-    public:
-        virtual ~GenericBitmap() {}
+public:
+    virtual ~GenericBitmap() { }
 
     /// Get a linear buffer containing the image data.
     /// Each pixel is stored in 4 bytes in the order B,G,R,A
@@ -46,10 +46,10 @@ class GenericBitmap: public SkinObject, public Box
     /// Get the number of frames per second (for animated bitmaps)
     int getFrameRate() const { return m_frameRate; }
 
-    protected:
+protected:
     GenericBitmap( intf_thread_t *pIntf, int nbFrames = 1, int fps = 0);
 
-    private:
+private:
     /// Number of frames
     int m_nbFrames;
     /// Frame rate
@@ -60,7 +60,7 @@ class GenericBitmap: public SkinObject, public Box
 /// Basic bitmap implementation
 class BitmapImpl: public GenericBitmap
 {
-    public:
+public:
     /// Create an empty bitmap of the given size
     BitmapImpl( intf_thread_t *pIntf, int width, int height,
                 int nbFrames = 1, int fps = 0 );
@@ -80,7 +80,7 @@ class BitmapImpl: public GenericBitmap
     bool drawBitmap( const GenericBitmap &rSource, int xSrc, int ySrc,
                      int xDest, int yDest, int width, int height );
 
-    private:
+private:
     /// Size of the bitmap.
     int m_width, m_height;
     /// Buffer containing the image data.

modules/gui/skins2/src/generic_font.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef GENERIC_FONT_HPP
@@ -34,8 +34,8 @@ class UString;
 /// Base class for fonts
 class GenericFont: public SkinObject
 {
-    public:
-        virtual ~GenericFont() {}
+public:
+    virtual ~GenericFont() { }
 
     virtual bool init() = 0;
 
@@ -48,8 +48,8 @@ class GenericFont: public SkinObject
     /// Get the font size
     virtual int getSize() const = 0;
 
-    protected:
-        GenericFont( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    GenericFont( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 typedef CountedPtr<GenericFont> GenericFontPtr;

modules/gui/skins2/src/generic_layout.cpp

@@ -250,11 +250,9 @@ void GenericLayout::refreshRect( int x, int y, int width, int height )
 class rect
 {
 public:
-  rect( int v_x = 0, int v_y = 0,
-          int v_width = 0, int v_height = 0 )
-     : x( v_x), y( v_y ), width( v_width), height( v_height)
-    {}
-    ~rect(){}
+    rect( int v_x = 0, int v_y = 0, int v_width = 0, int v_height = 0 )
+        : x( v_x ), y( v_y ), width( v_width ), height( v_height ) { }
+    ~rect() { }
     int x;
     int y;
     int width;

modules/gui/skins2/src/generic_layout.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef GENERIC_LAYOUT_HPP
@@ -43,7 +43,7 @@ class VarBoolImpl;
 struct LayeredControl
 {
     LayeredControl( CtrlGeneric *pControl, int layer ):
-        m_pControl( pControl ), m_layer( layer ) {}
+        m_pControl( pControl ), m_layer( layer ) { }
 
     /// Pointer on the control
     CtrlGeneric *m_pControl;
@@ -55,10 +55,9 @@ struct LayeredControl
 /// Base class for layouts
 class GenericLayout: public SkinObject
 {
-    public:
+public:
     GenericLayout( intf_thread_t *pIntf, int width, int height,
-                       int minWidth, int maxWidth, int minHeight,
-                       int maxHeight );
+                   int minWidth, int maxWidth, int minHeight, int maxHeight );
 
     virtual ~GenericLayout();
 
@@ -148,7 +147,7 @@ class GenericLayout: public SkinObject
     // FIXME: we give read/write access
     VarBoolImpl &getActiveVar() { return *m_pVarActive; }
 
-    private:
+private:
     /// Parent window of the layout
     TopWindow *m_pWindow;
     /// Layout size

modules/gui/skins2/src/generic_window.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef GENERIC_WINDOW_HPP
@@ -44,24 +44,24 @@ class WindowManager;
 /// Generic window class
 class GenericWindow: public SkinObject, public Observer<VarBool>
 {
-    private:
+private:
     friend class WindowManager;
     friend class VoutManager;
     friend class CtrlVideo;
-    public:
+public:
     GenericWindow( intf_thread_t *pIntf, int xPos, int yPos,
                    bool dragDrop, bool playOnDrop,
                    GenericWindow *pParent = NULL );
     virtual ~GenericWindow();
 
     /// Methods to process OS events.
-        virtual void processEvent( EvtFocus &rEvtFocus ) {}
-        virtual void processEvent( EvtMenu &rEvtMenu ) {}
-        virtual void processEvent( EvtMotion &rEvtMotion ) {}
-        virtual void processEvent( EvtMouse &rEvtMouse ) {}
-        virtual void processEvent( EvtLeave &rEvtLeave ) {}
-        virtual void processEvent( EvtKey &rEvtKey ) {}
-        virtual void processEvent( EvtScroll &rEvtScroll ) {}
+    virtual void processEvent( EvtFocus &rEvtFocus ) { }
+    virtual void processEvent( EvtMenu &rEvtMenu ) { }
+    virtual void processEvent( EvtMotion &rEvtMotion ) { }
+    virtual void processEvent( EvtMouse &rEvtMouse ) { }
+    virtual void processEvent( EvtLeave &rEvtLeave ) { }
+    virtual void processEvent( EvtKey &rEvtKey ) { }
+    virtual void processEvent( EvtScroll &rEvtScroll ) { }
 
     virtual void processEvent( EvtRefresh &rEvtRefresh );
 
@@ -69,7 +69,7 @@ class GenericWindow: public SkinObject, public Observer<VarBool>
     virtual void resize( int width, int height );
 
     /// Refresh an area of the window
-        virtual void refresh( int left, int top, int width, int height ) {}
+    virtual void refresh( int left, int top, int width, int height ) { }
 
     /// Get the coordinates of the window
     int getLeft() const { return m_left; }
@@ -89,7 +89,7 @@ class GenericWindow: public SkinObject, public Observer<VarBool>
     /// reparent
     void setParent( GenericWindow* pParent, int x, int y, int w, int h );
 
-    protected:
+protected:
     /// Get the OS window
     OSWindow *getOSWindow() const { return m_pOsWindow; }
 
@@ -121,7 +121,7 @@ class GenericWindow: public SkinObject, public Observer<VarBool>
     /// Actually hide the window
     virtual void innerHide();
 
-    private:
+private:
     /// Window position and size
     int m_left, m_top, m_width, m_height;
     /// OS specific implementation

modules/gui/skins2/src/ini_file.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef INI_FILE_HPP
@@ -32,15 +32,15 @@
 /// INI file parser
 class IniFile: public SkinObject
 {
-    public:
+public:
     IniFile( intf_thread_t *pIntf, const string &rName,
              const string &rPath );
-        virtual ~IniFile() {}
+    virtual ~IniFile() { }
 
     /// Parse the INI file and fill the VarManager
     void parseFile();
 
-    private:
+private:
     string m_name;
     string m_path;
 };

modules/gui/skins2/src/logger.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef LOGGER_HPP
@@ -37,7 +37,7 @@
 // Logger class
 class Logger: public SkinObject
 {
-    public:
+public:
     /// Get the instance of Logger
     /// Returns NULL if initialization failed
     static Logger *instance( intf_thread_t *pIntf );
@@ -51,7 +51,7 @@ class Logger: public SkinObject
     /// Print a warning
     void warn( const string &rMsg );
 
-    private:
+private:
     // Private because it's a singleton
     Logger( intf_thread_t *pIntf );
     ~Logger();

modules/gui/skins2/src/os_factory.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef OS_FACTORY_HPP
@@ -44,7 +44,7 @@ class OSTimer;
 /// Abstract factory used to instantiate OS specific objects.
 class OSFactory: public SkinObject
 {
-    public:
+public:
     enum CursorType_t
     {
         kDefaultArrow,
@@ -132,10 +132,10 @@ class OSFactory: public SkinObject
     /// Delete a directory recursively
     virtual void rmDir( const string &rPath ) = 0;
 
-   protected:
+protected:
     // Protected because it's a singleton
-        OSFactory( intf_thread_t* pIntf ): SkinObject( pIntf ) {}
-        virtual ~OSFactory() {}
+    OSFactory( intf_thread_t* pIntf ): SkinObject( pIntf ) { }
+    virtual ~OSFactory() { }
 };
 
 

modules/gui/skins2/src/os_graphics.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef OS_GRAPHICS_HPP
@@ -36,8 +36,8 @@ class OSWindow;
 /// OS specific graphics class
 class OSGraphics: public SkinObject, public Box
 {
-    public:
-        virtual ~OSGraphics() {}
+public:
+    virtual ~OSGraphics() { }
 
     /// Clear the graphics
     virtual void clear() = 0;
@@ -73,8 +73,8 @@ class OSGraphics: public SkinObject, public Box
     /// Tell whether the pixel at the given position is visible
     virtual bool hit( int x, int y ) const = 0;
 
-    protected:
-        OSGraphics( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    OSGraphics( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 typedef CountedPtr<OSGraphics> OSGraphicsPtr;

modules/gui/skins2/src/os_loop.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef OS_LOOP_HPP
@@ -31,8 +31,8 @@
 /// Abstract class for the main event loop
 class OSLoop: public SkinObject
 {
-    public:
-        virtual ~OSLoop() {}
+public:
+    virtual ~OSLoop() { }
 
     /// Enter the main loop
     virtual void run() = 0;
@@ -40,8 +40,8 @@ class OSLoop: public SkinObject
     /// Exit the main loop
     virtual void exit() = 0;
 
-    protected:
-        OSLoop( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    OSLoop( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 

modules/gui/skins2/src/os_popup.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef OS_POPUP_HPP
@@ -34,8 +34,8 @@ class OSGraphics;
 /// Base class for OS specific Popup Windows
 class OSPopup: public SkinObject
 {
-    public:
-        virtual ~OSPopup() {}
+public:
+    virtual ~OSPopup() { }
 
     /// Show the popup menu at the given (absolute) corrdinates
     virtual void show( int xPos, int yPos ) = 0;
@@ -52,8 +52,8 @@ class OSPopup: public SkinObject
     /// Return the position of the item identified by the given id
     virtual int getPosFromId( int id ) const = 0;
 
-    protected:
-        OSPopup( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    OSPopup( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 #endif

modules/gui/skins2/src/os_timer.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef OS_TIMER_HPP
@@ -31,8 +31,8 @@
 // Base class for OS-specific timers
 class OSTimer: public SkinObject
 {
-    public:
-        virtual ~OSTimer() {}
+public:
+    virtual ~OSTimer() { }
 
     /// (Re)start the timer with the given delay (in ms). If oneShot is
     /// true, stop it after the first execution of the callback.
@@ -41,8 +41,8 @@ class OSTimer: public SkinObject
     /// Stop the timer
     virtual void stop() = 0;
 
-    protected:
-        OSTimer( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    OSTimer( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 

modules/gui/skins2/src/os_tooltip.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef OS_TOOLTIP_HPP
@@ -33,8 +33,8 @@ class OSGraphics;
 /// Base class for OS specific Tooltip Windows
 class OSTooltip: public SkinObject
 {
-    public:
-        virtual ~OSTooltip() {}
+public:
+    virtual ~OSTooltip() { }
 
     /// Show the tooltip
     virtual void show( int left, int top, OSGraphics &rText ) = 0;
@@ -42,8 +42,8 @@ class OSTooltip: public SkinObject
     /// Hide the tooltip
     virtual void hide() = 0;
 
-    protected:
-        OSTooltip( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    OSTooltip( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 #endif

modules/gui/skins2/src/os_window.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef OS_WINDOW_HPP
@@ -34,8 +34,8 @@ class OSGraphics;
 /// OS specific delegate class for GenericWindow
 class OSWindow: public SkinObject
 {
-    public:
-        virtual ~OSWindow() {}
+public:
+    virtual ~OSWindow() { }
 
     // Show the window
     virtual void show() const = 0;
@@ -62,8 +62,8 @@ class OSWindow: public SkinObject
     /// reparent the window
     virtual void reparent( void* OSHandle, int x, int y, int w, int h ) = 0;
 
-    protected:
-        OSWindow( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    OSWindow( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 

modules/gui/skins2/src/popup.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef POPUP_HPP
@@ -39,9 +39,9 @@ class EvtMenu;
 /// Class handling a popup menu
 class Popup: public SkinObject
 {
-    public:
+public:
     Popup( intf_thread_t *pIntf, WindowManager &rWindowManager );
-        virtual ~Popup() {}
+    virtual ~Popup() { }
 
     void show( int xPos, int yPos );
     void hide();
@@ -57,7 +57,7 @@ class Popup: public SkinObject
     /// Execute the action corresponding to the chosen menu item
     void handleEvent( const EvtMenu &rEvent );
 
-    private:
+private:
     /// OS specific implementation
     OSPopup *m_pOsPopup;
 

modules/gui/skins2/src/scaled_bitmap.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef SCALED_BITMAP_HPP
@@ -31,7 +31,7 @@
 /// Class for scaling bitmaps
 class ScaledBitmap: public GenericBitmap
 {
-    public:
+public:
     /// Create a scaled bitmap from the given bitmap and size
     ScaledBitmap( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
                   int width, int height );
@@ -48,7 +48,7 @@ class ScaledBitmap: public GenericBitmap
     /// Each pixel is stored in 4 bytes in the order B,G,R,A
     virtual uint8_t *getData() const { return m_pData; }
 
-    private:
+private:
     /// Bitmap size
     int m_width, m_height;
     /// Image data buffer

modules/gui/skins2/src/skin_common.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifdef HAVE_CONFIG_H
@@ -158,15 +158,15 @@ struct intf_sys_t
 /// Base class for all skin classes
 class SkinObject
 {
-    public:
-        SkinObject( intf_thread_t *pIntf ): m_pIntf( pIntf ) {}
-        virtual ~SkinObject() {}
+public:
+    SkinObject( intf_thread_t *pIntf ): m_pIntf( pIntf ) { }
+    virtual ~SkinObject() { }
 
     /// Getter (public because it is used in C callbacks in the win32
     /// interface)
     intf_thread_t *getIntf() const { return m_pIntf; }
 
-    private:
+private:
     intf_thread_t *m_pIntf;
 };
 

modules/gui/skins2/src/theme.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef THEME_HPP
@@ -45,12 +45,12 @@ class Interpreter;
 /// Class storing the data of the current theme
 class Theme: public SkinObject
 {
-    private:
+private:
     friend class Builder;
     friend class Interpreter;
-    public:
+public:
     Theme( intf_thread_t *pIntf ): SkinObject( pIntf ),
-            m_windowManager( getIntf() ) {}
+        m_windowManager( getIntf() ) { }
     virtual ~Theme();
 
     void loadConfig();
@@ -66,7 +66,7 @@ class Theme: public SkinObject
 
     WindowManager &getWindowManager() { return m_windowManager; }
 
-    private:
+private:
     /// Store the bitmaps by ID
     map<string, GenericBitmapPtr> m_bitmaps;
     /// Store the fonts by ID

modules/gui/skins2/src/theme_loader.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef THEME_LOADER_HPP
@@ -33,14 +33,14 @@
 
 class ThemeLoader: public SkinObject
 {
-    public:
-        ThemeLoader( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
-        virtual ~ThemeLoader() {}
+public:
+    ThemeLoader( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
+    virtual ~ThemeLoader() { }
 
     /// The expected fileName must be an UTF-8 string
     bool load( const string &fileName );
 
-    private:
+private:
 #if defined( HAVE_ZLIB_H )
     /// Extract files from an archive (handles tar.gz and zip)
     /**

modules/gui/skins2/src/theme_repository.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef THEME_REPOSITORY_HPP
@@ -30,7 +30,7 @@
 /// Singleton object handling the list of available themes
 class ThemeRepository: public SkinObject
 {
-    public:
+public:
     /// Get the instance of ThemeRepository
     /// Returns NULL if the initialization of the object failed
     static ThemeRepository *instance( intf_thread_t *pIntf );
@@ -38,13 +38,12 @@ class ThemeRepository: public SkinObject
     /// Delete the instance of ThemeRepository
     static void destroy( intf_thread_t *pIntf );
 
-    protected:
+protected:
     // Protected because it is a singleton
     ThemeRepository( intf_thread_t *pIntf );
     virtual ~ThemeRepository();
 
-    private:
-
+private:
     /// Look for themes in a directory
     void parseDirectory( const string &rDir );
 

modules/gui/skins2/src/tooltip.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef TOOLTIP_HPP
@@ -37,7 +37,7 @@ class UString;
 
 class Tooltip: public SkinObject, public Observer<VarText>
 {
-    public:
+public:
     /// Create a tooltip with the given font and delay (in milliseconds)
     Tooltip( intf_thread_t *pIntf, const GenericFont &rFont, int delay );
 
@@ -50,7 +50,7 @@ class Tooltip: public SkinObject, public Observer<VarText>
     /// display
     void hide();
 
-    private:
+private:
     /// Font
     const GenericFont &m_rFont;
     /// Delay before popping the tooltip

modules/gui/skins2/src/top_window.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef TOP_WINDOW_HPP
@@ -39,9 +39,9 @@ class WindowManager;
 /// Class to handle top-level windows
 class TopWindow: public GenericWindow
 {
-    private:
+private:
     friend class WindowManager;
-    public:
+public:
     TopWindow( intf_thread_t *pIntf, int xPos, int yPos,
                WindowManager &rWindowManager,
                bool dragDrop, bool playOnDrop, bool visible );
@@ -84,14 +84,14 @@ class TopWindow: public GenericWindow
     /// Get the initial visibility status
     bool isVisible() const { return m_visible; }
 
-    protected:
+protected:
     /// Actually show the window
     virtual void innerShow();
 
     /// Actually hide the window
     virtual void innerHide();
 
-    private:
+private:
     /**
      * These methods are only used by the window manager
      */

modules/gui/skins2/src/var_manager.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VAR_MANAGER_HPP
@@ -32,7 +32,7 @@
 
 class VarManager: public SkinObject
 {
-    public:
+public:
     /// Get the instance of VarManager
     static VarManager *instance( intf_thread_t *pIntf );
 
@@ -63,7 +63,7 @@ class VarManager: public SkinObject
     /// Get a constant value by its name
     string getConst( const string &rName );
 
-    private:
+private:
     /// Tooltip text
     VarText *m_pTooltipText;
     /// Help text

modules/gui/skins2/src/vlcproc.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VLCPROC_HPP
@@ -48,7 +48,7 @@ struct vout_window_t;
 /// Singleton object handling VLC internal state and playlist
 class VlcProc: public SkinObject
 {
-    public:
+public:
     /// Get the instance of VlcProc
     /// Returns NULL if the initialization of the object failed
     static VlcProc *instance( intf_thread_t *pIntf );
@@ -103,12 +103,12 @@ class VlcProc: public SkinObject
     void on_volume_changed( vlc_object_t* p_obj, vlc_value_t newVal );
     void on_audio_filter_changed( vlc_object_t* p_obj, vlc_value_t newVal );
 
-    protected:
+protected:
     // Protected because it is a singleton
     VlcProc( intf_thread_t *pIntf );
     virtual ~VlcProc();
 
-    private:
+private:
     /// Timer to call manage() regularly (via doManage())
     OSTimer *m_pTimer;
     /// Playtree variable
@@ -209,21 +209,6 @@ class VlcProc: public SkinObject
                              vlc_value_t oldVal, vlc_value_t newVal,
                              void *pParam );
 
-        /// Callback for interaction variable
-        static int onInteraction( vlc_object_t *pObj, const char *pVariable,
-                                  vlc_value_t oldVal, vlc_value_t newVal,
-                                  void *pParam );
-
-        /// Callback for equalizer-bands variable
-        static int onEqBandsChange( vlc_object_t *pObj, const char *pVariable,
-                                    vlc_value_t oldVal, vlc_value_t newVal,
-                                    void *pParam );
-
-        /// Callback for equalizer-preamp variable
-        static int onEqPreampChange( vlc_object_t *pObj, const char *pVariable,
-                                     vlc_value_t oldVal, vlc_value_t newVal,
-                                     void *pParam );
-
     /// Generic Callback
     static int onGenericCallback( vlc_object_t *pObj, const char *pVariable,
                                   vlc_value_t oldVal, vlc_value_t newVal,

modules/gui/skins2/src/vout_manager.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VOUTMANAGER_HPP
@@ -41,11 +41,10 @@ class SavedWnd
 {
 public:
     SavedWnd( vout_window_t* pWnd, VoutWindow* pVoutWindow = NULL,
-               CtrlVideo* pCtrlVideo = NULL, int height = 0, int width = 0 ) :
-       pWnd( pWnd ), pVoutWindow( pVoutWindow ), pCtrlVideo( pCtrlVideo ),
-       height( height ), width( width ) {}
-
-    ~SavedWnd() {}
+               CtrlVideo* pCtrlVideo = NULL, int height = 0, int width = 0 )
+            : pWnd( pWnd ), pVoutWindow( pVoutWindow ),
+              pCtrlVideo( pCtrlVideo ), height( height ), width( width ) { }
+    ~SavedWnd() { }
 
     vout_window_t* pWnd;
     VoutWindow *pVoutWindow;
@@ -56,7 +55,7 @@ public:
 
 class VoutMainWindow: public GenericWindow
 {
-    public:
+public:
 
     VoutMainWindow( intf_thread_t *pIntf, int left = 0, int top = 0 ) :
             GenericWindow( pIntf, left, top, false, false, NULL )
@@ -64,15 +63,14 @@ class VoutMainWindow: public GenericWindow
         resize( 10, 10 );
         move( -50, -50 );
     }
-        virtual ~VoutMainWindow() {}
-
+    virtual ~VoutMainWindow() { }
 };
 
 
 /// Singleton object handling VLC internal state and playlist
 class VoutManager: public SkinObject
 {
-    public:
+public:
     /// Get the instance of VoutManager
     /// Returns NULL if the initialization of the object failed
     static VoutManager *instance( intf_thread_t *pIntf );
@@ -122,12 +120,12 @@ class VoutManager: public SkinObject
     // test if vout are running
     bool hasVout() { return ( m_SavedWndVec.size() != 0 ) ; }
 
-    protected:
+protected:
     // Protected because it is a singleton
     VoutManager( intf_thread_t *pIntf );
     virtual ~VoutManager();
 
-    private:
+private:
 
     vector<CtrlVideo *> m_pCtrlVideoVec;
     vector<CtrlVideo *> m_pCtrlVideoVecBackup;

modules/gui/skins2/src/vout_window.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VOUT_WINDOW_HPP
@@ -34,7 +34,7 @@ class CtrlVideo;
 /// Class to handle a video output window
 class VoutWindow: private GenericWindow
 {
-    public:
+public:
 
     VoutWindow( intf_thread_t *pIntf, vout_window_t* pWnd,
                 int width, int height, GenericWindow* pParent = NULL );
@@ -76,7 +76,7 @@ class VoutWindow: private GenericWindow
 
     virtual string getType() const { return "Vout"; }
 
-    private:
+private:
 
     /// vout thread
     vout_window_t* m_pWnd;

modules/gui/skins2/src/window_manager.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef WINDOW_MANAGER_HPP
@@ -44,7 +44,7 @@ class Popup;
 /// Window manager for skin windows
 class WindowManager: public SkinObject
 {
-    public:
+public:
     /// Direction of the resizing
     enum Direction_t
     {
@@ -53,11 +53,7 @@ class WindowManager: public SkinObject
         kResizeS,   // South
         kNone       // Reserved for internal use
     };
-
-        /// Constructor
-        WindowManager( intf_thread_t *pIntf);
-
-        /// Destructor
+    WindowManager( intf_thread_t *pIntf );
     virtual ~WindowManager();
 
     /**
@@ -163,7 +159,7 @@ class WindowManager: public SkinObject
     /// Return the active popup, or NULL if none is active
     Popup * getActivePopup() const { return m_pPopup; }
 
-    private:
+private:
     /// Some useful typedefs for lazy people like me
     typedef set<TopWindow*> WinSet_t;
     typedef list<Anchor*> AncList_t;
@@ -223,8 +219,7 @@ class WindowManager: public SkinObject
      * This function updates xOffset and yOffset, to take care of a new
      * anchoring (if any)
      */
-        void checkAnchors( TopWindow *pWindow,
-                           int &xOffset, int &yOffset ) const;
+    void checkAnchors( TopWindow *pWindow, int &xOffset, int &yOffset ) const;
 };
 
 

modules/gui/skins2/utils/bezier.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef BEZIER_HPP
@@ -35,7 +35,7 @@
 /// Class for Bezier curves
 class Bezier: public SkinObject
 {
-    public:
+public:
     /// Values to indicate which coordinate(s) must be checked to consider
     /// that two points are distinct
     enum Flag_t
@@ -49,7 +49,7 @@ class Bezier: public SkinObject
             const vector<float> &pAbscissas,
             const vector<float> &pOrdinates,
             Flag_t flag = kCoordsBoth );
-        ~Bezier() {}
+    ~Bezier() { }
 
     /// Get the number of control points used to define the curve
     int getNbCtrlPoints() const { return m_nbCtrlPt; }
@@ -73,7 +73,7 @@ class Bezier: public SkinObject
     /// Get the height (maximum ordinate) of the curve
     int getHeight() const;
 
-    private:
+private:
     /// Number of control points
     int m_nbCtrlPt;
     /// vectors containing the coordinates of the control points

modules/gui/skins2/utils/fsm.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef FSM_HPP
@@ -37,9 +37,9 @@ class CmdGeneric;
 /// This class implements a Finite State Machine (FSM)
 class FSM: public SkinObject
 {
-    public:
-        FSM( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
-        virtual ~FSM() {}
+public:
+    FSM( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
+    virtual ~FSM() { }
 
     /// Add a state to the machine
     void addState( const string &state );
@@ -59,7 +59,7 @@ class FSM: public SkinObject
     /// change the state, and call the associated callback (if any).
     void handleTransition( const string &event );
 
-    private:
+private:
     /// A Key_t contains the initial state of a transition, and a string
     /// characterizing an event (for example: "mouse:left:down:ctrl")
     typedef pair<string, string> Key_t;

modules/gui/skins2/utils/observer.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef OBSERVER_HPP
@@ -34,8 +34,8 @@ template <class S, class ARG> class Observer;
 /// Template for subjects in the Observer design pattern
 template <class S, class ARG = void> class Subject
 {
-    public:
-        virtual ~Subject() {}
+public:
+    virtual ~Subject() { }
 
     /// Remove all observers; should only be used for debugging purposes
     virtual void clearObservers()
@@ -77,10 +77,10 @@ template <class S, class ARG = void> class Subject
     /// Notify without any argument
     virtual void notify() { notify( NULL ); }
 
-    protected:
-        Subject() {}
+protected:
+    Subject() { }
 
-    private:
+private:
     /// Set of observers for this subject
     set<Observer<S, ARG>*> m_observers;
 };
@@ -89,14 +89,14 @@ template <class S, class ARG = void> class Subject
 /// Template for observers in the Observer design pattern
 template <class S, class ARG = void> class Observer
 {
-    public:
-        virtual ~Observer() {}
+public:
+    virtual ~Observer() { }
 
     /// Method called when the subject is modified
     virtual void onUpdate( Subject<S, ARG> &rSubject, ARG *arg) = 0;
 
-    protected:
-        Observer() {}
+protected:
+    Observer() { }
 };
 
 

modules/gui/skins2/utils/pointer.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef POINTER_HPP
@@ -29,7 +29,7 @@
 /// Reference couting pointer
 template <class T> class CountedPtr
 {
-    public:
+public:
     explicit CountedPtr( T *pPtr = 0 ): m_pCounter( 0 )
     {
         if( pPtr ) m_pCounter = new Counter( pPtr );
@@ -60,11 +60,11 @@ template <class T> class CountedPtr
         return ( m_pCounter ? m_pCounter->m_count == 1 : true );
     }
 
-    private:
+private:
     struct Counter
     {
-            Counter( T* pPtr = 0, unsigned int c = 1 ):
-                m_pPtr( pPtr ), m_count( c ) {}
+        Counter( T* pPtr = 0, unsigned int c = 1 )
+               : m_pPtr( pPtr ), m_count( c ) { }
         T* m_pPtr;
         unsigned int m_count;
     } *m_pCounter;

modules/gui/skins2/utils/position.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef POSITION_HPP
@@ -33,8 +33,8 @@
 /// Interface for rectangular objects
 class Box
 {
-    public:
-        virtual ~Box() {}
+public:
+    virtual ~Box() { }
 
     /// Get the size of the box
     virtual int getWidth() const = 0;
@@ -45,7 +45,7 @@ class Box
 /// Interface for rectangular objects with a position
 class GenericRect: public Box
 {
-    public:
+public:
     virtual int getLeft() const = 0;
     virtual int getTop() const = 0;
 };
@@ -54,7 +54,7 @@ class GenericRect: public Box
 /// Characterization of a rectangle
 class SkinsRect: public GenericRect
 {
-    public:
+public:
     SkinsRect( int left, int top, int right, int bottom );
 
     virtual int getLeft() const { return m_left; }
@@ -64,7 +64,7 @@ class SkinsRect: public GenericRect
     virtual int getWidth() const { return m_right - m_left; }
     virtual int getHeight() const { return m_bottom - m_top; }
 
-    private:
+private:
     int m_left;
     int m_top;
     int m_right;
@@ -75,13 +75,13 @@ class SkinsRect: public GenericRect
 /// Relative position of a rectangle in a box
 /**
  * Note: Even if the object is tied to its direct container rectangle, the
- * coordinates returned by getLeft(), getTop(), getRight() and getBottom() are
- * not relative to the direct container (which is usually a panel or the layout)
- * but to the root container (i.e. the layout).
+ * coordinates returned by getLeft(), getTop(), getRight() and getBottom()
+ * are not relative to the direct container (which is usually a panel or
+ * the layout) but to the root container (i.e. the layout).
  */
 class Position: public GenericRect
 {
-    public:
+public:
     /// Type for reference edge/corner
     enum Ref_t
     {
@@ -101,7 +101,7 @@ class Position: public GenericRect
               Ref_t refLeftTop, Ref_t refRightBottom,
               bool xKeepRatio, bool yKeepRatio );
 
-        ~Position() {}
+    ~Position() { }
 
     /// Get the position relative to the left top corner of the box
     virtual int getLeft() const;
@@ -115,7 +115,7 @@ class Position: public GenericRect
     Ref_t getRefLeftTop() const { return m_refLeftTop; }
     Ref_t getRefRightBottom() const { return m_refRighBottom; }
 
-    private:
+private:
     /// Position and reference edge/corner
     int m_left;
     int m_top;
@@ -139,10 +139,10 @@ typedef CountedPtr<Position> PositionPtr;
 /// Variable implementing the Box interface
 class VarBox: public Variable, public Box, public Subject<VarBox>
 {
-    public:
+public:
     VarBox( intf_thread_t *pIntf, int width = 0, int height = 0 );
 
-        virtual ~VarBox() {}
+    virtual ~VarBox() { }
 
     /// Get the variable type
     virtual const string &getType() const { return m_type; }
@@ -154,7 +154,7 @@ class VarBox: public Variable, public Box, public Subject<VarBox>
     /// Change the size of the box
     void setSize( int width, int height );
 
-    private:
+private:
     /// Variable type
     static const string m_type;
     /// Size

modules/gui/skins2/utils/ustring.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef USTRING_HPP
@@ -32,7 +32,7 @@
 // Class for UNICODE strings handling
 class UString: public SkinObject
 {
-    public:
+public:
     static const uint32_t npos;
 
     /// Copy constructor
@@ -85,7 +85,7 @@ class UString: public SkinObject
     /// Build a string from an integer
     static UString fromInt(intf_thread_t *pIntf, int number);
 
-    private:
+private:
     /// Unicode string
     uint32_t *m_pString;
     /// String length

modules/gui/skins2/utils/var_bool.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VAR_BOOL_HPP
@@ -32,18 +32,18 @@
 /// Interface for read-only boolean variable
 class VarBool: public Variable, public Subject<VarBool>
 {
-    public:
+public:
     /// Get the variable type
     virtual const string &getType() const { return m_type; }
 
     /// Get the boolean value
     virtual bool get() const = 0;
 
-    protected:
-        VarBool( intf_thread_t *pIntf ): Variable( pIntf ) {}
-        virtual ~VarBool() {}
+protected:
+    VarBool( intf_thread_t *pIntf ): Variable( pIntf ) { }
+    virtual ~VarBool() { }
 
-    private:
+private:
     /// Variable type
     static const string m_type;
 };
@@ -52,9 +52,9 @@ class VarBool: public Variable, public Subject<VarBool>
 /// Constant true VarBool
 class VarBoolTrue: public VarBool
 {
-    public:
-        VarBoolTrue( intf_thread_t *pIntf ): VarBool( pIntf ) {}
-        virtual ~VarBoolTrue() {}
+public:
+    VarBoolTrue( intf_thread_t *pIntf ): VarBool( pIntf ) { }
+    virtual ~VarBoolTrue() { }
     virtual bool get() const { return true; }
 };
 
@@ -62,9 +62,9 @@ class VarBoolTrue: public VarBool
 /// Constant false VarBool
 class VarBoolFalse: public VarBool
 {
-    public:
-        VarBoolFalse( intf_thread_t *pIntf ): VarBool( pIntf ) {}
-        virtual ~VarBoolFalse() {}
+public:
+    VarBoolFalse( intf_thread_t *pIntf ): VarBool( pIntf ) { }
+    virtual ~VarBoolFalse() { }
     virtual bool get() const { return false; }
 };
 
@@ -72,9 +72,9 @@ class VarBoolFalse: public VarBool
 /// Boolean variable implementation (read/write)
 class VarBoolImpl: public VarBool
 {
-    public:
+public:
     VarBoolImpl( intf_thread_t *pIntf );
-        virtual ~VarBoolImpl() {}
+    virtual ~VarBoolImpl() { }
 
     // Get the boolean value
     virtual bool get() const { return m_value; }
@@ -82,7 +82,7 @@ class VarBoolImpl: public VarBool
     /// Set the internal value
     virtual void set( bool value );
 
-    private:
+private:
     /// Boolean value
     bool m_value;
 };
@@ -91,17 +91,15 @@ class VarBoolImpl: public VarBool
 /// Conjunction of two boolean variables (AND)
 class VarBoolAndBool: public VarBool, public Observer<VarBool>
 {
-    public:
+public:
     VarBoolAndBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 );
     virtual ~VarBoolAndBool();
-
-        // Get the boolean value
     virtual bool get() const { return m_rVar1.get() && m_rVar2.get(); }
 
     // Called when one of the observed variables is changed
     void onUpdate( Subject<VarBool> &rVariable, void* );
 
-    private:
+private:
     /// Boolean variables
     VarBool &m_rVar1, &m_rVar2;
 };
@@ -110,17 +108,15 @@ class VarBoolAndBool: public VarBool, public Observer<VarBool>
 /// Disjunction of two boolean variables (OR)
 class VarBoolOrBool: public VarBool, public Observer<VarBool>
 {
-    public:
+public:
     VarBoolOrBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 );
     virtual ~VarBoolOrBool();
-
-        // Get the boolean value
     virtual bool get() const { return m_rVar1.get() || m_rVar2.get(); }
 
     // Called when one of the observed variables is changed
     void onUpdate( Subject<VarBool> &rVariable, void* );
 
-    private:
+private:
     /// Boolean variables
     VarBool &m_rVar1, &m_rVar2;
 };
@@ -129,17 +125,15 @@ class VarBoolOrBool: public VarBool, public Observer<VarBool>
 /// Negation of a boolean variable (NOT)
 class VarNotBool: public VarBool, public Observer<VarBool>
 {
-    public:
+public:
     VarNotBool( intf_thread_t *pIntf, VarBool &rVar );
     virtual ~VarNotBool();
-
-        // Get the boolean value
     virtual bool get() const { return !m_rVar.get(); }
 
     // Called when the observed variable is changed
     void onUpdate( Subject<VarBool> &rVariable, void* );
 
-    private:
+private:
     /// Boolean variable
     VarBool &m_rVar;
 };

modules/gui/skins2/utils/var_list.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VAR_LIST_HPP
@@ -36,7 +36,7 @@
 /// List variable
 class VarList: public Variable, public Subject<VarList>
 {
-    public:
+public:
     VarList( intf_thread_t *pIntf );
     virtual ~VarList();
 
@@ -62,10 +62,10 @@ class VarList: public Variable, public Subject<VarList>
         bool m_selected;
         bool m_playing;
 
-            Elem_t( const UStringPtr &rcString, bool selected = false, bool
-                    playing = false ):
-                m_cString( rcString ), m_selected( selected ),
-                m_playing( playing) {}
+        Elem_t( const UStringPtr &rcString,
+                bool selected = false, bool playing = false )
+              : m_cString( rcString ),
+                m_selected( selected ), m_playing( playing ) { }
     };
 
     /// Iterators
@@ -85,7 +85,7 @@ class VarList: public Variable, public Subject<VarList>
     ConstIterator operator[]( int n ) const;
 
     /// Execute the action associated to this item
-        virtual void action( Elem_t *pItem ) {}
+    virtual void action( Elem_t *pItem ) { }
 
     /// Get a reference on the position variable
     VarPercent &getPositionVar() const
@@ -94,11 +94,11 @@ class VarList: public Variable, public Subject<VarList>
     /// Get a counted pointer on the position variable
     const VariablePtr &getPositionVarPtr() const { return m_cPosition; }
 
-    protected:
+protected:
     /// List of elements
     list<Elem_t> m_list;
 
-    private:
+private:
     /// Variable type
     static const string m_type;
     /// Position variable

modules/gui/skins2/utils/var_percent.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VAR_PERCENT_HPP
@@ -34,9 +34,9 @@ class VarPercent;
 /// Percentage variable
 class VarPercent: public Variable, public Subject<VarPercent>
 {
-    public:
-        VarPercent( intf_thread_t *pIntf ): Variable( pIntf ), m_value( 0 ) {}
-        virtual ~VarPercent() {}
+public:
+    VarPercent( intf_thread_t *pIntf ): Variable( pIntf ), m_value( 0 ) { }
+    virtual ~VarPercent() { }
 
     /// Get the variable type
     virtual const string &getType() const { return m_type; }
@@ -45,7 +45,7 @@ class VarPercent: public Variable, public Subject<VarPercent>
     virtual void set( float percentage );
     virtual float get() const { return m_value; }
 
-    private:
+private:
     /// Variable type
     static const string m_type;
     /// Percent value

modules/gui/skins2/utils/var_text.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VAR_TEXT_HPP
@@ -36,7 +36,7 @@ class VarText: public Variable, public Subject<VarText>,
                public Observer<VarPercent>,
                public Observer<VarText>
 {
-    public:
+public:
     // Set substVars to true to replace "$X" variables in the text
     VarText( intf_thread_t *pIntf, bool substVars = true );
     virtual ~VarText();
@@ -52,7 +52,7 @@ class VarText: public Variable, public Subject<VarText>,
     virtual void onUpdate( Subject<VarPercent> &rVariable, void* );
     virtual void onUpdate( Subject<VarText> &rVariable, void* );
 
-    private:
+private:
     /// Stop observing other variables
     void delObservers();
 

modules/gui/skins2/utils/var_tree.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VAR_TREE_HPP
@@ -45,7 +45,7 @@ typedef struct tree_update
 /// Tree variable
 class VarTree: public Variable, public Subject<VarTree, tree_update>
 {
-    public:
+public:
     VarTree( intf_thread_t *pIntf );
 
     VarTree( intf_thread_t *pIntf, VarTree *pParent, int id,
@@ -129,7 +129,7 @@ class VarTree: public Variable, public Subject<VarTree, tree_update>
     }
 
     /// Execute the action associated to this item
-        virtual void action( VarTree *pItem ) {}
+    virtual void action( VarTree *pItem ) { }
 
     /// Get a reference on the position variable
     VarPercent &getPositionVar() const
@@ -138,7 +138,8 @@ class VarTree: public Variable, public Subject<VarTree, tree_update>
     /// Get a counted pointer on the position variable
     const VariablePtr &getPositionVarPtr() const { return m_cPosition; }
 
-        /// Count the number of items that should be displayed if the playlist window wasn't limited
+    /// Count the number of items that should be displayed if the
+    /// playlist window wasn't limited
     int visibleItems();
 
     /// Count the number of leafs in the tree
@@ -185,7 +186,7 @@ class VarTree: public Variable, public Subject<VarTree, tree_update>
     }
 
 
-    private:
+private:
     /// List of children
     list<VarTree> m_children;
 

modules/gui/skins2/utils/variable.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VARIABLE_HPP
@@ -33,14 +33,14 @@
 /// Base class for variable objects
 class Variable: public SkinObject
 {
-    public:
-        virtual ~Variable() {}
+public:
+    virtual ~Variable() { }
 
     /// Get the variable type
     virtual const string &getType() const = 0;
 
-    protected:
-        Variable( intf_thread_t *pIntf ): SkinObject( pIntf ) {}
+protected:
+    Variable( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
 };
 
 

modules/gui/skins2/vars/equalizer.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef EQUALIZER_HPP
@@ -31,7 +31,7 @@
 /// Variable for graphical equalizer
 class EqualizerBands: public SkinObject, public Observer<VarPercent>
 {
-    public:
+public:
     /// Number of bands
     static const int kNbBands = 10;
 
@@ -45,7 +45,7 @@ class EqualizerBands: public SkinObject, public Observer<VarPercent>
     /// Return the variable for a specific band
     VariablePtr getBand( int band );
 
-    private:
+private:
     /// Array of equalizer bands
     VariablePtr m_cBands[kNbBands];
     /// Flag set when an update is in progress
@@ -59,9 +59,9 @@ class EqualizerBands: public SkinObject, public Observer<VarPercent>
 /// Variable for equalizer preamp
 class EqualizerPreamp: public VarPercent
 {
-    public:
+public:
     EqualizerPreamp( intf_thread_t *pIntf );
-        virtual ~EqualizerPreamp() {}
+    virtual ~EqualizerPreamp() { }
 
     virtual void set( float percentage, bool updateVLC );
 

modules/gui/skins2/vars/playtree.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef PLAYTREE_HPP
@@ -30,7 +30,7 @@
 /// Variable for VLC playlist (new tree format)
 class Playtree: public VarTree
 {
-    public:
+public:
     Playtree( intf_thread_t *pIntf );
     virtual ~Playtree();
 
@@ -55,7 +55,7 @@ class Playtree: public VarTree
     /// Items waiting to be appended
     int i_items_to_append;
 
-    private:
+private:
     /// VLC playlist object
     playlist_t *m_pPlaylist;
 

modules/gui/skins2/vars/time.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef TIME_HPP
@@ -31,9 +31,9 @@
 /// Variable for VLC stream time
 class StreamTime: public VarPercent
 {
-    public:
-        StreamTime( intf_thread_t *pIntf ): VarPercent( pIntf ) {}
-        virtual ~StreamTime() {}
+public:
+    StreamTime( intf_thread_t *pIntf ): VarPercent( pIntf ) { }
+    virtual ~StreamTime() { }
 
     virtual void set( float percentage, bool updateVLC );
 
@@ -48,7 +48,7 @@ class StreamTime: public VarPercent
     /// Return the duration formatted as a time display (h:mm:ss)
     virtual const string getAsStringDuration( bool bShortFormat = false ) const;
 
-    private:
+private:
     /// Convert a number of seconds into "h:mm:ss" format
     const string formatTime( int seconds, bool bShortFormat ) const;
 };

modules/gui/skins2/vars/volume.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef VOLUME_HPP
@@ -33,9 +33,9 @@
 /// Variable for VLC volume
 class Volume: public VarPercent
 {
-    public:
+public:
     Volume( intf_thread_t *pIntf );
-        virtual ~Volume() {}
+    virtual ~Volume() { }
 
     virtual void set( float percentage, bool updateVLC );
 

modules/gui/skins2/win32/win32_dragdrop.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef WIN32_DRAGDROP_HPP
@@ -32,11 +32,11 @@
 
 class Win32DragDrop: public SkinObject, public IDropTarget
 {
-    public:
+public:
    Win32DragDrop( intf_thread_t *pIntf, bool playOnDrop );
-       virtual ~Win32DragDrop() {}
+   virtual ~Win32DragDrop() { }
 
-    protected:
+protected:
     // IUnknown methods
     STDMETHOD(QueryInterface)( REFIID riid, void FAR* FAR* ppvObj );
     STDMETHOD_(ULONG, AddRef)();
@@ -50,7 +50,7 @@ class Win32DragDrop: public SkinObject, public IDropTarget
     STDMETHOD(Drop)( LPDATAOBJECT pDataObj, DWORD grfKeyState,
                      POINTL pt, DWORD *pdwEffect );
 
-    private:
+private:
     /// Internal reference counter
     unsigned long m_references;
     /// Indicates whether the file(s) must be played immediately

modules/gui/skins2/win32/win32_factory.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef WIN32_FACTORY_HPP
@@ -38,7 +38,7 @@
 /// Class used to instanciate Win32 specific objects
 class Win32Factory: public OSFactory
 {
-    public:
+public:
     Win32Factory( intf_thread_t *pIntf );
     virtual ~Win32Factory();
 
@@ -124,7 +124,7 @@ class Win32Factory: public OSFactory
     BOOL (WINAPI *SetLayeredWindowAttributes)( HWND, COLORREF,
                                                BYTE, DWORD );
 
-    private:
+private:
     /// Handle of the instance
     HINSTANCE m_hInst;
     /// Handle of the parent window

modules/gui/skins2/win32/win32_graphics.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef WIN32_GRAPHICS_HPP
@@ -34,7 +34,7 @@ class GenericBitmap;
 /// Win32 implementation of OSGraphics
 class Win32Graphics: public OSGraphics
 {
-    public:
+public:
     Win32Graphics( intf_thread_t *pIntf, int width, int height );
     virtual ~Win32Graphics();
 
@@ -82,7 +82,7 @@ class Win32Graphics: public OSGraphics
     /// Get the mask
     virtual HRGN getMask() const { return m_mask; }
 
-    private:
+private:
     /// Size of the image
     int m_width, m_height;
 

modules/gui/skins2/win32/win32_loop.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef WIN32_LOOP_HPP
@@ -35,7 +35,7 @@ class GenericWindow;
 /// Main event loop for Win32
 class Win32Loop: public OSLoop
 {
-    public:
+public:
     /// Get the instance of Win32Loop
     static OSLoop *instance( intf_thread_t *pIntf );
 
@@ -48,7 +48,7 @@ class Win32Loop: public OSLoop
     /// Exit the main loop
     virtual void exit();
 
-    private:
+private:
     // Private because it is a singleton
     Win32Loop( intf_thread_t *pIntf );
     virtual ~Win32Loop();

modules/gui/skins2/win32/win32_popup.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef WIN32_POPUP_HPP
@@ -31,7 +31,7 @@
 /// Win32 implementation of OSPopup
 class Win32Popup: public OSPopup
 {
-    public:
+public:
     Win32Popup( intf_thread_t *pIntf, HWND hAssociatedWindow );
 
     virtual ~Win32Popup();
@@ -51,7 +51,7 @@ class Win32Popup: public OSPopup
     /// Return the position of the item identified by the given id
     virtual int getPosFromId( int id ) const { return id; }
 
-    private:
+private:
     /// Menu handle
     HMENU m_hMenu;
     /// Handle of the window which will receive the menu events
@@ -60,8 +60,8 @@ class Win32Popup: public OSPopup
     /**
      * Find the item before which to insert another item so that the
      * newly added item is at the position pos _when the whole menu has
-         * been built_ (no assumption is made for the order of insertion of the
-         * items)
+     * been built_ (no assumption is made for the order of insertion of
+     * the items)
      */
     unsigned int findInsertionPoint( unsigned int pos ) const;
 };

modules/gui/skins2/win32/win32_timer.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef WIN32_TIMER_HPP
@@ -32,7 +32,7 @@ class CmdGeneric;
 // Win32 specific timer
 class Win32Timer: public OSTimer
 {
-    public:
+public:
     Win32Timer( intf_thread_t *pIntf, CmdGeneric &rCmd, HWND hWnd );
     virtual ~Win32Timer();
 
@@ -46,7 +46,7 @@ class Win32Timer: public OSTimer
     /// Execute the callback
     void execute();
 
-    private:
+private:
     /// Command to execute
     CmdGeneric &m_rCommand;
 

modules/gui/skins2/win32/win32_tooltip.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef WIN32_TOOLTIP_HPP
@@ -32,9 +32,8 @@
 /// Win32 implementation of OSTooltip
 class Win32Tooltip: public OSTooltip
 {
-    public:
-        Win32Tooltip( intf_thread_t *pIntf, HINSTANCE hInst,
-                            HWND hParentWindow );
+public:
+    Win32Tooltip( intf_thread_t *pIntf, HINSTANCE hInst, HWND hParentWindow );
 
     virtual ~Win32Tooltip();
 
@@ -44,7 +43,7 @@ class Win32Tooltip: public OSTooltip
     /// Hide the tooltip
     virtual void hide();
 
-    private:
+private:
     /// Window ID
     HWND m_hWnd;
 };

modules/gui/skins2/win32/win32_window.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef WIN32_WINDOW_HPP
@@ -33,7 +33,7 @@
 /// Win32 implementation of OSWindow
 class Win32Window: public OSWindow
 {
-    public:
+public:
     Win32Window( intf_thread_t *pIntf, GenericWindow &rWindow,
                  HINSTANCE hInst, HWND hParentWindow,
                  bool dragDrop, bool playOnDrop,
@@ -47,8 +47,7 @@ class Win32Window: public OSWindow
     virtual void hide() const;
 
     /// Move and resize the window
-        virtual void moveResize( int left, int top,
-                                 int width, int height ) const;
+    virtual void moveResize( int left, int top, int width, int height ) const;
 
     /// Bring the window on top
     virtual void raise() const;
@@ -68,7 +67,7 @@ class Win32Window: public OSWindow
     /// reparent the window
     void reparent( void* OSHandle, int x, int y, int w, int h );
 
-    private:
+private:
     /// Window handle
     HWND m_hWnd;
     /// Window parent's handle

modules/gui/skins2/x11/x11_display.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_DISPLAY_HPP
@@ -39,7 +39,7 @@
 /// Class for encapsulation of a X11 Display
 class X11Display: public SkinObject
 {
-    public:
+public:
     X11Display( intf_thread_t *pIntf );
     virtual ~X11Display();
 
@@ -77,7 +77,7 @@ class X11Display: public SkinObject
     //XXX
     Window m_voutWindow;
 
-    private:
+private:
     /// Dummy parent window for the task bar
     Window m_mainWindow;
     /// Display parameters

modules/gui/skins2/x11/x11_dragdrop.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_DRAGDROP_HPP
@@ -33,19 +33,19 @@ class X11Display;
 
 class X11DragDrop: public SkinObject
 {
-    public:
+public:
     typedef long ldata_t[5];
 
     X11DragDrop( intf_thread_t *pIntf, X11Display &rDisplay, Window win,
                  bool playOnDrop );
-        virtual ~X11DragDrop() {}
+    virtual ~X11DragDrop() { }
 
     void dndEnter( ldata_t data );
     void dndPosition( ldata_t data );
     void dndLeave( ldata_t data );
     void dndDrop( ldata_t data );
 
-    private:
+private:
     /// X11 display
     X11Display &m_rDisplay;
     /// Window ID

modules/gui/skins2/x11/x11_factory.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_FACTORY_HPP
@@ -38,7 +38,7 @@ class X11TimerLoop;
 /// Class used to instanciate X11 specific objects
 class X11Factory: public OSFactory
 {
-    public:
+public:
     /// Map to find the GenericWindow associated to a X11Window
     map<Window, GenericWindow*> m_windowMap;
     /// Map to find the Dnd object associated to a X11Window
@@ -117,7 +117,7 @@ class X11Factory: public OSFactory
     /// Get the timer loop
     X11TimerLoop *getTimerLoop() const { return m_pTimerLoop; }
 
-    private:
+private:
     /// X11 display
     X11Display *m_pDisplay;
     /// Timer loop

modules/gui/skins2/x11/x11_graphics.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_GRAPHICS_HPP
@@ -37,7 +37,7 @@ class GenericBitmap;
 /// X11 implementation of OSGraphics
 class X11Graphics: public OSGraphics
 {
-    public:
+public:
     X11Graphics( intf_thread_t *pIntf, X11Display &rDisplay, int width,
                  int height);
 
@@ -85,7 +85,7 @@ class X11Graphics: public OSGraphics
     /// Get the transparency mask
     Region getMask() const { return m_mask; }
 
-    private:
+private:
     /// X11 display
     X11Display &m_rDisplay;
     /// Size of the image
@@ -98,11 +98,9 @@ class X11Graphics: public OSGraphics
     GC m_gc;
 
     /// Add an horizontal segment in a region
-        void addHSegmentInRegion( Region &rMask, int xStart,
-                                               int xEnd, int y );
+    void addHSegmentInRegion( Region &rMask, int xStart, int xEnd, int y );
     /// Add a vertical segment in a region
-        void addVSegmentInRegion( Region &rMask, int yStart,
-                                               int yEnd, int x );
+    void addVSegmentInRegion( Region &rMask, int yStart, int yEnd, int x );
 };
 
 

modules/gui/skins2/x11/x11_loop.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_LOOP_HPP
@@ -36,7 +36,7 @@ class GenericWindow;
 /// Main event loop for X11 (singleton)
 class X11Loop: public OSLoop
 {
-    public:
+public:
     /// Get the instance of X11Loop
     static OSLoop *instance( intf_thread_t *pIntf, X11Display &rDisplay );
 
@@ -49,7 +49,7 @@ class X11Loop: public OSLoop
     /// Exit the main loop
     virtual void exit();
 
-    private:
+private:
     /// X11 Display
     X11Display &m_rDisplay;
     /// Flag set on exit

modules/gui/skins2/x11/x11_popup.hpp

@@ -16,9 +16,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_POPUP_HPP
@@ -31,7 +31,7 @@ class X11Display;
 /// X11 implementation of OSPopup
 class X11Popup: public OSPopup
 {
-    public:
+public:
     X11Popup( intf_thread_t *pIntf, X11Display & );
 
     virtual ~X11Popup();

modules/gui/skins2/x11/x11_timer.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_TIMER_HPP
@@ -37,7 +37,7 @@ class CmdGeneric;
 // X11 specific timer
 class X11Timer: public OSTimer
 {
-    public:
+public:
     X11Timer( intf_thread_t *pIntf, CmdGeneric &rCmd );
     virtual ~X11Timer();
 
@@ -54,7 +54,7 @@ class X11Timer: public OSTimer
     /// Returns false if the timer must be removed after
     bool execute();
 
-    private:
+private:
     /// Command to execute
     CmdGeneric &m_rCommand;
     /// Timer loop
@@ -71,7 +71,7 @@ class X11Timer: public OSTimer
 /// Class to manage a set of timers
 class X11TimerLoop: public SkinObject
 {
-    public:
+public:
     /// Create the timer loop with the communication number of the X11
     /// display
     X11TimerLoop( intf_thread_t *pIntf, int connectionNumber );
@@ -86,13 +86,13 @@ class X11TimerLoop: public SkinObject
     /// Wait for the next timer and execute it
     void waitNextTimer();
 
-    private:
+private:
     /// Connection number of the X11 display
     int m_connectionNumber;
     /// List of timers
     list<X11Timer*> m_timers;
 
-        /// Sleep for delay milliseconds, unless an X11 event is received
+    /// Sleep for delay milliseconds, unless an X11 event is received.
     /// Returns true if the sleep has been interupted.
     bool sleep( int delay );
 };

modules/gui/skins2/x11/x11_tooltip.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_TOOLTIP_HPP
@@ -35,7 +35,7 @@ class X11Display;
 /// X11 implementation of OSTooltip
 class X11Tooltip: public OSTooltip
 {
-    public:
+public:
     X11Tooltip( intf_thread_t *pIntf, X11Display &rDisplay );
 
     virtual ~X11Tooltip();
@@ -46,7 +46,7 @@ class X11Tooltip: public OSTooltip
     /// Hide the tooltip
     virtual void hide();
 
-    private:
+private:
     /// X11 display
     X11Display &m_rDisplay;
     /// Window ID

modules/gui/skins2/x11/x11_window.hpp

@@ -17,9 +17,9 @@
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
  *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_WINDOW_HPP
@@ -36,7 +36,7 @@ class X11DragDrop;
 /// X11 implementation of OSWindow
 class X11Window: public OSWindow
 {
-    public:
+public:
     X11Window( intf_thread_t *pIntf, GenericWindow &rWindow,
                X11Display &rDisplay, bool dragDrop, bool playOnDrop,
                X11Window *pParentWindow );
@@ -74,7 +74,7 @@ class X11Window: public OSWindow
     /// reparent the window
     void reparent( void* OSHandle, int x, int y, int w, int h );
 
-    private:
+private:
     /// X11 display
     X11Display &m_rDisplay;
     /// Window ID