[Pingus-CVS] CVS: Games/Pingus/src/input axis_factory.cxx, 1.15, 1.16 axis_factory.hxx, 1.9, 1.10 button.hxx, 1.10, 1.11 button_factory.cxx, 1.12, 1.13 controller.hxx, 1.19, 1.20 event.hxx, 1.8, 1.9

[Ingo Ruhnke]

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

Modified Files:
        axis_factory.cxx axis_factory.hxx button.hxx 
        button_factory.cxx controller.hxx event.hxx 
Log Message:
- some namespace and CL0.7 stuff

Index: axis_factory.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/axis_factory.cxx,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -d -r1.15 -r1.16
--- axis_factory.cxx    16 Jun 2003 20:58:11 -0000      1.15
+++ axis_factory.cxx    20 Oct 2003 13:33:44 -0000      1.16
@@ -28,6 +28,7 @@
 #include "axes/multiple_axis.hxx"
 #include "../debug.hxx"
 
+namespace Pingus {
 namespace Input {
 
 using namespace Axes;
@@ -114,6 +115,7 @@
   return new MultipleAxis(axes);
 }
 
-}
+} // namespace Input
+} // namespace Pingus
 
 /* EOF */

Index: axis_factory.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/axis_factory.hxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- axis_factory.hxx    16 Jun 2003 20:58:11 -0000      1.9
+++ axis_factory.hxx    20 Oct 2003 13:33:44 -0000      1.10
@@ -22,28 +22,30 @@
 
 #include "../libxmlfwd.hxx"
 
+namespace Pingus {
 namespace Input {
 
-  class Axis;
+class Axis;
 
-  class AxisFactory
-  {
-    private:
-      static Axis* button_axis   (xmlNodePtr cur);
-      static Axis* inverted_axis (xmlNodePtr cur);
-      static Axis* joystick_axis (xmlNodePtr cur);
-      static Axis* multiple_axis (xmlNodePtr cur);
+class AxisFactory
+{
+private:
+  static Axis* button_axis   (xmlNodePtr cur);
+  static Axis* inverted_axis (xmlNodePtr cur);
+  static Axis* joystick_axis (xmlNodePtr cur);
+  static Axis* multiple_axis (xmlNodePtr cur);
 
-    public:
-      static Axis* create (xmlNodePtr cur);
+public:
+  static Axis* create (xmlNodePtr cur);
 
-    private:
-      AxisFactory ();
-      AxisFactory (const AxisFactory&);
-      AxisFactory& operator= (const AxisFactory&);
-  };
+private:
+  AxisFactory ();
+  AxisFactory (const AxisFactory&);
+  AxisFactory& operator= (const AxisFactory&);
+};
 
-}
+} // namespace Input
+} // namespace Pingus
 
 #endif
 

Index: button.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/button.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- button.hxx  19 Apr 2003 10:23:18 -0000      1.10
+++ button.hxx  20 Oct 2003 13:33:44 -0000      1.11
@@ -22,25 +22,27 @@
 
 #include "../pingus.hxx"
 
+namespace Pingus {
 namespace Input {
 
-  /// abstract base class which defines the button interface
-  class Button
-  {
-  public:
-    Button () { }
-    virtual ~Button () { }
+/// abstract base class which defines the button interface
+class Button
+{
+public:
+  Button () { }
+  virtual ~Button () { }
 
-    /// returns true if the button is pressed, false otherwise
-    virtual bool is_pressed ()      const =0;
-    virtual void update     (float)       =0;
+  /// returns true if the button is pressed, false otherwise
+  virtual bool is_pressed ()      const =0;
+  virtual void update     (float)       =0;
 
-  private:
-    Button (const Button&);
-    Button& operator= (const Button&);
-  };
+private:
+  Button (const Button&);
+  Button& operator= (const Button&);
+};
 
-}
+} // namespace Input
+} // namespace Pingus
 
 #endif
 

Index: button_factory.cxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/button_factory.cxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- button_factory.cxx  19 Apr 2003 10:23:18 -0000      1.12
+++ button_factory.cxx  20 Oct 2003 13:33:44 -0000      1.13
@@ -29,6 +29,7 @@
 #include "buttons/multiple_button.hxx"
 #include "buttons/triple_button.hxx"
 
+namespace Pingus {
 namespace Input {
 
 using namespace Buttons;
@@ -138,6 +139,7 @@
   return new TripleButton(button1, button2, button3);
 }
 
-}
+} // namespace Input
+} // namespace Pingus
 
 /* EOF */

Index: controller.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/controller.hxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- controller.hxx      19 Apr 2003 10:23:18 -0000      1.19
+++ controller.hxx      20 Oct 2003 13:33:44 -0000      1.20
@@ -28,6 +28,7 @@
 
 #include "event.hxx"
 
+namespace Pingus {
 namespace Input {
 
 class Axis;
@@ -75,6 +76,7 @@
 };
 
 } // namespace Input
+} // namespace Pingus
 
 #endif
 

Index: event.hxx
===================================================================
RCS file: /var/lib/cvs/Games/Pingus/src/input/event.hxx,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- event.hxx   19 Apr 2003 10:23:18 -0000      1.8
+++ event.hxx   20 Oct 2003 13:33:44 -0000      1.9
@@ -23,6 +23,7 @@
 #include <vector>
 #include "../pingus.hxx"
 
+namespace Pingus {
 namespace Input {
 
 enum EventType { ButtonEventType, PointerEventType, AxisEventType, 
ScrollEventType };
@@ -132,6 +133,7 @@
 }
 
 } // namespace Input
+} // namespace Pingus
 
 #endif