[Pingus-CVS] CVS: Games/Pingus/src/input axis.hxx,1.7,1.8 button.hxx,1.7,1.8 pointer.hxx,1.8,1.9 scroller.hxx,1.5,1.6 Makefile.am,1.18,1.19 axis_factory.cxx,1.9,1.10 axis_factory.hxx,1.5,1.6 button_factory.hxx,1.5,1.6 controller.hxx,1.12,1.13 pointer_factory.cxx,1.6,1.7 pointer_factory.hxx,1.3,1.4 scroller_factory.cxx,1.7,1.8 scroller_factory.hxx,1.4,1.5

[torangan]

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

Modified Files:
        Makefile.am axis_factory.cxx axis_factory.hxx 
        button_factory.hxx controller.hxx pointer_factory.cxx 
        pointer_factory.hxx scroller_factory.cxx scroller_factory.hxx 
Added Files:
        axis.hxx button.hxx pointer.hxx scroller.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/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -d -r1.18 -r1.19
--- Makefile.am 24 Aug 2002 11:37:29 -0000      1.18
+++ Makefile.am 26 Aug 2002 13:53:04 -0000      1.19
@@ -24,14 +24,18 @@
        scrollers
 
 libpingus_input_a_SOURCES =       \
+       axis.hxx \
        axis_event.hxx \
        axis_factory.hxx axis_factory.cxx \
+       button.hxx \
        button_event.hxx \
        button_factory.hxx button_factory.cxx \
        controller.hxx controller.cxx \
        event.hxx \
+       pointer.hxx \
        pointer_event.hxx \
        pointer_factory.hxx pointer_factory.cxx \
+       scroller.hxx \
        scroller_factory.hxx scroller_factory.cxx \
        scroll_event.hxx 
 

Index: axis_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axis_factory.cxx,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- axis_factory.cxx    24 Aug 2002 11:37:29 -0000      1.9
+++ axis_factory.cxx    26 Aug 2002 13:53:04 -0000      1.10
@@ -21,18 +21,17 @@
 #include "../xml_helper.hxx"
 #include "../pingus_error.hxx"
 #include "axis_factory.hxx"
+#include "button.hxx"
 #include "button_factory.hxx"
 #include "axes/button_axis.hxx"
 #include "axes/inverted_axis.hxx"
 #include "axes/joystick_axis.hxx"
 #include "axes/mouse_axis.hxx"
 #include "axes/multiple_axis.hxx"
-#include "buttons/button.hxx"
 
 namespace Input {
 
   using namespace Axes;
-  using Buttons::Button;
 
   Axis* AxisFactory::create(xmlNodePtr cur)
   {

Index: axis_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axis_factory.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- axis_factory.hxx    24 Aug 2002 11:37:29 -0000      1.5
+++ axis_factory.hxx    26 Aug 2002 13:53:04 -0000      1.6
@@ -24,21 +24,19 @@
 
 namespace Input {
 
-  namespace Axes {
-    class Axis;
-  }
+  class Axis;
   
   class AxisFactory 
   {
     private:
-      static inline Axes::Axis* button_axis   (xmlNodePtr cur);
-      static inline Axes::Axis* inverted_axis (xmlNodePtr cur);
-      static inline Axes::Axis* joystick_axis (xmlNodePtr cur);
-      static inline Axes::Axis* mouse_axis    (xmlNodePtr cur);
-      static inline Axes::Axis* multiple_axis (xmlNodePtr cur);
+      static inline Axis* button_axis   (xmlNodePtr cur);
+      static inline Axis* inverted_axis (xmlNodePtr cur);
+      static inline Axis* joystick_axis (xmlNodePtr cur);
+      static inline Axis* mouse_axis    (xmlNodePtr cur);
+      static inline Axis* multiple_axis (xmlNodePtr cur);
   
     public:
-      static Axes::Axis* create (xmlNodePtr cur);
+      static Axis* create (xmlNodePtr cur);
     
     private:
       AxisFactory ();

Index: button_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/button_factory.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- button_factory.hxx  24 Aug 2002 11:37:29 -0000      1.5
+++ button_factory.hxx  26 Aug 2002 13:53:04 -0000      1.6
@@ -24,22 +24,20 @@
 
 namespace Input {
 
-  namespace Buttons {
-    class Button;
-  }
+  class Button;
 
   class ButtonFactory 
   {
     private:
-      static inline Buttons::Button* double_button   (xmlNodePtr cur);
-      static inline Buttons::Button* joystick_button (xmlNodePtr cur);
-      static inline Buttons::Button* key_button      (xmlNodePtr cur);
-      static inline Buttons::Button* mouse_button    (xmlNodePtr cur);
-      static inline Buttons::Button* multiple_button (xmlNodePtr cur);
-      static inline Buttons::Button* triple_button   (xmlNodePtr cur);
+      static inline Button* double_button   (xmlNodePtr cur);
+      static inline Button* joystick_button (xmlNodePtr cur);
+      static inline Button* key_button      (xmlNodePtr cur);
+      static inline Button* mouse_button    (xmlNodePtr cur);
+      static inline Button* multiple_button (xmlNodePtr cur);
+      static inline Button* triple_button   (xmlNodePtr cur);
   
     public:
-      static Buttons::Button* create (xmlNodePtr cur);
+      static Button* create (xmlNodePtr cur);
     
     private:
       ButtonFactory ();

Index: controller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/controller.hxx,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- controller.hxx      24 Aug 2002 11:37:29 -0000      1.12
+++ controller.hxx      26 Aug 2002 13:53:04 -0000      1.13
@@ -29,32 +29,20 @@
 
 namespace Input {
 
-  namespace Axes {
-    class Axis;
-  }
-  
-  namespace Buttons {
-    class Button;
-  }
-
-  namespace Pointers {
-    class Pointer;
-  }
-
-  namespace Scrollers {
-    class Scroller;
-  }
-
+  class Axis;
+  class Button;
   class Event;
+  class Pointer;
+  class Scroller;
 
   class Controller {
 
     private:
-      Axes::Axis*          action_axis;
-      Pointers::Pointer*   standard_pointer;
-      Scrollers::Scroller* scroller;
+      Axis*     action_axis;
+      Pointer*  standard_pointer;
+      Scroller* scroller;
     
-      std::map<ButtonName, std::pair<Buttons::Button*, bool> > buttons;
+      std::map<ButtonName, std::pair<Button*, bool> > buttons;
       
       std::list<Event*> events;
 
@@ -66,12 +54,12 @@
       
       std::list<Event*>& get_events () { return events; }
       
-      const Pointers::Pointer  * get_pointer     () const { return 
standard_pointer; }
-      const Scrollers::Scroller* get_scroller    () const { return scroller;   
      }
-      const Axes::Axis         * get_action_axis () const { return 
action_axis;      }
+      const Pointer * get_pointer     () const { return standard_pointer; }
+      const Scroller* get_scroller    () const { return scroller;         }
+      const Axis    * get_action_axis () const { return action_axis;      }
 
       /// returns the requested Buttons::Button or 0 if it doesn't exist (e.g. 
undefined action Buttons::Button)
-      const Buttons::Button* get_button (ButtonName name);
+      const Button* get_button (ButtonName name);
       
       void update (float delta);
 

Index: pointer_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/pointer_factory.cxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pointer_factory.cxx 24 Aug 2002 11:37:30 -0000      1.6
+++ pointer_factory.cxx 26 Aug 2002 13:53:04 -0000      1.7
@@ -24,13 +24,11 @@
 #include "pointers/axis_pointer.hxx"
 #include "pointers/mouse_pointer.hxx"
 #include "pointers/multiple_pointer.hxx"
-#include "pointers/pointer.hxx"
 #include "pointer_factory.hxx"
 
 namespace Input {
 
   using namespace Pointers;
-  using Axes::Axis;
   
   Pointer* PointerFactory::create (xmlNodePtr cur)
   {

Index: pointer_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/pointer_factory.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- pointer_factory.hxx 24 Aug 2002 11:37:30 -0000      1.3
+++ pointer_factory.hxx 26 Aug 2002 13:53:04 -0000      1.4
@@ -24,19 +24,17 @@
 
 namespace Input {
 
-  namespace Pointers {
-    class Pointer;
-  }
+  class Pointer;
 
   class PointerFactory 
   {
     private:
-      static inline Pointers::Pointer* axis_pointer     (xmlNodePtr cur);
-      static inline Pointers::Pointer* mouse_pointer    ();
-      static inline Pointers::Pointer* multiple_pointer (xmlNodePtr cur);
+      static inline Pointer* axis_pointer     (xmlNodePtr cur);
+      static inline Pointer* mouse_pointer    ();
+      static inline Pointer* multiple_pointer (xmlNodePtr cur);
     
     public:
-      static Pointers::Pointer* create (xmlNodePtr cur);
+      static Pointer* create (xmlNodePtr cur);
       
     private:
       PointerFactory ();

Index: scroller_factory.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/scroller_factory.cxx,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- scroller_factory.cxx        24 Aug 2002 11:37:30 -0000      1.7
+++ scroller_factory.cxx        26 Aug 2002 13:53:04 -0000      1.8
@@ -20,13 +20,13 @@
 #include <stdlib.h>
 #include "../xml_helper.hxx"
 #include "../pingus_error.hxx"
+#include "axis.hxx"
 #include "axis_factory.hxx"
+#include "button.hxx"
 #include "button_factory.hxx"
+#include "pointer.hxx"
 #include "pointer_factory.hxx"
 #include "scroller_factory.hxx"
-#include "axes/axis.hxx"
-#include "buttons/button.hxx"
-#include "pointers/pointer.hxx"
 #include "scrollers/axis_scroller.hxx"
 #include "scrollers/inverted_scroller.hxx"
 #include "scrollers/joystick_scroller.hxx"
@@ -38,9 +38,6 @@
 namespace Input {
 
   using namespace Scrollers;
-  using Axes::Axis;
-  using Buttons::Button;
-  using Pointers::Pointer;
 
   Scroller*
   ScrollerFactory::create(xmlNodePtr cur)

Index: scroller_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/scroller_factory.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- scroller_factory.hxx        24 Aug 2002 11:37:30 -0000      1.4
+++ scroller_factory.hxx        26 Aug 2002 13:53:04 -0000      1.5
@@ -24,22 +24,20 @@
 
 namespace Input {
 
-  namespace Scrollers {
-    class Scroller;
-  }
+  class Scroller;
 
   class ScrollerFactory 
   {
     private:
-      static inline Scrollers::Scroller* axis_scroller     (xmlNodePtr cur);
-      static inline Scrollers::Scroller* inverted_scroller (xmlNodePtr cur);
-      static inline Scrollers::Scroller* joystick_scroller (xmlNodePtr cur);
-      static inline Scrollers::Scroller* mouse_scroller    (xmlNodePtr cur);
-      static inline Scrollers::Scroller* multiple_scroller (xmlNodePtr cur);
-      static inline Scrollers::Scroller* pointer_scroller  (xmlNodePtr cur);
+      static inline Scroller* axis_scroller     (xmlNodePtr cur);
+      static inline Scroller* inverted_scroller (xmlNodePtr cur);
+      static inline Scroller* joystick_scroller (xmlNodePtr cur);
+      static inline Scroller* mouse_scroller    (xmlNodePtr cur);
+      static inline Scroller* multiple_scroller (xmlNodePtr cur);
+      static inline Scroller* pointer_scroller  (xmlNodePtr cur);
     
     public:
-      static Scrollers::Scroller* create (xmlNodePtr cur);
+      static Scroller* create (xmlNodePtr cur);
       
     private:
       ScrollerFactory ();