Salastil/ncmpcpp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use prefix ++ instead of postfix where available

Browse Source
This commit is contained in:
Andrzej Rybczak
2009-07-04 06:41:35 +02:00
parent 2eb913fe22
commit 9dab25e02c
26 changed files with 178 additions and 178 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
src/browser.cpp
View File

@@ -113,7 +113,7 @@ void Browser::EnterPressed()
{
bool found = 0;
long long hash = w->Current().song->GetHash();
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
{
if (myPlaylist->Main()->at(i).GetHash() == hash)
{
@@ -141,7 +141,7 @@ void Browser::EnterPressed()
Mpd.GetPlaylistContent(locale_to_utf_cpy(item.name), list);
Mpd.StartCommandsList();
SongList::const_iterator it = list.begin();
for (; it != list.end(); it++)
for (; it != list.end(); ++it)
if (Mpd.AddSong(**it) < 0)
break;
Mpd.CommitCommandsList();
@@ -203,7 +203,7 @@ void Browser::SpacePressed()
SongList list;
Mpd.GetDirectoryRecursive(locale_to_utf_cpy(item.name), list);
Mpd.StartCommandsList();
for (SongList::const_iterator it = list.begin(); it != list.end(); it++)
for (SongList::const_iterator it = list.begin(); it != list.end(); ++it)
{
if (Mpd.AddSong(**it) < 0)
{
@@ -228,7 +228,7 @@ void Browser::SpacePressed()
Playlist::BlockUpdate = 1;
long long hash = w->Current().song->GetHash();
Mpd.StartCommandsList();
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
{
if (myPlaylist->Main()->at(i).GetHash() == hash)
{
@@ -258,7 +258,7 @@ void Browser::SpacePressed()
Mpd.GetPlaylistContent(locale_to_utf_cpy(item.name), list);
Mpd.StartCommandsList();
SongList::const_iterator it = list.begin();
for (; it != list.end(); it++)
for (; it != list.end(); ++it)
if (Mpd.AddSong(**it) < 0)
break;
Mpd.CommitCommandsList();
@@ -340,7 +340,7 @@ void Browser::GetSelectedSongs(MPD::SongList &v)
{
std::vector<size_t> selected;
w->GetSelected(selected);
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); it++)
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); ++it)
{
const Item &item = w->at(*it);
switch (item.type)
@@ -377,7 +377,7 @@ bool Browser::hasSupportedExtension(const string &file)
string ext = file.substr(last_dot+1);
ToLower(ext);
for (int i = 0; SupportedExtensions[i]; i++)
for (int i = 0; SupportedExtensions[i]; ++i)
if (strcmp(ext.c_str(), SupportedExtensions[i]) == 0)
return true;
@@ -397,7 +397,7 @@ void Browser::GetLocalDirectory(ItemList &v, const std::string &directory, bool
string full_path;
// omit . and ..
for (int i = 0; i < 2; i++)
for (int i = 0; i < 2; ++i)
{
file = readdir(dir);
if (!file)
@@ -457,7 +457,7 @@ void Browser::LocateSong(const MPD::Song &s)
locale_to_utf(option);
if (itsBrowsedDir != s.GetDirectory())
GetDirectory(s.GetDirectory());
for (size_t i = 0; i < w->Size(); i++)
for (size_t i = 0; i < w->Size(); ++i)
{
if (w->at(i).type == itSong && option == w->at(i).song->toString(Config.song_status_format))
{
@@ -480,7 +480,7 @@ void Browser::GetDirectory(string dir, string subdir)
locale_to_utf(dir);
for (size_t i = 0; i < w->Size(); i++)
for (size_t i = 0; i < w->Size(); ++i)
if (w->at(i).type == itSong)
delete w->at(i).song;
@@ -501,7 +501,7 @@ void Browser::GetDirectory(string dir, string subdir)
Config.local_browser ? GetLocalDirectory(list) : Mpd.GetDirectory(dir, list);
sort(list.begin(), list.end(), CaseInsensitiveSorting());
for (ItemList::iterator it = list.begin(); it != list.end(); it++)
for (ItemList::iterator it = list.begin(); it != list.end(); ++it)
{
switch (it->type)
{
@@ -522,7 +522,7 @@ void Browser::GetDirectory(string dir, string subdir)
case itSong:
{
bool bold = 0;
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
{
if (myPlaylist->Main()->at(i).GetHash() == it->song->GetHash())
{
@@ -550,7 +550,7 @@ void Browser::ClearDirectory(const std::string &path) const
string full_path;
// omit . and ..
for (int i = 0; i < 2; i++)
for (int i = 0; i < 2; ++i)
{
file = readdir(dir);
if (!file)
@@ -593,11 +593,11 @@ void Browser::ChangeBrowseMode()
void Browser::UpdateItemList()
{
bool bold = 0;
for (size_t i = 0; i < w->Size(); i++)
for (size_t i = 0; i < w->Size(); ++i)
{
if (w->at(i).type == itSong)
{
for (size_t j = 0; j < myPlaylist->Main()->Size(); j++)
for (size_t j = 0; j < myPlaylist->Main()->Size(); ++j)
{
if (myPlaylist->Main()->at(j).GetHash() == w->at(i).song->GetHash())
{

4
src/charset.cpp
View File

@@ -41,7 +41,7 @@ namespace
bool has_non_ascii_chars(const char *s)
{
for (; s; s++)
for (; s; ++s)
if (char_non_ascii(*s))
return true;
return false;
@@ -49,7 +49,7 @@ namespace
bool has_non_ascii_chars(const std::string &s)
{
for (std::string::const_iterator it = s.begin(); it != s.end(); it++)
for (std::string::const_iterator it = s.begin(); it != s.end(); ++it)
if (char_non_ascii(*it))
return true;
return false;

12
src/clock.cpp
View File

@@ -127,20 +127,20 @@ void Clock::Update()
attroff(COLOR_PAIR(Config.main_color));
refresh();
for (int k = 0; k < 6; k++)
for (int k = 0; k < 6; ++k)
{
newer[k] = (newer[k] & ~mask) | (next[k] & mask);
next[k] = 0;
for (int s = 1; s >= 0; s--)
for (int s = 1; s >= 0; --s)
{
w->Reverse(s);
for (int i = 0; i < 6; i++)
for (int i = 0; i < 6; ++i)
{
long a = (newer[i] ^ older[i]) & (s ? newer : older)[i];
if (a != 0)
{
long t = 1 << 26;
for (int j = 0; t; t >>= 1, j++)
for (int j = 0; t; t >>= 1, ++j)
{
if (a & t)
{
@@ -164,14 +164,14 @@ void Clock::Update()
void Clock::Prepare()
{
for (int i = 0; i < 5; i++)
for (int i = 0; i < 5; ++i)
older[i] = newer[i] = next[i] = 0;
}
void Clock::Set(int t, int n)
{
int m = 7 << n;
for (int i = 0; i < 5; i++)
for (int i = 0; i < 5; ++i)
{
next[i] |= ((disp[t] >> ((4 - i) * 3)) & 07) << n;
mask |= (next[i] ^ older[i]) & m;

16
src/display.cpp
View File

@@ -85,7 +85,7 @@ string Display::Columns(string st)
if (result.length() > where)
result = result.substr(0, where);
else
for (size_t i = result.length(); i <= where && i < size_t(COLS); i++, result += ' ') { }
for (size_t i = result.length(); i <= where && i < size_t(COLS); ++i, result += ' ') { }
}
return result;
}
@@ -187,14 +187,14 @@ void Display::Songs(const MPD::Song &s, void *data, Menu<MPD::Song> *menu)
string::const_iterator goto_pos, prev_pos;
for (string::const_iterator it = song_template.begin(); it != song_template.end(); it++)
for (string::const_iterator it = song_template.begin(); it != song_template.end(); ++it)
{
CHECK_LINKED_TAGS:;
if (*it == '{')
{
prev_pos = it;
Song::GetFunction get = 0;
for (; *it != '}'; it++)
for (; *it != '}'; ++it)
{
if (*it == '%')
{
@@ -260,21 +260,21 @@ void Display::Songs(const MPD::Song &s, void *data, Menu<MPD::Song> *menu)
{
if (*it == '}' && *(it+1) != '|')
break;
it++;
++it;
}
goto_pos = ++it;
it = ++prev_pos;
}
else
{
for (; *it != '}'; it++) { }
it++;
for (; *it != '}'; ++it) { }
++it;
if (it == song_template.end())
break;
if (*it == '{' || *it == '|')
{
if (*it == '|')
it++;
++it;
goto CHECK_LINKED_TAGS;
}
}
@@ -387,7 +387,7 @@ void Display::Songs(const MPD::Song &s, void *data, Menu<MPD::Song> *menu)
}
else
{
it++;
++it;
if (!right)
*menu << Color(*it-'0');
else

2
src/help.cpp
View File

@@ -118,7 +118,7 @@ std::string Help::DisplayKeys(int *key, int size)
}
if (result.length() > 12)
result = result.substr(0, 12);
for (size_t i = result.length(); i <= 12; result += " ", i++) { }
for (size_t i = result.length(); i <= 12; result += " ", ++i) { }
result += ": ";
return result;
}

14
src/helpers.cpp
View File

@@ -50,7 +50,7 @@ void ParseArgv(int argc, char **argv)
bool quit = 0;
for (int i = 1; i < argc; i++)
for (int i = 1; i < argc; ++i)
{
if (strcmp(argv[i], "-h") == 0)
{
@@ -223,9 +223,9 @@ bool CaseInsensitiveSorting::operator()(const Item &a, const Item &b)
void UpdateSongList(Menu<Song> *menu)
{
bool bold = 0;
for (size_t i = 0; i < menu->Size(); i++)
for (size_t i = 0; i < menu->Size(); ++i)
{
for (size_t j = 0; j < myPlaylist->Main()->Size(); j++)
for (size_t j = 0; j < myPlaylist->Main()->Size(); ++j)
{
if (myPlaylist->Main()->at(j).GetHash() == menu->at(i).GetHash())
{
@@ -243,7 +243,7 @@ void UpdateSongList(Menu<Song> *menu)
string FindSharedDir(Menu<Song> *menu)
{
SongList list;
for (size_t i = 0; i < menu->Size(); i++)
for (size_t i = 0; i < menu->Size(); ++i)
list.push_back(&menu->at(i));
return FindSharedDir(list);
}
@@ -254,7 +254,7 @@ string FindSharedDir(const SongList &v)
if (!v.empty())
{
result = v.front()->GetFile();
for (SongList::const_iterator it = v.begin()+1; it != v.end(); it++)
for (SongList::const_iterator it = v.begin()+1; it != v.end(); ++it)
{
int i = 1;
while (result.substr(0, i) == (*it)->GetFile().substr(0, i))
@@ -348,7 +348,7 @@ std::basic_string<my_char_t> Scroller(const string &str, size_t width, size_t &p
# endif
len = 0;
std::basic_string<my_char_t>::const_iterator b = s.begin(), e = s.end();
for (std::basic_string<my_char_t>::const_iterator it = b+pos; it < e && len < width; it++)
for (std::basic_string<my_char_t>::const_iterator it = b+pos; it < e && len < width; ++it)
{
# ifdef _UTF8
len += wcwidth(*it);
@@ -359,7 +359,7 @@ std::basic_string<my_char_t> Scroller(const string &str, size_t width, size_t &p
}
if (++pos >= s.length())
pos = 0;
for (; len < width; b++)
for (; len < width; ++b)
{
# ifdef _UTF8
len += wcwidth(*b);

2
src/info.cpp
View File

@@ -305,7 +305,7 @@ void *Info::PrepareArtist(void *screen_void_ptr)
if (save)
filebuffer << "\n\nSimilar artists:\n";
*screen->w << fmtBold << "\n\nSimilar artists:\n" << fmtBoldEnd;
for (size_t i = 1; i < similar.size(); i++)
for (size_t i = 1; i < similar.size(); ++i)
{
if (save)
filebuffer << "\n * " << similar[i] << " (" << urls[i] << ")";

2
src/lyrics.cpp
View File

@@ -329,7 +329,7 @@ bool Lyrics::LyricsPlugin_NotFound(const string &s)
{
if (s.empty())
return true;
for (string::const_iterator it = s.begin(); it != s.end(); it++)
for (string::const_iterator it = s.begin(); it != s.end(); ++it)
if (isprint(*it))
return false;
return true;

30
src/media_library.cpp
View File

@@ -168,7 +168,7 @@ void MediaLibrary::Update()
Songs->Clear(0);
Mpd.GetList(list, Config.media_lib_primary_tag);
sort(list.begin(), list.end(), CaseInsensitiveSorting());
for (TagList::iterator it = list.begin(); it != list.end(); it++)
for (TagList::iterator it = list.begin(); it != list.end(); ++it)
{
if (!it->empty())
{
@@ -206,7 +206,7 @@ void MediaLibrary::Update()
Albums->AddOption(std::make_pair("<no album>", SearchConstraints("", "")));
}
for (TagList::const_iterator it = list.begin(); it != list.end(); it++)
for (TagList::const_iterator it = list.begin(); it != list.end(); ++it)
{
TagList l;
Mpd.StartFieldSearch(MPD_TAG_ITEM_DATE);
@@ -218,11 +218,11 @@ void MediaLibrary::Update()
Albums->AddOption(std::make_pair(*it, SearchConstraints(*it, "")));
continue;
}
for (TagList::const_iterator j = l.begin(); j != l.end(); j++)
for (TagList::const_iterator j = l.begin(); j != l.end(); ++j)
Albums->AddOption(std::make_pair("(" + *j + ") " + *it, SearchConstraints(*it, *j)));
}
utf_to_locale(Artists->Current());
for (size_t i = 0; i < Albums->Size(); i++)
for (size_t i = 0; i < Albums->Size(); ++i)
utf_to_locale((*Albums)[i].first);
if (!Albums->Empty())
Albums->Sort<CaseInsensitiveSorting>((*Albums)[0].first == "<no album>");
@@ -234,13 +234,13 @@ void MediaLibrary::Update()
*Albums << XY(0, 0) << "Fetching albums...";
Albums->Window::Refresh();
Mpd.GetList(artists, Config.media_lib_primary_tag);
for (TagList::const_iterator i = artists.begin(); i != artists.end(); i++)
for (TagList::const_iterator i = artists.begin(); i != artists.end(); ++i)
{
TagList albums;
Mpd.StartFieldSearch(MPD_TAG_ITEM_ALBUM);
Mpd.AddSearch(Config.media_lib_primary_tag, *i);
Mpd.CommitSearch(albums);
for (TagList::const_iterator j = albums.begin(); j != albums.end(); j++)
for (TagList::const_iterator j = albums.begin(); j != albums.end(); ++j)
{
if (Config.media_lib_primary_tag != MPD_TAG_ITEM_DATE)
{
@@ -251,7 +251,7 @@ void MediaLibrary::Update()
Mpd.CommitSearch(years);
if (!years.empty())
{
for (TagList::const_iterator k = years.begin(); k != years.end(); k++)
for (TagList::const_iterator k = years.begin(); k != years.end(); ++k)
{
Albums->AddOption(std::make_pair(*i + " - (" + *k + ") " + *j, SearchConstraints(*i, *j, *k)));
}
@@ -263,7 +263,7 @@ void MediaLibrary::Update()
Albums->AddOption(std::make_pair(*i + " - " + *j, SearchConstraints(*i, *j, *i)));
}
}
for (size_t i = 0; i < Albums->Size(); i++)
for (size_t i = 0; i < Albums->Size(); ++i)
utf_to_locale((*Albums)[i].first);
if (!Albums->Empty())
Albums->Sort<CaseInsensitiveSorting>();
@@ -301,9 +301,9 @@ void MediaLibrary::Update()
sort(list.begin(), list.end(), SortSongsByTrack);
bool bold = 0;
for (SongList::const_iterator it = list.begin(); it != list.end(); it++)
for (SongList::const_iterator it = list.begin(); it != list.end(); ++it)
{
for (size_t j = 0; j < myPlaylist->Main()->Size(); j++)
for (size_t j = 0; j < myPlaylist->Main()->Size(); ++j)
{
if ((*it)->GetHash() == myPlaylist->Main()->at(j).GetHash())
{
@@ -411,7 +411,7 @@ void MediaLibrary::GetSelectedSongs(MPD::SongList &v)
{
std::vector<size_t> selected;
Songs->GetSelected(selected);
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); it++)
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); ++it)
{
v.push_back(new MPD::Song(Songs->at(*it)));
}
@@ -475,7 +475,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play)
Mpd.CommitSearch(list);
Mpd.StartCommandsList();
SongList::const_iterator it = list.begin();
for (; it != list.end(); it++)
for (; it != list.end(); ++it)
if (Mpd.AddSong(**it) < 0)
break;
Mpd.CommitCommandsList();
@@ -499,7 +499,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play)
{
Mpd.StartCommandsList();
size_t i = 0;
for (; i < Songs->Size(); i++)
for (; i < Songs->Size(); ++i)
if (Mpd.AddSong(Songs->at(i)) < 0)
break;
Mpd.CommitCommandsList();
@@ -527,7 +527,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play)
long long hash = Songs->Current().GetHash();
if (add_n_play)
{
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
{
if (myPlaylist->Main()->at(i).GetHash() == hash)
{
@@ -540,7 +540,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play)
{
Playlist::BlockUpdate = 1;
Mpd.StartCommandsList();
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
{
if (myPlaylist->Main()->at(i).GetHash() == hash)
{

4
src/menu.cpp
View File

@@ -32,7 +32,7 @@ void List::SelectCurrent()
void List::ReverseSelection(size_t beginning)
{
for (size_t i = beginning; i < Size(); i++)
for (size_t i = beginning; i < Size(); ++i)
Select(i, !isSelected(i) && !isStatic(i));
}
@@ -40,7 +40,7 @@ bool List::Deselect()
{
if (!hasSelected())
return false;
for (size_t i = 0; i < Size(); i++)
for (size_t i = 0; i < Size(); ++i)
Select(i, 0);
return true;
}

32
src/menu.h
View File

@@ -251,13 +251,13 @@ template <typename T> NCurses::Menu<T>::Menu(const Menu &m) : Window(m),
itsSelectedSuffix(m.itsSelectedSuffix)
{
itsOptions.reserve(m.itsOptions.size());
for (option_const_iterator it = m.itsOptions.begin(); it != m.itsOptions.end(); it++)
for (option_const_iterator it = m.itsOptions.begin(); it != m.itsOptions.end(); ++it)
itsOptions.push_back(new Option(**it));
}
template <typename T> NCurses::Menu<T>::~Menu()
{
for (option_iterator it = itsOptions.begin(); it != itsOptions.end(); it++)
for (option_iterator it = itsOptions.begin(); it != itsOptions.end(); ++it)
delete *it;
}
@@ -271,13 +271,13 @@ template <typename T> void NCurses::Menu<T>::ResizeList(size_t size)
if (size > itsOptions.size())
{
itsOptions.resize(size);
for (size_t i = 0; i < size; i++)
for (size_t i = 0; i < size; ++i)
if (!itsOptions[i])
itsOptions[i] = new Option();
}
else if (size < itsOptions.size())
{
for (size_t i = size; i < itsOptions.size(); i++)
for (size_t i = size; i < itsOptions.size(); ++i)
delete itsOptions[i];
itsOptions.resize(size);
}
@@ -313,7 +313,7 @@ template <typename T> void NCurses::Menu<T>::DeleteOption(size_t pos)
itsOptions.erase(itsOptions.begin()+itsFilteredRealPositions[pos]);
itsFilteredOptions.erase(itsFilteredOptions.begin()+pos);
itsFilteredRealPositions.erase(itsFilteredRealPositions.begin()+pos);
for (size_t i = pos; i < itsFilteredRealPositions.size(); i++)
for (size_t i = pos; i < itsFilteredRealPositions.size(); ++i)
itsFilteredRealPositions[i]--;
}
else
@@ -349,12 +349,12 @@ template <typename T> void NCurses::Menu<T>::Move(size_t from, size_t to)
int diff = from-to;
if (diff > 0)
{
for (size_t i = from; i > to; i--)
for (size_t i = from; i > to; --i)
std::swap(itsOptions.at(i), itsOptions.at(i-1));
}
else if (diff < 0)
{
for (size_t i = from; i < to; i++)
for (size_t i = from; i < to; ++i)
std::swap(itsOptions.at(i), itsOptions.at(i+1));
}
}
@@ -395,12 +395,12 @@ template <typename T> void NCurses::Menu<T>::Refresh()
Scroll(wDown);
}
size_t line = 0;
for (size_t i = itsBeginning; i < itsBeginning+itsHeight; i++)
for (size_t i = itsBeginning; i < itsBeginning+itsHeight; ++i)
{
GotoXY(0, line);
if (i >= itsOptionsPtr->size())
{
for (; line < itsHeight; line++)
for (; line < itsHeight; ++line)
mvwhline(itsWindow, line, 0, 32, itsWidth);
break;
}
@@ -562,7 +562,7 @@ template <typename T> void NCurses::Menu<T>::ClearFiltered()
template <typename T> void NCurses::Menu<T>::Clear(bool clrscr)
{
for (option_iterator it = itsOptions.begin(); it != itsOptions.end(); it++)
for (option_iterator it = itsOptions.begin(); it != itsOptions.end(); ++it)
delete *it;
itsOptions.clear();
itsFound.clear();
@@ -612,7 +612,7 @@ template <typename T> bool NCurses::Menu<T>::isStatic(int id) const
template <typename T> bool NCurses::Menu<T>::hasSelected() const
{
for (option_const_iterator it = itsOptionsPtr->begin(); it != itsOptionsPtr->end(); it++)
for (option_const_iterator it = itsOptionsPtr->begin(); it != itsOptionsPtr->end(); ++it)
if (*it && (*it)->isSelected)
return true;
return false;
@@ -620,7 +620,7 @@ template <typename T> bool NCurses::Menu<T>::hasSelected() const
template <typename T> void NCurses::Menu<T>::GetSelected(std::vector<size_t> &v) const
{
for (size_t i = 0; i < itsOptionsPtr->size(); i++)
for (size_t i = 0; i < itsOptionsPtr->size(); ++i)
if ((*itsOptionsPtr)[i] && (*itsOptionsPtr)[i]->isSelected)
v.push_back(i);
}
@@ -644,7 +644,7 @@ template <typename T> size_t NCurses::Menu<T>::Choice() const
template <typename T> size_t NCurses::Menu<T>::RealChoice() const
{
size_t result = 0;
for (option_const_iterator it = itsOptionsPtr->begin(); it != itsOptionsPtr->begin()+itsHighlight; it++)
for (option_const_iterator it = itsOptionsPtr->begin(); it != itsOptionsPtr->begin()+itsHighlight; ++it)
if (*it && !(*it)->isStatic)
result++;
return result;
@@ -660,7 +660,7 @@ template <typename T> bool NCurses::Menu<T>::Search(const std::string &constrain
regex_t rx;
if (regcomp(&rx, itsSearchConstraint.c_str(), flags) == 0)
{
for (size_t i = beginning; i < itsOptionsPtr->size(); i++)
for (size_t i = beginning; i < itsOptionsPtr->size(); ++i)
{
if (regexec(&rx, GetOption(i).c_str(), 0, 0, 0) == 0)
itsFound.insert(i);
@@ -699,7 +699,7 @@ template <typename T> void NCurses::Menu<T>::ApplyFilter(const std::string &filt
itsFilter = filter;
if (itsFilter.empty())
return;
for (size_t i = 0; i < beginning; i++)
for (size_t i = 0; i < beginning; ++i)
{
itsFilteredRealPositions.push_back(i);
itsFilteredOptions.push_back(itsOptions[i]);
@@ -707,7 +707,7 @@ template <typename T> void NCurses::Menu<T>::ApplyFilter(const std::string &filt
regex_t rx;
if (regcomp(&rx, itsFilter.c_str(), flags) == 0)
{
for (size_t i = beginning; i < itsOptions.size(); i++)
for (size_t i = beginning; i < itsOptions.size(); ++i)
{
if (regexec(&rx, GetOption(i).c_str(), 0, 0, 0) == 0)
{

6
src/misc.cpp
View File

@@ -182,9 +182,9 @@ void EscapeUnallowedChars(std::string &s)
{
static const std::string unallowed_chars = "\"*/:<>?\\|";
for (std::string::const_iterator it = unallowed_chars.begin(); it != unallowed_chars.end(); it++)
for (std::string::const_iterator it = unallowed_chars.begin(); it != unallowed_chars.end(); ++it)
{
for (size_t i = 0; i < s.length(); i++)
for (size_t i = 0; i < s.length(); ++i)
{
if (s[i] == *it)
{
@@ -209,7 +209,7 @@ void EscapeHtml(std::string &s)
s.replace(i, 6, "\"");
for (size_t i = s.find("&amp;"); i != std::string::npos; i = s.find("&amp;"))
s.replace(i, 5, "&");
for (size_t i = 0; i < s.length(); i++)
for (size_t i = 0; i < s.length(); ++i)
{
if (erase)
{

8
src/mpdpp.cpp
View File

@@ -592,7 +592,7 @@ bool Connection::AddRandomSongs(size_t number)
std::random_shuffle(files.begin(), files.end());
StartCommandsList();
TagList::const_iterator it = files.begin()+rand()%(files.size()-number);
for (size_t i = 0; i < number && it != files.end(); i++)
for (size_t i = 0; i < number && it != files.end(); ++i)
AddSong(*it++);
CommitCommandsList();
}
@@ -680,7 +680,7 @@ void Connection::GetPlaylists(TagList &v) const
{
ItemList list;
GetDirectory("/", list);
for (ItemList::const_iterator it = list.begin(); it != list.end(); it++)
for (ItemList::const_iterator it = list.begin(); it != list.end(); ++it)
{
if (it->type == itPlaylist)
v.push_back(it->name);
@@ -932,14 +932,14 @@ int Connection::CheckForErrors()
void MPD::FreeSongList(SongList &l)
{
for (SongList::iterator i = l.begin(); i != l.end(); i++)
for (SongList::iterator i = l.begin(); i != l.end(); ++i)
delete *i;
l.clear();
}
void MPD::FreeItemList(ItemList &l)
{
for (ItemList::iterator i = l.begin(); i != l.end(); i++)
for (ItemList::iterator i = l.begin(); i != l.end(); ++i)
delete i->song;
l.clear();
}

50
src/ncmpcpp.cpp
View File

@@ -474,7 +474,7 @@ int main(int argc, char *argv[])
vector<size_t> list;
myPlaylist->Main()->GetSelected(list);
Mpd.StartCommandsList();
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); it++)
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); ++it)
{
Mpd.DeleteID((*myPlaylist->Main())[*it].GetID());
myPlaylist->Main()->DeleteOption(*it);
@@ -604,7 +604,7 @@ int main(int argc, char *argv[])
string playlist = locale_to_utf_cpy(myPlaylistEditor->Playlists->Current());
ShowMessage("Deleting selected items...");
Mpd.StartCommandsList();
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); it++)
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); ++it)
{
Mpd.Delete(playlist, *it);
myPlaylistEditor->Content->DeleteOption(*it);
@@ -718,7 +718,7 @@ int main(int argc, char *argv[])
vector<size_t> list;
myPlaylist->Main()->GetSelected(list);
for (vector<size_t>::iterator it = list.begin(); it != list.end(); it++)
for (vector<size_t>::iterator it = list.begin(); it != list.end(); ++it)
if (*it == size_t(myPlaylist->NowPlaying) && list.front() > 0)
myPlaylist->Main()->BoldOption(myPlaylist->NowPlaying, 0);
@@ -729,7 +729,7 @@ int main(int argc, char *argv[])
TraceMpdStatus();
Playlist::BlockUpdate = 1;
myPlaylist->UpdateTimer();
for (vector<size_t>::iterator it = list.begin(); it != list.end(); it++)
for (vector<size_t>::iterator it = list.begin(); it != list.end(); ++it)
{
(*it)--;
myPlaylist->Main()->at((*it)+1).SetPosition(*it);
@@ -741,7 +741,7 @@ int main(int argc, char *argv[])
myPlaylist->Main()->ReadKey(input);
}
Mpd.StartCommandsList();
for (size_t i = 0; i < list.size(); i++)
for (size_t i = 0; i < list.size(); ++i)
Mpd.Move(origs[i], list[i]);
Mpd.CommitCommandsList();
}
@@ -784,7 +784,7 @@ int main(int argc, char *argv[])
{
TraceMpdStatus();
myPlaylist->UpdateTimer();
for (vector<size_t>::iterator it = list.begin(); it != list.end(); it++)
for (vector<size_t>::iterator it = list.begin(); it != list.end(); ++it)
{
(*it)--;
myPlaylistEditor->Content->Swap(*it, (*it)+1);
@@ -794,7 +794,7 @@ int main(int argc, char *argv[])
myPlaylistEditor->Content->ReadKey(input);
}
Mpd.StartCommandsList();
for (size_t i = 0; i < list.size(); i++)
for (size_t i = 0; i < list.size(); ++i)
if (origs[i] != list[i])
Mpd.Move(myPlaylistEditor->Playlists->Current(), origs[i], list[i]);
Mpd.CommitCommandsList();
@@ -830,7 +830,7 @@ int main(int argc, char *argv[])
vector<size_t> list;
myPlaylist->Main()->GetSelected(list);
for (vector<size_t>::iterator it = list.begin(); it != list.end(); it++)
for (vector<size_t>::iterator it = list.begin(); it != list.end(); ++it)
if (*it == size_t(myPlaylist->NowPlaying) && list.back() < myPlaylist->Main()->Size()-1)
myPlaylist->Main()->BoldOption(myPlaylist->NowPlaying, 0);
@@ -841,7 +841,7 @@ int main(int argc, char *argv[])
TraceMpdStatus();
Playlist::BlockUpdate = 1;
myPlaylist->UpdateTimer();
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); it++)
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); ++it)
{
(*it)++;
myPlaylist->Main()->at((*it)-1).SetPosition(*it);
@@ -853,7 +853,7 @@ int main(int argc, char *argv[])
myPlaylist->Main()->ReadKey(input);
}
Mpd.StartCommandsList();
for (int i = list.size()-1; i >= 0; i--)
for (int i = list.size()-1; i >= 0; --i)
Mpd.Move(origs[i], list[i]);
Mpd.CommitCommandsList();
}
@@ -897,7 +897,7 @@ int main(int argc, char *argv[])
{
TraceMpdStatus();
myPlaylist->UpdateTimer();
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); it++)
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); ++it)
{
(*it)++;
myPlaylistEditor->Content->Swap(*it, (*it)-1);
@@ -907,7 +907,7 @@ int main(int argc, char *argv[])
myPlaylistEditor->Content->ReadKey(input);
}
Mpd.StartCommandsList();
for (int i = list.size()-1; i >= 0; i--)
for (int i = list.size()-1; i >= 0; --i)
if (origs[i] != list[i])
Mpd.Move(myPlaylistEditor->Playlists->Current(), origs[i], list[i]);
Mpd.CommitCommandsList();
@@ -955,7 +955,7 @@ int main(int argc, char *argv[])
{
pos -= list.size();
size_t i = list.size()-1;
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); it++, i--)
for (vector<size_t>::reverse_iterator it = list.rbegin(); it != list.rend(); ++it, --i)
{
Mpd.Move(*it, pos+i);
myPlaylist->Main()->Move(*it, pos+i);
@@ -964,7 +964,7 @@ int main(int argc, char *argv[])
else if (diff < 0)
{
size_t i = 0;
for (vector<size_t>::const_iterator it = list.begin(); it != list.end(); it++, i++)
for (vector<size_t>::const_iterator it = list.begin(); it != list.end(); ++it, ++i)
{
Mpd.Move(*it, pos+i);
myPlaylist->Main()->Move(*it, pos+i);
@@ -992,12 +992,12 @@ int main(int argc, char *argv[])
SongList::const_iterator it = list.begin();
if (myScreen == myPlaylistEditor)
{
for (; it != list.end(); it++)
for (; it != list.end(); ++it)
Mpd.AddToPlaylist(myPlaylistEditor->Playlists->Current(), **it);
}
else
{
for (; it != list.end(); it++)
for (; it != list.end(); ++it)
if (Mpd.AddSong(**it) < 0)
break;
}
@@ -1248,7 +1248,7 @@ int main(int argc, char *argv[])
Song::SetFunction set = IntoSetFunction(Config.media_lib_primary_tag);
if (!set)
continue;
for (SongList::iterator it = list.begin(); it != list.end(); it++)
for (SongList::iterator it = list.begin(); it != list.end(); ++it)
{
(*it)->Localize();
((*it)->*set)(new_tag);
@@ -1279,7 +1279,7 @@ int main(int argc, char *argv[])
{
bool success = 1;
ShowMessage("Updating tags...");
for (size_t i = 0; i < myLibrary->Songs->Size(); i++)
for (size_t i = 0; i < myLibrary->Songs->Size(); ++i)
{
(*myLibrary->Songs)[i].Localize();
ShowMessage("Updating tags in \"%s\"...", (*myLibrary->Songs)[i].GetName().c_str());
@@ -1488,7 +1488,7 @@ int main(int argc, char *argv[])
mDialog.AddSeparator();
TagList playlists;
Mpd.GetPlaylists(playlists);
for (TagList::iterator it = playlists.begin(); it != playlists.end(); it++)
for (TagList::iterator it = playlists.begin(); it != playlists.end(); ++it)
{
utf_to_locale(*it);
mDialog.AddOption(*it, 0, playlists_not_active);
@@ -1528,7 +1528,7 @@ int main(int argc, char *argv[])
{
Mpd.StartCommandsList();
SongList::const_iterator it = result.begin();
for (; it != result.end(); it++)
for (; it != result.end(); ++it)
if (Mpd.AddSong(**it) < 0)
break;
Mpd.CommitCommandsList();
@@ -1552,7 +1552,7 @@ int main(int argc, char *argv[])
if (!playlist.empty())
{
Mpd.StartCommandsList();
for (SongList::const_iterator it = result.begin(); it != result.end(); it++)
for (SongList::const_iterator it = result.begin(); it != result.end(); ++it)
Mpd.AddToPlaylist(real_playlist, **it);
Mpd.CommitCommandsList();
ShowMessage("Selected items added to playlist \"%s\"!", playlist.c_str());
@@ -1562,7 +1562,7 @@ int main(int argc, char *argv[])
{
string playlist = locale_to_utf_cpy(mDialog.Current());
Mpd.StartCommandsList();
for (SongList::const_iterator it = result.begin(); it != result.end(); it++)
for (SongList::const_iterator it = result.begin(); it != result.end(); ++it)
Mpd.AddToPlaylist(playlist, **it);
Mpd.CommitCommandsList();
ShowMessage("Selected items added to playlist \"%s\"!", mDialog.Current().c_str());
@@ -1585,7 +1585,7 @@ int main(int argc, char *argv[])
if (myPlaylist->Main()->hasSelected())
{
Mpd.StartCommandsList();
for (int i = myPlaylist->Main()->Size()-1; i >= 0; i--)
for (int i = myPlaylist->Main()->Size()-1; i >= 0; --i)
{
if (!myPlaylist->Main()->isSelected(i) && i != myPlaylist->NowPlaying)
Mpd.Delete(i);
@@ -1607,7 +1607,7 @@ int main(int argc, char *argv[])
continue;
}
Mpd.StartCommandsList();
for (int i = myPlaylist->Main()->Size()-1; i >= 0; i--)
for (int i = myPlaylist->Main()->Size()-1; i >= 0; --i)
if (i != myPlaylist->NowPlaying)
Mpd.Delete(i);
ShowMessage("Deleting all items except now playing one...");
@@ -1621,7 +1621,7 @@ int main(int argc, char *argv[])
{
ShowMessage("Deleting filtered items...");
Mpd.StartCommandsList();
for (int i = myPlaylist->Main()->Size()-1; i >= 0; i--)
for (int i = myPlaylist->Main()->Size()-1; i >= 0; --i)
Mpd.Delete((*myPlaylist->Main())[i].GetPosition());
Mpd.CommitCommandsList();
ShowMessage("Filtered items deleted!");

2
src/outputs.cpp
View File

@@ -111,7 +111,7 @@ void Outputs::FetchList()
MPD::OutputList ol;
Mpd.GetOutputs(ol);
w->Clear();
for (MPD::OutputList::const_iterator it = ol.begin(); it != ol.end(); it++)
for (MPD::OutputList::const_iterator it = ol.begin(); it != ol.end(); ++it)
w->AddOption(*it, it->second);
}

16
src/playlist.cpp
View File

@@ -164,7 +164,7 @@ void Playlist::GetSelectedSongs(MPD::SongList &v)
{
vector<size_t> selected;
w->GetSelected(selected);
for (vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); it++)
for (vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); ++it)
{
v.push_back(new MPD::Song(w->at(*it)));
}
@@ -250,7 +250,7 @@ void Playlist::Sort()
BlockUpdate = 1;
ShowMessage("Reversing playlist order...");
Mpd.StartCommandsList();
for (size_t i = 0, j = w->Size()-1; i < w->Size()/2; i++, j--)
for (size_t i = 0, j = w->Size()-1; i < w->Size()/2; ++i, --j)
{
Mpd.Swap(i, j);
w->Swap(i, j);
@@ -273,7 +273,7 @@ void Playlist::Sort()
playlist.reserve(w->Size());
for (size_t i = 0; i < w->Size(); i++)
for (size_t i = 0; i < w->Size(); ++i)
{
(*w)[i].SetPosition(i);
playlist.push_back(&(*w)[i]);
@@ -293,7 +293,7 @@ void Playlist::Sort()
Mpd.StartCommandsList();
do
{
for (size_t i = 0; i < playlist.size(); i++)
for (size_t i = 0; i < playlist.size(); ++i)
{
if (playlist[i]->GetPosition() > int(i))
{
@@ -313,7 +313,7 @@ void Playlist::FixPositions(size_t beginning)
{
bool was_filtered = w->isFiltered();
w->ShowAll();
for (size_t i = beginning; i < w->Size(); i++)
for (size_t i = beginning; i < w->Size(); ++i)
{
(*w)[i].SetPosition(i);
}
@@ -330,7 +330,7 @@ void Playlist::EnableHighlighting()
bool Playlist::Sorting(MPD::Song *a, MPD::Song *b)
{
for (size_t i = 0; i < SortOptions; i++)
for (size_t i = 0; i < SortOptions; ++i)
{
std::string sa = (a->*(*SortDialog)[i].second)();
std::string sb = (b->*(*SortDialog)[i].second)();
@@ -354,14 +354,14 @@ std::string Playlist::TotalLength()
if (ReloadTotalLength)
{
itsTotalLength = 0;
for (size_t i = 0; i < w->Size(); i++)
for (size_t i = 0; i < w->Size(); ++i)
itsTotalLength += (*w)[i].GetTotalLength();
ReloadTotalLength = 0;
}
if (Config.playlist_show_remaining_time && ReloadRemaining && !w->isFiltered())
{
itsRemainingTime = 0;
for (size_t i = NowPlaying; i < w->Size(); i++)
for (size_t i = NowPlaying; i < w->Size(); ++i)
itsRemainingTime += (*w)[i].GetTotalLength();
ReloadRemaining = 0;
}

14
src/playlist_editor.cpp
View File

@@ -118,7 +118,7 @@ void PlaylistEditor::Update()
TagList list;
Mpd.GetPlaylists(list);
sort(list.begin(), list.end(), CaseInsensitiveSorting());
for (TagList::iterator it = list.begin(); it != list.end(); it++)
for (TagList::iterator it = list.begin(); it != list.end(); ++it)
{
utf_to_locale(*it);
Playlists->AddOption(*it);
@@ -137,9 +137,9 @@ void PlaylistEditor::Update()
else
Content->SetTitle("Playlist's content");
bool bold = 0;
for (SongList::const_iterator it = list.begin(); it != list.end(); it++)
for (SongList::const_iterator it = list.begin(); it != list.end(); ++it)
{
for (size_t j = 0; j < myPlaylist->Main()->Size(); j++)
for (size_t j = 0; j < myPlaylist->Main()->Size(); ++j)
{
if ((*it)->GetHash() == myPlaylist->Main()->at(j).GetHash())
{
@@ -200,7 +200,7 @@ void PlaylistEditor::AddToPlaylist(bool add_n_play)
Mpd.GetPlaylistContent(locale_to_utf_cpy(Playlists->Current()), list);
Mpd.StartCommandsList();
SongList::const_iterator it = list.begin();
for (; it != list.end(); it++)
for (; it != list.end(); ++it)
if (Mpd.AddSong(**it) < 0)
break;
Mpd.CommitCommandsList();
@@ -228,7 +228,7 @@ void PlaylistEditor::AddToPlaylist(bool add_n_play)
long long hash = Content->Current().GetHash();
if (add_n_play)
{
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
{
if (myPlaylist->Main()->at(i).GetHash() == hash)
{
@@ -241,7 +241,7 @@ void PlaylistEditor::AddToPlaylist(bool add_n_play)
{
Playlist::BlockUpdate = 1;
Mpd.StartCommandsList();
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
{
if (myPlaylist->Main()->at(i).GetHash() == hash)
{
@@ -332,7 +332,7 @@ void PlaylistEditor::GetSelectedSongs(MPD::SongList &v)
{
std::vector<size_t> selected;
Content->GetSelected(selected);
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); it++)
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); ++it)
{
v.push_back(new MPD::Song(Content->at(*it)));
}

4
src/screen.h
View File

@@ -149,12 +149,12 @@ template <> inline void Screen<Scrollpad>::MouseButtonPressed(MEVENT me)
{
if (me.bstate & BUTTON2_PRESSED)
{
for (size_t i = 0; i < 2; i++)
for (size_t i = 0; i < 2; ++i)
Scroll(wDown);
}
else if (me.bstate & BUTTON4_PRESSED)
{
for (size_t i = 0; i < 2; i++)
for (size_t i = 0; i < 2; ++i)
Scroll(wUp);
}
}

2
src/scrollpad.cpp
View File

@@ -58,7 +58,7 @@ void Scrollpad::Flush()
int space_pos = 0;
int tab_size = 0;
for (size_t i = 0; i < s.length(); i++)
for (size_t i = 0; i < s.length(); ++i)
{
tab_size = 8-x%8;

20
src/search_engine.cpp
View File

@@ -207,7 +207,7 @@ void SearchEngine::EnterPressed()
UpdateFoundList();
ShowMessage("Searching finished!");
if (Config.block_search_constraints_change)
for (size_t i = 0; i < StaticOptions-4; i++)
for (size_t i = 0; i < StaticOptions-4; ++i)
w->Static(i, 1);
w->Scroll(wDown);
w->Scroll(wDown);
@@ -230,7 +230,7 @@ void SearchEngine::EnterPressed()
if (Config.ncmpc_like_songs_adding && w->isBold())
{
long long hash = w->Current().second->GetHash();
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
{
if (myPlaylist->Main()->at(i).GetHash() == hash)
{
@@ -274,7 +274,7 @@ void SearchEngine::SpacePressed()
Playlist::BlockUpdate = 1;
long long hash = w->Current().second->GetHash();
Mpd.StartCommandsList();
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
{
if (myPlaylist->Main()->at(i).GetHash() == hash)
{
@@ -336,7 +336,7 @@ void SearchEngine::GetSelectedSongs(MPD::SongList &v)
{
std::vector<size_t> selected;
w->GetSelected(selected);
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); it++)
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); ++it)
{
v.push_back(new MPD::Song(*w->at(*it).second));
}
@@ -350,9 +350,9 @@ void SearchEngine::ApplyFilter(const std::string &s)
void SearchEngine::UpdateFoundList()
{
bool bold = 0;
for (size_t i = StaticOptions; i < w->Size(); i++)
for (size_t i = StaticOptions; i < w->Size(); ++i)
{
for (size_t j = 0; j < myPlaylist->Main()->Size(); j++)
for (size_t j = 0; j < myPlaylist->Main()->Size(); ++j)
{
if (myPlaylist->Main()->at(j).GetHash() == w->at(i).second->GetHash())
{
@@ -367,7 +367,7 @@ void SearchEngine::UpdateFoundList()
void SearchEngine::Prepare()
{
for (size_t i = 0; i < w->Size(); i++)
for (size_t i = 0; i < w->Size(); ++i)
{
try
{
@@ -384,7 +384,7 @@ void SearchEngine::Prepare()
w->IntoSeparator(10);
w->IntoSeparator(14);
for (size_t i = 0; i < 17; i++)
for (size_t i = 0; i < 17; ++i)
{
try
{
@@ -425,7 +425,7 @@ void SearchEngine::Search()
else
{
list.reserve(myPlaylist->Main()->Size());
for (size_t i = 0; i < myPlaylist->Main()->Size(); i++)
for (size_t i = 0; i < myPlaylist->Main()->Size(); ++i)
list.push_back(&(*myPlaylist->Main())[i]);
}
@@ -472,7 +472,7 @@ void SearchEngine::Search()
s.SetComment(t);
}
for (SongList::const_iterator it = list.begin(); it != list.end(); it++)
for (SongList::const_iterator it = list.begin(); it != list.end(); ++it)
{
(*it)->CopyPtr(CaseSensitive || MatchToPattern);
Song copy = **it;

2
src/settings.cpp
View File

@@ -64,7 +64,7 @@ namespace
void String2Buffer(const string &s, Buffer &buf)
{
for (string::const_iterator it = s.begin(); it != s.end(); it++)
for (string::const_iterator it = s.begin(); it != s.end(); ++it)
{
if (*it != '$')
buf << *it;

14
src/song.cpp
View File

@@ -50,7 +50,7 @@ Song::Song(mpd_Song *s, bool copy_ptr) : itsSong(s ? s : mpd_newSong()),
}
// generate pseudo-hash
for (size_t i = 0; i < file_len; i++)
for (size_t i = 0; i < file_len; ++i)
{
itsHash += itsSong->file[i];
if (i%3)
@@ -295,14 +295,14 @@ string Song::toString(const std::string &format) const
string result;
string::const_iterator goto_pos, prev_pos;
for (string::const_iterator it = format.begin(); it != format.end(); it++)
for (string::const_iterator it = format.begin(); it != format.end(); ++it)
{
CHECK_LINKED_TAGS:;
if (*it == '{')
{
prev_pos = it;
GetFunction get = 0;
for (; *it != '}'; it++)
for (; *it != '}'; ++it)
{
if (*it == '%')
{
@@ -368,21 +368,21 @@ string Song::toString(const std::string &format) const
{
if (*it == '}' && *(it+1) != '|')
break;
it++;
++it;
}
goto_pos = ++it;
it = ++prev_pos;
}
else
{
for (; *it != '}'; it++) { }
it++;
for (; *it != '}'; ++it) { }
++it;
if (it == format.end())
break;
if (*it == '{' || *it == '|')
{
if (*it == '|')
it++;
++it;
goto CHECK_LINKED_TAGS;
}
}

2
src/status.cpp
View File

@@ -216,7 +216,7 @@ void NcmpcppStatusChanged(Connection *, StatusChanges changed, void *)
Mpd.GetPlaylistChanges(Mpd.GetOldPlaylistID(), list);
myPlaylist->Main()->Reserve(playlist_length);
for (SongList::const_iterator it = list.begin(); it != list.end(); it++)
for (SongList::const_iterator it = list.begin(); it != list.end(); ++it)
{
int pos = (*it)->GetPosition();
if (pos < int(myPlaylist->Main()->Size()))

4
src/strbuffer.h
View File

@@ -172,7 +172,7 @@ template <typename C> NCurses::basic_buffer<C> &NCurses::basic_buffer<C>::operat
itsString << buf.itsString.str();
std::list<FormatPos> tmp = buf.itsFormat;
if (len)
for (typename std::list<typename NCurses::basic_buffer<C>::FormatPos>::iterator it = tmp.begin(); it != tmp.end(); it++)
for (typename std::list<typename NCurses::basic_buffer<C>::FormatPos>::iterator it = tmp.begin(); it != tmp.end(); ++it)
it->Position += len;
itsFormat.merge(tmp);
return *this;
@@ -190,7 +190,7 @@ template <typename C> NCurses::Window &operator<<(NCurses::Window &w, const NCur
std::basic_string<C> tmp;
typename std::list<typename NCurses::basic_buffer<C>::FormatPos>::const_iterator b = buf.itsFormat.begin();
typename std::list<typename NCurses::basic_buffer<C>::FormatPos>::const_iterator e = buf.itsFormat.end();
for (size_t i = 0; i < s.length() || b != e; i++)
for (size_t i = 0; i < s.length() || b != e; ++i)
{
while (b != e && i == b->Position)
{

46
src/tag_editor.cpp
View File

@@ -267,7 +267,7 @@ bool TinyTagEditor::GetTags()
w->ResizeList(23);
for (size_t i = 0; i < 7; i++)
for (size_t i = 0; i < 7; ++i)
w->Static(i, 1);
w->IntoSeparator(7);
@@ -275,7 +275,7 @@ bool TinyTagEditor::GetTags()
w->IntoSeparator(20);
if (ext != "mp3")
for (size_t i = 14; i <= 16; i++)
for (size_t i = 14; i <= 16; ++i)
w->Static(i, 1);
w->Highlight(8);
@@ -444,7 +444,7 @@ void TagEditor::Update()
*Albums << XY(0, 0) << "Fetching albums...";
Albums->Window::Refresh();
Mpd.GetAlbums("", list);
for (TagList::const_iterator it = list.begin(); it != list.end(); it++)
for (TagList::const_iterator it = list.begin(); it != list.end(); ++it)
{
SongList l;
@@ -475,7 +475,7 @@ void TagEditor::Update()
{
Dirs->AddOption(make_pair(".", "/"));
}
for (TagList::const_iterator it = list.begin(); it != list.end(); it++)
for (TagList::const_iterator it = list.begin(); it != list.end(); ++it)
{
size_t slash = it->rfind("/");
string to_display = slash != string::npos ? it->substr(slash+1) : *it;
@@ -501,7 +501,7 @@ void TagEditor::Update()
Mpd.AddSearch(MPD_TAG_ITEM_ALBUM, Albums->Current().second);
Mpd.CommitSearch(list);
sort(list.begin(), list.end(), CaseInsensitiveSorting());
for (SongList::iterator it = list.begin(); it != list.end(); it++)
for (SongList::iterator it = list.begin(); it != list.end(); ++it)
{
(*it)->Localize();
Tags->AddOption(**it);
@@ -511,7 +511,7 @@ void TagEditor::Update()
{
Mpd.GetSongs(Dirs->Current().second, list);
sort(list.begin(), list.end(), CaseInsensitiveSorting());
for (SongList::const_iterator it = list.begin(); it != list.end(); it++)
for (SongList::const_iterator it = list.begin(); it != list.end(); ++it)
{
(*it)->Localize();
Tags->AddOption(**it);
@@ -557,11 +557,11 @@ void TagEditor::EnterPressed()
{
vector<size_t> selected;
Tags->GetSelected(selected);
for (vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); it++)
for (vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); ++it)
list.push_back(&Tags->at(*it));
}
else
for (size_t i = 0; i < Tags->Size(); i++)
for (size_t i = 0; i < Tags->Size(); ++i)
list.push_back(&Tags->at(i));
Song::GetFunction get = 0;
@@ -604,7 +604,7 @@ void TagEditor::EnterPressed()
if (in == 'y')
{
int i = 1;
for (SongList::iterator it = list.begin(); it != list.end(); it++, i++)
for (SongList::iterator it = list.begin(); it != list.end(); ++it, ++i)
(*it)->SetTrack(i);
ShowMessage("Tracks numbered!");
}
@@ -668,7 +668,7 @@ void TagEditor::EnterPressed()
{
bool success = 1;
ShowMessage("Writing changes...");
for (SongList::iterator it = list.begin(); it != list.end(); it++)
for (SongList::iterator it = list.begin(); it != list.end(); ++it)
{
ShowMessage("Writing tags in \"%s\"...", (*it)->GetName().c_str());
if (!WriteTags(**it))
@@ -695,7 +695,7 @@ void TagEditor::EnterPressed()
case 13: // capitalize first letters
{
ShowMessage("Processing...");
for (SongList::iterator it = list.begin(); it != list.end(); it++)
for (SongList::iterator it = list.begin(); it != list.end(); ++it)
CapitalizeFirstLetters(**it);
ShowMessage("Done!");
break;
@@ -703,7 +703,7 @@ void TagEditor::EnterPressed()
case 14: // lower all letters
{
ShowMessage("Processing...");
for (SongList::iterator it = list.begin(); it != list.end(); it++)
for (SongList::iterator it = list.begin(); it != list.end(); ++it)
LowerAllLetters(**it);
ShowMessage("Done!");
break;
@@ -718,7 +718,7 @@ void TagEditor::EnterPressed()
Statusbar() << fmtBold << TagTypes->Current() << fmtBoldEnd << ": ";
string new_tag = wFooter->GetString((Tags->Current().*get)());
UnlockStatusbar();
for (SongList::iterator it = list.begin(); it != list.end(); it++)
for (SongList::iterator it = list.begin(); it != list.end(); ++it)
(**it.*set)(new_tag);
}
else if (w == Tags && set != NULL)
@@ -816,7 +816,7 @@ void TagEditor::GetSelectedSongs(MPD::SongList &v)
{
std::vector<size_t> selected;
Tags->GetSelected(selected);
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); it++)
for (std::vector<size_t>::const_iterator it = selected.begin(); it != selected.end(); ++it)
{
v.push_back(new MPD::Song(Tags->at(*it)));
}
@@ -1013,7 +1013,7 @@ std::string TagEditor::CapitalizeFirstLetters(const string &s)
string result = s;
if (isalpha(result[0]))
result[0] = toupper(result[0]);
for (string::iterator it = result.begin()+1; it != result.end(); it++)
for (string::iterator it = result.begin()+1; it != result.end(); ++it)
{
if (isalpha(*it) && !isalpha(*(it-1)) && *(it-1) != '\'')
*it = toupper(*it);
@@ -1150,7 +1150,7 @@ void TagEditor::SavePatternList()
std::ofstream output(PatternsFile.c_str());
if (output.is_open())
{
for (vector<string>::const_iterator it = Patterns.begin(); it != Patterns.end() && it != Patterns.begin()+30; it++)
for (vector<string>::const_iterator it = Patterns.begin(); it != Patterns.end() && it != Patterns.begin()+30; ++it)
output << *it << std::endl;
output.close();
}
@@ -1210,7 +1210,7 @@ string TagEditor::ParseFilename(Song &s, string mask, bool preview)
separators.push_back(mask.substr(0, i));
}
int i = 0;
for (vector<string>::const_iterator it = separators.begin(); it != separators.end(); it++, i++)
for (vector<string>::const_iterator it = separators.begin(); it != separators.end(); ++it, ++i)
{
int j = file.find(*it);
tags.at(i).second = file.substr(0, j);
@@ -1224,9 +1224,9 @@ string TagEditor::ParseFilename(Song &s, string mask, bool preview)
return "Error while parsing filename!";
}
for (vector< std::pair<char, string> >::iterator it = tags.begin(); it != tags.end(); it++)
for (vector< std::pair<char, string> >::iterator it = tags.begin(); it != tags.end(); ++it)
{
for (string::iterator j = it->second.begin(); j != it->second.end(); j++)
for (string::iterator j = it->second.begin(); j != it->second.end(); ++j)
if (*j == '_')
*j = ' ';
@@ -1302,7 +1302,7 @@ void TagEditor::DealWithFilenames(SongList &v)
*Legend << "%d - disc\n";
*Legend << "%C - comment\n\n";
*Legend << fmtBold << "Files:\n" << fmtBoldEnd;
for (SongList::const_iterator it = v.begin(); it != v.end(); it++)
for (SongList::const_iterator it = v.begin(); it != v.end(); ++it)
*Legend << Config.color2 << " * " << clEnd << (*it)->GetName() << "\n";
Legend->Flush();
@@ -1328,7 +1328,7 @@ void TagEditor::DealWithFilenames(SongList &v)
Main->AddSeparator();
Main->AddOption("Recent patterns", 1, 1);
Main->AddSeparator();
for (vector<string>::const_iterator it = Patterns.begin(); it != Patterns.end(); it++)
for (vector<string>::const_iterator it = Patterns.begin(); it != Patterns.end(); ++it)
Main->AddOption(*it);
}
@@ -1382,7 +1382,7 @@ void TagEditor::DealWithFilenames(SongList &v)
bool success = 1;
ShowMessage("Parsing...");
Preview->Clear();
for (SongList::iterator it = v.begin(); it != v.end(); it++)
for (SongList::iterator it = v.begin(); it != v.end(); ++it)
{
Song &s = **it;
if (!choice)
@@ -1425,7 +1425,7 @@ void TagEditor::DealWithFilenames(SongList &v)
}
else
{
for (size_t i = 0; i < Patterns.size(); i++)
for (size_t i = 0; i < Patterns.size(); ++i)
{
if (Patterns[i] == Config.pattern)
{

18
src/window.cpp
View File

@@ -56,8 +56,8 @@ void NCurses::InitScreen(GNUC_UNUSED const char *window_title, bool enable_color
# else
int i = -1;
# endif // USE_PDCURSES
for (; i < 8; i++)
for (int j = 0; j < 8; j++)
for (; i < 8; ++i)
for (int j = 0; j < 8; ++j)
init_pair(num++, ColorsTable[j], i < 0 ? i : ColorsTable[i]);
}
noecho();
@@ -322,7 +322,7 @@ void Window::Clear(bool)
void Window::Hide(char x) const
{
for (size_t i = 0; i < GetHeight(); i++)
for (size_t i = 0; i < GetHeight(); ++i)
mvhline(i+GetStartY(), GetStartX(), x, GetWidth());
refresh();
}
@@ -403,7 +403,7 @@ string Window::GetString(const string &base, size_t length, size_t width, bool e
bool block_scrolling = 0;
// disable scrolling if wide chars are used
for (wstring::const_iterator it = tmp->begin(); it != tmp->end(); it++)
for (wstring::const_iterator it = tmp->begin(); it != tmp->end(); ++it)
if (wcwidth(*it) > 1)
block_scrolling = 1;
@@ -430,7 +430,7 @@ string Window::GetString(const string &base, size_t length, size_t width, bool e
if (block_scrolling && maxx >= biggest_x)
{
size_t i = 0;
for (wstring::const_iterator it = tmp->begin(); i < width; it++, real_real_maxx++)
for (wstring::const_iterator it = tmp->begin(); i < width; ++it, ++real_real_maxx)
i += wcwidth(*it);
}
else
@@ -846,14 +846,14 @@ Window &Window::operator<<(double d)
Window &Window::operator<<(const string &s)
{
for (string::const_iterator it = s.begin(); it != s.end(); it++)
for (string::const_iterator it = s.begin(); it != s.end(); ++it)
wprintw(itsWindow, "%c", *it);
return *this;
}
Window &Window::operator<<(const wstring &ws)
{
for (wstring::const_iterator it = ws.begin(); it != ws.end(); it++)
for (wstring::const_iterator it = ws.begin(); it != ws.end(); ++it)
wprintw(itsWindow, "%lc", *it);
return *this;
}
@@ -873,7 +873,7 @@ string ToString(const wstring &ws)
{
string result;
char *s = new char[MB_CUR_MAX];
for (size_t i = 0; i < ws.length(); i++)
for (size_t i = 0; i < ws.length(); ++i)
{
int n = wcrtomb(s, ws[i], 0);
if (n > 0)
@@ -898,7 +898,7 @@ wstring ToWString(const string &s)
size_t Window::Length(const wstring &ws)
{
size_t length = 0;
for (wstring::const_iterator it = ws.begin(); it != ws.end(); it++)
for (wstring::const_iterator it = ws.begin(); it != ws.end(); ++it)
length += wcwidth(*it);
return length;
}