From ad685091bc96420114167d32a8f7fdb71e3c1d3e Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Sat, 19 Sep 2009 02:44:44 +0200 Subject: [PATCH] rename Menu::BoldOption() to Menu::Bold() --- src/browser.cpp | 6 +++--- src/helpers.cpp | 2 +- src/media_library.cpp | 2 +- src/menu.h | 8 ++++---- src/ncmpcpp.cpp | 8 ++++---- src/outputs.cpp | 4 ++-- src/playlist_editor.cpp | 2 +- src/search_engine.cpp | 6 +++--- src/status.cpp | 4 ++-- 9 files changed, 21 insertions(+), 21 deletions(-) diff --git a/src/browser.cpp b/src/browser.cpp index f8fb432c..3e7680d3 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -108,7 +108,7 @@ void Browser::EnterPressed() } case itSong: { - w->BoldOption(w->Choice(), myPlaylist->Add(*item.song, w->isBold(), 1)); + w->Bold(w->Choice(), myPlaylist->Add(*item.song, w->isBold(), 1)); break; } case itPlaylist: @@ -167,7 +167,7 @@ void Browser::SpacePressed() } case itSong: { - w->BoldOption(w->Choice(), myPlaylist->Add(*item.song, w->isBold(), 0)); + w->Bold(w->Choice(), myPlaylist->Add(*item.song, w->isBold(), 0)); break; } case itPlaylist: @@ -503,7 +503,7 @@ void Browser::UpdateItemList() break; } } - w->BoldOption(i, bold); + w->Bold(i, bold); bold = 0; } } diff --git a/src/helpers.cpp b/src/helpers.cpp index 5711b0d2..dd6aab9c 100644 --- a/src/helpers.cpp +++ b/src/helpers.cpp @@ -259,7 +259,7 @@ void UpdateSongList(Menu *menu) break; } } - menu->BoldOption(i, bold); + menu->Bold(i, bold); bold = 0; } menu->Refresh(); diff --git a/src/media_library.cpp b/src/media_library.cpp index 771a9e95..6ccd9f10 100644 --- a/src/media_library.cpp +++ b/src/media_library.cpp @@ -502,7 +502,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play) ShowMessage("Adding songs from album \"%s\"", Albums->Current().second.Album.c_str()); } else if (w == Songs && !Songs->Empty()) - Songs->BoldOption(Songs->Choice(), myPlaylist->Add(Songs->Current(), Songs->isBold(), add_n_play)); + Songs->Bold(Songs->Choice(), myPlaylist->Add(Songs->Current(), Songs->isBold(), add_n_play)); FreeSongList(list); if (!add_n_play) { diff --git a/src/menu.h b/src/menu.h index 04ec16c1..30a77ede 100644 --- a/src/menu.h +++ b/src/menu.h @@ -263,7 +263,7 @@ namespace NCurses /// @param pos position of item to be bolded/unbolded /// @param state state of bold attribute /// - void BoldOption(int pos, bool state); + void Bold(int pos, bool state); /// Makes given position static/active. /// Static positions cannot be highlighted. @@ -651,7 +651,7 @@ template void NCurses::Menu::IntoSeparator(size_t pos) (*itsOptionsPtr)[pos] = 0; } -template void NCurses::Menu::BoldOption(int pos, bool state) +template void NCurses::Menu::Bold(int pos, bool state) { if (!itsOptionsPtr->at(pos)) return; @@ -729,7 +729,7 @@ template void NCurses::Menu::Refresh() continue; } if ((*itsOptionsPtr)[i]->isBold) - Bold(1); + Window::Bold(1); if (highlightEnabled && int(i) == itsHighlight) { Reverse(1); @@ -748,7 +748,7 @@ template void NCurses::Menu::Refresh() Reverse(0); } if ((*itsOptionsPtr)[i]->isBold) - Bold(0); + Window::Bold(0); line++; } Window::Refresh(); diff --git a/src/ncmpcpp.cpp b/src/ncmpcpp.cpp index eef8296d..14979333 100644 --- a/src/ncmpcpp.cpp +++ b/src/ncmpcpp.cpp @@ -813,7 +813,7 @@ int main(int argc, char *argv[]) for (std::vector::iterator it = list.begin(); it != list.end(); ++it) if (*it == size_t(myPlaylist->NowPlaying) && list.front() > 0) - myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 0); + myPlaylist->Items->Bold(myPlaylist->NowPlaying, 0); std::vector origs(list); @@ -844,7 +844,7 @@ int main(int argc, char *argv[]) from = to = myPlaylist->Items->Choice(); // unbold now playing as if song changes during move, this won't be unbolded. if (to == size_t(myPlaylist->NowPlaying) && to > 0) - myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 0); + myPlaylist->Items->Bold(myPlaylist->NowPlaying, 0); while (Keypressed(input, Key.MvSongUp) && to > 0) { TraceMpdStatus(); @@ -927,7 +927,7 @@ int main(int argc, char *argv[]) for (std::vector::iterator it = list.begin(); it != list.end(); ++it) if (*it == size_t(myPlaylist->NowPlaying) && list.back() < myPlaylist->Items->Size()-1) - myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 0); + myPlaylist->Items->Bold(myPlaylist->NowPlaying, 0); std::vector origs(list); @@ -958,7 +958,7 @@ int main(int argc, char *argv[]) from = to = myPlaylist->Items->Choice(); // unbold now playing as if song changes during move, this won't be unbolded. if (to == size_t(myPlaylist->NowPlaying) && to < myPlaylist->Items->Size()-1) - myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 0); + myPlaylist->Items->Bold(myPlaylist->NowPlaying, 0); while (Keypressed(input, Key.MvSongDown) && to < myPlaylist->Items->Size()-1) { TraceMpdStatus(); diff --git a/src/outputs.cpp b/src/outputs.cpp index aab7b8a3..eca0246f 100644 --- a/src/outputs.cpp +++ b/src/outputs.cpp @@ -78,7 +78,7 @@ void Outputs::EnterPressed() { ShowMessage("Output \"%s\" disabled", w->Current().first.c_str()); w->Current().second = 0; - w->BoldOption(w->Choice(), 0); + w->Bold(w->Choice(), 0); } } else @@ -87,7 +87,7 @@ void Outputs::EnterPressed() { ShowMessage("Output \"%s\" enabled", w->Current().first.c_str()); w->Current().second = 1; - w->BoldOption(w->Choice(), 1); + w->Bold(w->Choice(), 1); } } diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp index cd15b29e..f7325601 100644 --- a/src/playlist_editor.cpp +++ b/src/playlist_editor.cpp @@ -202,7 +202,7 @@ void PlaylistEditor::AddToPlaylist(bool add_n_play) ShowMessage("Loading playlist %s...", Playlists->Current().c_str()); } else if (w == Content && !Content->Empty()) - Content->BoldOption(Content->Choice(), myPlaylist->Add(Content->Current(), Content->isBold(), add_n_play)); + Content->Bold(Content->Choice(), myPlaylist->Add(Content->Current(), Content->isBold(), add_n_play)); FreeSongList(list); if (!add_n_play) diff --git a/src/search_engine.cpp b/src/search_engine.cpp index d88aa673..96b91dda 100644 --- a/src/search_engine.cpp +++ b/src/search_engine.cpp @@ -236,7 +236,7 @@ void SearchEngine::EnterPressed() } default: { - w->BoldOption(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 1)); + w->Bold(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 1)); break; } } @@ -256,7 +256,7 @@ void SearchEngine::SpacePressed() return; } - w->BoldOption(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 0)); + w->Bold(w->Choice(), myPlaylist->Add(*w->Current().second, w->isBold(), 0)); w->Scroll(wDown); } @@ -321,7 +321,7 @@ void SearchEngine::UpdateFoundList() break; } } - w->BoldOption(i, bold); + w->Bold(i, bold); bold = 0; } } diff --git a/src/status.cpp b/src/status.cpp index 2f0f53d0..0c1d9478 100644 --- a/src/status.cpp +++ b/src/status.cpp @@ -193,12 +193,12 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *) myPlaylist->Items->ShowAll(); try { - myPlaylist->Items->BoldOption(myPlaylist->OldPlaying, 0); + myPlaylist->Items->Bold(myPlaylist->OldPlaying, 0); } catch (std::out_of_range) { } try { - myPlaylist->Items->BoldOption(myPlaylist->NowPlaying, 1); + myPlaylist->Items->Bold(myPlaylist->NowPlaying, 1); } catch (std::out_of_range) { } if (was_filtered)