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/Workspace.cc | |
parent | 7c7dfbfbddc635faaabb87fa755925fbb66d89dd (diff) | |
download | fluxbox-eb42a7806d0af854cc4bdfa8f194a0bb67446153.zip fluxbox-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/Workspace.cc')
-rw-r--r-- | src/Workspace.cc | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/Workspace.cc b/src/Workspace.cc index 4de6a37..e0bf51d 100644 --- a/src/Workspace.cc +++ b/src/Workspace.cc | |||
@@ -353,7 +353,7 @@ bool Workspace::loadGroups(const std::string &filename) { | |||
353 | } | 353 | } |
354 | 354 | ||
355 | void Workspace::update(FbTk::Subject *subj) { | 355 | void Workspace::update(FbTk::Subject *subj) { |
356 | menu().update(); | 356 | menu().updateMenu(); |
357 | } | 357 | } |
358 | 358 | ||
359 | 359 | ||
@@ -373,7 +373,7 @@ void Workspace::setName(const std::string &name) { | |||
373 | screen().updateWorkspaceNamesAtom(); | 373 | screen().updateWorkspaceNamesAtom(); |
374 | 374 | ||
375 | menu().setLabel(m_name.c_str()); | 375 | menu().setLabel(m_name.c_str()); |
376 | menu().update(); | 376 | menu().updateMenu(); |
377 | } | 377 | } |
378 | 378 | ||
379 | /** | 379 | /** |
@@ -407,7 +407,7 @@ void Workspace::updateClientmenu() { | |||
407 | menu().insert(new ClientMenuItem(*(*client_it))); | 407 | menu().insert(new ClientMenuItem(*(*client_it))); |
408 | } | 408 | } |
409 | 409 | ||
410 | menu().update(); | 410 | menu().updateMenu(); |
411 | } | 411 | } |
412 | 412 | ||
413 | void Workspace::placeWindow(FluxboxWindow &win) { | 413 | void Workspace::placeWindow(FluxboxWindow &win) { |