[Pingus-CVS] CVS: Games/Pingus/src/input/buttons double_button.cxx, 1.2, 1.3 double_button.hxx, 1.4, 1.5 joystick_button.cxx, 1.4, 1.5 joystick_button.hxx, 1.4, 1.5 key_button.cxx, 1.4, 1.5 key_button.hxx, 1.7, 1.8 mouse_button.cxx, 1.4, 1.5 mouse_button.hxx, 1.6, 1.7 multiple_button.cxx, 1.2, 1.3 multiple_button.hxx, 1.4, 1.5 triple_button.cxx, 1.2, 1.3 triple_button.hxx, 1.4, 1.5

[Ingo Ruhnke]

Update of /var/lib/cvs/Games/Pingus/src/input/buttons
In directory dark:/tmp/cvs-serv18306/input/buttons

Modified Files:
        double_button.cxx double_button.hxx joystick_button.cxx 
        joystick_button.hxx key_button.cxx key_button.hxx 
        mouse_button.cxx mouse_button.hxx multiple_button.cxx 
        multiple_button.hxx triple_button.cxx triple_button.hxx 
Log Message:
- some namespace and CL0.7 stuff

Index: double_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/double_button.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- double_button.cxx   19 Apr 2003 10:23:19 -0000      1.2
+++ double_button.cxx   20 Oct 2003 13:33:44 -0000      1.3
@@ -19,49 +19,50 @@
 
 #include "double_button.hxx"
 
+namespace Pingus {
 namespace Input {
+namespace Buttons {
 
-  namespace Buttons {
+DoubleButton::DoubleButton (Button* button1_, Button* button2_) : 
button1(button1_), button2(button2_),
+                                                                  
first_pressed(false), ignore_second(false)
+{
+}
 
-    DoubleButton::DoubleButton (Button* button1_, Button* button2_) : 
button1(button1_), button2(button2_),
-                                                                      
first_pressed(false), ignore_second(false)
-    {
-    }
+DoubleButton::~DoubleButton ()
+{
+  delete button1;
+  delete button2;
+}
 
-    DoubleButton::~DoubleButton ()
-    {
-      delete button1;
-      delete button2;
-    }
+void
+DoubleButton::update (float delta)
+{
+  button1->update(delta);
+  button2->update(delta);
 
-    void
-    DoubleButton::update (float delta)
+  if (button1->is_pressed())
     {
-      button1->update(delta);
-      button2->update(delta);
-
-      if (button1->is_pressed())
-        {
-          if (!first_pressed)
-            {
-             first_pressed = true;
-             ignore_second = button2->is_pressed();
-           }
-        }
-      else
+      if (!first_pressed)
         {
-          first_pressed = false;
-         ignore_second = true;
+          first_pressed = true;
+          ignore_second = button2->is_pressed();
         }
     }
-
-    bool
-    DoubleButton::is_pressed () const
+  else
     {
-      return ( ! ignore_second && first_pressed && button2->is_pressed());
+      first_pressed = false;
+      ignore_second = true;
     }
+}
 
-  }
+bool
+DoubleButton::is_pressed () const
+{
+  return ( ! ignore_second && first_pressed && button2->is_pressed());
 }
 
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
+
 /* EOF */

Index: double_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/double_button.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- double_button.hxx   19 Apr 2003 10:23:19 -0000      1.4
+++ double_button.hxx   20 Oct 2003 13:33:44 -0000      1.5
@@ -22,42 +22,43 @@
 
 #include "../button.hxx"
 
+namespace Pingus {
 namespace Input {
+namespace Buttons {
 
-  namespace Buttons {
-
-    /**
-      @brief allows two buttons to be used in combination
+/**
+   @brief allows two buttons to be used in combination
 
-      XML definition: <double-button><button1><button2></double-button>
+   XML definition: <double-button><button1><button2></double-button>
 
-      This class allows combinations like CTRL-X whereby it's important that 
the first
-      key is pressed before the second else the DoubleButton itself won't 
change it's
-      own state to pressed.
-      */
-    class DoubleButton : public Button {
+   This class allows combinations like CTRL-X whereby it's important that the 
first
+   key is pressed before the second else the DoubleButton itself won't change 
it's
+   own state to pressed.
+*/
+class DoubleButton : public Button {
 
-      private:
-        Button* const button1;
-        Button* const button2;
-        bool          first_pressed;
-        bool          ignore_second;
+private:
+  Button* const button1;
+  Button* const button2;
+  bool          first_pressed;
+  bool          ignore_second;
 
-      public:
+public:
 
-        DoubleButton (Button* button1_, Button* button2_);
-       ~DoubleButton ();
+  DoubleButton (Button* button1_, Button* button2_);
+  ~DoubleButton ();
 
-        virtual bool is_pressed () const;
-        virtual void update (float delta);
+  virtual bool is_pressed () const;
+  virtual void update (float delta);
 
-      private:
-        DoubleButton (const DoubleButton&);
-        DoubleButton& operator= (const DoubleButton&);
-    };
+private:
+  DoubleButton (const DoubleButton&);
+  DoubleButton& operator= (const DoubleButton&);
+};
 
-  }
-}
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
 
 #endif
 

Index: joystick_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/joystick_button.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- joystick_button.cxx 19 Oct 2003 12:25:47 -0000      1.4
+++ joystick_button.cxx 20 Oct 2003 13:33:44 -0000      1.5
@@ -24,16 +24,19 @@
 #include "../../string_converter.hxx"
 #include "../../pingus_error.hxx"
 
+namespace Pingus {
 namespace Input {
 namespace Buttons {
 
 JoystickButton::JoystickButton(int id_, int button_) : id(id_), button(button_)
 {
+#ifdef CLANLIB_0_6
   if (static_cast<unsigned int>(id) >= CL_Input::joysticks.size())
     PingusError::raise("JoystickButton: Invalid joystick id: " + 
to_string(id));
 
   if (button > CL_Input::joysticks[id]->get_num_buttons())
     PingusError::raise("JoystickButton: Invalid joystick button id: " + 
to_string(button));
+#endif
 }
 
 void
@@ -44,10 +47,15 @@
 bool
 JoystickButton::is_pressed() const
 {
+#ifdef CLANLIB_0_6
   return CL_Input::joysticks[id]->get_button(button)->is_pressed();
+#else
+  return false;
+#endif
 }
 
-}
-}
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
 
 /* EOF */

Index: joystick_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/joystick_button.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- joystick_button.hxx 19 Apr 2003 10:23:19 -0000      1.4
+++ joystick_button.hxx 20 Oct 2003 13:33:44 -0000      1.5
@@ -22,35 +22,36 @@
 
 #include "../button.hxx"
 
+namespace Pingus {
 namespace Input {
+namespace Buttons {
 
-  namespace Buttons {
-
-    /**
-      @brief represents a button of a joystick
+/**
+   @brief represents a button of a joystick
 
-      XML definition: <joystick-button id="joystick id" button="button num"/>
-      */
-    class JoystickButton : public Button {
+   XML definition: <joystick-button id="joystick id" button="button num"/>
+*/
+class JoystickButton : public Button {
 
-      private:
-        int id;
-        int button;
+private:
+  int id;
+  int button;
 
-      public:
+public:
 
-        JoystickButton (int id_, int button_);
+  JoystickButton (int id_, int button_);
 
-        virtual bool is_pressed () const;
-        virtual void update (float);
+  virtual bool is_pressed () const;
+  virtual void update (float);
 
-      private:
-        JoystickButton (const JoystickButton&);
-        JoystickButton& operator= (const JoystickButton&);
-    };
+private:
+  JoystickButton (const JoystickButton&);
+  JoystickButton& operator= (const JoystickButton&);
+};
 
-  }
-}
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
 
 #endif
 

Index: key_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/key_button.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- key_button.cxx      19 Oct 2003 12:25:47 -0000      1.4
+++ key_button.cxx      20 Oct 2003 13:33:44 -0000      1.5
@@ -17,18 +17,20 @@
 //  along with this program; if not, write to the Free Software
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
-//#include <ClanLib/Display/input.h>
+#include <ClanLib/Display/keyboard.h>
+#include <ClanLib/Display/input_event.h>
 #include "key_button.hxx"
 
 #include <iostream>
 
+namespace Pingus {
 namespace Input {
 namespace Buttons {
 
 KeyButton::KeyButton (int button_) 
   : button(button_),
-    key_press  (CL_Input::sig_button_press  ().connect(this, 
&Input::Buttons::KeyButton::key_press_handler)),
-    key_release(CL_Input::sig_button_release().connect(this, 
&Input::Buttons::KeyButton::key_release_handler)),
+    key_press  (CL_Keyboard::sig_key_down().connect(this, 
&Input::Buttons::KeyButton::key_press_handler)),
+    key_release(CL_Keyboard::sig_key_up().connect(this, 
&Input::Buttons::KeyButton::key_release_handler)),
     pressed(false)
 {
 }
@@ -45,20 +47,21 @@
 }
 
 void
-KeyButton::key_press_handler (CL_InputDevice*, const CL_Key& key)
+KeyButton::key_press_handler (const CL_InputEvent& event)
 {
-  if (key.id == button)
+  if (event.id == button)
     pressed = true;
 }
 
 void
-KeyButton::key_release_handler (CL_InputDevice*, const CL_Key& key)
+KeyButton::key_release_handler (const CL_InputEvent& event)
 {
-  if (key.id == button)
+  if (event.id == button)
     pressed = false;
 }
 
-}
-}
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
 
 /* EOF */

Index: key_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/key_button.hxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- key_button.hxx      19 Jun 2003 11:00:10 -0000      1.7
+++ key_button.hxx      20 Oct 2003 13:33:44 -0000      1.8
@@ -23,43 +23,44 @@
 #include <ClanLib/Signals/slot.h>
 #include "../button.hxx"
 
-class CL_Key;
+class CL_InputEvent;
 class CL_InputDevice;
 
+namespace Pingus {
 namespace Input {
+namespace Buttons {
 
-  namespace Buttons {
-
-    /**
-      @brief maps a keyboard key to a button
+/**
+   @brief maps a keyboard key to a button
 
-      XML definition: <key-button button="key name"/>
-      */
-    class KeyButton : public Button {
+   XML definition: <key-button button="key name"/>
+*/
+class KeyButton : public Button {
 
-      private:
-        int     button;
-        CL_Slot key_press;
-        CL_Slot key_release;
-        bool    pressed;
+private:
+  int     button;
+  CL_Slot key_press;
+  CL_Slot key_release;
+  bool    pressed;
 
-      public:
+public:
 
-        KeyButton (int button_);
+  KeyButton (int button_);
 
-        virtual bool is_pressed () const;
-        virtual void update (float);
+  virtual bool is_pressed () const;
+  virtual void update (float);
 
-      private:
-        void key_press_handler (CL_InputDevice*, const CL_Key&);
-        void key_release_handler (CL_InputDevice*, const CL_Key&);
+private:
+  void key_press_handler (const CL_InputEvent& event);
+  void key_release_handler (const CL_InputEvent& event);
       
-        KeyButton (const KeyButton&);
-        KeyButton& operator= (const KeyButton&);
-    };
+  KeyButton (const KeyButton&);
+  KeyButton& operator= (const KeyButton&);
+};
 
-  }
-}
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
 
 #endif
 

Index: mouse_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/mouse_button.cxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mouse_button.cxx    19 Oct 2003 12:25:47 -0000      1.4
+++ mouse_button.cxx    20 Oct 2003 13:33:44 -0000      1.5
@@ -23,21 +23,20 @@
 #include "mouse_button.hxx"
 #include "../../pingus_error.hxx"
 
-
+namespace Pingus {
 namespace Input {
 namespace Buttons {
   
-void   press_handler (const CL_Key&);
-void release_handler (const CL_Key&);
-
 MouseButton::MouseButton (int button_)
   : button(button_),
-    button_press_slot  (CL_Mouse::sig_button_press  ().connect(this, 
&Input::Buttons::MouseButton::press_handler)),
-    button_release_slot(CL_Mouse::sig_button_release().connect(this, 
&Input::Buttons::MouseButton::release_handler)),
+    button_press_slot  (CL_Mouse::sig_key_down().connect(this, 
&Input::Buttons::MouseButton::press_handler)),
+    button_release_slot(CL_Mouse::sig_key_up().connect(this, 
&Input::Buttons::MouseButton::release_handler)),
     pressed(false)
 {
-  if (button > CL_Input::pointers[0]->get_num_buttons())
+#ifdef CLANLIB_0_6
+  if (button > CL_Mouse::get_num_buttons())
     PingusError::raise("MouseButton: Invalid button id");
+#endif
 }
 
 void
@@ -95,7 +94,8 @@
     }
 }
     
-}
-}
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
 
 /* EOF */

Index: mouse_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/mouse_button.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- mouse_button.hxx    19 Oct 2003 12:25:47 -0000      1.6
+++ mouse_button.hxx    20 Oct 2003 13:33:44 -0000      1.7
@@ -23,8 +23,9 @@
 #include <ClanLib/Signals/slot.h>
 #include "../button.hxx"
 
-class CL_Key;
+class CL_InputEvent;
 
+namespace Pingus {
 namespace Input {
 namespace Buttons {
 
@@ -48,15 +49,16 @@
   virtual void update (float);
 
 private:
-  void   press_handler (const CL_Key& number);
-  void release_handler (const CL_Key& number);
+  void   press_handler (const CL_InputEvent& number);
+  void release_handler (const CL_InputEvent& number);
       
   MouseButton (const MouseButton&);
   MouseButton& operator= (const MouseButton&);
 };
 
-}
-}
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
 
 #endif
 

Index: multiple_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/multiple_button.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- multiple_button.cxx 19 Apr 2003 10:23:19 -0000      1.2
+++ multiple_button.cxx 20 Oct 2003 13:33:44 -0000      1.3
@@ -19,38 +19,39 @@
 
 #include "multiple_button.hxx"
 
+namespace Pingus {
 namespace Input {
+namespace Buttons {
 
-  namespace Buttons {
-
-    MultipleButton::MultipleButton (const std::vector<Button*>& buttons_) : 
buttons(buttons_)
-    {
-    }
-
-    MultipleButton::~MultipleButton ()
-    {
-      for (std::vector<Button*>::iterator it = buttons.begin(); it != 
buttons.end(); it++)
-        delete *it;
-    }
+MultipleButton::MultipleButton (const std::vector<Button*>& buttons_) : 
buttons(buttons_)
+{
+}
 
-    void
-    MultipleButton::update (float delta)
-    {
-      for (std::vector<Button*>::iterator it = buttons.begin(); it != 
buttons.end(); it++)
-        (*it)->update(delta);
-    }
+MultipleButton::~MultipleButton ()
+{
+  for (std::vector<Button*>::iterator it = buttons.begin(); it != 
buttons.end(); it++)
+    delete *it;
+}
 
-    bool
-    MultipleButton::is_pressed () const
-    {
-      for (std::vector<Button*>::const_iterator it = buttons.begin(); it != 
buttons.end(); it++)
-        if ((*it)->is_pressed())
-          return true;
+void
+MultipleButton::update (float delta)
+{
+  for (std::vector<Button*>::iterator it = buttons.begin(); it != 
buttons.end(); it++)
+    (*it)->update(delta);
+}
 
-      return false;
-    }
+bool
+MultipleButton::is_pressed () const
+{
+  for (std::vector<Button*>::const_iterator it = buttons.begin(); it != 
buttons.end(); it++)
+    if ((*it)->is_pressed())
+      return true;
 
-  }
+  return false;
 }
 
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
+
 /* EOF */

Index: multiple_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/multiple_button.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- multiple_button.hxx 19 Apr 2003 10:23:19 -0000      1.4
+++ multiple_button.hxx 20 Oct 2003 13:33:44 -0000      1.5
@@ -23,37 +23,38 @@
 #include <vector>
 #include "../button.hxx"
 
+namespace Pingus {
 namespace Input {
+namespace Buttons {
 
-  namespace Buttons {
-
-    /**
-      @brief wrapper class mapping multiple buttons into one
+/**
+   @brief wrapper class mapping multiple buttons into one
 
-      XML definition: <multiple-button> <button 1>...<button n> 
</multiple-button>
+   XML definition: <multiple-button> <button 1>...<button n> </multiple-button>
 
-      A multiple button is pressed whenever at least one of the buttons 
contained is pressed.
-      */
-    class MultipleButton : public Button {
+   A multiple button is pressed whenever at least one of the buttons contained 
is pressed.
+*/
+class MultipleButton : public Button {
 
-      private:
-        std::vector<Button*> buttons;
+private:
+  std::vector<Button*> buttons;
 
-      public:
+public:
 
-        MultipleButton (const std::vector<Button*>& buttons_);
-       ~MultipleButton ();
+  MultipleButton (const std::vector<Button*>& buttons_);
+  ~MultipleButton ();
 
-        virtual bool is_pressed () const;
-        virtual void update (float delta);
+  virtual bool is_pressed () const;
+  virtual void update (float delta);
 
-      private:
-        MultipleButton (const MultipleButton&);
-        MultipleButton& operator= (const MultipleButton&);
-    };
+private:
+  MultipleButton (const MultipleButton&);
+  MultipleButton& operator= (const MultipleButton&);
+};
 
-  }
-}
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
 
 #endif
 

Index: triple_button.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/triple_button.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- triple_button.cxx   19 Apr 2003 10:23:19 -0000      1.2
+++ triple_button.cxx   20 Oct 2003 13:33:44 -0000      1.3
@@ -19,55 +19,56 @@
 
 #include "triple_button.hxx"
 
+namespace Pingus {
 namespace Input {
+namespace Buttons {
 
-  namespace Buttons {
+TripleButton::TripleButton (Button* button1_, Button* button2_, Button* 
button3_)
+  : button1(button1_),
+    button2(button2_),
+    button3(button3_),
+    first_second_pressed(false),
+    ignore_third(false)
+{
+}
 
-    TripleButton::TripleButton (Button* button1_, Button* button2_, Button* 
button3_)
-                              : button1(button1_),
-                               button2(button2_),
-                               button3(button3_),
-                               first_second_pressed(false),
-                               ignore_third(false)
-    {
-    }
+TripleButton::~TripleButton ()
+{
+  delete button1;
+  delete button2;
+  delete button3;
+}
 
-    TripleButton::~TripleButton ()
-    {
-      delete button1;
-      delete button2;
-      delete button3;
-    }
+void
+TripleButton::update (float delta)
+{
+  button1->update(delta);
+  button2->update(delta);
+  button3->update(delta);
 
-    void
-    TripleButton::update (float delta)
+  if (button1->is_pressed() && button2->is_pressed())
     {
-      button1->update(delta);
-      button2->update(delta);
-      button3->update(delta);
-
-      if (button1->is_pressed() && button2->is_pressed())
-        {
-          if (!first_second_pressed)
-            {
-             first_second_pressed = true;
-             ignore_third = button3->is_pressed();
-           }
-        }
-      else
+      if (!first_second_pressed)
         {
-          first_second_pressed = false;
-         ignore_third         = true;
+          first_second_pressed = true;
+          ignore_third = button3->is_pressed();
         }
     }
-
-    bool
-    TripleButton::is_pressed() const
+  else
     {
-      return ( ! ignore_third && first_second_pressed && 
button3->is_pressed());
+      first_second_pressed = false;
+      ignore_third         = true;
     }
+}
 
-  }
+bool
+TripleButton::is_pressed() const
+{
+  return ( ! ignore_third && first_second_pressed && button3->is_pressed());
 }
 
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
+
 /* EOF */

Index: triple_button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/buttons/triple_button.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- triple_button.hxx   19 Apr 2003 10:23:19 -0000      1.4
+++ triple_button.hxx   20 Oct 2003 13:33:44 -0000      1.5
@@ -22,43 +22,44 @@
 
 #include "../button.hxx"
 
+namespace Pingus {
 namespace Input {
+namespace Buttons {
 
-  namespace Buttons {
-
-    /**
-      @brief allows three buttons to be used in combination
+/**
+   @brief allows three buttons to be used in combination
 
-      XML definition: <triple-button> <button1><button2><button3> 
</triple-button>
+   XML definition: <triple-button> <button1><button2><button3> </triple-button>
 
-      This class allows combinations like CTRL-ALT-R whereby it's important 
that the first
-      two keys are pressed before the third else the TripleButton itself won't 
change it's
-      own state to pressed. The order in which the first two keys are pressed 
is of no
-      importance, such behaviour may be created by using nested DoubleButtons.
-      */
-    class TripleButton : public Button {
+   This class allows combinations like CTRL-ALT-R whereby it's important that 
the first
+   two keys are pressed before the third else the TripleButton itself won't 
change it's
+   own state to pressed. The order in which the first two keys are pressed is 
of no
+   importance, such behaviour may be created by using nested DoubleButtons.
+*/
+class TripleButton : public Button {
 
-      private:
-        Button* const button1;
-        Button* const button2;
-        Button* const button3;
-        bool          first_second_pressed;
-        bool          ignore_third;
+private:
+  Button* const button1;
+  Button* const button2;
+  Button* const button3;
+  bool          first_second_pressed;
+  bool          ignore_third;
 
-      public:
-        TripleButton (Button* button1_, Button* button2_, Button* button3_);
-       ~TripleButton ();
+public:
+  TripleButton (Button* button1_, Button* button2_, Button* button3_);
+  ~TripleButton ();
 
-        virtual bool is_pressed () const;
-        virtual void update (float delta);
+  virtual bool is_pressed () const;
+  virtual void update (float delta);
 
-      private:
-        TripleButton (const TripleButton&);
-        TripleButton& operator= (const TripleButton&);
-    };
+private:
+  TripleButton (const TripleButton&);
+  TripleButton& operator= (const TripleButton&);
+};
 
-  }
-}
+} // namespace Buttons
+} // namespace Input
+} // namespace Pingus
 
 #endif