diff options
author | mathias <mathias> | 2004-12-13 14:03:17 (GMT) |
---|---|---|
committer | mathias <mathias> | 2004-12-13 14:03:17 (GMT) |
commit | eb42a7806d0af854cc4bdfa8f194a0bb67446153 (patch) | |
tree | 5a8a22b0705ee927a16265f1a754159835fb22d9 /src/Slit.cc | |
parent | 7c7dfbfbddc635faaabb87fa755925fbb66d89dd (diff) | |
download | fluxbox_pavel-eb42a7806d0af854cc4bdfa8f194a0bb67446153.zip fluxbox_pavel-eb42a7806d0af854cc4bdfa8f194a0bb67446153.tar.bz2 |
icc complaint about a "possible" conflict between the
FbTk::Menu::update(Subject*) and FbTk::Menu::update(int index)
to avoid this, we rename FbTk::Menu::update(int index)
-> FbTk::Menu::updateMenu(int index)
this is mostly cosmetic, but if it makes the life of a compiler happy, well ..
be happy icc :)
Diffstat (limited to 'src/Slit.cc')
-rw-r--r-- | src/Slit.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Slit.cc b/src/Slit.cc index b89e428..566b76d 100644 --- a/src/Slit.cc +++ b/src/Slit.cc | |||
@@ -1174,7 +1174,7 @@ void Slit::updateClientmenu() { | |||
1174 | "Save SlitList", "Saves the current order in the slit"), | 1174 | "Save SlitList", "Saves the current order in the slit"), |
1175 | savecmd); | 1175 | savecmd); |
1176 | 1176 | ||
1177 | m_clientlist_menu.update(); | 1177 | m_clientlist_menu.updateMenu(); |
1178 | } | 1178 | } |
1179 | 1179 | ||
1180 | void Slit::saveClientList() { | 1180 | void Slit::saveClientList() { |
@@ -1271,7 +1271,7 @@ void Slit::setupMenu() { | |||
1271 | *this, | 1271 | *this, |
1272 | save_and_reconfigure)); | 1272 | save_and_reconfigure)); |
1273 | m_slitmenu.insert(_FBTEXT(Slit, ClientsMenu, "Clients", "Slit client menu"), &m_clientlist_menu); | 1273 | m_slitmenu.insert(_FBTEXT(Slit, ClientsMenu, "Clients", "Slit client menu"), &m_clientlist_menu); |
1274 | m_slitmenu.update(); | 1274 | m_slitmenu.updateMenu(); |
1275 | 1275 | ||
1276 | // setup sub menu | 1276 | // setup sub menu |
1277 | m_placement_menu.setLabel(_FBTEXT(Slit, Placement, "Slit Placement", "Slit Placement")); | 1277 | m_placement_menu.setLabel(_FBTEXT(Slit, Placement, "Slit Placement", "Slit Placement")); |
@@ -1313,7 +1313,7 @@ void Slit::setupMenu() { | |||
1313 | } | 1313 | } |
1314 | 1314 | ||
1315 | // finaly update sub menu | 1315 | // finaly update sub menu |
1316 | m_placement_menu.update(); | 1316 | m_placement_menu.updateMenu(); |
1317 | } | 1317 | } |
1318 | 1318 | ||
1319 | void Slit::moveToLayer(int layernum) { | 1319 | void Slit::moveToLayer(int layernum) { |