Fix "ISO C++ 11 does not allow converting from string literal to char*"

This commit is contained in:
2024-06-16 21:52:15 -04:00
parent 10a63d738c
commit 50a7e2cfe1
2 changed files with 6 additions and 6 deletions

View File

@@ -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;

View File

@@ -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;
}