[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Pingus-CVS] CVS: Games/Pingus/src/input axis.hxx,1.5,1.6 axis_event.hxx
|
From: |
torangan |
|
Subject: |
[Pingus-CVS] CVS: Games/Pingus/src/input axis.hxx,1.5,1.6 axis_event.hxx,1.2,1.3 axis_factory.hxx,1.3,1.4 axis_pointer.hxx,1.6,1.7 axis_scroller.hxx,1.2,1.3 button.hxx,1.5,1.6 button_axis.hxx,1.4,1.5 button_event.hxx,1.2,1.3 button_factory.hxx,1.3,1.4 controller.cxx,1.19,1.20 controller.hxx,1.10,1.11 double_button.hxx,1.2,1.3 dummy_axis.hxx,1.2,1.3 dummy_button.hxx,1.2,1.3 dummy_pointer.hxx,1.2,1.3 dummy_scroller.hxx,1.2,1.3 event.hxx,1.4,1.5 inverted_axis.hxx,1.5,1.6 inverted_scroller.hxx,1.2,1.3 joystick_axis.hxx,1.4,1.5 joystick_button.hxx,1.3,1.4 joystick_scroller.hxx,1.2,1.3 key_button.hxx,1.3,1.4 key_helper.hxx,1.1,1.2 mouse_axis.hxx,1.5,1.6 mouse_button.hxx,1.3,1.4 mouse_pointer.cxx,1.3,1.4 mouse_pointer.hxx,1.4,1.5 mouse_scroller.cxx,1.2,1.3 mouse_scroller.hxx,1.2,1.3 multiple_axis.hxx,1.3,1.4 multiple_button.hxx,1.5,1.6 multiple_pointer.hxx,1.4,1.5 multiple_scroller.hxx,1.2,1.3 pointer.hxx,1.6,1.7 pointer_event.hxx,1.2,1.3 pointer_factory.hxx,1.1,1.2 pointer_scroller.hxx,1.2,1.3 scroll_event.hxx,1.1,1.2 scroller.hxx,1.3,1.4 scroller_factory.hxx,1.2,1.3 triple_button.hxx,1.2,1.3 |
|
Date: |
23 Aug 2002 15:49:59 -0000 |
Update of /usr/local/cvsroot/Games/Pingus/src/input
In directory dark:/tmp/cvs-serv21141/input
Modified Files:
axis.hxx axis_event.hxx axis_factory.hxx axis_pointer.hxx
axis_scroller.hxx button.hxx button_axis.hxx button_event.hxx
button_factory.hxx controller.cxx controller.hxx
double_button.hxx dummy_axis.hxx dummy_button.hxx
dummy_pointer.hxx dummy_scroller.hxx event.hxx
inverted_axis.hxx inverted_scroller.hxx joystick_axis.hxx
joystick_button.hxx joystick_scroller.hxx key_button.hxx
key_helper.hxx mouse_axis.hxx mouse_button.hxx
mouse_pointer.cxx mouse_pointer.hxx mouse_scroller.cxx
mouse_scroller.hxx multiple_axis.hxx multiple_button.hxx
multiple_pointer.hxx multiple_scroller.hxx pointer.hxx
pointer_event.hxx pointer_factory.hxx pointer_scroller.hxx
scroll_event.hxx scroller.hxx scroller_factory.hxx
triple_button.hxx
Log Message:
- added copy constructor/operator= or private declarations
- some cleanup
Index: axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axis.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- axis.hxx 16 Aug 2002 13:03:36 -0000 1.5
+++ axis.hxx 23 Aug 2002 15:49:55 -0000 1.6
@@ -28,6 +28,7 @@
class Axis {
public:
+ Axis () { }
virtual ~Axis () { }
/// yields the position of the axis in [-1;1]
@@ -37,6 +38,10 @@
virtual const float& get_angle () const =0;
virtual void update(float) =0;
+
+ private:
+ Axis (const Axis&);
+ Axis operator= (const Axis&);
};
}
Index: axis_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axis_event.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- axis_event.hxx 16 Aug 2002 18:13:36 -0000 1.2
+++ axis_event.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -36,6 +36,10 @@
AxisEvent (float dir_, AxisName name_=action) : dir(dir_), name(name_) {
}
EventType get_type () { return AxisEventType; }
+
+ private:
+ AxisEvent (const AxisEvent&);
+ AxisEvent operator= (const AxisEvent&);
};
}
Index: axis_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axis_factory.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- axis_factory.hxx 10 Jul 2002 11:22:29 -0000 1.3
+++ axis_factory.hxx 23 Aug 2002 15:49:55 -0000 1.4
@@ -37,6 +37,11 @@
public:
static Axis* create (xmlNodePtr cur);
+
+ private:
+ AxisFactory ();
+ AxisFactory (const AxisFactory&);
+ AxisFactory operator= (const AxisFactory&);
};
}
Index: axis_pointer.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axis_pointer.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- axis_pointer.hxx 14 Aug 2002 12:41:22 -0000 1.6
+++ axis_pointer.hxx 23 Aug 2002 15:49:55 -0000 1.7
@@ -58,6 +58,10 @@
virtual void set_pos(float new_x, float new_y);
virtual void update (float delta);
+
+ private:
+ AxisPointer (const AxisPointer&);
+ AxisPointer operator= (const AxisPointer&);
};
}
Index: axis_scroller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/axis_scroller.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- axis_scroller.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ axis_scroller.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -53,6 +53,10 @@
void get_delta (float& x, float& y) const;
void update (float delta);
+
+ private:
+ AxisScroller (const AxisScroller&);
+ AxisScroller operator= (const AxisScroller&);
};
}
Index: button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/button.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- button.hxx 16 Aug 2002 13:03:36 -0000 1.5
+++ button.hxx 23 Aug 2002 15:49:55 -0000 1.6
@@ -28,12 +28,16 @@
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;
+
+ private:
+ Button (const Button&);
+ Button operator= (const Button&);
};
}
Index: button_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/button_axis.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- button_axis.hxx 14 Aug 2002 12:41:22 -0000 1.4
+++ button_axis.hxx 23 Aug 2002 15:49:55 -0000 1.5
@@ -50,6 +50,10 @@
virtual const float& get_angle () const;
virtual void update (float delta);
+
+ private:
+ ButtonAxis (const ButtonAxis&);
+ ButtonAxis operator= (const ButtonAxis&);
};
}
Index: button_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/button_event.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- button_event.hxx 10 Jul 2002 17:22:11 -0000 1.2
+++ button_event.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -38,6 +38,10 @@
ButtonEvent (ButtonName name_, State state_) : name(name_),
state(state_) { }
EventType get_type () { return ButtonEventType; }
+
+ private:
+ ButtonEvent (const ButtonEvent&);
+ ButtonEvent operator= (const ButtonEvent&);
};
}
Index: button_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/button_factory.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- button_factory.hxx 11 Jul 2002 15:38:07 -0000 1.3
+++ button_factory.hxx 23 Aug 2002 15:49:55 -0000 1.4
@@ -38,6 +38,11 @@
public:
static Button* create (xmlNodePtr cur);
+
+ private:
+ ButtonFactory ();
+ ButtonFactory (const ButtonFactory&);
+ ButtonFactory operator= (const ButtonFactory&);
};
}
Index: controller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/controller.cxx,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -d -r1.19 -r1.20
--- controller.cxx 22 Aug 2002 02:33:56 -0000 1.19
+++ controller.cxx 23 Aug 2002 15:49:55 -0000 1.20
@@ -17,24 +17,19 @@
// along with this program; if not, write to the Free Software
// Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
-#include "../pingus.hxx"
#include "../debug.hxx"
#include "../xml_helper.hxx"
#include "../pingus_error.hxx"
-#include "axis.hxx"
#include "axis_event.hxx"
#include "axis_factory.hxx"
-#include "button.hxx"
#include "button_factory.hxx"
#include "controller.hxx"
#include "dummy_axis.hxx"
#include "dummy_button.hxx"
#include "dummy_pointer.hxx"
#include "dummy_scroller.hxx"
-#include "pointer.hxx"
#include "pointer_event.hxx"
#include "pointer_factory.hxx"
-#include "scroller.hxx"
#include "scroller_factory.hxx"
#include "scroll_event.hxx"
Index: controller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/controller.hxx,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- controller.hxx 19 Aug 2002 08:28:03 -0000 1.10
+++ controller.hxx 23 Aug 2002 15:49:55 -0000 1.11
@@ -66,6 +66,8 @@
private:
void create_action_buttons (xmlNodePtr cur);
+ Controller (const Controller&);
+ Controller operator= (const Controller&);
};
}
Index: double_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/double_button.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- double_button.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ double_button.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -48,6 +48,10 @@
virtual bool is_pressed () const;
virtual void update (float delta);
+
+ private:
+ DoubleButton (const DoubleButton&);
+ DoubleButton operator= (const DoubleButton&);
};
}
Index: dummy_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/dummy_axis.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dummy_axis.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ dummy_axis.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -43,6 +43,10 @@
virtual const float& get_angle () const { return angle; }
virtual void update(float) { }
+
+ private:
+ DummyAxis (const DummyAxis&);
+ DummyAxis operator= (const DummyAxis&);
};
}
Index: dummy_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/dummy_button.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dummy_button.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ dummy_button.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -31,9 +31,14 @@
*/
class DummyButton : public Button {
public:
-
+ DummyButton () { }
+
virtual bool is_pressed () const { return false; }
virtual void update (float) { }
+
+ private:
+ DummyButton (const DummyButton&);
+ DummyButton operator= (const DummyButton&);
};
}
Index: dummy_pointer.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/dummy_pointer.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dummy_pointer.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ dummy_pointer.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -43,6 +43,10 @@
virtual void set_pos (float, float) { }
virtual void update (float) { }
+
+ private:
+ DummyPointer (const DummyPointer&);
+ DummyPointer operator= (const DummyPointer&);
};
}
Index: dummy_scroller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/dummy_scroller.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- dummy_scroller.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ dummy_scroller.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -43,6 +43,10 @@
void get_delta (float& x_delta, float& y_delta) const { x_delta =
delta; y_delta = delta; }
void update (float) { }
+
+ private:
+ DummyScroller (const DummyScroller&);
+ DummyScroller operator= (const DummyScroller&);
};
}
Index: event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/event.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- event.hxx 16 Aug 2002 13:03:36 -0000 1.4
+++ event.hxx 23 Aug 2002 15:49:55 -0000 1.5
@@ -28,9 +28,13 @@
class Event {
public:
-
+ Event () { }
virtual ~Event () { }
virtual EventType get_type ()=0;
+
+ private:
+ Event (const Event&);
+ Event operator= (const Event&);
};
}
Index: inverted_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/inverted_axis.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- inverted_axis.hxx 14 Aug 2002 12:41:22 -0000 1.5
+++ inverted_axis.hxx 23 Aug 2002 15:49:55 -0000 1.6
@@ -43,6 +43,10 @@
virtual const float& get_angle () const;
virtual void update (float delta);
+
+ private:
+ InvertedAxis (const InvertedAxis&);
+ InvertedAxis operator= (const InvertedAxis&);
};
}
Index: inverted_scroller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/inverted_scroller.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- inverted_scroller.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ inverted_scroller.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -51,6 +51,10 @@
void get_delta (float& x, float& y) const;
void update (float delta);
+
+ private:
+ InvertedScroller (const InvertedScroller&);
+ InvertedScroller operator= (const InvertedScroller&);
};
}
Index: joystick_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/joystick_axis.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- joystick_axis.hxx 14 Aug 2002 12:41:22 -0000 1.4
+++ joystick_axis.hxx 23 Aug 2002 15:49:55 -0000 1.5
@@ -31,20 +31,24 @@
*/
class JoystickAxis : public Axis {
- private:
- int id;
- int axis;
- float pos;
- float angle;
-
- public:
+ private:
+ int id;
+ int axis;
+ float pos;
+ float angle;
- JoystickAxis(int id_, int axis_, float angle_);
+ public:
- virtual const float& get_pos () const;
- virtual const float& get_angle () const;
-
- virtual void update (float);
+ JoystickAxis (int id_, int axis_, float angle_);
+
+ virtual const float& get_pos () const;
+ virtual const float& get_angle () const;
+
+ virtual void update (float);
+
+ private:
+ JoystickAxis (const JoystickAxis&);
+ JoystickAxis operator= (const JoystickAxis&);
};
}
Index: joystick_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/joystick_button.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- joystick_button.hxx 14 Aug 2002 12:41:22 -0000 1.3
+++ joystick_button.hxx 23 Aug 2002 15:49:55 -0000 1.4
@@ -37,10 +37,14 @@
public:
- JoystickButton(int id_, int button_);
+ JoystickButton (int id_, int button_);
virtual bool is_pressed () const;
virtual void update (float);
+
+ private:
+ JoystickButton (const JoystickButton&);
+ JoystickButton operator= (const JoystickButton&);
};
}
Index: joystick_scroller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/joystick_scroller.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- joystick_scroller.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ joystick_scroller.hxx 23 Aug 2002 15:49:55 -0000 1.3
@@ -53,6 +53,10 @@
void get_delta (float& x, float& y) const;
void update (float delta);
+
+ private:
+ JoystickScroller (const JoystickScroller&);
+ JoystickScroller operator= (const JoystickScroller&);
};
}
Index: key_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/key_button.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- key_button.hxx 14 Aug 2002 12:41:22 -0000 1.3
+++ key_button.hxx 23 Aug 2002 15:49:55 -0000 1.4
@@ -36,10 +36,14 @@
public:
- KeyButton(int button_);
+ KeyButton (int button_);
virtual bool is_pressed () const;
virtual void update (float);
+
+ private:
+ KeyButton (const KeyButton&);
+ KeyButton operator= (const KeyButton&);
};
}
Index: key_helper.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/key_helper.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- key_helper.hxx 9 Jul 2002 14:18:47 -0000 1.1
+++ key_helper.hxx 23 Aug 2002 15:49:55 -0000 1.2
@@ -26,9 +26,14 @@
{
class KeyHelper
{
- public:
- static std::string key_to_string (int);
- static int string_to_key (const std::string&);
+ public:
+ static std::string key_to_string (int);
+ static int string_to_key (const std::string&);
+
+ private:
+ KeyHelper ();
+ KeyHelper (const KeyHelper&);
+ KeyHelper operator= (const KeyHelper&);
};
}
Index: mouse_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/mouse_axis.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- mouse_axis.hxx 14 Aug 2002 12:41:22 -0000 1.5
+++ mouse_axis.hxx 23 Aug 2002 15:49:56 -0000 1.6
@@ -38,12 +38,16 @@
float old_pos;
public:
- MouseAxis(int axis_, float angle_);
+ MouseAxis (int axis_, float angle_);
virtual const float& get_pos () const;
virtual const float& get_angle () const;
virtual void update (float);
+
+ private:
+ MouseAxis (const MouseAxis&);
+ MouseAxis operator= (const MouseAxis&);
};
}
Index: mouse_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/mouse_button.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mouse_button.hxx 14 Aug 2002 12:41:22 -0000 1.3
+++ mouse_button.hxx 23 Aug 2002 15:49:56 -0000 1.4
@@ -35,11 +35,14 @@
int button;
public:
-
MouseButton (int button_);
virtual bool is_pressed () const;
virtual void update (float);
+
+ private:
+ MouseButton (const MouseButton&);
+ MouseButton operator= (const MouseButton&);
};
}
Index: mouse_pointer.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/mouse_pointer.cxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- mouse_pointer.cxx 14 Aug 2002 12:41:22 -0000 1.3
+++ mouse_pointer.cxx 23 Aug 2002 15:49:56 -0000 1.4
@@ -24,6 +24,9 @@
namespace Input
{
+ MousePointer::MousePointer () : x_pos(0), y_pos(0)
+ {
+ }
const float&
MousePointer::get_x_pos () const
Index: mouse_pointer.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/mouse_pointer.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mouse_pointer.hxx 14 Aug 2002 12:41:22 -0000 1.4
+++ mouse_pointer.hxx 23 Aug 2002 15:49:56 -0000 1.5
@@ -36,13 +36,18 @@
float y_pos;
public:
-
+ MousePointer ();
+
virtual const float& get_x_pos () const;
virtual const float& get_y_pos () const;
virtual void set_pos (float new_x, float new_y);
virtual void update (float);
+
+ private:
+ MousePointer (const MousePointer&);
+ MousePointer operator= (const MousePointer&);
};
}
Index: mouse_scroller.cxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/mouse_scroller.cxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mouse_scroller.cxx 14 Aug 2002 12:41:22 -0000 1.2
+++ mouse_scroller.cxx 23 Aug 2002 15:49:56 -0000 1.3
@@ -22,7 +22,11 @@
#include <ClanLib/Display/Input/inputcursor.h>
#include "mouse_scroller.hxx"
-namespace Input {
+namespace Input
+{
+ MouseScroller::MouseScroller () : old_x(0), old_y(0), x_delta(0), y_delta(0)
+ {
+ }
const float&
MouseScroller::get_x_delta () const
Index: mouse_scroller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/mouse_scroller.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- mouse_scroller.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ mouse_scroller.hxx 23 Aug 2002 15:49:56 -0000 1.3
@@ -37,12 +37,18 @@
float y_delta;
public:
+ MouseScroller ();
+
const float& get_x_delta () const;
const float& get_y_delta () const;
void get_delta (float& x, float& y) const;
void update (float);
+
+ private:
+ MouseScroller (const MouseScroller&);
+ MouseScroller operator= (const MouseScroller&);
};
}
Index: multiple_axis.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/multiple_axis.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- multiple_axis.hxx 14 Aug 2002 12:41:22 -0000 1.3
+++ multiple_axis.hxx 23 Aug 2002 15:49:56 -0000 1.4
@@ -49,6 +49,10 @@
virtual const float& get_angle () const;
virtual void update (float delta);
+
+ private:
+ MultipleAxis (const MultipleAxis&);
+ MultipleAxis operator= (const MultipleAxis&);
};
}
Index: multiple_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/multiple_button.hxx,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- multiple_button.hxx 14 Aug 2002 12:41:22 -0000 1.5
+++ multiple_button.hxx 23 Aug 2002 15:49:56 -0000 1.6
@@ -44,6 +44,10 @@
virtual bool is_pressed () const;
virtual void update (float delta);
+
+ private:
+ MultipleButton (const MultipleButton&);
+ MultipleButton operator= (const MultipleButton&);
};
}
Index: multiple_pointer.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/multiple_pointer.hxx,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- multiple_pointer.hxx 14 Aug 2002 12:41:22 -0000 1.4
+++ multiple_pointer.hxx 23 Aug 2002 15:49:56 -0000 1.5
@@ -46,7 +46,6 @@
float y_pos;
public:
-
MultiplePointer (const std::vector<Pointer*>& pointers_);
~MultiplePointer ();
@@ -56,6 +55,10 @@
virtual void set_pos (float x_pos, float y_pos);
virtual void update (float delta);
+
+ private:
+ MultiplePointer (const MultiplePointer&);
+ MultiplePointer operator= (const MultiplePointer&);
};
}
Index: multiple_scroller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/multiple_scroller.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- multiple_scroller.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ multiple_scroller.hxx 23 Aug 2002 15:49:56 -0000 1.3
@@ -47,6 +47,10 @@
void get_delta (float& x, float& y) const;
void update (float delta);
+
+ private:
+ MultipleScroller (const MultipleScroller&);
+ MultipleScroller operator= (const MultipleScroller&);
};
}
Index: pointer.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/pointer.hxx,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- pointer.hxx 16 Aug 2002 13:03:36 -0000 1.6
+++ pointer.hxx 23 Aug 2002 15:49:56 -0000 1.7
@@ -28,7 +28,7 @@
class Pointer
{
public:
-
+ Pointer () { }
virtual ~Pointer() { }
/// returns the X coordinate of the pointer
@@ -41,6 +41,10 @@
virtual void set_pos (float, float) =0;
virtual void update (float) =0;
+
+ private:
+ Pointer (const Pointer&);
+ Pointer operator= (const Pointer&);
};
}
Index: pointer_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/pointer_event.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pointer_event.hxx 12 Jul 2002 15:08:45 -0000 1.2
+++ pointer_event.hxx 23 Aug 2002 15:49:56 -0000 1.3
@@ -36,6 +36,10 @@
PointerEvent (Type type_, float x_, float y_) : type(type_), x(x_),
y(y_) { }
EventType get_type () { return PointerEventType; }
+
+ private:
+ PointerEvent (const PointerEvent&);
+ PointerEvent operator= (const PointerEvent&);
};
}
Index: pointer_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/pointer_factory.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- pointer_factory.hxx 9 Jul 2002 16:50:26 -0000 1.1
+++ pointer_factory.hxx 23 Aug 2002 15:49:56 -0000 1.2
@@ -35,6 +35,11 @@
public:
static Pointer* create (xmlNodePtr cur);
+
+ private:
+ PointerFactory ();
+ PointerFactory (const PointerFactory&);
+ PointerFactory operator= (const PointerFactory&);
};
}
Index: pointer_scroller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/pointer_scroller.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- pointer_scroller.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ pointer_scroller.hxx 23 Aug 2002 15:49:56 -0000 1.3
@@ -57,6 +57,10 @@
void get_delta (float& x, float& y) const;
void update (float delta);
+
+ private:
+ PointerScroller (const PointerScroller&);
+ PointerScroller operator= (const PointerScroller&);
};
}
Index: scroll_event.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/scroll_event.hxx,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- scroll_event.hxx 11 Jul 2002 15:15:19 -0000 1.1
+++ scroll_event.hxx 23 Aug 2002 15:49:56 -0000 1.2
@@ -34,6 +34,10 @@
ScrollEvent (float x_delta_, float y_delta_) : x_delta(x_delta_),
y_delta(y_delta_) { }
EventType get_type () { return ScrollEventType; }
+
+ private:
+ ScrollEvent (const ScrollEvent&);
+ ScrollEvent operator= (const ScrollEvent&);
};
}
Index: scroller.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/scroller.hxx,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- scroller.hxx 16 Aug 2002 13:03:36 -0000 1.3
+++ scroller.hxx 23 Aug 2002 15:49:56 -0000 1.4
@@ -27,6 +27,7 @@
/// abstract base class defining the scroller interface
class Scroller {
public:
+ Scroller () { }
virtual ~Scroller () { }
/// returns the scroll delta in X direction
@@ -39,6 +40,10 @@
virtual void get_delta (float&, float&) const =0;
virtual void update (float) =0;
+
+ private:
+ Scroller (const Scroller&);
+ Scroller operator= (const Scroller&);
};
}
Index: scroller_factory.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/scroller_factory.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- scroller_factory.hxx 12 Jul 2002 12:36:14 -0000 1.2
+++ scroller_factory.hxx 23 Aug 2002 15:49:56 -0000 1.3
@@ -38,6 +38,11 @@
public:
static Scroller* create (xmlNodePtr cur);
+
+ private:
+ ScrollerFactory ();
+ ScrollerFactory (const ScrollerFactory&);
+ ScrollerFactory operator= (const ScrollerFactory&);
};
}
Index: triple_button.hxx
===================================================================
RCS file: /usr/local/cvsroot/Games/Pingus/src/input/triple_button.hxx,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- triple_button.hxx 14 Aug 2002 12:41:22 -0000 1.2
+++ triple_button.hxx 23 Aug 2002 15:49:56 -0000 1.3
@@ -49,6 +49,10 @@
virtual bool is_pressed () const;
virtual void update (float delta);
+
+ private:
+ TripleButton (const TripleButton&);
+ TripleButton operator= (const TripleButton&);
};
}
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Pingus-CVS] CVS: Games/Pingus/src/input axis.hxx,1.5,1.6 axis_event.hxx,1.2,1.3 axis_factory.hxx,1.3,1.4 axis_pointer.hxx,1.6,1.7 axis_scroller.hxx,1.2,1.3 button.hxx,1.5,1.6 button_axis.hxx,1.4,1.5 button_event.hxx,1.2,1.3 button_factory.hxx,1.3,1.4 controller.cxx,1.19,1.20 controller.hxx,1.10,1.11 double_button.hxx,1.2,1.3 dummy_axis.hxx,1.2,1.3 dummy_button.hxx,1.2,1.3 dummy_pointer.hxx,1.2,1.3 dummy_scroller.hxx,1.2,1.3 event.hxx,1.4,1.5 inverted_axis.hxx,1.5,1.6 inverted_scroller.hxx,1.2,1.3 joystick_axis.hxx,1.4,1.5 joystick_button.hxx,1.3,1.4 joystick_scroller.hxx,1.2,1.3 key_button.hxx,1.3,1.4 key_helper.hxx,1.1,1.2 mouse_axis.hxx,1.5,1.6 mouse_button.hxx,1.3,1.4 mouse_pointer.cxx,1.3,1.4 mouse_pointer.hxx,1.4,1.5 mouse_scroller.cxx,1.2,1.3 mouse_scroller.hxx,1.2,1.3 multiple_axis.hxx,1.3,1.4 multiple_button.hxx,1.5,1.6 multiple_pointer.hxx,1.4,1.5 multiple_scroller.hxx,1.2,1.3 pointer.hxx,1.6,1.7 pointer_event.hxx,1.2,1.3 pointer_factory.hxx,1.1,1.2 pointer_scroller.hxx,1.2,1.3 scroll_event.hxx,1.1,1.2 scroller.hxx,1.3,1.4 scroller_factory.hxx,1.2,1.3 triple_button.hxx,1.2,1.3,
torangan <=
- Prev by Date:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap graph.hxx,1.4,1.5 manager.hxx,1.6,1.7 node.hxx,1.3,1.4 node_data.cxx,1.1,1.2 node_data.hxx,1.5,1.6 pingus.hxx,1.6,1.7 stat.cxx,1.5,1.6 stat.hxx,1.4,1.5 worldmap.hxx,1.5,1.6
- Next by Date:
[Pingus-CVS] CVS: Games/Pingus/src/entrances cloud.hxx,1.2,1.3 woodthing.hxx,1.2,1.3
- Previous by thread:
[Pingus-CVS] CVS: Games/Pingus/src/worldmap graph.hxx,1.4,1.5 manager.hxx,1.6,1.7 node.hxx,1.3,1.4 node_data.cxx,1.1,1.2 node_data.hxx,1.5,1.6 pingus.hxx,1.6,1.7 stat.cxx,1.5,1.6 stat.hxx,1.4,1.5 worldmap.hxx,1.5,1.6
- Next by thread:
[Pingus-CVS] CVS: Games/Pingus/src/entrances cloud.hxx,1.2,1.3 woodthing.hxx,1.2,1.3
- Index(es):