Removes trailing spaces. Removes tabs.

[vlc] / modules / gui / skins2 / x11 / x11_timer.hpp

diff --git a/modules/gui/skins2/x11/x11_timer.hpp b/modules/gui/skins2/x11/x11_timer.hpp
index 84564b60da3911303b091a5a82be1a4f4a0a5429..039f1b1bab6b499a3f1bb7d189406e17d69cf222 100644 (file)
--- a/modules/gui/skins2/x11/x11_timer.hpp
+++ b/modules/gui/skins2/x11/x11_timer.hpp
@@ -1,11 +1,11 @@
 /*****************************************************************************
  * x11_timer.hpp
  *****************************************************************************
- * Copyright (C) 2003 VideoLAN
- * $Id: x11_timer.hpp,v 1.1 2004/01/03 23:31:34 asmax Exp $
+ * Copyright (C) 2003 the VideoLAN team
+ * $Id$
  *
  * Authors: Cyril Deguet     <asmax@via.ecp.fr>
- *          Olivier Teulière <ipkiss@via.ecp.fr>
+ *          Olivier Teulière <ipkiss@via.ecp.fr>
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -19,7 +19,7 @@
  *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
  *****************************************************************************/
 
 #ifndef X11_TIMER_HPP
@@ -31,13 +31,14 @@
 
 // Forward declaration
 class X11TimerLoop;
+class CmdGeneric;
 
 
 // X11 specific timer
 class X11Timer: public OSTimer
 {
     public:
-        X11Timer( intf_thread_t *pIntf, const Callback &rCallback );
+        X11Timer( intf_thread_t *pIntf, CmdGeneric &rCmd );
         virtual ~X11Timer();
 
         /// (Re)start the timer with the given delay (in ms). If oneShot is
@@ -54,8 +55,8 @@ class X11Timer: public OSTimer
         bool execute();
 
     private:
-        /// Callback to execute
-        Callback m_callback;
+        /// Command to execute
+        CmdGeneric &m_rCommand;
         /// Timer loop
         X11TimerLoop *m_pTimerLoop;
         /// Delay between two execute