X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Finput%2Fcontrol.h;h=924bbeca39024f3c0ed615c17d986cffa7ce7eb5;hb=5d688fbf457b1f4d3bebde431a7f58c898be584c;hp=1ee21c8af072f5e305710c28597055d50482382b;hpb=b453da0696b24cc02a7fcf5127afcd7baef9c801;p=libs%2Fgui.git

diff --git a/source/input/control.h b/source/input/control.h
index 1ee21c8..924bbec 100644
--- a/source/input/control.h
+++ b/source/input/control.h
@@ -1,13 +1,7 @@
-/* $Id$
-
-This file is part of libmspgbase
-Copyright © 2007 Mikko Rasa, Mikkosoft Productions
-Distributed under the LGPL
-*/
-
-#ifndef MSP_GBASE_CONTROL_H_
-#define MSP_GBASE_CONTROL_H_
+#ifndef MSP_INPUT_CONTROL_H_
+#define MSP_INPUT_CONTROL_H_
 
+#include <string>
 #include <sigc++/signal.h>
 #include <sigc++/trackable.h>
 
@@ -60,9 +54,7 @@ protected:
 	Control();
 	Control(const ControlSource &);
 	Control(Device &, ControlSrcType, unsigned);
-	Control(const Control &);
 public:
-	Control &operator=(const Control &);
 	virtual ~Control() { }
 
 	void capture(Device &);
@@ -71,15 +63,18 @@ public:
 	void set_source(const ControlSource &);
 	const ControlSource &get_source() const { return src; }
 protected:
-	virtual void on_press() =0;
-	virtual void on_release() =0;
-	virtual void on_motion(float, float) =0;
+	virtual void on_press() = 0;
+	virtual void on_release() = 0;
+	virtual void on_motion(float, float) = 0;
 
 private:
 	void connect_signals();
 	void button_press(unsigned);
 	void button_release(unsigned);
 	void axis_motion(unsigned, float, float);
+
+	Control(const Control &);
+	Control &operator=(const Control &);
 };
 
 } // namespace Input