Update .gitignore to include build products on Windows

[libs/gui.git] / source / input / hub.h

diff --git a/source/input/hub.h b/source/input/hub.h
index af4db47d81da96538482ce0fe62c965b71cee323..aadfcd7f5b0a87752b9e623d354f29bcf0403ec5 100644 (file)
--- a/source/input/hub.h
+++ b/source/input/hub.h
@@ -1,6 +1,9 @@
-#ifndef MSP_GBASE_INPUTHUB_H_
-#define MSP_GBASE_INPUTHUB_H_
+#ifndef MSP_INPUT_INPUTHUB_H_
+#define MSP_INPUT_INPUTHUB_H_
 
+#include <vector>
+#include <sigc++/trackable.h>
+#include <msp/graphics/mspgui_api.h>
 #include "device.h"
 
 namespace Msp {
@@ -10,7 +13,7 @@ namespace Input {
 The Hub device collects events from multiple input devices and presents an
 aggregate of them.  Button and axis numbers are mapped to unique values.
 */
-class Hub: public Device
+class MSPGUI_API Hub: public Device, public sigc::trackable
 {
 protected:
        std::vector<Device *> devices;
@@ -18,17 +21,14 @@ protected:
 public:
        Hub();
 
-       /**
-       Attaches an input device to the hub.
+       /// Attaches an input device to the hub.
+       void attach(Device &dev);
 
-       @param   dev  Device to attach
+       Device *find_subdevice(DeviceType, unsigned = 0) override;
+       Device *find_subdevice(const std::string &) override;
 
-       @return  Index of the device within the hub
-       */
-       unsigned attach(Device &dev);
-
-       virtual std::string get_button_name(unsigned) const;
-       virtual std::string get_axis_name(unsigned) const;
+       std::string get_button_name(unsigned) const override;
+       std::string get_axis_name(unsigned) const override;
 protected:
        void button_press(unsigned, unsigned);
        void button_release(unsigned, unsigned);