Fix "ISO C++ 11 does not allow converting from string literal to char*"
This commit is contained in:
@@ -26,8 +26,8 @@ private:
|
||||
public:
|
||||
static std::vector<Key> GetKeyboard();
|
||||
Key();
|
||||
Key(char* charcode, X11Scancode scancode, WindowsScancode wSc);
|
||||
char* CharCode;
|
||||
Key(const char* charcode, X11Scancode scancode, WindowsScancode wSc);
|
||||
const char* CharCode;
|
||||
X11Scancode x11ScanCode;
|
||||
WindowsScancode winScanCode;
|
||||
bool operator==(const Key& rhs) const;
|
||||
@@ -139,8 +139,8 @@ class GamepadButton {};
|
||||
class MouseButton {
|
||||
public:
|
||||
MouseButton();
|
||||
MouseButton(char* charcode);
|
||||
char* CharCode;
|
||||
explicit MouseButton(const char* charcode);
|
||||
const char* CharCode;
|
||||
};
|
||||
|
||||
using J3ML::LinearAlgebra::Vector2;
|
||||
|
@@ -9,7 +9,7 @@ Key::Key() {
|
||||
keyboard.push_back(*this);
|
||||
}
|
||||
|
||||
Key::Key(char* charcode, X11Scancode scancode, WindowsScancode sc)
|
||||
Key::Key(const char* charcode, X11Scancode scancode, WindowsScancode sc)
|
||||
: CharCode(charcode), x11ScanCode(scancode), winScanCode(sc)
|
||||
{
|
||||
keyboard.push_back(*this);
|
||||
@@ -18,7 +18,7 @@ Key::Key(char* charcode, X11Scancode scancode, WindowsScancode sc)
|
||||
MouseButton::MouseButton() {
|
||||
}
|
||||
|
||||
MouseButton::MouseButton(char* charcode) {
|
||||
MouseButton::MouseButton(const char* charcode) {
|
||||
this->CharCode = charcode;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user