Skip to content

Commit f5d9bed

Browse files
committed
Fix deprecated conversion from string constant
1 parent 0e72784 commit f5d9bed

File tree

2 files changed

+11
-11
lines changed

2 files changed

+11
-11
lines changed

MenuSystem.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -9,17 +9,17 @@
99
// MenuComponent
1010
// *********************************************************
1111

12-
MenuComponent::MenuComponent(char* name)
12+
MenuComponent::MenuComponent(const char* name)
1313
: _name(name)
1414
{
1515
}
1616

17-
char* MenuComponent::get_name() const
17+
const char* MenuComponent::get_name() const
1818
{
1919
return _name;
2020
}
2121

22-
void MenuComponent::set_name(char* name)
22+
void MenuComponent::set_name(const char* name)
2323
{
2424
_name = name;
2525
}
@@ -29,7 +29,7 @@ void MenuComponent::set_name(char* name)
2929
// Menu
3030
// *********************************************************
3131

32-
Menu::Menu(char* name)
32+
Menu::Menu(const char* name)
3333
: MenuComponent(name),
3434
_p_sel_menu_component(NULL),
3535
_menu_components(NULL),
@@ -168,7 +168,7 @@ byte Menu::get_cur_menu_component_num() const
168168
// MenuItem
169169
// *********************************************************
170170

171-
MenuItem::MenuItem(char* name)
171+
MenuItem::MenuItem(const char* name)
172172
: MenuComponent(name),
173173
_on_select(0)
174174
{

MenuSystem.h

+6-6
Original file line numberDiff line numberDiff line change
@@ -15,22 +15,22 @@
1515
class MenuComponent
1616
{
1717
public:
18-
MenuComponent(char* name);
18+
MenuComponent(const char* name);
1919

20-
void set_name(char* name);
21-
char* get_name() const;
20+
void set_name(const char* name);
21+
const char* get_name() const;
2222

2323
virtual MenuComponent* select() = 0;
2424

2525
protected:
26-
char* _name;
26+
const char* _name;
2727
};
2828

2929

3030
class MenuItem : public MenuComponent
3131
{
3232
public:
33-
MenuItem(char* name);
33+
MenuItem(const char* name);
3434

3535
void set_select_function(void (*on_select)(MenuItem*));
3636

@@ -44,7 +44,7 @@ class MenuItem : public MenuComponent
4444
class Menu : public MenuComponent
4545
{
4646
public:
47-
Menu(char* name);
47+
Menu(const char* name);
4848

4949
boolean next(boolean loop=false);
5050
boolean prev(boolean loop=false);

0 commit comments

Comments
 (0)