[Pingus-CVS] CVS: Games/Pingus/src/input/axes Makefile.am,1.1,1.2 button_axis.cxx,1.1,1.2 button_axis.hxx,1.1,1.2 dummy_axis.hxx,1.1,1.2 inverted_axis.hxx,1.1,1.2 joystick_axis.hxx,1.1,1.2 mouse_axis.hxx,1.1,1.2 multiple_axis.hxx,1.1,1.2 axis.hxx,1.1,NONE

[torangan]

Update of /usr/local/cvsroot/Games/Pingus/src/input/axes
In directory dark:/tmp/cvs-serv32547/axes

Modified Files:
        Makefile.am button_axis.cxx button_axis.hxx dummy_axis.hxx 
        inverted_axis.hxx joystick_axis.hxx mouse_axis.hxx 
        multiple_axis.hxx 
Removed Files:
        axis.hxx 
Log Message:
Moved axis, button, pointer and scroller out of the namespaces, only 
concrete implementations are inside the namespace


Index: Makefile.am
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/Makefile.am,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- Makefile.am 24 Aug 2002 11:37:30 -0000      1.1
+++ Makefile.am 26 Aug 2002 13:53:04 -0000      1.2
@@ -18,7 +18,6 @@
 noinst_LIBRARIES = libpingus_input_axes.a
 
 libpingus_input_axes_a_SOURCES =       \
-        axis.hxx \
         button_axis.hxx button_axis.cxx \
        dummy_axis.hxx \
        inverted_axis.hxx inverted_axis.cxx \

Index: button_axis.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/button_axis.cxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- button_axis.cxx     24 Aug 2002 11:37:30 -0000      1.1
+++ button_axis.cxx     26 Aug 2002 13:53:04 -0000      1.2
@@ -18,11 +18,9 @@
 //  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 
 #include "button_axis.hxx"
-#include "../buttons/button.hxx"
+#include "../button.hxx"
 
 namespace Input {
-
-  using Buttons::Button;
 
   namespace Axes {
 

Index: button_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/button_axis.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- button_axis.hxx     24 Aug 2002 11:37:30 -0000      1.1
+++ button_axis.hxx     26 Aug 2002 13:53:04 -0000      1.2
@@ -20,13 +20,11 @@
 #ifndef HEADER_PINGUS_INPUT_BUTTON_AXIS_HXX
 #define HEADER_PINGUS_INPUT_BUTTON_AXIS_HXX
 
-#include "axis.hxx"
+#include "../axis.hxx"
 
 namespace Input {
 
-  namespace Buttons {
-    class Button;
-  }
+  class Button;
 
   namespace Axes {
   
@@ -41,12 +39,12 @@
       float   pos;
       float   angle;
     
-      Buttons::Button* const button1;
-      Buttons::Button* const button2;
+      Button* const button1;
+      Button* const button2;
     
     public:
   
-      ButtonAxis (float angle_, Buttons::Button* button1_, Buttons::Button* 
button2_);
+      ButtonAxis (float angle_, Button* button1_, Button* button2_);
      ~ButtonAxis ();
   
       virtual const float& get_pos () const;

Index: dummy_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/dummy_axis.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- dummy_axis.hxx      24 Aug 2002 11:37:31 -0000      1.1
+++ dummy_axis.hxx      26 Aug 2002 13:53:04 -0000      1.2
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_INPUT_DUMMY_AXIS_HXX
 #define HEADER_PINGUS_INPUT_DUMMY_AXIS_HXX
 
-#include "axis.hxx"
+#include "../axis.hxx"
 
 namespace Input {
 

Index: inverted_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/inverted_axis.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- inverted_axis.hxx   24 Aug 2002 11:37:31 -0000      1.1
+++ inverted_axis.hxx   26 Aug 2002 13:53:04 -0000      1.2
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_INPUT_INVERTED_AXIS_HXX
 #define HEADER_PINGUS_INPUT_INVERTED_AXIS_HXX
 
-#include "axis.hxx"
+#include "../axis.hxx"
 
 namespace Input {
 

Index: joystick_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/joystick_axis.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- joystick_axis.hxx   24 Aug 2002 11:37:31 -0000      1.1
+++ joystick_axis.hxx   26 Aug 2002 13:53:04 -0000      1.2
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_INPUT_JOYSTICK_AXIS_HXX
 #define HEADER_PINGUS_INPUT_JOYSTICK_AXIS_HXX
 
-#include "axis.hxx"
+#include "../axis.hxx"
 
 namespace Input {
 

Index: mouse_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/mouse_axis.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- mouse_axis.hxx      24 Aug 2002 11:37:31 -0000      1.1
+++ mouse_axis.hxx      26 Aug 2002 13:53:04 -0000      1.2
@@ -20,7 +20,7 @@
 #ifndef HEADER_PINGUS_INPUT_MOUSE_AXIS_HXX
 #define HEADER_PINGUS_INPUT_MOUSE_AXIS_HXX
 
-#include "axis.hxx"
+#include "../axis.hxx"
 
 namespace Input {
 

Index: multiple_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axes/multiple_axis.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- multiple_axis.hxx   24 Aug 2002 11:37:31 -0000      1.1
+++ multiple_axis.hxx   26 Aug 2002 13:53:04 -0000      1.2
@@ -21,7 +21,7 @@
 #define HEADER_PINGUS_INPUT_MULTIPLE_AXIS_HXX
 
 #include <vector>
-#include "axis.hxx"
+#include "../axis.hxx"
 
 namespace Input {
 

--- axis.hxx DELETED ---