Commit bebef5dc authored by JP Dinger's avatar JP Dinger

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

parent b25aa5bf
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef ASYNC_QUEUE_HPP #ifndef ASYNC_QUEUE_HPP
...@@ -36,7 +36,7 @@ class OSTimer; ...@@ -36,7 +36,7 @@ class OSTimer;
/// Asynchronous queue for commands /// Asynchronous queue for commands
class AsyncQueue: public SkinObject class AsyncQueue: public SkinObject
{ {
public: public:
/// Get the instance of AsyncQueue /// Get the instance of AsyncQueue
/// Returns NULL if initialization failed. /// Returns NULL if initialization failed.
static AsyncQueue *instance( intf_thread_t *pIntf ); static AsyncQueue *instance( intf_thread_t *pIntf );
...@@ -54,7 +54,7 @@ class AsyncQueue: public SkinObject ...@@ -54,7 +54,7 @@ class AsyncQueue: public SkinObject
/// Flush the queue and execute the commands /// Flush the queue and execute the commands
void flush(); void flush();
private: private:
/// Command queue /// Command queue
list<CmdGenericPtr> m_cmdList; list<CmdGenericPtr> m_cmdList;
/// Timer /// Timer
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_ADD_ITEM_HPP #ifndef CMD_ADD_ITEM_HPP
...@@ -32,18 +32,14 @@ ...@@ -32,18 +32,14 @@
/// "Add item" command /// "Add item" command
class CmdAddItem: public CmdGeneric class CmdAddItem: public CmdGeneric
{ {
public: public:
CmdAddItem( intf_thread_t *pIntf, const string &rName, bool playNow ): CmdAddItem( intf_thread_t *pIntf, const string &rName, bool playNow )
CmdGeneric( pIntf ), m_name( rName ), m_playNow( playNow ) {} : CmdGeneric( pIntf ), m_name( rName ), m_playNow( playNow ) { }
virtual ~CmdAddItem() {} virtual ~CmdAddItem() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "add item"; } virtual string getType() const { return "add item"; }
private: private:
/// Name of the item to enqueue /// Name of the item to enqueue
string m_name; string m_name;
/// Should we play the item immediately? /// Should we play the item immediately?
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_AUDIO_HPP #ifndef CMD_AUDIO_HPP
...@@ -29,18 +29,14 @@ ...@@ -29,18 +29,14 @@
/// Command to enable/disable the equalizer /// Command to enable/disable the equalizer
class CmdSetEqualizer: public CmdGeneric class CmdSetEqualizer: public CmdGeneric
{ {
public: public:
CmdSetEqualizer( intf_thread_t *pIntf, bool iEnable ): CmdSetEqualizer( intf_thread_t *pIntf, bool iEnable )
CmdGeneric( pIntf ), m_enable( iEnable ) {} : CmdGeneric( pIntf ), m_enable( iEnable ) { }
virtual ~CmdSetEqualizer() {} virtual ~CmdSetEqualizer() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "set equalizer"; } virtual string getType() const { return "set equalizer"; }
private: private:
/// Enable or disable the equalizer /// Enable or disable the equalizer
bool m_enable; bool m_enable;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_CHANGE_SKIN_HPP #ifndef CMD_CHANGE_SKIN_HPP
...@@ -31,18 +31,14 @@ ...@@ -31,18 +31,14 @@
/// "Change Skin" command /// "Change Skin" command
class CmdChangeSkin: public CmdGeneric class CmdChangeSkin: public CmdGeneric
{ {
public: public:
CmdChangeSkin( intf_thread_t *pIntf, const string &rFile ): CmdChangeSkin( intf_thread_t *pIntf, const string &rFile ):
CmdGeneric( pIntf ), m_file( rFile ) {} CmdGeneric( pIntf ), m_file( rFile ) { }
virtual ~CmdChangeSkin() {} virtual ~CmdChangeSkin() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "change skin"; } virtual string getType() const { return "change skin"; }
private: private:
/// Skin file to load /// Skin file to load
string m_file; string m_file;
}; };
......
...@@ -17,30 +17,28 @@ ...@@ -17,30 +17,28 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_GENERIC_HPP #ifndef CMD_GENERIC_HPP
#define CMD_GENERIC_HPP #define CMD_GENERIC_HPP
#include <string>
#include "../src/skin_common.hpp" #include "../src/skin_common.hpp"
#include "../utils/pointer.hpp" #include "../utils/pointer.hpp"
#include <string>
/// Macro to define the prototype of simple commands /// Macro to define the prototype of simple commands
#define DEFINE_COMMAND( name, type ) \ #define DEFINE_COMMAND( name, type ) \
class Cmd##name: public CmdGeneric \ class Cmd##name: public CmdGeneric \
{ \ { public: \
public: \ Cmd##name( intf_thread_t *pIntf ): CmdGeneric( pIntf ) { } \
Cmd##name( intf_thread_t *pIntf ): CmdGeneric( pIntf ) {} \ virtual ~Cmd##name() { } \
virtual ~Cmd##name() {} \
virtual void execute(); \ virtual void execute(); \
virtual string getType() const { return type; } \ virtual string getType() const { return type; } \
\
}; };
...@@ -48,15 +46,14 @@ class Cmd##name: public CmdGeneric \ ...@@ -48,15 +46,14 @@ class Cmd##name: public CmdGeneric \
#define DEFINE_CALLBACK( parent, action ) \ #define DEFINE_CALLBACK( parent, action ) \
class Cmd##action: public CmdGeneric \ class Cmd##action: public CmdGeneric \
{ \ { \
public: \ public: \
Cmd##action( parent *pParent ): \ Cmd##action( parent *pParent ): \
CmdGeneric( pParent->getIntf() ), m_pParent( pParent ) {} \ CmdGeneric( pParent->getIntf() ), m_pParent( pParent ) { } \
virtual ~Cmd##action() {} \ virtual ~Cmd##action() { } \
virtual void execute(); \ virtual void execute(); \
virtual string getType() const { return "Cmd" #parent #action; } \ virtual string getType() const { return "Cmd" #parent #action; } \
private: \ private: \
parent *m_pParent; \ parent *m_pParent; \
\
} m_cmd##action; \ } m_cmd##action; \
friend class Cmd##action; friend class Cmd##action;
...@@ -64,8 +61,8 @@ friend class Cmd##action; ...@@ -64,8 +61,8 @@ friend class Cmd##action;
/// Base class for skins commands /// Base class for skins commands
class CmdGeneric: public SkinObject class CmdGeneric: public SkinObject
{ {
public: public:
virtual ~CmdGeneric() {} virtual ~CmdGeneric() { }
/// This method does the real job of the command /// This method does the real job of the command
virtual void execute() = 0; virtual void execute() = 0;
...@@ -77,8 +74,8 @@ class CmdGeneric: public SkinObject ...@@ -77,8 +74,8 @@ class CmdGeneric: public SkinObject
/// this command. /// this command.
virtual bool checkRemove( CmdGeneric * ) const { return true; } virtual bool checkRemove( CmdGeneric * ) const { return true; }
protected: protected:
CmdGeneric( intf_thread_t *pIntf ): SkinObject( pIntf ) {} CmdGeneric( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_LAYOUT_HPP #ifndef CMD_LAYOUT_HPP
...@@ -33,18 +33,14 @@ class GenericLayout; ...@@ -33,18 +33,14 @@ class GenericLayout;
/// "Change layout" command /// "Change layout" command
class CmdLayout: public CmdGeneric class CmdLayout: public CmdGeneric
{ {
public: public:
CmdLayout( intf_thread_t *pIntf, TopWindow &rWindow, CmdLayout( intf_thread_t *pIntf, TopWindow &rWindow,
GenericLayout &rLayout ); GenericLayout &rLayout );
virtual ~CmdLayout() {} virtual ~CmdLayout() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "change layout"; } virtual string getType() const { return "change layout"; }
private: private:
TopWindow &m_rWindow; TopWindow &m_rWindow;
GenericLayout &m_rLayout; GenericLayout &m_rLayout;
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_MINIMIZE_HPP #ifndef CMD_MINIMIZE_HPP
...@@ -36,19 +36,15 @@ DEFINE_COMMAND(Restore, "restore" ) ...@@ -36,19 +36,15 @@ DEFINE_COMMAND(Restore, "restore" )
/// Command to maximize a window /// Command to maximize a window
class CmdMaximize: public CmdGeneric class CmdMaximize: public CmdGeneric
{ {
public: public:
/// Maximize the given layout /// Maximize the given layout
CmdMaximize( intf_thread_t *pIntf, WindowManager &rWindowManager, CmdMaximize( intf_thread_t *pIntf, WindowManager &rWindowManager,
TopWindow &rWindow ); TopWindow &rWindow );
virtual ~CmdMaximize() {} virtual ~CmdMaximize() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "maximize"; } virtual string getType() const { return "maximize"; }
private: private:
WindowManager &m_rWindowManager; WindowManager &m_rWindowManager;
TopWindow &m_rWindow; TopWindow &m_rWindow;
}; };
...@@ -57,27 +53,23 @@ class CmdMaximize: public CmdGeneric ...@@ -57,27 +53,23 @@ class CmdMaximize: public CmdGeneric
/// Command to unmaximize a window /// Command to unmaximize a window
class CmdUnmaximize: public CmdGeneric class CmdUnmaximize: public CmdGeneric
{ {
public: public:
/// Unmaximize the given layout /// Unmaximize the given layout
CmdUnmaximize( intf_thread_t *pIntf, WindowManager &rWindowManager, CmdUnmaximize( intf_thread_t *pIntf, WindowManager &rWindowManager,
TopWindow &rWindow ); TopWindow &rWindow );
virtual ~CmdUnmaximize() {} virtual ~CmdUnmaximize() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "unmaximize"; } virtual string getType() const { return "unmaximize"; }
private: private:
WindowManager &m_rWindowManager; WindowManager &m_rWindowManager;
TopWindow &m_rWindow; TopWindow &m_rWindow;
}; };
DEFINE_COMMAND(AddInTray, "add in tray" ) DEFINE_COMMAND( AddInTray, "add in tray" )
DEFINE_COMMAND(RemoveFromTray, "remove from tray" ) DEFINE_COMMAND( RemoveFromTray, "remove from tray" )
DEFINE_COMMAND(AddInTaskBar, "add in taskbar" ) DEFINE_COMMAND( AddInTaskBar, "add in taskbar" )
DEFINE_COMMAND(RemoveFromTaskBar, "remove from taskbar" ) DEFINE_COMMAND( RemoveFromTaskBar, "remove from taskbar" )
#endif #endif
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_MUXER_HPP #ifndef CMD_MUXER_HPP
...@@ -31,18 +31,14 @@ ...@@ -31,18 +31,14 @@
/// This command only contains other commands (composite pattern) /// This command only contains other commands (composite pattern)
class CmdMuxer: public CmdGeneric class CmdMuxer: public CmdGeneric
{ {
public: public:
CmdMuxer( intf_thread_t *pIntf, const list<CmdGeneric*> &rList ): CmdMuxer( intf_thread_t *pIntf, const list<CmdGeneric*> &rList ):
CmdGeneric( pIntf ), m_list( rList ) {} CmdGeneric( pIntf ), m_list( rList ) { }
virtual ~CmdMuxer() {} virtual ~CmdMuxer() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "muxer"; } virtual string getType() const { return "muxer"; }
private: private:
/// List of commands we will execute sequentially /// List of commands we will execute sequentially
list<CmdGeneric*> m_list; list<CmdGeneric*> m_list;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_PLAYLIST_HPP #ifndef CMD_PLAYLIST_HPP
...@@ -32,18 +32,14 @@ ...@@ -32,18 +32,14 @@
/// Command to delete the selected items from a list /// Command to delete the selected items from a list
class CmdPlaylistDel: public CmdGeneric class CmdPlaylistDel: public CmdGeneric
{ {
public: public:
CmdPlaylistDel( intf_thread_t *pIntf, VarList &rList ): CmdPlaylistDel( intf_thread_t *pIntf, VarList &rList )
CmdGeneric( pIntf ), m_rList( rList ) {} : CmdGeneric( pIntf ), m_rList( rList ) { }
virtual ~CmdPlaylistDel() {} virtual ~CmdPlaylistDel() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playlist del"; } virtual string getType() const { return "playlist del"; }
private: private:
/// List /// List
VarList &m_rList; VarList &m_rList;
}; };
...@@ -65,18 +61,14 @@ DEFINE_COMMAND( PlaylistFirst, "playlist first" ) ...@@ -65,18 +61,14 @@ DEFINE_COMMAND( PlaylistFirst, "playlist first" )
/// Command to set the random state /// Command to set the random state
class CmdPlaylistRandom: public CmdGeneric class CmdPlaylistRandom: public CmdGeneric
{ {
public: public:
CmdPlaylistRandom( intf_thread_t *pIntf, bool value ): CmdPlaylistRandom( intf_thread_t *pIntf, bool value )
CmdGeneric( pIntf ), m_value( value ) {} : CmdGeneric( pIntf ), m_value( value ) { }
virtual ~CmdPlaylistRandom() {} virtual ~CmdPlaylistRandom() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playlist random"; } virtual string getType() const { return "playlist random"; }
private: private:
/// Random state /// Random state
bool m_value; bool m_value;
}; };
...@@ -85,18 +77,14 @@ class CmdPlaylistRandom: public CmdGeneric ...@@ -85,18 +77,14 @@ class CmdPlaylistRandom: public CmdGeneric
/// Command to set the loop state /// Command to set the loop state
class CmdPlaylistLoop: public CmdGeneric class CmdPlaylistLoop: public CmdGeneric
{ {
public: public:
CmdPlaylistLoop( intf_thread_t *pIntf, bool value ): CmdPlaylistLoop( intf_thread_t *pIntf, bool value )
CmdGeneric( pIntf ), m_value( value ) {} : CmdGeneric( pIntf ), m_value( value ) { }
virtual ~CmdPlaylistLoop() {} virtual ~CmdPlaylistLoop() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playlist loop"; } virtual string getType() const { return "playlist loop"; }
private: private:
/// Loop state /// Loop state
bool m_value; bool m_value;
}; };
...@@ -105,18 +93,14 @@ class CmdPlaylistLoop: public CmdGeneric ...@@ -105,18 +93,14 @@ class CmdPlaylistLoop: public CmdGeneric
/// Command to set the repeat state /// Command to set the repeat state
class CmdPlaylistRepeat: public CmdGeneric class CmdPlaylistRepeat: public CmdGeneric
{ {
public: public:
CmdPlaylistRepeat( intf_thread_t *pIntf, bool value ): CmdPlaylistRepeat( intf_thread_t *pIntf, bool value )
CmdGeneric( pIntf ), m_value( value ) {} : CmdGeneric( pIntf ), m_value( value ) { }
virtual ~CmdPlaylistRepeat() {} virtual ~CmdPlaylistRepeat() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playlist repeat"; } virtual string getType() const { return "playlist repeat"; }
private: private:
/// Repeat state /// Repeat state
bool m_value; bool m_value;
}; };
...@@ -125,18 +109,14 @@ class CmdPlaylistRepeat: public CmdGeneric ...@@ -125,18 +109,14 @@ class CmdPlaylistRepeat: public CmdGeneric
/// Command to load a playlist /// Command to load a playlist
class CmdPlaylistLoad: public CmdGeneric class CmdPlaylistLoad: public CmdGeneric
{ {
public: public:
CmdPlaylistLoad( intf_thread_t *pIntf, const string& rFile ): CmdPlaylistLoad( intf_thread_t *pIntf, const string& rFile )
CmdGeneric( pIntf ), m_file( rFile ) {} : CmdGeneric( pIntf ), m_file( rFile ) { }
virtual ~CmdPlaylistLoad() {} virtual ~CmdPlaylistLoad() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playlist load"; } virtual string getType() const { return "playlist load"; }
private: private:
/// Playlist file to load /// Playlist file to load
string m_file; string m_file;
}; };
...@@ -145,18 +125,14 @@ class CmdPlaylistLoad: public CmdGeneric ...@@ -145,18 +125,14 @@ class CmdPlaylistLoad: public CmdGeneric
/// Command to save a playlist /// Command to save a playlist
class CmdPlaylistSave: public CmdGeneric class CmdPlaylistSave: public CmdGeneric
{ {
public: public:
CmdPlaylistSave( intf_thread_t *pIntf, const string& rFile ): CmdPlaylistSave( intf_thread_t *pIntf, const string& rFile )
CmdGeneric( pIntf ), m_file( rFile ) {} : CmdGeneric( pIntf ), m_file( rFile ) { }
virtual ~CmdPlaylistSave() {} virtual ~CmdPlaylistSave() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playlist save"; } virtual string getType() const { return "playlist save"; }
private: private:
/// Playlist file to save /// Playlist file to save
string m_file; string m_file;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_PLAYTREE_HPP #ifndef CMD_PLAYTREE_HPP
...@@ -33,18 +33,14 @@ ...@@ -33,18 +33,14 @@
/// Command to delete the selected items from a tree /// Command to delete the selected items from a tree
class CmdPlaytreeDel: public CmdGeneric class CmdPlaytreeDel: public CmdGeneric
{ {
public: public:
CmdPlaytreeDel( intf_thread_t *pIntf, VarTree &rTree ): CmdPlaytreeDel( intf_thread_t *pIntf, VarTree &rTree )
CmdGeneric( pIntf ), m_rTree( rTree ) {} : CmdGeneric( pIntf ), m_rTree( rTree ) { }
virtual ~CmdPlaytreeDel() {} virtual ~CmdPlaytreeDel() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playtree del"; } virtual string getType() const { return "playtree del"; }
private: private:
/// Tree /// Tree
VarTree &m_rTree; VarTree &m_rTree;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_RESIZE_HPP #ifndef CMD_RESIZE_HPP
...@@ -36,19 +36,15 @@ class CtrlVideo; ...@@ -36,19 +36,15 @@ class CtrlVideo;
/// Command to resize a layout /// Command to resize a layout
class CmdResize: public CmdGeneric class CmdResize: public CmdGeneric
{ {
public: public:
/// Resize the given layout /// Resize the given layout
CmdResize( intf_thread_t *pIntf, const WindowManager &rWindowManager, CmdResize( intf_thread_t *pIntf, const WindowManager &rWindowManager,
GenericLayout &rLayout, int width, int height ); GenericLayout &rLayout, int width, int height );
virtual ~CmdResize() {} virtual ~CmdResize() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "resize"; } virtual string getType() const { return "resize"; }
private: private:
const WindowManager &m_rWindowManager; const WindowManager &m_rWindowManager;
GenericLayout &m_rLayout; GenericLayout &m_rLayout;
int m_width, m_height; int m_width, m_height;
...@@ -58,18 +54,14 @@ class CmdResize: public CmdGeneric ...@@ -58,18 +54,14 @@ class CmdResize: public CmdGeneric
/// Command to resize the inner vout window /// Command to resize the inner vout window
class CmdResizeInnerVout: public CmdGeneric class CmdResizeInnerVout: public CmdGeneric
{ {
public: public:
/// Resize the given layout /// Resize the given layout
CmdResizeInnerVout( intf_thread_t *pIntf, CtrlVideo* pCtrlVideo ); CmdResizeInnerVout( intf_thread_t *pIntf, CtrlVideo* pCtrlVideo );
virtual ~CmdResizeInnerVout() {} virtual ~CmdResizeInnerVout() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "resize inner vout"; } virtual string getType() const { return "resize inner vout"; }
private: private:
CtrlVideo* m_pCtrlVideo; CtrlVideo* m_pCtrlVideo;
}; };
...@@ -77,19 +69,15 @@ class CmdResizeInnerVout: public CmdGeneric ...@@ -77,19 +69,15 @@ class CmdResizeInnerVout: public CmdGeneric
/// Command to resize the vout window /// Command to resize the vout window
class CmdResizeVout: public CmdGeneric class CmdResizeVout: public CmdGeneric
{ {
public: public:
/// Resize the given layout /// Resize the given layout
CmdResizeVout( intf_thread_t *pIntf, vout_window_t* pWnd, CmdResizeVout( intf_thread_t *pIntf, vout_window_t* pWnd,
int width, int height ); int width, int height );
virtual ~CmdResizeVout() {} virtual ~CmdResizeVout() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "resize vout"; } virtual string getType() const { return "resize vout"; }
private: private:
vout_window_t* m_pWnd; vout_window_t* m_pWnd;
int m_width, m_height; int m_width, m_height;
}; };
...@@ -98,19 +86,15 @@ class CmdResizeVout: public CmdGeneric ...@@ -98,19 +86,15 @@ class CmdResizeVout: public CmdGeneric
/// Command to toggle Fullscreen /// Command to toggle Fullscreen
class CmdSetFullscreen: public CmdGeneric class CmdSetFullscreen: public CmdGeneric
{ {
public: public:
/// Resize the given layout /// Resize the given layout
CmdSetFullscreen( intf_thread_t *pIntf, vout_window_t* pWnd, CmdSetFullscreen( intf_thread_t *pIntf, vout_window_t* pWnd,
bool fullscreen ); bool fullscreen );
virtual ~CmdSetFullscreen() {} virtual ~CmdSetFullscreen() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "toogle fullscreen"; } virtual string getType() const { return "toogle fullscreen"; }
private: private:
vout_window_t* m_pWnd; vout_window_t* m_pWnd;
bool m_bFullscreen; bool m_bFullscreen;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_SHOW_WINDOW_HPP #ifndef CMD_SHOW_WINDOW_HPP
...@@ -35,19 +35,15 @@ ...@@ -35,19 +35,15 @@
/// Command to show a window /// Command to show a window
class CmdShowWindow: public CmdGeneric class CmdShowWindow: public CmdGeneric
{ {
public: public:
CmdShowWindow( intf_thread_t *pIntf, WindowManager &rWinManager, CmdShowWindow( intf_thread_t *pIntf, WindowManager &rWinManager,
TopWindow &rWin ): TopWindow &rWin ):
CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) {} CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) { }
virtual ~CmdShowWindow() {} virtual ~CmdShowWindow() { }
/// This method does the real job of the command
virtual void execute() { m_rWinManager.show( m_rWin ); } virtual void execute() { m_rWinManager.show( m_rWin ); }
/// Return the type of the command
virtual string getType() const { return "show window"; } virtual string getType() const { return "show window"; }
private: private:
/// Reference to the window manager /// Reference to the window manager
WindowManager &m_rWinManager; WindowManager &m_rWinManager;
/// Reference to the window /// Reference to the window
...@@ -58,19 +54,15 @@ class CmdShowWindow: public CmdGeneric ...@@ -58,19 +54,15 @@ class CmdShowWindow: public CmdGeneric
/// Command to hide a window /// Command to hide a window
class CmdHideWindow: public CmdGeneric class CmdHideWindow: public CmdGeneric
{ {
public: public:
CmdHideWindow( intf_thread_t *pIntf, WindowManager &rWinManager, CmdHideWindow( intf_thread_t *pIntf, WindowManager &rWinManager,
TopWindow &rWin ): TopWindow &rWin ):
CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) {} CmdGeneric( pIntf ), m_rWinManager( rWinManager ), m_rWin( rWin ) { }
virtual ~CmdHideWindow() {} virtual ~CmdHideWindow() { }
/// This method does the real job of the command
virtual void execute() { m_rWinManager.hide( m_rWin ); } virtual void execute() { m_rWinManager.hide( m_rWin ); }
/// Return the type of the command
virtual string getType() const { return "hide window"; } virtual string getType() const { return "hide window"; }
private: private:
/// Reference to the window manager /// Reference to the window manager
WindowManager &m_rWinManager; WindowManager &m_rWinManager;
/// Reference to the window /// Reference to the window
...@@ -81,18 +73,14 @@ class CmdHideWindow: public CmdGeneric ...@@ -81,18 +73,14 @@ class CmdHideWindow: public CmdGeneric
/// Command to raise all windows /// Command to raise all windows
class CmdRaiseAll: public CmdGeneric class CmdRaiseAll: public CmdGeneric
{ {
public: public:
CmdRaiseAll( intf_thread_t *pIntf, WindowManager &rWinManager ): CmdRaiseAll( intf_thread_t *pIntf, WindowManager &rWinManager ):
CmdGeneric( pIntf ), m_rWinManager( rWinManager ) {} CmdGeneric( pIntf ), m_rWinManager( rWinManager ) { }
virtual ~CmdRaiseAll() {} virtual ~CmdRaiseAll() { }
/// This method does the real job of the command
virtual void execute() { m_rWinManager.raiseAll(); } virtual void execute() { m_rWinManager.raiseAll(); }
/// Return the type of the command
virtual string getType() const { return "raise all windows"; } virtual string getType() const { return "raise all windows"; }
private: private:
/// Reference to the window manager /// Reference to the window manager
WindowManager &m_rWinManager; WindowManager &m_rWinManager;
}; };
...@@ -101,12 +89,11 @@ class CmdRaiseAll: public CmdGeneric ...@@ -101,12 +89,11 @@ class CmdRaiseAll: public CmdGeneric
/// Command to show a popup menu /// Command to show a popup menu
class CmdShowPopup: public CmdGeneric class CmdShowPopup: public CmdGeneric
{ {
public: public:
CmdShowPopup( intf_thread_t *pIntf, Popup &rPopup ): CmdShowPopup( intf_thread_t *pIntf, Popup &rPopup ):
CmdGeneric( pIntf ), m_rPopup( rPopup ) {} CmdGeneric( pIntf ), m_rPopup( rPopup ) { }
virtual ~CmdShowPopup() {} virtual ~CmdShowPopup() { }
/// This method does the real job of the command
virtual void execute() virtual void execute()
{ {
int x, y; int x, y;
...@@ -114,10 +101,9 @@ class CmdShowPopup: public CmdGeneric ...@@ -114,10 +101,9 @@ class CmdShowPopup: public CmdGeneric
m_rPopup.show( x, y ); m_rPopup.show( x, y );
} }
/// Return the type of the command
virtual string getType() const { return "show popup"; } virtual string getType() const { return "show popup"; }
private: private:
/// Reference to the popup /// Reference to the popup
Popup &m_rPopup; Popup &m_rPopup;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_UPDATE_ITEM_HPP #ifndef CMD_UPDATE_ITEM_HPP
...@@ -31,18 +31,14 @@ ...@@ -31,18 +31,14 @@
/// Udate item command /// Udate item command
class CmdUpdateItem: public CmdGeneric class CmdUpdateItem: public CmdGeneric
{ {
public: public:
CmdUpdateItem( intf_thread_t *pIntf, VarText &rStreamName, VarText &rStreamURI ) : CmdUpdateItem( intf_thread_t *I,VarText &N,VarText &U )
CmdGeneric( pIntf ), m_rStreamName(rStreamName), m_rStreamURI(rStreamURI) {} : CmdGeneric(I), m_rStreamName(N), m_rStreamURI(U) { }
virtual ~CmdUpdateItem() {} virtual ~CmdUpdateItem() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "update item"; } virtual string getType() const { return "update item"; }
private: private:
VarText &m_rStreamName; VarText &m_rStreamName;
VarText &m_rStreamURI; VarText &m_rStreamURI;
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_VARS_HPP #ifndef CMD_VARS_HPP
...@@ -40,21 +40,17 @@ DEFINE_COMMAND( PlaytreeChanged, "playtree changed" ) ...@@ -40,21 +40,17 @@ DEFINE_COMMAND( PlaytreeChanged, "playtree changed" )
/// Command to notify the playtree of an item update /// Command to notify the playtree of an item update
class CmdPlaytreeUpdate: public CmdGeneric class CmdPlaytreeUpdate: public CmdGeneric
{ {
public: public:
CmdPlaytreeUpdate( intf_thread_t *pIntf, int id ): CmdPlaytreeUpdate( intf_thread_t *pIntf, int id ):
CmdGeneric( pIntf ), m_id( id ) {} CmdGeneric( pIntf ), m_id( id ) { }
virtual ~CmdPlaytreeUpdate() {} virtual ~CmdPlaytreeUpdate() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playtree update"; } virtual string getType() const { return "playtree update"; }
/// Only accept removal of command if they concern the same item /// Only accept removal of command if they concern the same item
virtual bool checkRemove( CmdGeneric * ) const; virtual bool checkRemove( CmdGeneric * ) const;
private: private:
/// Playlist item ID /// Playlist item ID
int m_id; int m_id;
}; };
...@@ -62,58 +58,43 @@ class CmdPlaytreeUpdate: public CmdGeneric ...@@ -62,58 +58,43 @@ class CmdPlaytreeUpdate: public CmdGeneric
/// Command to notify the playtree of an item append /// Command to notify the playtree of an item append
class CmdPlaytreeAppend: public CmdGeneric class CmdPlaytreeAppend: public CmdGeneric
{ {
public: public:
CmdPlaytreeAppend( intf_thread_t *pIntf, playlist_add_t *p_add ) : CmdPlaytreeAppend( intf_thread_t *pIntf, playlist_add_t *p_add ):
CmdGeneric( pIntf ), m_pAdd( p_add ) {} CmdGeneric( pIntf ), m_pAdd( p_add ) { }
virtual ~CmdPlaytreeAppend() {} virtual ~CmdPlaytreeAppend() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playtree append"; } virtual string getType() const { return "playtree append"; }
private: private:
playlist_add_t * m_pAdd; playlist_add_t * m_pAdd;
}; };
/// Command to notify the playtree of an item deletion /// Command to notify the playtree of an item deletion
class CmdPlaytreeDelete: public CmdGeneric class CmdPlaytreeDelete: public CmdGeneric
{ {
public: public:
CmdPlaytreeDelete( intf_thread_t *pIntf, int i_id ) : CmdPlaytreeDelete( intf_thread_t *pIntf, int i_id ):
CmdGeneric( pIntf ), m_id( i_id ) {} CmdGeneric( pIntf ), m_id( i_id ) { }
virtual ~CmdPlaytreeDelete() {} virtual ~CmdPlaytreeDelete() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "playtree append"; } virtual string getType() const { return "playtree append"; }
private: private:
int m_id; int m_id;
}; };
/// Command to set a text variable /// Command to set a text variable
class CmdSetText: public CmdGeneric class CmdSetText: public CmdGeneric
{ {
public: public:
CmdSetText( intf_thread_t *pIntf, VarText &rText, CmdSetText( intf_thread_t *pIntf, VarText &rText, const UString &rValue ):
const UString &rValue ): CmdGeneric( pIntf ), m_rText( rText ), m_value( rValue ) { }
CmdGeneric( pIntf ), m_rText( rText ), m_value( rValue ) {} virtual ~CmdSetText() { }
virtual ~CmdSetText() {}
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "set text"; } virtual string getType() const { return "set text"; }
private: private:
/// Text variable to set /// Text variable to set
VarText &m_rText; VarText &m_rText;
/// Value to set /// Value to set
...@@ -124,19 +105,14 @@ class CmdSetText: public CmdGeneric ...@@ -124,19 +105,14 @@ class CmdSetText: public CmdGeneric
/// Command to set the equalizer preamp /// Command to set the equalizer preamp
class CmdSetEqPreamp: public CmdGeneric class CmdSetEqPreamp: public CmdGeneric
{ {
public: public:
CmdSetEqPreamp( intf_thread_t *pIntf, EqualizerPreamp &rPreamp, CmdSetEqPreamp( intf_thread_t *I, EqualizerPreamp &P, float v )
float value ): : CmdGeneric( I ), m_rPreamp( P ), m_value( v ) { }
CmdGeneric( pIntf ), m_rPreamp( rPreamp ), m_value( value ) {} virtual ~CmdSetEqPreamp() { }
virtual ~CmdSetEqPreamp() {}
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "set equalizer preamp"; } virtual string getType() const { return "set equalizer preamp"; }
private: private:
/// Preamp variable to set /// Preamp variable to set
EqualizerPreamp &m_rPreamp; EqualizerPreamp &m_rPreamp;
/// Value to set /// Value to set
...@@ -147,19 +123,14 @@ class CmdSetEqPreamp: public CmdGeneric ...@@ -147,19 +123,14 @@ class CmdSetEqPreamp: public CmdGeneric
/// Command to set the equalizerbands /// Command to set the equalizerbands
class CmdSetEqBands: public CmdGeneric class CmdSetEqBands: public CmdGeneric
{ {
public: public:
CmdSetEqBands( intf_thread_t *pIntf, EqualizerBands &rEqBands, CmdSetEqBands( intf_thread_t *I, EqualizerBands &B, const string &V )
const string &rValue ): : CmdGeneric( I ), m_rEqBands( B ), m_value( V ) { }
CmdGeneric( pIntf ), m_rEqBands( rEqBands ), m_value( rValue ) {} virtual ~CmdSetEqBands() { }
virtual ~CmdSetEqBands() {}
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "set equalizer bands"; } virtual string getType() const { return "set equalizer bands"; }
private: private:
/// Equalizer variable to set /// Equalizer variable to set
EqualizerBands &m_rEqBands; EqualizerBands &m_rEqBands;
/// Value to set /// Value to set
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CMD_VOUTWINDOW_HPP #ifndef CMD_VOUTWINDOW_HPP
...@@ -31,18 +31,14 @@ ...@@ -31,18 +31,14 @@
/// Command to create a vout window /// Command to create a vout window
class CmdNewVoutWindow: public CmdGeneric class CmdNewVoutWindow: public CmdGeneric
{ {
public: public:
/// Create a vout window /// Create a vout window
CmdNewVoutWindow( intf_thread_t *pIntf, vout_window_t *pWnd ); CmdNewVoutWindow( intf_thread_t *pIntf, vout_window_t *pWnd );
virtual ~CmdNewVoutWindow() {} virtual ~CmdNewVoutWindow() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "new vout window"; } virtual string getType() const { return "new vout window"; }
private: private:
vout_window_t* m_pWnd; vout_window_t* m_pWnd;
}; };
...@@ -50,18 +46,14 @@ class CmdNewVoutWindow: public CmdGeneric ...@@ -50,18 +46,14 @@ class CmdNewVoutWindow: public CmdGeneric
/// Command to release a vout window /// Command to release a vout window
class CmdReleaseVoutWindow: public CmdGeneric class CmdReleaseVoutWindow: public CmdGeneric
{ {
public: public:
/// Release a vout window /// Release a vout window
CmdReleaseVoutWindow( intf_thread_t *pIntf, vout_window_t *pWnd ); CmdReleaseVoutWindow( intf_thread_t *pIntf, vout_window_t *pWnd );
virtual ~CmdReleaseVoutWindow() {} virtual ~CmdReleaseVoutWindow() { }
/// This method does the real job of the command
virtual void execute(); virtual void execute();
/// Return the type of the command
virtual string getType() const { return "new vout window"; } virtual string getType() const { return "new vout window"; }
private: private:
vout_window_t* m_pWnd; vout_window_t* m_pWnd;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_BUTTON_HPP #ifndef CTRL_BUTTON_HPP
...@@ -36,11 +36,10 @@ class CmdGeneric; ...@@ -36,11 +36,10 @@ class CmdGeneric;
/// Base class for button controls /// Base class for button controls
class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap> class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap>
{ {
public: public:
/// Create a button with 3 images /// Create a button with 3 images
CtrlButton( intf_thread_t *pIntf, const GenericBitmap &rBmpUp, CtrlButton( intf_thread_t *pIntf, const GenericBitmap &rBmpUp,
const GenericBitmap &rBmpOver, const GenericBitmap &rBmpOver, const GenericBitmap &rBmpDown,
const GenericBitmap &rBmpDown,
CmdGeneric &rCommand, const UString &rTooltip, CmdGeneric &rCommand, const UString &rTooltip,
const UString &rHelp, VarBool *pVisible ); const UString &rHelp, VarBool *pVisible );
...@@ -61,7 +60,7 @@ class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap> ...@@ -61,7 +60,7 @@ class CtrlButton: public CtrlGeneric, public Observer<AnimBitmap>
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return "button"; } virtual string getType() const { return "button"; }
private: private:
/// Finite state machine of the control /// Finite state machine of the control
FSM m_fsm; FSM m_fsm;
/// Command triggered by the button /// Command triggered by the button
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_CHECKBOX_HPP #ifndef CTRL_CHECKBOX_HPP
...@@ -38,7 +38,7 @@ class CmdGeneric; ...@@ -38,7 +38,7 @@ class CmdGeneric;
/// Base class for checkbox controls /// Base class for checkbox controls
class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap> class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap>
{ {
public: public:
/// Create a checkbox with 6 images /// Create a checkbox with 6 images
CtrlCheckbox( intf_thread_t *pIntf, CtrlCheckbox( intf_thread_t *pIntf,
const GenericBitmap &rBmpUp1, const GenericBitmap &rBmpUp1,
...@@ -69,7 +69,7 @@ class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap> ...@@ -69,7 +69,7 @@ class CtrlCheckbox: public CtrlGeneric, public Observer<AnimBitmap>
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return "checkbox"; } virtual string getType() const { return "checkbox"; }
private: private:
/// Finite state machine of the control /// Finite state machine of the control
FSM m_fsm; FSM m_fsm;
/// Observed variable /// Observed variable
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_FLAT_HPP #ifndef CTRL_FLAT_HPP
...@@ -31,12 +31,11 @@ ...@@ -31,12 +31,11 @@
/// Base class for "mover controls" and images /// Base class for "mover controls" and images
class CtrlFlat: public CtrlGeneric class CtrlFlat: public CtrlGeneric
{ {
protected: protected:
CtrlFlat( intf_thread_t *pIntf, const UString &rHelp, CtrlFlat( intf_thread_t *pIntf, const UString &rHelp, VarBool *pVisible )
VarBool *pVisible ): : CtrlGeneric( pIntf, rHelp, pVisible ) { }
CtrlGeneric( pIntf, rHelp, pVisible ) {}
virtual ~CtrlFlat() {} virtual ~CtrlFlat() { }
}; };
#endif #endif
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_GENERIC_HPP #ifndef CTRL_GENERIC_HPP
...@@ -43,17 +43,17 @@ class VarBool; ...@@ -43,17 +43,17 @@ class VarBool;
/// Base class for controls /// Base class for controls
class CtrlGeneric: public SkinObject, public Observer<VarBool> class CtrlGeneric: public SkinObject, public Observer<VarBool>
{ {
public: public:
virtual ~CtrlGeneric(); virtual ~CtrlGeneric();
/// Handle an event on the control /// Handle an event on the control
virtual void handleEvent( EvtGeneric &rEvent ) {} virtual void handleEvent( EvtGeneric &rEvent ) { }
/// Check whether coordinates are inside the control /// Check whether coordinates are inside the control
virtual bool mouseOver( int x, int y ) const { return false; } virtual bool mouseOver( int x, int y ) const { return false; }
/// Draw the control on the given graphics /// 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 /// Set the position and the associated layout of the control
virtual void setLayout( GenericLayout *pLayout, virtual void setLayout( GenericLayout *pLayout,
...@@ -70,7 +70,7 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool> ...@@ -70,7 +70,7 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool>
* Overload this method if you want to do something special when * Overload this method if you want to do something special when
* the layout is resized * the layout is resized
*/ */
virtual void onResize() {} virtual void onResize() { }
/// Get the help text /// Get the help text
virtual const UString &getHelpText() const { return m_help; } virtual const UString &getHelpText() const { return m_help; }
...@@ -84,7 +84,7 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool> ...@@ -84,7 +84,7 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool>
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return ""; } virtual string getType() const { return ""; }
protected: protected:
// If pVisible is NULL, the control is always visible // If pVisible is NULL, the control is always visible
CtrlGeneric( intf_thread_t *pIntf, const UString &rHelp, CtrlGeneric( intf_thread_t *pIntf, const UString &rHelp,
VarBool *pVisible = NULL ); VarBool *pVisible = NULL );
...@@ -120,10 +120,10 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool> ...@@ -120,10 +120,10 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool>
* Overload this method if you want to do something special when * Overload this method if you want to do something special when
* the Position object is set * the Position object is set
*/ */
virtual void onPositionChange() {} virtual void onPositionChange() { }
/// Overload this method to get notified of bool variable changes /// 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 /// Method called when an observed bool variable is changed
virtual void onUpdate( Subject<VarBool> &rVariable , void* ); virtual void onUpdate( Subject<VarBool> &rVariable , void* );
...@@ -134,7 +134,7 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool> ...@@ -134,7 +134,7 @@ class CtrlGeneric: public SkinObject, public Observer<VarBool>
/// Visibility variable /// Visibility variable
VarBool *m_pVisible; VarBool *m_pVisible;
private: private:
/// Position in the layout /// Position in the layout
Position *m_pPosition; Position *m_pPosition;
/// Help text /// Help text
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_IMAGE_HPP #ifndef CTRL_IMAGE_HPP
...@@ -36,7 +36,7 @@ class CmdGeneric; ...@@ -36,7 +36,7 @@ class CmdGeneric;
/// Control image /// Control image
class CtrlImage: public CtrlFlat class CtrlImage: public CtrlFlat
{ {
public: public:
/// Resize methods /// Resize methods
enum resize_t enum resize_t
{ {
...@@ -62,7 +62,7 @@ class CtrlImage: public CtrlFlat ...@@ -62,7 +62,7 @@ class CtrlImage: public CtrlFlat
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return "image"; } virtual string getType() const { return "image"; }
private: private:
/// Bitmap /// Bitmap
const GenericBitmap &m_rBitmap; const GenericBitmap &m_rBitmap;
/// Buffer to stored the rendered bitmap /// Buffer to stored the rendered bitmap
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_LIST_HPP #ifndef CTRL_LIST_HPP
...@@ -38,7 +38,7 @@ class GenericBitmap; ...@@ -38,7 +38,7 @@ class GenericBitmap;
class CtrlList: public CtrlGeneric, public Observer<VarList>, class CtrlList: public CtrlGeneric, public Observer<VarList>,
public Observer<VarPercent> public Observer<VarPercent>
{ {
public: public:
CtrlList( intf_thread_t *pIntf, VarList &rList, CtrlList( intf_thread_t *pIntf, VarList &rList,
const GenericFont &rFont, const GenericBitmap *pBitmap, const GenericFont &rFont, const GenericBitmap *pBitmap,
uint32_t fgcolor, uint32_t playcolor, uint32_t bgcolor1, uint32_t fgcolor, uint32_t playcolor, uint32_t bgcolor1,
...@@ -64,7 +64,7 @@ class CtrlList: public CtrlGeneric, public Observer<VarList>, ...@@ -64,7 +64,7 @@ class CtrlList: public CtrlGeneric, public Observer<VarList>,
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return "list"; } virtual string getType() const { return "list"; }
private: private:
/// List associated to the control /// List associated to the control
VarList &m_rList; VarList &m_rList;
/// Font /// Font
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_MOVE_HPP #ifndef CTRL_MOVE_HPP
...@@ -36,11 +36,11 @@ class WindowManager; ...@@ -36,11 +36,11 @@ class WindowManager;
/// Control for moving windows /// Control for moving windows
class CtrlMove: public CtrlFlat class CtrlMove: public CtrlFlat
{ {
public: public:
CtrlMove( intf_thread_t *pIntf, WindowManager &rWindowManager, CtrlMove( intf_thread_t *pIntf, WindowManager &rWindowManager,
CtrlFlat &rCtrl, TopWindow &rWindow, CtrlFlat &rCtrl, TopWindow &rWindow,
const UString &rHelp, VarBool *pVisible ); const UString &rHelp, VarBool *pVisible );
virtual ~CtrlMove() {} virtual ~CtrlMove() { }
/// Handle an event /// Handle an event
virtual void handleEvent( EvtGeneric &rEvent ); virtual void handleEvent( EvtGeneric &rEvent );
...@@ -64,7 +64,7 @@ class CtrlMove: public CtrlFlat ...@@ -64,7 +64,7 @@ class CtrlMove: public CtrlFlat
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return m_rCtrl.getType(); } virtual string getType() const { return m_rCtrl.getType(); }
private: private:
FSM m_fsm; FSM m_fsm;
/// Window manager /// Window manager
WindowManager &m_rWindowManager; WindowManager &m_rWindowManager;
...@@ -81,6 +81,6 @@ class CtrlMove: public CtrlFlat ...@@ -81,6 +81,6 @@ class CtrlMove: public CtrlFlat
DEFINE_CALLBACK( CtrlMove, MovingMoving ) DEFINE_CALLBACK( CtrlMove, MovingMoving )
DEFINE_CALLBACK( CtrlMove, StillMoving ) DEFINE_CALLBACK( CtrlMove, StillMoving )
DEFINE_CALLBACK( CtrlMove, MovingStill ) DEFINE_CALLBACK( CtrlMove, MovingStill )
}; };
#endif #endif
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_RADIALSLIDER_HPP #ifndef CTRL_RADIALSLIDER_HPP
...@@ -38,7 +38,7 @@ class VarPercent; ...@@ -38,7 +38,7 @@ class VarPercent;
/// Radial slider /// Radial slider
class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent> class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent>
{ {
public: public:
/// Create a radial slider with the given image, which must be /// Create a radial slider with the given image, which must be
/// composed of numImg subimages of the same size /// composed of numImg subimages of the same size
CtrlRadialSlider( intf_thread_t *pIntf, const GenericBitmap &rBmpSeq, CtrlRadialSlider( intf_thread_t *pIntf, const GenericBitmap &rBmpSeq,
...@@ -60,7 +60,7 @@ class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent> ...@@ -60,7 +60,7 @@ class CtrlRadialSlider: public CtrlGeneric, public Observer<VarPercent>
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return "radial_slider"; } virtual string getType() const { return "radial_slider"; }
private: private:
/// Finite state machine of the control /// Finite state machine of the control
FSM m_fsm; FSM m_fsm;
/// Number of sub-images in the slider image /// Number of sub-images in the slider image
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_RESIZE_HPP #ifndef CTRL_RESIZE_HPP
...@@ -36,12 +36,12 @@ class WindowManager; ...@@ -36,12 +36,12 @@ class WindowManager;
/// Control decorator for resizing windows /// Control decorator for resizing windows
class CtrlResize: public CtrlFlat class CtrlResize: public CtrlFlat
{ {
public: public:
CtrlResize( intf_thread_t *pIntf, WindowManager &rWindowManager, CtrlResize( intf_thread_t *pIntf, WindowManager &rWindowManager,
CtrlFlat &rCtrl, GenericLayout &rLayout, CtrlFlat &rCtrl, GenericLayout &rLayout,
const UString &rHelp, VarBool *pVisible, const UString &rHelp, VarBool *pVisible,
WindowManager::Direction_t direction ); WindowManager::Direction_t direction );
virtual ~CtrlResize() {} virtual ~CtrlResize() { }
/// Handle an event /// Handle an event
virtual void handleEvent( EvtGeneric &rEvent ); virtual void handleEvent( EvtGeneric &rEvent );
...@@ -65,7 +65,7 @@ class CtrlResize: public CtrlFlat ...@@ -65,7 +65,7 @@ class CtrlResize: public CtrlFlat
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return m_rCtrl.getType(); } virtual string getType() const { return m_rCtrl.getType(); }
private: private:
FSM m_fsm; FSM m_fsm;
/// Window manager /// Window manager
WindowManager &m_rWindowManager; WindowManager &m_rWindowManager;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_SLIDER_HPP #ifndef CTRL_SLIDER_HPP
...@@ -39,7 +39,7 @@ class VarPercent; ...@@ -39,7 +39,7 @@ class VarPercent;
/// Cursor of a slider /// Cursor of a slider
class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent> class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
{ {
public: public:
/// Create a cursor with 3 images (which are NOT copied, be careful) /// Create a cursor with 3 images (which are NOT copied, be careful)
/// If pVisible is NULL, the control is always visible /// If pVisible is NULL, the control is always visible
CtrlSliderCursor( intf_thread_t *pIntf, const GenericBitmap &rBmpUp, CtrlSliderCursor( intf_thread_t *pIntf, const GenericBitmap &rBmpUp,
...@@ -66,7 +66,7 @@ class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent> ...@@ -66,7 +66,7 @@ class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return "slider_cursor"; } virtual string getType() const { return "slider_cursor"; }
private: private:
/// Finite state machine of the control /// Finite state machine of the control
FSM m_fsm; FSM m_fsm;
/// Variable associated to the cursor /// Variable associated to the cursor
...@@ -111,7 +111,7 @@ class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent> ...@@ -111,7 +111,7 @@ class CtrlSliderCursor: public CtrlGeneric, public Observer<VarPercent>
/// Slider background /// Slider background
class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent> class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent>
{ {
public: public:
CtrlSliderBg( intf_thread_t *pIntf, CtrlSliderBg( intf_thread_t *pIntf,
const Bezier &rCurve, VarPercent &rVariable, const Bezier &rCurve, VarPercent &rVariable,
int thickness, GenericBitmap *pBackground, int nbHoriz, int thickness, GenericBitmap *pBackground, int nbHoriz,
...@@ -137,7 +137,7 @@ class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent> ...@@ -137,7 +137,7 @@ class CtrlSliderBg: public CtrlGeneric, public Observer<VarPercent>
/// Associate a cursor to this background /// Associate a cursor to this background
void associateCursor( CtrlSliderCursor &rCursor ); void associateCursor( CtrlSliderCursor &rCursor );
private: private:
/// Cursor of the slider /// Cursor of the slider
CtrlSliderCursor *m_pCursor; CtrlSliderCursor *m_pCursor;
/// Variable associated to the slider /// Variable associated to the slider
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_TEXT_HPP #ifndef CTRL_TEXT_HPP
...@@ -40,7 +40,7 @@ class VarText; ...@@ -40,7 +40,7 @@ class VarText;
/// Class for control text /// Class for control text
class CtrlText: public CtrlGeneric, public Observer<VarText> class CtrlText: public CtrlGeneric, public Observer<VarText>
{ {
public: public:
enum Align_t enum Align_t
{ {
kLeft, kLeft,
...@@ -83,7 +83,7 @@ class CtrlText: public CtrlGeneric, public Observer<VarText> ...@@ -83,7 +83,7 @@ class CtrlText: public CtrlGeneric, public Observer<VarText>
/// Get the type of control (custom RTTI) /// Get the type of control (custom RTTI)
virtual string getType() const { return "text"; } virtual string getType() const { return "text"; }
private: private:
/// Finite state machine of the control /// Finite state machine of the control
FSM m_fsm; FSM m_fsm;
/// Variable associated to the control /// Variable associated to the control
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_TREE_HPP #ifndef CTRL_TREE_HPP
...@@ -37,7 +37,7 @@ class GenericBitmap; ...@@ -37,7 +37,7 @@ class GenericBitmap;
class CtrlTree: public CtrlGeneric, public Observer<VarTree, tree_update>, class CtrlTree: public CtrlGeneric, public Observer<VarTree, tree_update>,
public Observer<VarPercent> public Observer<VarPercent>
{ {
public: public:
CtrlTree( intf_thread_t *pIntf, CtrlTree( intf_thread_t *pIntf,
VarTree &rTree, VarTree &rTree,
const GenericFont &rFont, const GenericFont &rFont,
...@@ -83,7 +83,7 @@ class CtrlTree: public CtrlGeneric, public Observer<VarTree, tree_update>, ...@@ -83,7 +83,7 @@ class CtrlTree: public CtrlGeneric, public Observer<VarTree, tree_update>,
/// \return true if it changed the position /// \return true if it changed the position
bool ensureVisible( int itemIndex ); bool ensureVisible( int itemIndex );
private: private:
/// Tree associated to the control /// Tree associated to the control
VarTree &m_rTree; VarTree &m_rTree;
/// Font /// Font
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef CTRL_VIDEO_HPP #ifndef CTRL_VIDEO_HPP
...@@ -33,7 +33,7 @@ ...@@ -33,7 +33,7 @@
/// Control video /// Control video
class CtrlVideo: public CtrlGeneric, public Observer<VarBox> class CtrlVideo: public CtrlGeneric, public Observer<VarBox>
{ {
public: public:
CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout, CtrlVideo( intf_thread_t *pIntf, GenericLayout &rLayout,
bool autoResize, const UString &rHelp, VarBool *pVisible ); bool autoResize, const UString &rHelp, VarBool *pVisible );
virtual ~CtrlVideo(); virtual ~CtrlVideo();
...@@ -91,7 +91,7 @@ class CtrlVideo: public CtrlGeneric, public Observer<VarBox> ...@@ -91,7 +91,7 @@ class CtrlVideo: public CtrlGeneric, public Observer<VarBox>
// Is this control used // Is this control used
virtual bool isUsed() { return m_pVoutWindow ? true : false; } virtual bool isUsed() { return m_pVoutWindow ? true : false; }
private: private:
/// Associated layout /// Associated layout
GenericLayout &m_rLayout; GenericLayout &m_rLayout;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_ENTER_HPP #ifndef EVT_ENTER_HPP
...@@ -31,11 +31,9 @@ ...@@ -31,11 +31,9 @@
/// Mouse enter event /// Mouse enter event
class EvtEnter: public EvtInput class EvtEnter: public EvtInput
{ {
public: public:
EvtEnter( intf_thread_t *pIntf ): EvtInput( pIntf ) {} EvtEnter( intf_thread_t *pIntf ): EvtInput( pIntf ) { }
virtual ~EvtEnter() {} virtual ~EvtEnter() { }
/// Return the type of event
virtual const string getAsString() const { return "enter"; } virtual const string getAsString() const { return "enter"; }
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_FOCUS_HPP #ifndef EVT_FOCUS_HPP
...@@ -31,18 +31,17 @@ ...@@ -31,18 +31,17 @@
/// Focus change event /// Focus change event
class EvtFocus: public EvtGeneric class EvtFocus: public EvtGeneric
{ {
public: public:
EvtFocus( intf_thread_t *pIntf, bool focus ): EvtGeneric( pIntf ), EvtFocus( intf_thread_t *pIntf, bool focus )
m_focus( focus ) {} : EvtGeneric( pIntf ), m_focus( focus ) { }
virtual ~EvtFocus() {} virtual ~EvtFocus() { }
/// Return the type of event
virtual const string getAsString() const virtual const string getAsString() const
{ {
return ( m_focus ? "focus:in" : "focus:out" ); return ( m_focus ? "focus:in" : "focus:out" );
} }
private: private:
/// true for a focus in, and false for a focus out /// true for a focus in, and false for a focus out
bool m_focus; bool m_focus;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_GENERIC_HPP #ifndef EVT_GENERIC_HPP
...@@ -32,14 +32,14 @@ ...@@ -32,14 +32,14 @@
/// Base class for OS events /// Base class for OS events
class EvtGeneric: public SkinObject class EvtGeneric: public SkinObject
{ {
public: public:
virtual ~EvtGeneric() {} virtual ~EvtGeneric() { }
/// Return the type of the event /// Return the type of the event
virtual const string getAsString() const = 0; virtual const string getAsString() const = 0;
protected: protected:
EvtGeneric( intf_thread_t *pIntf ): SkinObject( pIntf ) {} EvtGeneric( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_INPUT_HPP #ifndef EVT_INPUT_HPP
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
/// Base class for mouse and key events /// Base class for mouse and key events
class EvtInput: public EvtGeneric class EvtInput: public EvtGeneric
{ {
public: public:
virtual ~EvtInput() {} virtual ~EvtInput() { }
/// Masks for modifier keys /// Masks for modifier keys
static const int kModNone; static const int kModNone;
...@@ -43,13 +43,13 @@ class EvtInput: public EvtGeneric ...@@ -43,13 +43,13 @@ class EvtInput: public EvtGeneric
/// Get the modifiers /// Get the modifiers
virtual int getMod() const { return m_mod; } virtual int getMod() const { return m_mod; }
protected: protected:
EvtInput( intf_thread_t *pIntf, int mod = kModNone ); EvtInput( intf_thread_t *pIntf, int mod = kModNone );
/// Add the modifier to the event string /// Add the modifier to the event string
virtual void addModifier( string &rEvtString ) const; virtual void addModifier( string &rEvtString ) const;
private: private:
/// Modifiers (special key(s) pressed during the mouse event) /// Modifiers (special key(s) pressed during the mouse event)
int m_mod; int m_mod;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_KEY_HPP #ifndef EVT_KEY_HPP
...@@ -31,24 +31,21 @@ ...@@ -31,24 +31,21 @@
/// Class for keyboard events /// Class for keyboard events
class EvtKey: public EvtInput class EvtKey: public EvtInput
{ {
public: public:
enum ActionType_t enum ActionType_t
{ {
kDown, kDown,
kUp kUp
}; };
EvtKey( intf_thread_t *pIntf, int key, ActionType_t action, EvtKey( intf_thread_t *I, int key, ActionType_t actn, int mod = kModNone )
int mod = kModNone ): : EvtInput( I, mod ), m_key( key ), m_action( actn ) { }
EvtInput( pIntf, mod ), m_key( key ), m_action( action ) {} virtual ~EvtKey() { }
virtual ~EvtKey() {}
/// Return the type of event
virtual const string getAsString() const; virtual const string getAsString() const;
int getKey() const { return m_key; } int getKey() const { return m_key; }
private: private:
/// The concerned key, stored according to the '#define's in vlc_keys.h /// The concerned key, stored according to the '#define's in vlc_keys.h
/// but without the modifiers (which are stored in EvtInput) /// but without the modifiers (which are stored in EvtInput)
int m_key; int m_key;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_LEAVE_HPP #ifndef EVT_LEAVE_HPP
...@@ -31,11 +31,9 @@ ...@@ -31,11 +31,9 @@
/// Mouse leave event /// Mouse leave event
class EvtLeave: public EvtInput class EvtLeave: public EvtInput
{ {
public: public:
EvtLeave( intf_thread_t *pIntf ): EvtInput( pIntf ) {} EvtLeave( intf_thread_t *pIntf ): EvtInput( pIntf ) { }
virtual ~EvtLeave() {} virtual ~EvtLeave() { }
/// Return the type of event
virtual const string getAsString() const { return "leave"; } virtual const string getAsString() const { return "leave"; }
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_MENU_HPP #ifndef EVT_MENU_HPP
...@@ -30,18 +30,15 @@ ...@@ -30,18 +30,15 @@
/// Mouse move event /// Mouse move event
class EvtMenu: public EvtGeneric class EvtMenu: public EvtGeneric
{ {
public: public:
EvtMenu( intf_thread_t *pIntf, int itemId ): EvtMenu( intf_thread_t *pIntf, int itemId )
EvtGeneric( pIntf ), m_itemId( itemId ) {} : EvtGeneric( pIntf ), m_itemId( itemId ) { }
virtual ~EvtMenu() {} virtual ~EvtMenu() { }
/// Return the type of event
virtual const string getAsString() const { return "menu"; } virtual const string getAsString() const { return "menu"; }
// Getter
int getItemId() const { return m_itemId; } int getItemId() const { return m_itemId; }
private: private:
/// Coordinates of the mouse (absolute or relative) /// Coordinates of the mouse (absolute or relative)
int m_itemId; int m_itemId;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_MOTION_HPP #ifndef EVT_MOTION_HPP
...@@ -31,19 +31,17 @@ ...@@ -31,19 +31,17 @@
/// Mouse move event /// Mouse move event
class EvtMotion: public EvtInput class EvtMotion: public EvtInput
{ {
public: public:
EvtMotion( intf_thread_t *pIntf, int xPos, int yPos ): EvtMotion( intf_thread_t *pIntf, int xPos, int yPos )
EvtInput( pIntf ), m_xPos( xPos ), m_yPos( yPos ) {} : EvtInput( pIntf ), m_xPos( xPos ), m_yPos( yPos ) { }
virtual ~EvtMotion() {} virtual ~EvtMotion() { }
/// Return the type of event
virtual const string getAsString() const { return "motion"; } virtual const string getAsString() const { return "motion"; }
// Getters // Getters
int getXPos() const { return m_xPos; } int getXPos() const { return m_xPos; }
int getYPos() const { return m_yPos; } int getYPos() const { return m_yPos; }
private: private:
/// Coordinates of the mouse (absolute or relative) /// Coordinates of the mouse (absolute or relative)
/** /**
* The coordinates are absolute when the event is sent to the * The coordinates are absolute when the event is sent to the
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_MOUSE_HPP #ifndef EVT_MOUSE_HPP
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
/// Class for mouse button events /// Class for mouse button events
class EvtMouse: public EvtInput class EvtMouse: public EvtInput
{ {
public: public:
enum ButtonType_t enum ButtonType_t
{ {
kLeft, kLeft,
...@@ -47,10 +47,11 @@ class EvtMouse: public EvtInput ...@@ -47,10 +47,11 @@ class EvtMouse: public EvtInput
}; };
EvtMouse( intf_thread_t *pIntf, int xPos, int yPos, ButtonType_t button, EvtMouse( intf_thread_t *pIntf, int xPos, int yPos, ButtonType_t button,
ActionType_t action, int mod = kModNone ): ActionType_t action, int mod = kModNone )
EvtInput( pIntf, mod ), m_xPos( xPos ), m_yPos( yPos ), : EvtInput( pIntf, mod ), m_xPos( xPos ), m_yPos( yPos ),
m_button( button ), m_action( action ) {} m_button( button ), m_action( action ) { }
virtual ~EvtMouse() {} virtual ~EvtMouse() { }
virtual const string getAsString() const;
// Return the event coordinates // Return the event coordinates
int getXPos() const { return m_xPos; } int getXPos() const { return m_xPos; }
...@@ -60,9 +61,7 @@ class EvtMouse: public EvtInput ...@@ -60,9 +61,7 @@ class EvtMouse: public EvtInput
ButtonType_t getButton() const { return m_button; } ButtonType_t getButton() const { return m_button; }
ActionType_t getAction() const { return m_action; } ActionType_t getAction() const { return m_action; }
virtual const string getAsString() const; private:
private:
/// Coordinates of the mouse relative to the window /// Coordinates of the mouse relative to the window
int m_xPos, m_yPos; int m_xPos, m_yPos;
/// Mouse button involved in the event /// Mouse button involved in the event
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_REFRESH_HPP #ifndef EVT_REFRESH_HPP
...@@ -31,16 +31,14 @@ ...@@ -31,16 +31,14 @@
/// Refresh window event /// Refresh window event
class EvtRefresh: public EvtGeneric class EvtRefresh: public EvtGeneric
{ {
public: public:
/// Constructor with the coordinates of the area to refresh /// Constructor with the coordinates of the area to refresh
EvtRefresh( intf_thread_t *pIntf, int xStart, int yStart, int width, EvtRefresh( intf_thread_t *pIntf, int xStart, int yStart,
int height ): int width, int height )
EvtGeneric( pIntf ), m_xStart( xStart ), m_yStart( yStart ), : EvtGeneric( pIntf ), m_xStart( xStart ), m_yStart( yStart ),
m_width( width ), m_height( height ) {} m_width( width ), m_height( height ) { }
virtual ~EvtRefresh() {} virtual ~EvtRefresh() { }
/// Return the type of event
virtual const string getAsString() const { return "refresh"; } virtual const string getAsString() const { return "refresh"; }
/// Getters /// Getters
...@@ -49,7 +47,7 @@ class EvtRefresh: public EvtGeneric ...@@ -49,7 +47,7 @@ class EvtRefresh: public EvtGeneric
int getWidth() const { return m_width; } int getWidth() const { return m_width; }
int getHeight() const { return m_height; } int getHeight() const { return m_height; }
private: private:
/// Coordinates and size of the area to refresh /// Coordinates and size of the area to refresh
int m_xStart, m_yStart, m_width, m_height; int m_xStart, m_yStart, m_width, m_height;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_SCROLL_HPP #ifndef EVT_SCROLL_HPP
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
/// Class for mouse scroll events /// Class for mouse scroll events
class EvtScroll: public EvtInput class EvtScroll: public EvtInput
{ {
public: public:
enum Direction_t enum Direction_t
{ {
kUp, kUp,
...@@ -39,10 +39,11 @@ class EvtScroll: public EvtInput ...@@ -39,10 +39,11 @@ class EvtScroll: public EvtInput
}; };
EvtScroll( intf_thread_t *pIntf, int xPos, int yPos, EvtScroll( intf_thread_t *pIntf, int xPos, int yPos,
Direction_t direction, int mod = kModNone ): Direction_t direction, int mod = kModNone )
EvtInput( pIntf, mod ), m_xPos( xPos ), m_yPos( yPos ), : EvtInput( pIntf, mod ), m_xPos( xPos ), m_yPos( yPos ),
m_direction( direction ) {} m_direction( direction ) { }
virtual ~EvtScroll() {} virtual ~EvtScroll() { }
virtual const string getAsString() const;
// Return the event coordinates // Return the event coordinates
int getXPos() const { return m_xPos; } int getXPos() const { return m_xPos; }
...@@ -51,9 +52,7 @@ class EvtScroll: public EvtInput ...@@ -51,9 +52,7 @@ class EvtScroll: public EvtInput
// Return the direction // Return the direction
Direction_t getDirection() const { return m_direction; } Direction_t getDirection() const { return m_direction; }
virtual const string getAsString() const; private:
private:
/// Coordinates of the mouse relative to the window /// Coordinates of the mouse relative to the window
int m_xPos, m_yPos; int m_xPos, m_yPos;
/// Scroll direction /// Scroll direction
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EVT_SPECIAL_HPP #ifndef EVT_SPECIAL_HPP
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
/// Class for non-genuine events /// Class for non-genuine events
class EvtSpecial: public EvtGeneric class EvtSpecial: public EvtGeneric
{ {
public: public:
enum ActionType_t enum ActionType_t
{ {
kShow, kShow,
...@@ -40,14 +40,12 @@ class EvtSpecial: public EvtGeneric ...@@ -40,14 +40,12 @@ class EvtSpecial: public EvtGeneric
kDisable kDisable
}; };
EvtSpecial( intf_thread_t *pIntf, ActionType_t action ): EvtSpecial( intf_thread_t *pIntf, ActionType_t action )
EvtGeneric( pIntf ), m_action( action ) {} : EvtGeneric( pIntf ), m_action( action ) { }
virtual ~EvtSpecial() {} virtual ~EvtSpecial() { }
/// Return the type of event
virtual const string getAsString() const; virtual const string getAsString() const;
private: private:
/// Type of action /// Type of action
ActionType_t m_action; ActionType_t m_action;
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef MACOSX_DRAGDROP_HPP #ifndef MACOSX_DRAGDROP_HPP
...@@ -28,13 +28,13 @@ ...@@ -28,13 +28,13 @@
class MacOSXDragDrop: public SkinObject class MacOSXDragDrop: public SkinObject
{ {
public: public:
typedef long ldata_t[5]; typedef long ldata_t[5];
MacOSXDragDrop( intf_thread_t *pIntf, bool playOnDrop ); MacOSXDragDrop( intf_thread_t *pIntf, bool playOnDrop );
virtual ~MacOSXDragDrop() {} virtual ~MacOSXDragDrop() { }
private: private:
/// Indicates whether the file(s) must be played immediately /// Indicates whether the file(s) must be played immediately
bool m_playOnDrop; bool m_playOnDrop;
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef MACOSX_FACTORY_HPP #ifndef MACOSX_FACTORY_HPP
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
/// Class used to instanciate MacOSX specific objects /// Class used to instanciate MacOSX specific objects
class MacOSXFactory: public OSFactory class MacOSXFactory: public OSFactory
{ {
public: public:
MacOSXFactory( intf_thread_t *pIntf ); MacOSXFactory( intf_thread_t *pIntf );
virtual ~MacOSXFactory(); virtual ~MacOSXFactory();
...@@ -101,7 +101,7 @@ class MacOSXFactory: public OSFactory ...@@ -101,7 +101,7 @@ class MacOSXFactory: public OSFactory
/// Delete a directory recursively /// Delete a directory recursively
virtual void rmDir( const string &rPath ); virtual void rmDir( const string &rPath );
private: private:
/// Directory separator /// Directory separator
const string m_dirSep; const string m_dirSep;
/// Resource path /// Resource path
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef MACOSX_GRAPHICS_HPP #ifndef MACOSX_GRAPHICS_HPP
...@@ -33,7 +33,7 @@ class GenericBitmap; ...@@ -33,7 +33,7 @@ class GenericBitmap;
/// MacOSX implementation of OSGraphics /// MacOSX implementation of OSGraphics
class MacOSXGraphics: public OSGraphics class MacOSXGraphics: public OSGraphics
{ {
public: public:
MacOSXGraphics( intf_thread_t *pIntf, int width, int height); MacOSXGraphics( intf_thread_t *pIntf, int width, int height);
virtual ~MacOSXGraphics(); virtual ~MacOSXGraphics();
...@@ -75,7 +75,7 @@ class MacOSXGraphics: public OSGraphics ...@@ -75,7 +75,7 @@ class MacOSXGraphics: public OSGraphics
virtual int getWidth() const { return m_width; } virtual int getWidth() const { return m_width; }
virtual int getHeight() const { return m_height; } virtual int getHeight() const { return m_height; }
private: private:
/// Size of the image /// Size of the image
int m_width, m_height; int m_width, m_height;
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef MACOSX_LOOP_HPP #ifndef MACOSX_LOOP_HPP
...@@ -33,7 +33,7 @@ class GenericWindow; ...@@ -33,7 +33,7 @@ class GenericWindow;
/// Main event loop for MacOSX (singleton) /// Main event loop for MacOSX (singleton)
class MacOSXLoop: public OSLoop class MacOSXLoop: public OSLoop
{ {
public: public:
/// Get the instance of MacOSXLoop /// Get the instance of MacOSXLoop
static OSLoop *instance( intf_thread_t *pIntf ); static OSLoop *instance( intf_thread_t *pIntf );
...@@ -49,7 +49,7 @@ class MacOSXLoop: public OSLoop ...@@ -49,7 +49,7 @@ class MacOSXLoop: public OSLoop
// Handle a window event // Handle a window event
void registerWindow( GenericWindow &rGenWin, WindowRef win ); void registerWindow( GenericWindow &rGenWin, WindowRef win );
private: private:
// Private because it's a singleton // Private because it's a singleton
MacOSXLoop( intf_thread_t *pIntf ); MacOSXLoop( intf_thread_t *pIntf );
virtual ~MacOSXLoop(); virtual ~MacOSXLoop();
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef MACOSX_POPUP_HPP #ifndef MACOSX_POPUP_HPP
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
/// MacOSX implementation of OSPopup /// MacOSX implementation of OSPopup
class MacOSXPopup: public OSPopup class MacOSXPopup: public OSPopup
{ {
public: public:
MacOSXPopup( intf_thread_t *pIntf ); MacOSXPopup( intf_thread_t *pIntf );
virtual ~MacOSXPopup(); virtual ~MacOSXPopup();
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef MACOSX_TIMER_HPP #ifndef MACOSX_TIMER_HPP
...@@ -34,7 +34,7 @@ class CmdGeneric; ...@@ -34,7 +34,7 @@ class CmdGeneric;
// MacOSX specific timer // MacOSX specific timer
class MacOSXTimer: public OSTimer class MacOSXTimer: public OSTimer
{ {
public: public:
MacOSXTimer( intf_thread_t *pIntf, CmdGeneric &rCmd ); MacOSXTimer( intf_thread_t *pIntf, CmdGeneric &rCmd );
virtual ~MacOSXTimer(); virtual ~MacOSXTimer();
...@@ -45,7 +45,7 @@ class MacOSXTimer: public OSTimer ...@@ -45,7 +45,7 @@ class MacOSXTimer: public OSTimer
/// Stop the timer /// Stop the timer
virtual void stop(); virtual void stop();
private: private:
/// Command to execute /// Command to execute
CmdGeneric &m_rCommand; CmdGeneric &m_rCommand;
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef MACOSX_TOOLTIP_HPP #ifndef MACOSX_TOOLTIP_HPP
...@@ -32,7 +32,7 @@ class MacOSXDisplay; ...@@ -32,7 +32,7 @@ class MacOSXDisplay;
/// MacOSX implementation of OSTooltip /// MacOSX implementation of OSTooltip
class MacOSXTooltip: public OSTooltip class MacOSXTooltip: public OSTooltip
{ {
public: public:
MacOSXTooltip( intf_thread_t *pIntf ); MacOSXTooltip( intf_thread_t *pIntf );
virtual ~MacOSXTooltip(); virtual ~MacOSXTooltip();
...@@ -42,8 +42,6 @@ class MacOSXTooltip: public OSTooltip ...@@ -42,8 +42,6 @@ class MacOSXTooltip: public OSTooltip
/// Hide the tooltip /// Hide the tooltip
virtual void hide(); virtual void hide();
private:
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef MACOSX_WINDOW_HPP #ifndef MACOSX_WINDOW_HPP
...@@ -34,7 +34,7 @@ class MacOSXDragDrop; ...@@ -34,7 +34,7 @@ class MacOSXDragDrop;
/// MacOSX implementation of OSWindow /// MacOSX implementation of OSWindow
class MacOSXWindow: public OSWindow class MacOSXWindow: public OSWindow
{ {
public: public:
MacOSXWindow( intf_thread_t *pIntf, GenericWindow &rWindow, MacOSXWindow( intf_thread_t *pIntf, GenericWindow &rWindow,
bool dragDrop, bool playOnDrop, bool dragDrop, bool playOnDrop,
MacOSXWindow *pParentWindow ); MacOSXWindow *pParentWindow );
...@@ -63,7 +63,7 @@ class MacOSXWindow: public OSWindow ...@@ -63,7 +63,7 @@ class MacOSXWindow: public OSWindow
/// Get the Carbon window handle /// Get the Carbon window handle
WindowRef getWindowRef() const { return m_win; }; WindowRef getWindowRef() const { return m_win; };
private: private:
/// Parent window /// Parent window
MacOSXWindow *m_pParent; MacOSXWindow *m_pParent;
/// Indicates whether the window handles drag&drop events /// Indicates whether the window handles drag&drop events
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
...@@ -47,7 +47,7 @@ class GenericRect; ...@@ -47,7 +47,7 @@ class GenericRect;
/// Class for skin construction /// Class for skin construction
class Builder: public SkinObject class Builder: public SkinObject
{ {
public: public:
Builder( intf_thread_t *pIntf, const BuilderData &rData, Builder( intf_thread_t *pIntf, const BuilderData &rData,
const string &rPath ); const string &rPath );
virtual ~Builder(); virtual ~Builder();
...@@ -59,7 +59,7 @@ class Builder: public SkinObject ...@@ -59,7 +59,7 @@ class Builder: public SkinObject
/// Parse an action tag and returns a command /// Parse an action tag and returns a command
CmdGeneric *parseAction( const string &rAction ); CmdGeneric *parseAction( const string &rAction );
private: private:
/// Data from the XML /// Data from the XML
const BuilderData &m_rData; const BuilderData &m_rData;
/// Path of the theme /// Path of the theme
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EXPR_EVALUATOR_HPP #ifndef EXPR_EVALUATOR_HPP
...@@ -31,12 +31,9 @@ ...@@ -31,12 +31,9 @@
/// Expression evaluator using Reverse Polish Notation /// Expression evaluator using Reverse Polish Notation
class ExprEvaluator: public SkinObject class ExprEvaluator: public SkinObject
{ {
public: public:
/// Constructor ExprEvaluator( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
ExprEvaluator( intf_thread_t *pIntf ): SkinObject( pIntf ) {} ~ExprEvaluator() { }
/// Destructor
~ExprEvaluator() {}
/// Clear the RPN stack and parse an expression /// Clear the RPN stack and parse an expression
void parse( const string &rExpr ); void parse( const string &rExpr );
...@@ -45,7 +42,7 @@ class ExprEvaluator: public SkinObject ...@@ -45,7 +42,7 @@ class ExprEvaluator: public SkinObject
/// Return NULL when the stack is empty. /// Return NULL when the stack is empty.
string getToken(); string getToken();
private: private:
/// RPN stack /// RPN stack
list<string> m_stack; list<string> m_stack;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef INTERPRETER_HPP #ifndef INTERPRETER_HPP
...@@ -38,7 +38,7 @@ class VarPercent; ...@@ -38,7 +38,7 @@ class VarPercent;
/// Command interpreter for scripts in the XML /// Command interpreter for scripts in the XML
class Interpreter: public SkinObject class Interpreter: public SkinObject
{ {
public: public:
/// Get the instance of Interpreter /// Get the instance of Interpreter
static Interpreter *instance( intf_thread_t *pIntf ); static Interpreter *instance( intf_thread_t *pIntf );
...@@ -66,13 +66,13 @@ class Interpreter: public SkinObject ...@@ -66,13 +66,13 @@ class Interpreter: public SkinObject
/// Get a constant value /// Get a constant value
string getConstant( const string &rValue ); string getConstant( const string &rValue );
private: private:
/// Map of global commands /// Map of global commands
map<string, CmdGenericPtr> m_commandMap; map<string, CmdGenericPtr> m_commandMap;
// Private because it is a singleton // Private because it is a singleton
Interpreter( intf_thread_t *pIntf ); Interpreter( intf_thread_t *pIntf );
virtual ~Interpreter() {} virtual ~Interpreter() { }
}; };
#endif #endif
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef SKIN_PARSER_HPP #ifndef SKIN_PARSER_HPP
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
/// Parser for the skin DTD /// Parser for the skin DTD
class SkinParser: public XMLParser class SkinParser: public XMLParser
{ {
public: public:
SkinParser( intf_thread_t *pIntf, const string &rFileName, SkinParser( intf_thread_t *pIntf, const string &rFileName,
const string &rPath, bool useDTD = true, const string &rPath, bool useDTD = true,
BuilderData *pData = NULL ); BuilderData *pData = NULL );
...@@ -42,7 +42,7 @@ class SkinParser: public XMLParser ...@@ -42,7 +42,7 @@ class SkinParser: public XMLParser
static int convertColor( const char *transcolor ); static int convertColor( const char *transcolor );
private: private:
/// Path of the theme /// Path of the theme
const string m_path; const string m_path;
/// Container for mapping data from the XML /// Container for mapping data from the XML
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef XMLPARSER_HPP #ifndef XMLPARSER_HPP
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/// XML parser using libxml2 text reader API /// XML parser using libxml2 text reader API
class XMLParser: public SkinObject class XMLParser: public SkinObject
{ {
public: public:
XMLParser( intf_thread_t *pIntf, const string &rFileName, XMLParser( intf_thread_t *pIntf, const string &rFileName,
bool useDTD = true ); bool useDTD = true );
virtual ~XMLParser(); virtual ~XMLParser();
...@@ -44,7 +44,7 @@ class XMLParser: public SkinObject ...@@ -44,7 +44,7 @@ class XMLParser: public SkinObject
/// Parse the file. Returns true on success /// Parse the file. Returns true on success
bool parse(); bool parse();
protected: protected:
// Key comparison function for type "const char*" // Key comparison function for type "const char*"
struct ltstr struct ltstr
{ {
...@@ -61,10 +61,10 @@ class XMLParser: public SkinObject ...@@ -61,10 +61,10 @@ class XMLParser: public SkinObject
/// Callbacks /// Callbacks
virtual void handleBeginElement( const string &rName, virtual void handleBeginElement( const string &rName,
AttrList_t &attr ) {} AttrList_t &attr ) { }
virtual void handleEndElement( const string &rName ) {} virtual void handleEndElement( const string &rName ) { }
private: private:
void LoadCatalog(); void LoadCatalog();
/// Reader context /// Reader context
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef ANCHOR_HPP #ifndef ANCHOR_HPP
...@@ -34,13 +34,12 @@ ...@@ -34,13 +34,12 @@
/// Class for the windows anchors /// Class for the windows anchors
class Anchor: public SkinObject class Anchor: public SkinObject
{ {
public: public:
Anchor( intf_thread_t *pIntf, const Position &rPosition, int range, Anchor( intf_thread_t *pIntf, const Position &rPosition, int range,
int priority, const Bezier &rCurve, GenericLayout &rLayout ): int priority, const Bezier &rCurve, GenericLayout &rLayout )
SkinObject( pIntf ), m_position( rPosition ), : SkinObject( pIntf ), m_position( rPosition ), m_rCurve( rCurve ),
m_rCurve( rCurve ), m_range( range ), m_priority( priority ), m_range( range ), m_priority( priority ), m_rLayout( rLayout ) { }
m_rLayout( rLayout ) {} virtual ~Anchor() { }
virtual ~Anchor() {}
/** /**
* Return true if the given anchor is hanged by this one * Return true if the given anchor is hanged by this one
...@@ -79,7 +78,7 @@ class Anchor: public SkinObject ...@@ -79,7 +78,7 @@ class Anchor: public SkinObject
return (m_position.getTop() + m_rLayout.getTop()); return (m_position.getTop() + m_rLayout.getTop());
} }
private: private:
/// Position in the layout /// Position in the layout
Position m_position; Position m_position;
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef ANIM_BITMAP_HPP #ifndef ANIM_BITMAP_HPP
...@@ -37,7 +37,7 @@ class OSTimer; ...@@ -37,7 +37,7 @@ class OSTimer;
class AnimBitmap: public SkinObject, public Box, class AnimBitmap: public SkinObject, public Box,
public Subject<AnimBitmap> public Subject<AnimBitmap>
{ {
public: public:
AnimBitmap( intf_thread_t *pIntf, const GenericBitmap &rBitmap ); AnimBitmap( intf_thread_t *pIntf, const GenericBitmap &rBitmap );
virtual ~AnimBitmap(); virtual ~AnimBitmap();
...@@ -58,7 +58,7 @@ class AnimBitmap: public SkinObject, public Box, ...@@ -58,7 +58,7 @@ class AnimBitmap: public SkinObject, public Box,
virtual int getWidth() const; virtual int getWidth() const;
virtual int getHeight() const; virtual int getHeight() const;
private: private:
/// Bitmap stored /// Bitmap stored
const GenericBitmap &m_rBitmap; const GenericBitmap &m_rBitmap;
/// Graphics to store the bitmap /// Graphics to store the bitmap
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef BITMAP_FONT_HPP #ifndef BITMAP_FONT_HPP
...@@ -33,10 +33,10 @@ class GenericBitmap; ...@@ -33,10 +33,10 @@ class GenericBitmap;
/// Class to handle bitmap fonts /// Class to handle bitmap fonts
class BitmapFont: public GenericFont class BitmapFont: public GenericFont
{ {
public: public:
BitmapFont( intf_thread_t *pIntf, const GenericBitmap &rBitmap, BitmapFont( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
const string &rType ); const string &rType );
virtual ~BitmapFont() {} virtual ~BitmapFont() { }
virtual bool init() { return true; } virtual bool init() { return true; }
...@@ -48,11 +48,11 @@ class BitmapFont: public GenericFont ...@@ -48,11 +48,11 @@ class BitmapFont: public GenericFont
/// Get the font size /// Get the font size
virtual int getSize() const { return m_height; } virtual int getSize() const { return m_height; }
private: private:
/// Description of a glyph /// Description of a glyph
struct Glyph_t struct Glyph_t
{ {
Glyph_t(): m_xPos( -1 ), m_yPos( 0 ) {} Glyph_t(): m_xPos( -1 ), m_yPos( 0 ) { }
int m_xPos, m_yPos; int m_xPos, m_yPos;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef DIALOGS_HPP #ifndef DIALOGS_HPP
...@@ -33,7 +33,7 @@ struct interaction_dialog_t ; ...@@ -33,7 +33,7 @@ struct interaction_dialog_t ;
// Dialogs provider // Dialogs provider
class Dialogs: public SkinObject class Dialogs: public SkinObject
{ {
public: public:
/// Get the instance of Dialogs (or NULL if initialization failed) /// Get the instance of Dialogs (or NULL if initialization failed)
static Dialogs *instance( intf_thread_t *pIntf ); static Dialogs *instance( intf_thread_t *pIntf );
...@@ -95,7 +95,7 @@ class Dialogs: public SkinObject ...@@ -95,7 +95,7 @@ class Dialogs: public SkinObject
/// Show an interaction dialog /// Show an interaction dialog
void showInteraction( interaction_dialog_t * ); void showInteraction( interaction_dialog_t * );
private: private:
// Private because it's a singleton // Private because it's a singleton
Dialogs( intf_thread_t *pIntf ); Dialogs( intf_thread_t *pIntf );
~Dialogs(); ~Dialogs();
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef FILE_BITMAP_HPP #ifndef FILE_BITMAP_HPP
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
/// Class for file bitmaps /// Class for file bitmaps
class FileBitmap: public GenericBitmap class FileBitmap: public GenericBitmap
{ {
public: public:
/// Load a bitmap from a file. aColor is the transparency /// Load a bitmap from a file. aColor is the transparency
/// color, in the format 0xRRGGBB /// color, in the format 0xRRGGBB
FileBitmap( intf_thread_t *pIntf, image_handler_t *pImageHandler, FileBitmap( intf_thread_t *pIntf, image_handler_t *pImageHandler,
...@@ -51,7 +51,7 @@ class FileBitmap: public GenericBitmap ...@@ -51,7 +51,7 @@ class FileBitmap: public GenericBitmap
/// Each pixel is stored in 4 bytes in the order B,G,R,A /// Each pixel is stored in 4 bytes in the order B,G,R,A
virtual uint8_t *getData() const; virtual uint8_t *getData() const;
private: private:
/// Size of the bitmap. /// Size of the bitmap.
int m_width, m_height; int m_width, m_height;
/// Buffer containing the image data. /// Buffer containing the image data.
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef FT2_BITMAP_HPP #ifndef FT2_BITMAP_HPP
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
/// Class for rendering freetype glyphs on a bitmap /// Class for rendering freetype glyphs on a bitmap
class FT2Bitmap: public GenericBitmap class FT2Bitmap: public GenericBitmap
{ {
public: public:
/// Create an empty bitmap /// Create an empty bitmap
FT2Bitmap( intf_thread_t *pIntf, int width, int height ); FT2Bitmap( intf_thread_t *pIntf, int width, int height );
...@@ -54,7 +54,7 @@ class FT2Bitmap: public GenericBitmap ...@@ -54,7 +54,7 @@ class FT2Bitmap: public GenericBitmap
void draw( const FT_Bitmap &rBitmap, int left, int top, void draw( const FT_Bitmap &rBitmap, int left, int top,
uint32_t color ); uint32_t color );
private: private:
/// Bitmap size /// Bitmap size
int m_width, m_height; int m_width, m_height;
/// Image data buffer /// Image data buffer
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef FT2_FONT_HPP #ifndef FT2_FONT_HPP
...@@ -39,7 +39,7 @@ class UString; ...@@ -39,7 +39,7 @@ class UString;
/// Freetype2 font /// Freetype2 font
class FT2Font: public GenericFont class FT2Font: public GenericFont
{ {
public: public:
FT2Font( intf_thread_t *pIntf, const string &rName, int size ); FT2Font( intf_thread_t *pIntf, const string &rName, int size );
virtual ~FT2Font(); virtual ~FT2Font();
...@@ -54,7 +54,7 @@ class FT2Font: public GenericFont ...@@ -54,7 +54,7 @@ class FT2Font: public GenericFont
/// Get the text height /// Get the text height
virtual int getSize() const { return m_height; } virtual int getSize() const { return m_height; }
private: private:
typedef struct typedef struct
{ {
FT_Glyph m_glyph; FT_Glyph m_glyph;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef GENERIC_BITMAP_HPP #ifndef GENERIC_BITMAP_HPP
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
/// Generic interface for bitmaps /// Generic interface for bitmaps
class GenericBitmap: public SkinObject, public Box class GenericBitmap: public SkinObject, public Box
{ {
public: public:
virtual ~GenericBitmap() {} virtual ~GenericBitmap() { }
/// Get a linear buffer containing the image data. /// Get a linear buffer containing the image data.
/// Each pixel is stored in 4 bytes in the order B,G,R,A /// Each pixel is stored in 4 bytes in the order B,G,R,A
...@@ -46,10 +46,10 @@ class GenericBitmap: public SkinObject, public Box ...@@ -46,10 +46,10 @@ class GenericBitmap: public SkinObject, public Box
/// Get the number of frames per second (for animated bitmaps) /// Get the number of frames per second (for animated bitmaps)
int getFrameRate() const { return m_frameRate; } int getFrameRate() const { return m_frameRate; }
protected: protected:
GenericBitmap( intf_thread_t *pIntf, int nbFrames = 1, int fps = 0); GenericBitmap( intf_thread_t *pIntf, int nbFrames = 1, int fps = 0);
private: private:
/// Number of frames /// Number of frames
int m_nbFrames; int m_nbFrames;
/// Frame rate /// Frame rate
...@@ -60,7 +60,7 @@ class GenericBitmap: public SkinObject, public Box ...@@ -60,7 +60,7 @@ class GenericBitmap: public SkinObject, public Box
/// Basic bitmap implementation /// Basic bitmap implementation
class BitmapImpl: public GenericBitmap class BitmapImpl: public GenericBitmap
{ {
public: public:
/// Create an empty bitmap of the given size /// Create an empty bitmap of the given size
BitmapImpl( intf_thread_t *pIntf, int width, int height, BitmapImpl( intf_thread_t *pIntf, int width, int height,
int nbFrames = 1, int fps = 0 ); int nbFrames = 1, int fps = 0 );
...@@ -80,7 +80,7 @@ class BitmapImpl: public GenericBitmap ...@@ -80,7 +80,7 @@ class BitmapImpl: public GenericBitmap
bool drawBitmap( const GenericBitmap &rSource, int xSrc, int ySrc, bool drawBitmap( const GenericBitmap &rSource, int xSrc, int ySrc,
int xDest, int yDest, int width, int height ); int xDest, int yDest, int width, int height );
private: private:
/// Size of the bitmap. /// Size of the bitmap.
int m_width, m_height; int m_width, m_height;
/// Buffer containing the image data. /// Buffer containing the image data.
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef GENERIC_FONT_HPP #ifndef GENERIC_FONT_HPP
...@@ -34,8 +34,8 @@ class UString; ...@@ -34,8 +34,8 @@ class UString;
/// Base class for fonts /// Base class for fonts
class GenericFont: public SkinObject class GenericFont: public SkinObject
{ {
public: public:
virtual ~GenericFont() {} virtual ~GenericFont() { }
virtual bool init() = 0; virtual bool init() = 0;
...@@ -48,8 +48,8 @@ class GenericFont: public SkinObject ...@@ -48,8 +48,8 @@ class GenericFont: public SkinObject
/// Get the font size /// Get the font size
virtual int getSize() const = 0; virtual int getSize() const = 0;
protected: protected:
GenericFont( intf_thread_t *pIntf ): SkinObject( pIntf ) {} GenericFont( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
typedef CountedPtr<GenericFont> GenericFontPtr; typedef CountedPtr<GenericFont> GenericFontPtr;
......
...@@ -250,11 +250,9 @@ void GenericLayout::refreshRect( int x, int y, int width, int height ) ...@@ -250,11 +250,9 @@ void GenericLayout::refreshRect( int x, int y, int width, int height )
class rect class rect
{ {
public: public:
rect( int v_x = 0, int v_y = 0, rect( int v_x = 0, int v_y = 0, int v_width = 0, int v_height = 0 )
int v_width = 0, int v_height = 0 ) : x( v_x ), y( v_y ), width( v_width ), height( v_height ) { }
: x( v_x), y( v_y ), width( v_width), height( v_height) ~rect() { }
{}
~rect(){}
int x; int x;
int y; int y;
int width; int width;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef GENERIC_LAYOUT_HPP #ifndef GENERIC_LAYOUT_HPP
...@@ -43,7 +43,7 @@ class VarBoolImpl; ...@@ -43,7 +43,7 @@ class VarBoolImpl;
struct LayeredControl struct LayeredControl
{ {
LayeredControl( CtrlGeneric *pControl, int layer ): LayeredControl( CtrlGeneric *pControl, int layer ):
m_pControl( pControl ), m_layer( layer ) {} m_pControl( pControl ), m_layer( layer ) { }
/// Pointer on the control /// Pointer on the control
CtrlGeneric *m_pControl; CtrlGeneric *m_pControl;
...@@ -55,10 +55,9 @@ struct LayeredControl ...@@ -55,10 +55,9 @@ struct LayeredControl
/// Base class for layouts /// Base class for layouts
class GenericLayout: public SkinObject class GenericLayout: public SkinObject
{ {
public: public:
GenericLayout( intf_thread_t *pIntf, int width, int height, GenericLayout( intf_thread_t *pIntf, int width, int height,
int minWidth, int maxWidth, int minHeight, int minWidth, int maxWidth, int minHeight, int maxHeight );
int maxHeight );
virtual ~GenericLayout(); virtual ~GenericLayout();
...@@ -148,7 +147,7 @@ class GenericLayout: public SkinObject ...@@ -148,7 +147,7 @@ class GenericLayout: public SkinObject
// FIXME: we give read/write access // FIXME: we give read/write access
VarBoolImpl &getActiveVar() { return *m_pVarActive; } VarBoolImpl &getActiveVar() { return *m_pVarActive; }
private: private:
/// Parent window of the layout /// Parent window of the layout
TopWindow *m_pWindow; TopWindow *m_pWindow;
/// Layout size /// Layout size
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef GENERIC_WINDOW_HPP #ifndef GENERIC_WINDOW_HPP
...@@ -44,24 +44,24 @@ class WindowManager; ...@@ -44,24 +44,24 @@ class WindowManager;
/// Generic window class /// Generic window class
class GenericWindow: public SkinObject, public Observer<VarBool> class GenericWindow: public SkinObject, public Observer<VarBool>
{ {
private: private:
friend class WindowManager; friend class WindowManager;
friend class VoutManager; friend class VoutManager;
friend class CtrlVideo; friend class CtrlVideo;
public: public:
GenericWindow( intf_thread_t *pIntf, int xPos, int yPos, GenericWindow( intf_thread_t *pIntf, int xPos, int yPos,
bool dragDrop, bool playOnDrop, bool dragDrop, bool playOnDrop,
GenericWindow *pParent = NULL ); GenericWindow *pParent = NULL );
virtual ~GenericWindow(); virtual ~GenericWindow();
/// Methods to process OS events. /// Methods to process OS events.
virtual void processEvent( EvtFocus &rEvtFocus ) {} virtual void processEvent( EvtFocus &rEvtFocus ) { }
virtual void processEvent( EvtMenu &rEvtMenu ) {} virtual void processEvent( EvtMenu &rEvtMenu ) { }
virtual void processEvent( EvtMotion &rEvtMotion ) {} virtual void processEvent( EvtMotion &rEvtMotion ) { }
virtual void processEvent( EvtMouse &rEvtMouse ) {} virtual void processEvent( EvtMouse &rEvtMouse ) { }
virtual void processEvent( EvtLeave &rEvtLeave ) {} virtual void processEvent( EvtLeave &rEvtLeave ) { }
virtual void processEvent( EvtKey &rEvtKey ) {} virtual void processEvent( EvtKey &rEvtKey ) { }
virtual void processEvent( EvtScroll &rEvtScroll ) {} virtual void processEvent( EvtScroll &rEvtScroll ) { }
virtual void processEvent( EvtRefresh &rEvtRefresh ); virtual void processEvent( EvtRefresh &rEvtRefresh );
...@@ -69,7 +69,7 @@ class GenericWindow: public SkinObject, public Observer<VarBool> ...@@ -69,7 +69,7 @@ class GenericWindow: public SkinObject, public Observer<VarBool>
virtual void resize( int width, int height ); virtual void resize( int width, int height );
/// Refresh an area of the window /// 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 /// Get the coordinates of the window
int getLeft() const { return m_left; } int getLeft() const { return m_left; }
...@@ -89,7 +89,7 @@ class GenericWindow: public SkinObject, public Observer<VarBool> ...@@ -89,7 +89,7 @@ class GenericWindow: public SkinObject, public Observer<VarBool>
/// reparent /// reparent
void setParent( GenericWindow* pParent, int x, int y, int w, int h ); void setParent( GenericWindow* pParent, int x, int y, int w, int h );
protected: protected:
/// Get the OS window /// Get the OS window
OSWindow *getOSWindow() const { return m_pOsWindow; } OSWindow *getOSWindow() const { return m_pOsWindow; }
...@@ -121,7 +121,7 @@ class GenericWindow: public SkinObject, public Observer<VarBool> ...@@ -121,7 +121,7 @@ class GenericWindow: public SkinObject, public Observer<VarBool>
/// Actually hide the window /// Actually hide the window
virtual void innerHide(); virtual void innerHide();
private: private:
/// Window position and size /// Window position and size
int m_left, m_top, m_width, m_height; int m_left, m_top, m_width, m_height;
/// OS specific implementation /// OS specific implementation
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef INI_FILE_HPP #ifndef INI_FILE_HPP
...@@ -32,15 +32,15 @@ ...@@ -32,15 +32,15 @@
/// INI file parser /// INI file parser
class IniFile: public SkinObject class IniFile: public SkinObject
{ {
public: public:
IniFile( intf_thread_t *pIntf, const string &rName, IniFile( intf_thread_t *pIntf, const string &rName,
const string &rPath ); const string &rPath );
virtual ~IniFile() {} virtual ~IniFile() { }
/// Parse the INI file and fill the VarManager /// Parse the INI file and fill the VarManager
void parseFile(); void parseFile();
private: private:
string m_name; string m_name;
string m_path; string m_path;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef LOGGER_HPP #ifndef LOGGER_HPP
...@@ -37,7 +37,7 @@ ...@@ -37,7 +37,7 @@
// Logger class // Logger class
class Logger: public SkinObject class Logger: public SkinObject
{ {
public: public:
/// Get the instance of Logger /// Get the instance of Logger
/// Returns NULL if initialization failed /// Returns NULL if initialization failed
static Logger *instance( intf_thread_t *pIntf ); static Logger *instance( intf_thread_t *pIntf );
...@@ -51,7 +51,7 @@ class Logger: public SkinObject ...@@ -51,7 +51,7 @@ class Logger: public SkinObject
/// Print a warning /// Print a warning
void warn( const string &rMsg ); void warn( const string &rMsg );
private: private:
// Private because it's a singleton // Private because it's a singleton
Logger( intf_thread_t *pIntf ); Logger( intf_thread_t *pIntf );
~Logger(); ~Logger();
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef OS_FACTORY_HPP #ifndef OS_FACTORY_HPP
...@@ -44,7 +44,7 @@ class OSTimer; ...@@ -44,7 +44,7 @@ class OSTimer;
/// Abstract factory used to instantiate OS specific objects. /// Abstract factory used to instantiate OS specific objects.
class OSFactory: public SkinObject class OSFactory: public SkinObject
{ {
public: public:
enum CursorType_t enum CursorType_t
{ {
kDefaultArrow, kDefaultArrow,
...@@ -132,10 +132,10 @@ class OSFactory: public SkinObject ...@@ -132,10 +132,10 @@ class OSFactory: public SkinObject
/// Delete a directory recursively /// Delete a directory recursively
virtual void rmDir( const string &rPath ) = 0; virtual void rmDir( const string &rPath ) = 0;
protected: protected:
// Protected because it's a singleton // Protected because it's a singleton
OSFactory( intf_thread_t* pIntf ): SkinObject( pIntf ) {} OSFactory( intf_thread_t* pIntf ): SkinObject( pIntf ) { }
virtual ~OSFactory() {} virtual ~OSFactory() { }
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef OS_GRAPHICS_HPP #ifndef OS_GRAPHICS_HPP
...@@ -36,8 +36,8 @@ class OSWindow; ...@@ -36,8 +36,8 @@ class OSWindow;
/// OS specific graphics class /// OS specific graphics class
class OSGraphics: public SkinObject, public Box class OSGraphics: public SkinObject, public Box
{ {
public: public:
virtual ~OSGraphics() {} virtual ~OSGraphics() { }
/// Clear the graphics /// Clear the graphics
virtual void clear() = 0; virtual void clear() = 0;
...@@ -73,8 +73,8 @@ class OSGraphics: public SkinObject, public Box ...@@ -73,8 +73,8 @@ class OSGraphics: public SkinObject, public Box
/// Tell whether the pixel at the given position is visible /// Tell whether the pixel at the given position is visible
virtual bool hit( int x, int y ) const = 0; virtual bool hit( int x, int y ) const = 0;
protected: protected:
OSGraphics( intf_thread_t *pIntf ): SkinObject( pIntf ) {} OSGraphics( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
typedef CountedPtr<OSGraphics> OSGraphicsPtr; typedef CountedPtr<OSGraphics> OSGraphicsPtr;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef OS_LOOP_HPP #ifndef OS_LOOP_HPP
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
/// Abstract class for the main event loop /// Abstract class for the main event loop
class OSLoop: public SkinObject class OSLoop: public SkinObject
{ {
public: public:
virtual ~OSLoop() {} virtual ~OSLoop() { }
/// Enter the main loop /// Enter the main loop
virtual void run() = 0; virtual void run() = 0;
...@@ -40,8 +40,8 @@ class OSLoop: public SkinObject ...@@ -40,8 +40,8 @@ class OSLoop: public SkinObject
/// Exit the main loop /// Exit the main loop
virtual void exit() = 0; virtual void exit() = 0;
protected: protected:
OSLoop( intf_thread_t *pIntf ): SkinObject( pIntf ) {} OSLoop( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef OS_POPUP_HPP #ifndef OS_POPUP_HPP
...@@ -34,8 +34,8 @@ class OSGraphics; ...@@ -34,8 +34,8 @@ class OSGraphics;
/// Base class for OS specific Popup Windows /// Base class for OS specific Popup Windows
class OSPopup: public SkinObject class OSPopup: public SkinObject
{ {
public: public:
virtual ~OSPopup() {} virtual ~OSPopup() { }
/// Show the popup menu at the given (absolute) corrdinates /// Show the popup menu at the given (absolute) corrdinates
virtual void show( int xPos, int yPos ) = 0; virtual void show( int xPos, int yPos ) = 0;
...@@ -52,8 +52,8 @@ class OSPopup: public SkinObject ...@@ -52,8 +52,8 @@ class OSPopup: public SkinObject
/// Return the position of the item identified by the given id /// Return the position of the item identified by the given id
virtual int getPosFromId( int id ) const = 0; virtual int getPosFromId( int id ) const = 0;
protected: protected:
OSPopup( intf_thread_t *pIntf ): SkinObject( pIntf ) {} OSPopup( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
#endif #endif
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef OS_TIMER_HPP #ifndef OS_TIMER_HPP
...@@ -31,8 +31,8 @@ ...@@ -31,8 +31,8 @@
// Base class for OS-specific timers // Base class for OS-specific timers
class OSTimer: public SkinObject class OSTimer: public SkinObject
{ {
public: public:
virtual ~OSTimer() {} virtual ~OSTimer() { }
/// (Re)start the timer with the given delay (in ms). If oneShot is /// (Re)start the timer with the given delay (in ms). If oneShot is
/// true, stop it after the first execution of the callback. /// true, stop it after the first execution of the callback.
...@@ -41,8 +41,8 @@ class OSTimer: public SkinObject ...@@ -41,8 +41,8 @@ class OSTimer: public SkinObject
/// Stop the timer /// Stop the timer
virtual void stop() = 0; virtual void stop() = 0;
protected: protected:
OSTimer( intf_thread_t *pIntf ): SkinObject( pIntf ) {} OSTimer( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef OS_TOOLTIP_HPP #ifndef OS_TOOLTIP_HPP
...@@ -33,8 +33,8 @@ class OSGraphics; ...@@ -33,8 +33,8 @@ class OSGraphics;
/// Base class for OS specific Tooltip Windows /// Base class for OS specific Tooltip Windows
class OSTooltip: public SkinObject class OSTooltip: public SkinObject
{ {
public: public:
virtual ~OSTooltip() {} virtual ~OSTooltip() { }
/// Show the tooltip /// Show the tooltip
virtual void show( int left, int top, OSGraphics &rText ) = 0; virtual void show( int left, int top, OSGraphics &rText ) = 0;
...@@ -42,8 +42,8 @@ class OSTooltip: public SkinObject ...@@ -42,8 +42,8 @@ class OSTooltip: public SkinObject
/// Hide the tooltip /// Hide the tooltip
virtual void hide() = 0; virtual void hide() = 0;
protected: protected:
OSTooltip( intf_thread_t *pIntf ): SkinObject( pIntf ) {} OSTooltip( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
#endif #endif
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef OS_WINDOW_HPP #ifndef OS_WINDOW_HPP
...@@ -34,8 +34,8 @@ class OSGraphics; ...@@ -34,8 +34,8 @@ class OSGraphics;
/// OS specific delegate class for GenericWindow /// OS specific delegate class for GenericWindow
class OSWindow: public SkinObject class OSWindow: public SkinObject
{ {
public: public:
virtual ~OSWindow() {} virtual ~OSWindow() { }
// Show the window // Show the window
virtual void show() const = 0; virtual void show() const = 0;
...@@ -62,8 +62,8 @@ class OSWindow: public SkinObject ...@@ -62,8 +62,8 @@ class OSWindow: public SkinObject
/// reparent the window /// reparent the window
virtual void reparent( void* OSHandle, int x, int y, int w, int h ) = 0; virtual void reparent( void* OSHandle, int x, int y, int w, int h ) = 0;
protected: protected:
OSWindow( intf_thread_t *pIntf ): SkinObject( pIntf ) {} OSWindow( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef POPUP_HPP #ifndef POPUP_HPP
...@@ -39,9 +39,9 @@ class EvtMenu; ...@@ -39,9 +39,9 @@ class EvtMenu;
/// Class handling a popup menu /// Class handling a popup menu
class Popup: public SkinObject class Popup: public SkinObject
{ {
public: public:
Popup( intf_thread_t *pIntf, WindowManager &rWindowManager ); Popup( intf_thread_t *pIntf, WindowManager &rWindowManager );
virtual ~Popup() {} virtual ~Popup() { }
void show( int xPos, int yPos ); void show( int xPos, int yPos );
void hide(); void hide();
...@@ -57,7 +57,7 @@ class Popup: public SkinObject ...@@ -57,7 +57,7 @@ class Popup: public SkinObject
/// Execute the action corresponding to the chosen menu item /// Execute the action corresponding to the chosen menu item
void handleEvent( const EvtMenu &rEvent ); void handleEvent( const EvtMenu &rEvent );
private: private:
/// OS specific implementation /// OS specific implementation
OSPopup *m_pOsPopup; OSPopup *m_pOsPopup;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef SCALED_BITMAP_HPP #ifndef SCALED_BITMAP_HPP
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
/// Class for scaling bitmaps /// Class for scaling bitmaps
class ScaledBitmap: public GenericBitmap class ScaledBitmap: public GenericBitmap
{ {
public: public:
/// Create a scaled bitmap from the given bitmap and size /// Create a scaled bitmap from the given bitmap and size
ScaledBitmap( intf_thread_t *pIntf, const GenericBitmap &rBitmap, ScaledBitmap( intf_thread_t *pIntf, const GenericBitmap &rBitmap,
int width, int height ); int width, int height );
...@@ -48,7 +48,7 @@ class ScaledBitmap: public GenericBitmap ...@@ -48,7 +48,7 @@ class ScaledBitmap: public GenericBitmap
/// Each pixel is stored in 4 bytes in the order B,G,R,A /// Each pixel is stored in 4 bytes in the order B,G,R,A
virtual uint8_t *getData() const { return m_pData; } virtual uint8_t *getData() const { return m_pData; }
private: private:
/// Bitmap size /// Bitmap size
int m_width, m_height; int m_width, m_height;
/// Image data buffer /// Image data buffer
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifdef HAVE_CONFIG_H #ifdef HAVE_CONFIG_H
...@@ -158,15 +158,15 @@ struct intf_sys_t ...@@ -158,15 +158,15 @@ struct intf_sys_t
/// Base class for all skin classes /// Base class for all skin classes
class SkinObject class SkinObject
{ {
public: public:
SkinObject( intf_thread_t *pIntf ): m_pIntf( pIntf ) {} SkinObject( intf_thread_t *pIntf ): m_pIntf( pIntf ) { }
virtual ~SkinObject() {} virtual ~SkinObject() { }
/// Getter (public because it is used in C callbacks in the win32 /// Getter (public because it is used in C callbacks in the win32
/// interface) /// interface)
intf_thread_t *getIntf() const { return m_pIntf; } intf_thread_t *getIntf() const { return m_pIntf; }
private: private:
intf_thread_t *m_pIntf; intf_thread_t *m_pIntf;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef THEME_HPP #ifndef THEME_HPP
...@@ -45,12 +45,12 @@ class Interpreter; ...@@ -45,12 +45,12 @@ class Interpreter;
/// Class storing the data of the current theme /// Class storing the data of the current theme
class Theme: public SkinObject class Theme: public SkinObject
{ {
private: private:
friend class Builder; friend class Builder;
friend class Interpreter; friend class Interpreter;
public: public:
Theme( intf_thread_t *pIntf ): SkinObject( pIntf ), Theme( intf_thread_t *pIntf ): SkinObject( pIntf ),
m_windowManager( getIntf() ) {} m_windowManager( getIntf() ) { }
virtual ~Theme(); virtual ~Theme();
void loadConfig(); void loadConfig();
...@@ -66,7 +66,7 @@ class Theme: public SkinObject ...@@ -66,7 +66,7 @@ class Theme: public SkinObject
WindowManager &getWindowManager() { return m_windowManager; } WindowManager &getWindowManager() { return m_windowManager; }
private: private:
/// Store the bitmaps by ID /// Store the bitmaps by ID
map<string, GenericBitmapPtr> m_bitmaps; map<string, GenericBitmapPtr> m_bitmaps;
/// Store the fonts by ID /// Store the fonts by ID
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef THEME_LOADER_HPP #ifndef THEME_LOADER_HPP
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
class ThemeLoader: public SkinObject class ThemeLoader: public SkinObject
{ {
public: public:
ThemeLoader( intf_thread_t *pIntf ): SkinObject( pIntf ) {} ThemeLoader( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
virtual ~ThemeLoader() {} virtual ~ThemeLoader() { }
/// The expected fileName must be an UTF-8 string /// The expected fileName must be an UTF-8 string
bool load( const string &fileName ); bool load( const string &fileName );
private: private:
#if defined( HAVE_ZLIB_H ) #if defined( HAVE_ZLIB_H )
/// Extract files from an archive (handles tar.gz and zip) /// Extract files from an archive (handles tar.gz and zip)
/** /**
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef THEME_REPOSITORY_HPP #ifndef THEME_REPOSITORY_HPP
...@@ -30,7 +30,7 @@ ...@@ -30,7 +30,7 @@
/// Singleton object handling the list of available themes /// Singleton object handling the list of available themes
class ThemeRepository: public SkinObject class ThemeRepository: public SkinObject
{ {
public: public:
/// Get the instance of ThemeRepository /// Get the instance of ThemeRepository
/// Returns NULL if the initialization of the object failed /// Returns NULL if the initialization of the object failed
static ThemeRepository *instance( intf_thread_t *pIntf ); static ThemeRepository *instance( intf_thread_t *pIntf );
...@@ -38,13 +38,12 @@ class ThemeRepository: public SkinObject ...@@ -38,13 +38,12 @@ class ThemeRepository: public SkinObject
/// Delete the instance of ThemeRepository /// Delete the instance of ThemeRepository
static void destroy( intf_thread_t *pIntf ); static void destroy( intf_thread_t *pIntf );
protected: protected:
// Protected because it is a singleton // Protected because it is a singleton
ThemeRepository( intf_thread_t *pIntf ); ThemeRepository( intf_thread_t *pIntf );
virtual ~ThemeRepository(); virtual ~ThemeRepository();
private: private:
/// Look for themes in a directory /// Look for themes in a directory
void parseDirectory( const string &rDir ); void parseDirectory( const string &rDir );
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef TOOLTIP_HPP #ifndef TOOLTIP_HPP
...@@ -37,7 +37,7 @@ class UString; ...@@ -37,7 +37,7 @@ class UString;
class Tooltip: public SkinObject, public Observer<VarText> class Tooltip: public SkinObject, public Observer<VarText>
{ {
public: public:
/// Create a tooltip with the given font and delay (in milliseconds) /// Create a tooltip with the given font and delay (in milliseconds)
Tooltip( intf_thread_t *pIntf, const GenericFont &rFont, int delay ); Tooltip( intf_thread_t *pIntf, const GenericFont &rFont, int delay );
...@@ -50,7 +50,7 @@ class Tooltip: public SkinObject, public Observer<VarText> ...@@ -50,7 +50,7 @@ class Tooltip: public SkinObject, public Observer<VarText>
/// display /// display
void hide(); void hide();
private: private:
/// Font /// Font
const GenericFont &m_rFont; const GenericFont &m_rFont;
/// Delay before popping the tooltip /// Delay before popping the tooltip
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef TOP_WINDOW_HPP #ifndef TOP_WINDOW_HPP
...@@ -39,9 +39,9 @@ class WindowManager; ...@@ -39,9 +39,9 @@ class WindowManager;
/// Class to handle top-level windows /// Class to handle top-level windows
class TopWindow: public GenericWindow class TopWindow: public GenericWindow
{ {
private: private:
friend class WindowManager; friend class WindowManager;
public: public:
TopWindow( intf_thread_t *pIntf, int xPos, int yPos, TopWindow( intf_thread_t *pIntf, int xPos, int yPos,
WindowManager &rWindowManager, WindowManager &rWindowManager,
bool dragDrop, bool playOnDrop, bool visible ); bool dragDrop, bool playOnDrop, bool visible );
...@@ -84,14 +84,14 @@ class TopWindow: public GenericWindow ...@@ -84,14 +84,14 @@ class TopWindow: public GenericWindow
/// Get the initial visibility status /// Get the initial visibility status
bool isVisible() const { return m_visible; } bool isVisible() const { return m_visible; }
protected: protected:
/// Actually show the window /// Actually show the window
virtual void innerShow(); virtual void innerShow();
/// Actually hide the window /// Actually hide the window
virtual void innerHide(); virtual void innerHide();
private: private:
/** /**
* These methods are only used by the window manager * These methods are only used by the window manager
*/ */
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VAR_MANAGER_HPP #ifndef VAR_MANAGER_HPP
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
class VarManager: public SkinObject class VarManager: public SkinObject
{ {
public: public:
/// Get the instance of VarManager /// Get the instance of VarManager
static VarManager *instance( intf_thread_t *pIntf ); static VarManager *instance( intf_thread_t *pIntf );
...@@ -63,7 +63,7 @@ class VarManager: public SkinObject ...@@ -63,7 +63,7 @@ class VarManager: public SkinObject
/// Get a constant value by its name /// Get a constant value by its name
string getConst( const string &rName ); string getConst( const string &rName );
private: private:
/// Tooltip text /// Tooltip text
VarText *m_pTooltipText; VarText *m_pTooltipText;
/// Help text /// Help text
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VLCPROC_HPP #ifndef VLCPROC_HPP
...@@ -48,7 +48,7 @@ struct vout_window_t; ...@@ -48,7 +48,7 @@ struct vout_window_t;
/// Singleton object handling VLC internal state and playlist /// Singleton object handling VLC internal state and playlist
class VlcProc: public SkinObject class VlcProc: public SkinObject
{ {
public: public:
/// Get the instance of VlcProc /// Get the instance of VlcProc
/// Returns NULL if the initialization of the object failed /// Returns NULL if the initialization of the object failed
static VlcProc *instance( intf_thread_t *pIntf ); static VlcProc *instance( intf_thread_t *pIntf );
...@@ -103,12 +103,12 @@ class VlcProc: public SkinObject ...@@ -103,12 +103,12 @@ class VlcProc: public SkinObject
void on_volume_changed( vlc_object_t* p_obj, vlc_value_t newVal ); 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 ); void on_audio_filter_changed( vlc_object_t* p_obj, vlc_value_t newVal );
protected: protected:
// Protected because it is a singleton // Protected because it is a singleton
VlcProc( intf_thread_t *pIntf ); VlcProc( intf_thread_t *pIntf );
virtual ~VlcProc(); virtual ~VlcProc();
private: private:
/// Timer to call manage() regularly (via doManage()) /// Timer to call manage() regularly (via doManage())
OSTimer *m_pTimer; OSTimer *m_pTimer;
/// Playtree variable /// Playtree variable
...@@ -209,21 +209,6 @@ class VlcProc: public SkinObject ...@@ -209,21 +209,6 @@ class VlcProc: public SkinObject
vlc_value_t oldVal, vlc_value_t newVal, vlc_value_t oldVal, vlc_value_t newVal,
void *pParam ); 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 /// Generic Callback
static int onGenericCallback( vlc_object_t *pObj, const char *pVariable, static int onGenericCallback( vlc_object_t *pObj, const char *pVariable,
vlc_value_t oldVal, vlc_value_t newVal, vlc_value_t oldVal, vlc_value_t newVal,
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VOUTMANAGER_HPP #ifndef VOUTMANAGER_HPP
...@@ -41,11 +41,10 @@ class SavedWnd ...@@ -41,11 +41,10 @@ class SavedWnd
{ {
public: public:
SavedWnd( vout_window_t* pWnd, VoutWindow* pVoutWindow = NULL, SavedWnd( vout_window_t* pWnd, VoutWindow* pVoutWindow = NULL,
CtrlVideo* pCtrlVideo = NULL, int height = 0, int width = 0 ) : CtrlVideo* pCtrlVideo = NULL, int height = 0, int width = 0 )
pWnd( pWnd ), pVoutWindow( pVoutWindow ), pCtrlVideo( pCtrlVideo ), : pWnd( pWnd ), pVoutWindow( pVoutWindow ),
height( height ), width( width ) {} pCtrlVideo( pCtrlVideo ), height( height ), width( width ) { }
~SavedWnd() { }
~SavedWnd() {}
vout_window_t* pWnd; vout_window_t* pWnd;
VoutWindow *pVoutWindow; VoutWindow *pVoutWindow;
...@@ -56,7 +55,7 @@ public: ...@@ -56,7 +55,7 @@ public:
class VoutMainWindow: public GenericWindow class VoutMainWindow: public GenericWindow
{ {
public: public:
VoutMainWindow( intf_thread_t *pIntf, int left = 0, int top = 0 ) : VoutMainWindow( intf_thread_t *pIntf, int left = 0, int top = 0 ) :
GenericWindow( pIntf, left, top, false, false, NULL ) GenericWindow( pIntf, left, top, false, false, NULL )
...@@ -64,15 +63,14 @@ class VoutMainWindow: public GenericWindow ...@@ -64,15 +63,14 @@ class VoutMainWindow: public GenericWindow
resize( 10, 10 ); resize( 10, 10 );
move( -50, -50 ); move( -50, -50 );
} }
virtual ~VoutMainWindow() {} virtual ~VoutMainWindow() { }
}; };
/// Singleton object handling VLC internal state and playlist /// Singleton object handling VLC internal state and playlist
class VoutManager: public SkinObject class VoutManager: public SkinObject
{ {
public: public:
/// Get the instance of VoutManager /// Get the instance of VoutManager
/// Returns NULL if the initialization of the object failed /// Returns NULL if the initialization of the object failed
static VoutManager *instance( intf_thread_t *pIntf ); static VoutManager *instance( intf_thread_t *pIntf );
...@@ -122,12 +120,12 @@ class VoutManager: public SkinObject ...@@ -122,12 +120,12 @@ class VoutManager: public SkinObject
// test if vout are running // test if vout are running
bool hasVout() { return ( m_SavedWndVec.size() != 0 ) ; } bool hasVout() { return ( m_SavedWndVec.size() != 0 ) ; }
protected: protected:
// Protected because it is a singleton // Protected because it is a singleton
VoutManager( intf_thread_t *pIntf ); VoutManager( intf_thread_t *pIntf );
virtual ~VoutManager(); virtual ~VoutManager();
private: private:
vector<CtrlVideo *> m_pCtrlVideoVec; vector<CtrlVideo *> m_pCtrlVideoVec;
vector<CtrlVideo *> m_pCtrlVideoVecBackup; vector<CtrlVideo *> m_pCtrlVideoVecBackup;
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VOUT_WINDOW_HPP #ifndef VOUT_WINDOW_HPP
...@@ -34,7 +34,7 @@ class CtrlVideo; ...@@ -34,7 +34,7 @@ class CtrlVideo;
/// Class to handle a video output window /// Class to handle a video output window
class VoutWindow: private GenericWindow class VoutWindow: private GenericWindow
{ {
public: public:
VoutWindow( intf_thread_t *pIntf, vout_window_t* pWnd, VoutWindow( intf_thread_t *pIntf, vout_window_t* pWnd,
int width, int height, GenericWindow* pParent = NULL ); int width, int height, GenericWindow* pParent = NULL );
...@@ -76,7 +76,7 @@ class VoutWindow: private GenericWindow ...@@ -76,7 +76,7 @@ class VoutWindow: private GenericWindow
virtual string getType() const { return "Vout"; } virtual string getType() const { return "Vout"; }
private: private:
/// vout thread /// vout thread
vout_window_t* m_pWnd; vout_window_t* m_pWnd;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef WINDOW_MANAGER_HPP #ifndef WINDOW_MANAGER_HPP
...@@ -44,7 +44,7 @@ class Popup; ...@@ -44,7 +44,7 @@ class Popup;
/// Window manager for skin windows /// Window manager for skin windows
class WindowManager: public SkinObject class WindowManager: public SkinObject
{ {
public: public:
/// Direction of the resizing /// Direction of the resizing
enum Direction_t enum Direction_t
{ {
...@@ -53,11 +53,7 @@ class WindowManager: public SkinObject ...@@ -53,11 +53,7 @@ class WindowManager: public SkinObject
kResizeS, // South kResizeS, // South
kNone // Reserved for internal use kNone // Reserved for internal use
}; };
WindowManager( intf_thread_t *pIntf );
/// Constructor
WindowManager( intf_thread_t *pIntf);
/// Destructor
virtual ~WindowManager(); virtual ~WindowManager();
/** /**
...@@ -163,7 +159,7 @@ class WindowManager: public SkinObject ...@@ -163,7 +159,7 @@ class WindowManager: public SkinObject
/// Return the active popup, or NULL if none is active /// Return the active popup, or NULL if none is active
Popup * getActivePopup() const { return m_pPopup; } Popup * getActivePopup() const { return m_pPopup; }
private: private:
/// Some useful typedefs for lazy people like me /// Some useful typedefs for lazy people like me
typedef set<TopWindow*> WinSet_t; typedef set<TopWindow*> WinSet_t;
typedef list<Anchor*> AncList_t; typedef list<Anchor*> AncList_t;
...@@ -223,8 +219,7 @@ class WindowManager: public SkinObject ...@@ -223,8 +219,7 @@ class WindowManager: public SkinObject
* This function updates xOffset and yOffset, to take care of a new * This function updates xOffset and yOffset, to take care of a new
* anchoring (if any) * anchoring (if any)
*/ */
void checkAnchors( TopWindow *pWindow, void checkAnchors( TopWindow *pWindow, int &xOffset, int &yOffset ) const;
int &xOffset, int &yOffset ) const;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef BEZIER_HPP #ifndef BEZIER_HPP
...@@ -35,7 +35,7 @@ ...@@ -35,7 +35,7 @@
/// Class for Bezier curves /// Class for Bezier curves
class Bezier: public SkinObject class Bezier: public SkinObject
{ {
public: public:
/// Values to indicate which coordinate(s) must be checked to consider /// Values to indicate which coordinate(s) must be checked to consider
/// that two points are distinct /// that two points are distinct
enum Flag_t enum Flag_t
...@@ -49,7 +49,7 @@ class Bezier: public SkinObject ...@@ -49,7 +49,7 @@ class Bezier: public SkinObject
const vector<float> &pAbscissas, const vector<float> &pAbscissas,
const vector<float> &pOrdinates, const vector<float> &pOrdinates,
Flag_t flag = kCoordsBoth ); Flag_t flag = kCoordsBoth );
~Bezier() {} ~Bezier() { }
/// Get the number of control points used to define the curve /// Get the number of control points used to define the curve
int getNbCtrlPoints() const { return m_nbCtrlPt; } int getNbCtrlPoints() const { return m_nbCtrlPt; }
...@@ -73,7 +73,7 @@ class Bezier: public SkinObject ...@@ -73,7 +73,7 @@ class Bezier: public SkinObject
/// Get the height (maximum ordinate) of the curve /// Get the height (maximum ordinate) of the curve
int getHeight() const; int getHeight() const;
private: private:
/// Number of control points /// Number of control points
int m_nbCtrlPt; int m_nbCtrlPt;
/// vectors containing the coordinates of the control points /// vectors containing the coordinates of the control points
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef FSM_HPP #ifndef FSM_HPP
...@@ -37,9 +37,9 @@ class CmdGeneric; ...@@ -37,9 +37,9 @@ class CmdGeneric;
/// This class implements a Finite State Machine (FSM) /// This class implements a Finite State Machine (FSM)
class FSM: public SkinObject class FSM: public SkinObject
{ {
public: public:
FSM( intf_thread_t *pIntf ): SkinObject( pIntf ) {} FSM( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
virtual ~FSM() {} virtual ~FSM() { }
/// Add a state to the machine /// Add a state to the machine
void addState( const string &state ); void addState( const string &state );
...@@ -59,7 +59,7 @@ class FSM: public SkinObject ...@@ -59,7 +59,7 @@ class FSM: public SkinObject
/// change the state, and call the associated callback (if any). /// change the state, and call the associated callback (if any).
void handleTransition( const string &event ); void handleTransition( const string &event );
private: private:
/// A Key_t contains the initial state of a transition, and a string /// A Key_t contains the initial state of a transition, and a string
/// characterizing an event (for example: "mouse:left:down:ctrl") /// characterizing an event (for example: "mouse:left:down:ctrl")
typedef pair<string, string> Key_t; typedef pair<string, string> Key_t;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef OBSERVER_HPP #ifndef OBSERVER_HPP
...@@ -34,8 +34,8 @@ template <class S, class ARG> class Observer; ...@@ -34,8 +34,8 @@ template <class S, class ARG> class Observer;
/// Template for subjects in the Observer design pattern /// Template for subjects in the Observer design pattern
template <class S, class ARG = void> class Subject template <class S, class ARG = void> class Subject
{ {
public: public:
virtual ~Subject() {} virtual ~Subject() { }
/// Remove all observers; should only be used for debugging purposes /// Remove all observers; should only be used for debugging purposes
virtual void clearObservers() virtual void clearObservers()
...@@ -77,10 +77,10 @@ template <class S, class ARG = void> class Subject ...@@ -77,10 +77,10 @@ template <class S, class ARG = void> class Subject
/// Notify without any argument /// Notify without any argument
virtual void notify() { notify( NULL ); } virtual void notify() { notify( NULL ); }
protected: protected:
Subject() {} Subject() { }
private: private:
/// Set of observers for this subject /// Set of observers for this subject
set<Observer<S, ARG>*> m_observers; set<Observer<S, ARG>*> m_observers;
}; };
...@@ -89,14 +89,14 @@ template <class S, class ARG = void> class Subject ...@@ -89,14 +89,14 @@ template <class S, class ARG = void> class Subject
/// Template for observers in the Observer design pattern /// Template for observers in the Observer design pattern
template <class S, class ARG = void> class Observer template <class S, class ARG = void> class Observer
{ {
public: public:
virtual ~Observer() {} virtual ~Observer() { }
/// Method called when the subject is modified /// Method called when the subject is modified
virtual void onUpdate( Subject<S, ARG> &rSubject, ARG *arg) = 0; virtual void onUpdate( Subject<S, ARG> &rSubject, ARG *arg) = 0;
protected: protected:
Observer() {} Observer() { }
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef POINTER_HPP #ifndef POINTER_HPP
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
/// Reference couting pointer /// Reference couting pointer
template <class T> class CountedPtr template <class T> class CountedPtr
{ {
public: public:
explicit CountedPtr( T *pPtr = 0 ): m_pCounter( 0 ) explicit CountedPtr( T *pPtr = 0 ): m_pCounter( 0 )
{ {
if( pPtr ) m_pCounter = new Counter( pPtr ); if( pPtr ) m_pCounter = new Counter( pPtr );
...@@ -60,11 +60,11 @@ template <class T> class CountedPtr ...@@ -60,11 +60,11 @@ template <class T> class CountedPtr
return ( m_pCounter ? m_pCounter->m_count == 1 : true ); return ( m_pCounter ? m_pCounter->m_count == 1 : true );
} }
private: private:
struct Counter struct Counter
{ {
Counter( T* pPtr = 0, unsigned int c = 1 ): Counter( T* pPtr = 0, unsigned int c = 1 )
m_pPtr( pPtr ), m_count( c ) {} : m_pPtr( pPtr ), m_count( c ) { }
T* m_pPtr; T* m_pPtr;
unsigned int m_count; unsigned int m_count;
} *m_pCounter; } *m_pCounter;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef POSITION_HPP #ifndef POSITION_HPP
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
/// Interface for rectangular objects /// Interface for rectangular objects
class Box class Box
{ {
public: public:
virtual ~Box() {} virtual ~Box() { }
/// Get the size of the box /// Get the size of the box
virtual int getWidth() const = 0; virtual int getWidth() const = 0;
...@@ -45,7 +45,7 @@ class Box ...@@ -45,7 +45,7 @@ class Box
/// Interface for rectangular objects with a position /// Interface for rectangular objects with a position
class GenericRect: public Box class GenericRect: public Box
{ {
public: public:
virtual int getLeft() const = 0; virtual int getLeft() const = 0;
virtual int getTop() const = 0; virtual int getTop() const = 0;
}; };
...@@ -54,7 +54,7 @@ class GenericRect: public Box ...@@ -54,7 +54,7 @@ class GenericRect: public Box
/// Characterization of a rectangle /// Characterization of a rectangle
class SkinsRect: public GenericRect class SkinsRect: public GenericRect
{ {
public: public:
SkinsRect( int left, int top, int right, int bottom ); SkinsRect( int left, int top, int right, int bottom );
virtual int getLeft() const { return m_left; } virtual int getLeft() const { return m_left; }
...@@ -64,7 +64,7 @@ class SkinsRect: public GenericRect ...@@ -64,7 +64,7 @@ class SkinsRect: public GenericRect
virtual int getWidth() const { return m_right - m_left; } virtual int getWidth() const { return m_right - m_left; }
virtual int getHeight() const { return m_bottom - m_top; } virtual int getHeight() const { return m_bottom - m_top; }
private: private:
int m_left; int m_left;
int m_top; int m_top;
int m_right; int m_right;
...@@ -75,13 +75,13 @@ class SkinsRect: public GenericRect ...@@ -75,13 +75,13 @@ class SkinsRect: public GenericRect
/// Relative position of a rectangle in a box /// Relative position of a rectangle in a box
/** /**
* Note: Even if the object is tied to its direct container rectangle, the * Note: Even if the object is tied to its direct container rectangle, the
* coordinates returned by getLeft(), getTop(), getRight() and getBottom() are * coordinates returned by getLeft(), getTop(), getRight() and getBottom()
* not relative to the direct container (which is usually a panel or the layout) * are not relative to the direct container (which is usually a panel or
* but to the root container (i.e. the layout). * the layout) but to the root container (i.e. the layout).
*/ */
class Position: public GenericRect class Position: public GenericRect
{ {
public: public:
/// Type for reference edge/corner /// Type for reference edge/corner
enum Ref_t enum Ref_t
{ {
...@@ -101,7 +101,7 @@ class Position: public GenericRect ...@@ -101,7 +101,7 @@ class Position: public GenericRect
Ref_t refLeftTop, Ref_t refRightBottom, Ref_t refLeftTop, Ref_t refRightBottom,
bool xKeepRatio, bool yKeepRatio ); bool xKeepRatio, bool yKeepRatio );
~Position() {} ~Position() { }
/// Get the position relative to the left top corner of the box /// Get the position relative to the left top corner of the box
virtual int getLeft() const; virtual int getLeft() const;
...@@ -115,7 +115,7 @@ class Position: public GenericRect ...@@ -115,7 +115,7 @@ class Position: public GenericRect
Ref_t getRefLeftTop() const { return m_refLeftTop; } Ref_t getRefLeftTop() const { return m_refLeftTop; }
Ref_t getRefRightBottom() const { return m_refRighBottom; } Ref_t getRefRightBottom() const { return m_refRighBottom; }
private: private:
/// Position and reference edge/corner /// Position and reference edge/corner
int m_left; int m_left;
int m_top; int m_top;
...@@ -139,10 +139,10 @@ typedef CountedPtr<Position> PositionPtr; ...@@ -139,10 +139,10 @@ typedef CountedPtr<Position> PositionPtr;
/// Variable implementing the Box interface /// Variable implementing the Box interface
class VarBox: public Variable, public Box, public Subject<VarBox> class VarBox: public Variable, public Box, public Subject<VarBox>
{ {
public: public:
VarBox( intf_thread_t *pIntf, int width = 0, int height = 0 ); VarBox( intf_thread_t *pIntf, int width = 0, int height = 0 );
virtual ~VarBox() {} virtual ~VarBox() { }
/// Get the variable type /// Get the variable type
virtual const string &getType() const { return m_type; } virtual const string &getType() const { return m_type; }
...@@ -154,7 +154,7 @@ class VarBox: public Variable, public Box, public Subject<VarBox> ...@@ -154,7 +154,7 @@ class VarBox: public Variable, public Box, public Subject<VarBox>
/// Change the size of the box /// Change the size of the box
void setSize( int width, int height ); void setSize( int width, int height );
private: private:
/// Variable type /// Variable type
static const string m_type; static const string m_type;
/// Size /// Size
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef USTRING_HPP #ifndef USTRING_HPP
...@@ -32,7 +32,7 @@ ...@@ -32,7 +32,7 @@
// Class for UNICODE strings handling // Class for UNICODE strings handling
class UString: public SkinObject class UString: public SkinObject
{ {
public: public:
static const uint32_t npos; static const uint32_t npos;
/// Copy constructor /// Copy constructor
...@@ -85,7 +85,7 @@ class UString: public SkinObject ...@@ -85,7 +85,7 @@ class UString: public SkinObject
/// Build a string from an integer /// Build a string from an integer
static UString fromInt(intf_thread_t *pIntf, int number); static UString fromInt(intf_thread_t *pIntf, int number);
private: private:
/// Unicode string /// Unicode string
uint32_t *m_pString; uint32_t *m_pString;
/// String length /// String length
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VAR_BOOL_HPP #ifndef VAR_BOOL_HPP
...@@ -32,18 +32,18 @@ ...@@ -32,18 +32,18 @@
/// Interface for read-only boolean variable /// Interface for read-only boolean variable
class VarBool: public Variable, public Subject<VarBool> class VarBool: public Variable, public Subject<VarBool>
{ {
public: public:
/// Get the variable type /// Get the variable type
virtual const string &getType() const { return m_type; } virtual const string &getType() const { return m_type; }
/// Get the boolean value /// Get the boolean value
virtual bool get() const = 0; virtual bool get() const = 0;
protected: protected:
VarBool( intf_thread_t *pIntf ): Variable( pIntf ) {} VarBool( intf_thread_t *pIntf ): Variable( pIntf ) { }
virtual ~VarBool() {} virtual ~VarBool() { }
private: private:
/// Variable type /// Variable type
static const string m_type; static const string m_type;
}; };
...@@ -52,9 +52,9 @@ class VarBool: public Variable, public Subject<VarBool> ...@@ -52,9 +52,9 @@ class VarBool: public Variable, public Subject<VarBool>
/// Constant true VarBool /// Constant true VarBool
class VarBoolTrue: public VarBool class VarBoolTrue: public VarBool
{ {
public: public:
VarBoolTrue( intf_thread_t *pIntf ): VarBool( pIntf ) {} VarBoolTrue( intf_thread_t *pIntf ): VarBool( pIntf ) { }
virtual ~VarBoolTrue() {} virtual ~VarBoolTrue() { }
virtual bool get() const { return true; } virtual bool get() const { return true; }
}; };
...@@ -62,9 +62,9 @@ class VarBoolTrue: public VarBool ...@@ -62,9 +62,9 @@ class VarBoolTrue: public VarBool
/// Constant false VarBool /// Constant false VarBool
class VarBoolFalse: public VarBool class VarBoolFalse: public VarBool
{ {
public: public:
VarBoolFalse( intf_thread_t *pIntf ): VarBool( pIntf ) {} VarBoolFalse( intf_thread_t *pIntf ): VarBool( pIntf ) { }
virtual ~VarBoolFalse() {} virtual ~VarBoolFalse() { }
virtual bool get() const { return false; } virtual bool get() const { return false; }
}; };
...@@ -72,9 +72,9 @@ class VarBoolFalse: public VarBool ...@@ -72,9 +72,9 @@ class VarBoolFalse: public VarBool
/// Boolean variable implementation (read/write) /// Boolean variable implementation (read/write)
class VarBoolImpl: public VarBool class VarBoolImpl: public VarBool
{ {
public: public:
VarBoolImpl( intf_thread_t *pIntf ); VarBoolImpl( intf_thread_t *pIntf );
virtual ~VarBoolImpl() {} virtual ~VarBoolImpl() { }
// Get the boolean value // Get the boolean value
virtual bool get() const { return m_value; } virtual bool get() const { return m_value; }
...@@ -82,7 +82,7 @@ class VarBoolImpl: public VarBool ...@@ -82,7 +82,7 @@ class VarBoolImpl: public VarBool
/// Set the internal value /// Set the internal value
virtual void set( bool value ); virtual void set( bool value );
private: private:
/// Boolean value /// Boolean value
bool m_value; bool m_value;
}; };
...@@ -91,17 +91,15 @@ class VarBoolImpl: public VarBool ...@@ -91,17 +91,15 @@ class VarBoolImpl: public VarBool
/// Conjunction of two boolean variables (AND) /// Conjunction of two boolean variables (AND)
class VarBoolAndBool: public VarBool, public Observer<VarBool> class VarBoolAndBool: public VarBool, public Observer<VarBool>
{ {
public: public:
VarBoolAndBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 ); VarBoolAndBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 );
virtual ~VarBoolAndBool(); virtual ~VarBoolAndBool();
// Get the boolean value
virtual bool get() const { return m_rVar1.get() && m_rVar2.get(); } virtual bool get() const { return m_rVar1.get() && m_rVar2.get(); }
// Called when one of the observed variables is changed // Called when one of the observed variables is changed
void onUpdate( Subject<VarBool> &rVariable, void* ); void onUpdate( Subject<VarBool> &rVariable, void* );
private: private:
/// Boolean variables /// Boolean variables
VarBool &m_rVar1, &m_rVar2; VarBool &m_rVar1, &m_rVar2;
}; };
...@@ -110,17 +108,15 @@ class VarBoolAndBool: public VarBool, public Observer<VarBool> ...@@ -110,17 +108,15 @@ class VarBoolAndBool: public VarBool, public Observer<VarBool>
/// Disjunction of two boolean variables (OR) /// Disjunction of two boolean variables (OR)
class VarBoolOrBool: public VarBool, public Observer<VarBool> class VarBoolOrBool: public VarBool, public Observer<VarBool>
{ {
public: public:
VarBoolOrBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 ); VarBoolOrBool( intf_thread_t *pIntf, VarBool &rVar1, VarBool &rVar2 );
virtual ~VarBoolOrBool(); virtual ~VarBoolOrBool();
// Get the boolean value
virtual bool get() const { return m_rVar1.get() || m_rVar2.get(); } virtual bool get() const { return m_rVar1.get() || m_rVar2.get(); }
// Called when one of the observed variables is changed // Called when one of the observed variables is changed
void onUpdate( Subject<VarBool> &rVariable, void* ); void onUpdate( Subject<VarBool> &rVariable, void* );
private: private:
/// Boolean variables /// Boolean variables
VarBool &m_rVar1, &m_rVar2; VarBool &m_rVar1, &m_rVar2;
}; };
...@@ -129,17 +125,15 @@ class VarBoolOrBool: public VarBool, public Observer<VarBool> ...@@ -129,17 +125,15 @@ class VarBoolOrBool: public VarBool, public Observer<VarBool>
/// Negation of a boolean variable (NOT) /// Negation of a boolean variable (NOT)
class VarNotBool: public VarBool, public Observer<VarBool> class VarNotBool: public VarBool, public Observer<VarBool>
{ {
public: public:
VarNotBool( intf_thread_t *pIntf, VarBool &rVar ); VarNotBool( intf_thread_t *pIntf, VarBool &rVar );
virtual ~VarNotBool(); virtual ~VarNotBool();
// Get the boolean value
virtual bool get() const { return !m_rVar.get(); } virtual bool get() const { return !m_rVar.get(); }
// Called when the observed variable is changed // Called when the observed variable is changed
void onUpdate( Subject<VarBool> &rVariable, void* ); void onUpdate( Subject<VarBool> &rVariable, void* );
private: private:
/// Boolean variable /// Boolean variable
VarBool &m_rVar; VarBool &m_rVar;
}; };
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VAR_LIST_HPP #ifndef VAR_LIST_HPP
...@@ -36,7 +36,7 @@ ...@@ -36,7 +36,7 @@
/// List variable /// List variable
class VarList: public Variable, public Subject<VarList> class VarList: public Variable, public Subject<VarList>
{ {
public: public:
VarList( intf_thread_t *pIntf ); VarList( intf_thread_t *pIntf );
virtual ~VarList(); virtual ~VarList();
...@@ -62,10 +62,10 @@ class VarList: public Variable, public Subject<VarList> ...@@ -62,10 +62,10 @@ class VarList: public Variable, public Subject<VarList>
bool m_selected; bool m_selected;
bool m_playing; bool m_playing;
Elem_t( const UStringPtr &rcString, bool selected = false, bool Elem_t( const UStringPtr &rcString,
playing = false ): bool selected = false, bool playing = false )
m_cString( rcString ), m_selected( selected ), : m_cString( rcString ),
m_playing( playing) {} m_selected( selected ), m_playing( playing ) { }
}; };
/// Iterators /// Iterators
...@@ -85,7 +85,7 @@ class VarList: public Variable, public Subject<VarList> ...@@ -85,7 +85,7 @@ class VarList: public Variable, public Subject<VarList>
ConstIterator operator[]( int n ) const; ConstIterator operator[]( int n ) const;
/// Execute the action associated to this item /// 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 /// Get a reference on the position variable
VarPercent &getPositionVar() const VarPercent &getPositionVar() const
...@@ -94,11 +94,11 @@ class VarList: public Variable, public Subject<VarList> ...@@ -94,11 +94,11 @@ class VarList: public Variable, public Subject<VarList>
/// Get a counted pointer on the position variable /// Get a counted pointer on the position variable
const VariablePtr &getPositionVarPtr() const { return m_cPosition; } const VariablePtr &getPositionVarPtr() const { return m_cPosition; }
protected: protected:
/// List of elements /// List of elements
list<Elem_t> m_list; list<Elem_t> m_list;
private: private:
/// Variable type /// Variable type
static const string m_type; static const string m_type;
/// Position variable /// Position variable
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VAR_PERCENT_HPP #ifndef VAR_PERCENT_HPP
...@@ -34,9 +34,9 @@ class VarPercent; ...@@ -34,9 +34,9 @@ class VarPercent;
/// Percentage variable /// Percentage variable
class VarPercent: public Variable, public Subject<VarPercent> class VarPercent: public Variable, public Subject<VarPercent>
{ {
public: public:
VarPercent( intf_thread_t *pIntf ): Variable( pIntf ), m_value( 0 ) {} VarPercent( intf_thread_t *pIntf ): Variable( pIntf ), m_value( 0 ) { }
virtual ~VarPercent() {} virtual ~VarPercent() { }
/// Get the variable type /// Get the variable type
virtual const string &getType() const { return m_type; } virtual const string &getType() const { return m_type; }
...@@ -45,7 +45,7 @@ class VarPercent: public Variable, public Subject<VarPercent> ...@@ -45,7 +45,7 @@ class VarPercent: public Variable, public Subject<VarPercent>
virtual void set( float percentage ); virtual void set( float percentage );
virtual float get() const { return m_value; } virtual float get() const { return m_value; }
private: private:
/// Variable type /// Variable type
static const string m_type; static const string m_type;
/// Percent value /// Percent value
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VAR_TEXT_HPP #ifndef VAR_TEXT_HPP
...@@ -36,7 +36,7 @@ class VarText: public Variable, public Subject<VarText>, ...@@ -36,7 +36,7 @@ class VarText: public Variable, public Subject<VarText>,
public Observer<VarPercent>, public Observer<VarPercent>,
public Observer<VarText> public Observer<VarText>
{ {
public: public:
// Set substVars to true to replace "$X" variables in the text // Set substVars to true to replace "$X" variables in the text
VarText( intf_thread_t *pIntf, bool substVars = true ); VarText( intf_thread_t *pIntf, bool substVars = true );
virtual ~VarText(); virtual ~VarText();
...@@ -52,7 +52,7 @@ class VarText: public Variable, public Subject<VarText>, ...@@ -52,7 +52,7 @@ class VarText: public Variable, public Subject<VarText>,
virtual void onUpdate( Subject<VarPercent> &rVariable, void* ); virtual void onUpdate( Subject<VarPercent> &rVariable, void* );
virtual void onUpdate( Subject<VarText> &rVariable, void* ); virtual void onUpdate( Subject<VarText> &rVariable, void* );
private: private:
/// Stop observing other variables /// Stop observing other variables
void delObservers(); void delObservers();
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VAR_TREE_HPP #ifndef VAR_TREE_HPP
...@@ -45,7 +45,7 @@ typedef struct tree_update ...@@ -45,7 +45,7 @@ typedef struct tree_update
/// Tree variable /// Tree variable
class VarTree: public Variable, public Subject<VarTree, tree_update> class VarTree: public Variable, public Subject<VarTree, tree_update>
{ {
public: public:
VarTree( intf_thread_t *pIntf ); VarTree( intf_thread_t *pIntf );
VarTree( intf_thread_t *pIntf, VarTree *pParent, int id, VarTree( intf_thread_t *pIntf, VarTree *pParent, int id,
...@@ -129,7 +129,7 @@ class VarTree: public Variable, public Subject<VarTree, tree_update> ...@@ -129,7 +129,7 @@ class VarTree: public Variable, public Subject<VarTree, tree_update>
} }
/// Execute the action associated to this item /// Execute the action associated to this item
virtual void action( VarTree *pItem ) {} virtual void action( VarTree *pItem ) { }
/// Get a reference on the position variable /// Get a reference on the position variable
VarPercent &getPositionVar() const VarPercent &getPositionVar() const
...@@ -138,7 +138,8 @@ class VarTree: public Variable, public Subject<VarTree, tree_update> ...@@ -138,7 +138,8 @@ class VarTree: public Variable, public Subject<VarTree, tree_update>
/// Get a counted pointer on the position variable /// Get a counted pointer on the position variable
const VariablePtr &getPositionVarPtr() const { return m_cPosition; } 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(); int visibleItems();
/// Count the number of leafs in the tree /// Count the number of leafs in the tree
...@@ -185,7 +186,7 @@ class VarTree: public Variable, public Subject<VarTree, tree_update> ...@@ -185,7 +186,7 @@ class VarTree: public Variable, public Subject<VarTree, tree_update>
} }
private: private:
/// List of children /// List of children
list<VarTree> m_children; list<VarTree> m_children;
......
...@@ -17,9 +17,9 @@ ...@@ -17,9 +17,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef VARIABLE_HPP #ifndef VARIABLE_HPP
...@@ -33,14 +33,14 @@ ...@@ -33,14 +33,14 @@
/// Base class for variable objects /// Base class for variable objects
class Variable: public SkinObject class Variable: public SkinObject
{ {
public: public:
virtual ~Variable() {} virtual ~Variable() { }
/// Get the variable type /// Get the variable type
virtual const string &getType() const = 0; virtual const string &getType() const = 0;
protected: protected:
Variable( intf_thread_t *pIntf ): SkinObject( pIntf ) {} Variable( intf_thread_t *pIntf ): SkinObject( pIntf ) { }
}; };
......
...@@ -16,9 +16,9 @@ ...@@ -16,9 +16,9 @@
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License along
* along with this program; if not, write to the Free Software * with this program; if not, write to the Free Software Foundation, Inc.,
* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA. * 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/ *****************************************************************************/
#ifndef EQUALIZER_HPP #ifndef EQUALIZER_HPP
...@@ -31,7 +31,7 @@ ...@@ -31,7 +31,7 @@
/// Variable for graphical equalizer /// Variable for graphical equalizer
class EqualizerBands: public SkinObject, public Observer<VarPercent> class EqualizerBands: public SkinObject, public Observer<VarPercent>
{ {
public: public:
/// Number of bands /// Number of bands
static const int kNbBands = 10; static const int kNbBands = 10;
...@@ -45,7 +45,7 @@ class EqualizerBands: public SkinObject, public Observer<VarPercent> ...@@ -45,7 +45,7 @@ class EqualizerBands: public SkinObject, public Observer<VarPercent>
/// Return the variable for a specific band /// Return the variable for a specific band
VariablePtr getBand( int band ); VariablePtr getBand( int band );
private: private:
/// Array of equalizer bands /// Array of equalizer bands
VariablePtr m_cBands[kNbBands]; VariablePtr m_cBands[kNbBands];
/// Flag set when an update is in progress /// Flag set when an update is in progress
...@@ -59,9 +59,9 @@ class EqualizerBands: public SkinObject, public Observer<VarPercent> ...@@ -59,9 +59,9 @@ class EqualizerBands: public SkinObject, public Observer<VarPercent>
/// Variable for equalizer preamp /// Variable for equalizer preamp
class EqualizerPreamp: public VarPercent class EqualizerPreamp: public VarPercent
{ {
public: public:
EqualizerPreamp( intf_thread_t *pIntf ); EqualizerPreamp( intf_thread_t *pIntf );
virtual ~EqualizerPreamp() {} virtual ~EqualizerPreamp() { }
virtual void set( float percentage, bool updateVLC ); virtual void set( float percentage, bool updateVLC );
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment