Reformat all the things. Have fun with merge conflicts.

This commit is contained in:
Pierre Bourdon
2016-06-24 10:43:46 +02:00
parent 2115e8a4a6
commit 3570c7f03a
1116 changed files with 187405 additions and 180344 deletions

View File

@ -11,43 +11,46 @@ namespace ciface
{
namespace Android
{
void Init( std::vector<Core::Device*>& devices );
void Init(std::vector<Core::Device*>& devices);
class Touchscreen : public Core::Device
{
private:
class Button : public Input
{
public:
std::string GetName() const;
Button(int padID, ButtonManager::ButtonType index) : _padID(padID), _index(index) {}
ControlState GetState() const;
private:
const int _padID;
const ButtonManager::ButtonType _index;
};
class Axis : public Input
{
public:
std::string GetName() const;
Axis(int padID, ButtonManager::ButtonType index, float neg = 1.0f) : _padID(padID), _index(index), _neg(neg) {}
ControlState GetState() const;
private:
const int _padID;
const ButtonManager::ButtonType _index;
const float _neg;
};
class Button : public Input
{
public:
std::string GetName() const;
Button(int padID, ButtonManager::ButtonType index) : _padID(padID), _index(index) {}
ControlState GetState() const;
private:
const int _padID;
const ButtonManager::ButtonType _index;
};
class Axis : public Input
{
public:
std::string GetName() const;
Axis(int padID, ButtonManager::ButtonType index, float neg = 1.0f)
: _padID(padID), _index(index), _neg(neg)
{
}
ControlState GetState() const;
private:
const int _padID;
const ButtonManager::ButtonType _index;
const float _neg;
};
public:
Touchscreen(int padID);
~Touchscreen() {}
Touchscreen(int padID);
~Touchscreen() {}
std::string GetName() const;
int GetId() const;
std::string GetSource() const;
std::string GetName() const;
int GetId() const;
std::string GetSource() const;
private:
const int _padID;
const int _padID;
};
}
}