]> git.pld-linux.org Git - packages/widelands.git/blame - widelands-gcc-4.5.patch
- fix build with gcc-4.5
[packages/widelands.git] / widelands-gcc-4.5.patch
CommitLineData
98664f7f 1--- widelands-build15-src/src/editor/ui_menus/editor_main_menu_random_map.cc~ 2010-04-16 17:41:22.000000000 +0200
2+++ widelands-build15-src/src/editor/ui_menus/editor_main_menu_random_map.cc 2010-04-26 14:49:08.138178091 +0200
3@@ -272,7 +272,7 @@
4 posx, posy, width, height,
5 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
6 &Main_Menu_New_Random_Map::button_clicked, *this, 8,
7- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
8+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
9
10 posy += height + spacing + spacing + spacing;
11
12@@ -343,7 +343,7 @@
13 if (m_currentworld == m_worlds.size())
14 m_currentworld = 0;
15 m_world->set_title
16- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
17+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
18 break;
19 case 9:
20 break;
21@@ -476,7 +476,7 @@
22 (strcmp(mapInfo.worldName.c_str(), m_worlds[m_currentworld].c_str()))
23 ++m_currentworld;
24 m_world->set_title
25- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
26+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
27
28 button_clicked(-1); // Update other values in UI as well
29
30--- widelands-build15-src/src/editor/ui_menus/editor_main_menu_new_map.cc~ 2010-04-16 17:41:22.000000000 +0200
31+++ widelands-build15-src/src/editor/ui_menus/editor_main_menu_new_map.cc 2010-04-26 15:17:52.691333135 +0200
32@@ -113,7 +113,7 @@
33 posx, posy, width, height,
34 g_gr->get_picture(PicMod_UI, "pics/but1.png"),
35 &Main_Menu_New_Map::button_clicked, *this, 4,
36- Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name());
37+ Widelands::World(m_worlds[m_currentworld].c_str()).get_name());
38
39 posy += height + spacing + spacing + spacing;
40
41@@ -142,7 +142,7 @@
42 if (m_currentworld == m_worlds.size())
43 m_currentworld = 0;
44 m_world->set_title
45- (Widelands::World::World(m_worlds[m_currentworld].c_str()).get_name
46+ (Widelands::World(m_worlds[m_currentworld].c_str()).get_name
47 ());
48 break;
49 }
This page took 0.115852 seconds and 4 git commands to generate.