summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/actions.cpp4
-rw-r--r--src/bindings.cpp2
-rw-r--r--src/charset.cpp2
-rw-r--r--src/charset.h2
-rw-r--r--src/display.cpp2
-rw-r--r--src/display.h2
-rw-r--r--src/global.cpp2
-rw-r--r--src/global.h2
-rw-r--r--src/macro_utilities.cpp2
-rw-r--r--src/macro_utilities.h2
-rw-r--r--src/media_library.cpp2
-rw-r--r--src/mutable_song.cpp2
-rw-r--r--src/mutable_song.h2
-rw-r--r--src/playlist.cpp2
-rw-r--r--src/scrollpad.cpp4
-rw-r--r--src/scrollpad.h2
-rw-r--r--src/search_engine.cpp6
-rw-r--r--src/sel_items_adder.cpp2
-rw-r--r--src/song.h2
-rw-r--r--src/status.h4
-rw-r--r--src/statusbar.h4
-rw-r--r--src/strbuffer.h2
-rw-r--r--src/tag_editor.cpp4
-rw-r--r--src/tags.cpp2
-rw-r--r--src/tags.h2
-rw-r--r--src/utility/comparators.cpp2
26 files changed, 33 insertions, 33 deletions
diff --git a/src/actions.cpp b/src/actions.cpp
index 7f9bf662..0b93a0e9 100644
--- a/src/actions.cpp
+++ b/src/actions.cpp
@@ -84,7 +84,7 @@ void listsChangeFinisher();
}
-namespace Actions {//
+namespace Actions {
bool OriginalStatusbarVisibility;
bool ExitMainLoop = false;
@@ -2467,7 +2467,7 @@ void ShowServerInfo::run()
}
-namespace {//
+namespace {
void populateActions()
{
diff --git a/src/bindings.cpp b/src/bindings.cpp
index 355484c5..057d25b2 100644
--- a/src/bindings.cpp
+++ b/src/bindings.cpp
@@ -30,7 +30,7 @@ BindingsConfiguration Bindings;
Key Key::noOp = Key(ERR, NCurses);
-namespace {//
+namespace {
Key stringToSpecialKey(const std::string &s)
{
diff --git a/src/charset.cpp b/src/charset.cpp
index cb11e54c..05ca1e62 100644
--- a/src/charset.cpp
+++ b/src/charset.cpp
@@ -22,7 +22,7 @@
#include "charset.h"
#include "settings.h"
-namespace Charset {//
+namespace Charset {
std::locale internalLocale()
{
diff --git a/src/charset.h b/src/charset.h
index 4e9817af..b28aae3d 100644
--- a/src/charset.h
+++ b/src/charset.h
@@ -24,7 +24,7 @@
#include <locale>
#include <string>
-namespace Charset {//
+namespace Charset {
std::locale internalLocale();
diff --git a/src/display.cpp b/src/display.cpp
index dd05827e..d24b8c61 100644
--- a/src/display.cpp
+++ b/src/display.cpp
@@ -33,7 +33,7 @@
using Global::myScreen;
-namespace {//
+namespace {
const wchar_t *toColumnName(char c)
{
diff --git a/src/display.h b/src/display.h
index 55a9b586..e209b0d1 100644
--- a/src/display.h
+++ b/src/display.h
@@ -27,7 +27,7 @@
#include "mutable_song.h"
#include "search_engine.h"
-namespace Display {//
+namespace Display {
std::string Columns(size_t);
diff --git a/src/global.cpp b/src/global.cpp
index 2cc86bf0..9bd2c590 100644
--- a/src/global.cpp
+++ b/src/global.cpp
@@ -20,7 +20,7 @@
#include "global.h"
-namespace Global {//
+namespace Global {
BaseScreen *myScreen;
BaseScreen *myLockedScreen;
diff --git a/src/global.h b/src/global.h
index 95170b93..ed1f3cf9 100644
--- a/src/global.h
+++ b/src/global.h
@@ -25,7 +25,7 @@
#include "mpdpp.h"
#include "screen.h"
-namespace Global {//
+namespace Global {
// currently active screen (displayed in main window)
extern BaseScreen *myScreen;
diff --git a/src/macro_utilities.cpp b/src/macro_utilities.cpp
index 769d846d..a0583b2d 100644
--- a/src/macro_utilities.cpp
+++ b/src/macro_utilities.cpp
@@ -21,7 +21,7 @@
#include "global.h"
#include "macro_utilities.h"
-namespace Actions {//
+namespace Actions {
void PushCharacters::run()
{
diff --git a/src/macro_utilities.h b/src/macro_utilities.h
index 0342bb80..c12a253a 100644
--- a/src/macro_utilities.h
+++ b/src/macro_utilities.h
@@ -25,7 +25,7 @@
#include "actions.h"
#include "screen_type.h"
-namespace Actions {//
+namespace Actions {
struct PushCharacters : public BaseAction
{
diff --git a/src/media_library.cpp b/src/media_library.cpp
index a7680d26..9e94d32f 100644
--- a/src/media_library.cpp
+++ b/src/media_library.cpp
@@ -1013,7 +1013,7 @@ void MediaLibrary::AddToPlaylist(bool add_n_play)
}
}
-namespace {//
+namespace {
std::string AlbumToString(const AlbumEntry &ae)
{
diff --git a/src/mutable_song.cpp b/src/mutable_song.cpp
index ad4dadc3..f035882d 100644
--- a/src/mutable_song.cpp
+++ b/src/mutable_song.cpp
@@ -22,7 +22,7 @@
#include <boost/algorithm/string/split.hpp>
#include "mutable_song.h"
-namespace MPD {//
+namespace MPD {
std::string MutableSong::getArtist(unsigned idx) const
{
diff --git a/src/mutable_song.h b/src/mutable_song.h
index f10b80e8..8c6a5bd8 100644
--- a/src/mutable_song.h
+++ b/src/mutable_song.h
@@ -25,7 +25,7 @@
#include "config.h"
#include "song.h"
-namespace MPD {//
+namespace MPD {
struct MutableSong : public Song
{
diff --git a/src/playlist.cpp b/src/playlist.cpp
index ef7dbd54..c70c2a42 100644
--- a/src/playlist.cpp
+++ b/src/playlist.cpp
@@ -303,7 +303,7 @@ void Playlist::unregisterSong(const MPD::Song &s)
--it->second;
}
-namespace {//
+namespace {
std::string songToString(const MPD::Song &s)
{
diff --git a/src/scrollpad.cpp b/src/scrollpad.cpp
index 7ae099e6..e03849c3 100644
--- a/src/scrollpad.cpp
+++ b/src/scrollpad.cpp
@@ -24,7 +24,7 @@
#include "scrollpad.h"
-namespace {//
+namespace {
template <typename PropT>
bool regexSearch(NC::Buffer &buf, PropT begin, const std::string &ws, PropT end, size_t id, boost::regex::flag_type flags)
@@ -48,7 +48,7 @@ bool regexSearch(NC::Buffer &buf, PropT begin, const std::string &ws, PropT end,
}
-namespace NC {//
+namespace NC {
Scrollpad::Scrollpad(size_t startx,
size_t starty,
diff --git a/src/scrollpad.h b/src/scrollpad.h
index c281dd2a..1891ce0e 100644
--- a/src/scrollpad.h
+++ b/src/scrollpad.h
@@ -25,7 +25,7 @@
#include "window.h"
#include "strbuffer.h"
-namespace NC {//
+namespace NC {
/// Scrollpad is specialized window that holds large portions of text and
/// supports scrolling if the amount of it is bigger than the window area.
diff --git a/src/search_engine.cpp b/src/search_engine.cpp
index bc96e9f6..84db6401 100644
--- a/src/search_engine.cpp
+++ b/src/search_engine.cpp
@@ -39,7 +39,7 @@ using Global::MainStartY;
SearchEngine *mySearcher;
-namespace {//
+namespace {
/*const std::array<const std::string, 11> constraintsNames = {{
"Any",
@@ -61,7 +61,7 @@ const std::array<const char *, 3> searchModes = {{
"Match only if both values are the same"
}};
-namespace pos {//
+namespace pos {
const size_t searchIn = constraintsNames.size()-1+1+1; // separated
const size_t searchMode = searchIn+1;
const size_t search = searchMode+1+1; // separated
@@ -581,7 +581,7 @@ void SearchEngine::Search()
}
}
-namespace {//
+namespace {
std::string SEItemToString(const SEItem &ei)
{
diff --git a/src/sel_items_adder.cpp b/src/sel_items_adder.cpp
index 5eab7955..109a13e7 100644
--- a/src/sel_items_adder.cpp
+++ b/src/sel_items_adder.cpp
@@ -35,7 +35,7 @@
SelectedItemsAdder *mySelectedItemsAdder;
-namespace {//
+namespace {
void DisplayComponent(SelectedItemsAdder::Component &menu)
{
diff --git a/src/song.h b/src/song.h
index c135fb17..c7bed84e 100644
--- a/src/song.h
+++ b/src/song.h
@@ -29,7 +29,7 @@
#include <mpd/client.h>
-namespace MPD {//
+namespace MPD {
struct Song
{
diff --git a/src/status.h b/src/status.h
index b771b277..bfdd8bab 100644
--- a/src/status.h
+++ b/src/status.h
@@ -24,7 +24,7 @@
#include "interfaces.h"
#include "mpdpp.h"
-namespace Status {//
+namespace Status {
void handleClientError(MPD::ClientError &e);
void handleServerError(MPD::ServerError &e);
@@ -53,7 +53,7 @@ int volume();
}
-namespace Changes {//
+namespace Changes {
void playlist(unsigned previous_version);
void storedPlaylists();
diff --git a/src/statusbar.h b/src/statusbar.h
index 1340b69b..9bb6857f 100644
--- a/src/statusbar.h
+++ b/src/statusbar.h
@@ -27,7 +27,7 @@
#include "interfaces.h"
#include "window.h"
-namespace Progressbar {//
+namespace Progressbar {
struct ScopedLock
{
@@ -61,7 +61,7 @@ void tryRedraw();
/// @return window object that represents statusbar
NC::Window &put();
-namespace Helpers {//
+namespace Helpers {
/// called when statusbar window detects incoming idle notification
void mpd();
diff --git a/src/strbuffer.h b/src/strbuffer.h
index 2db181e1..06046373 100644
--- a/src/strbuffer.h
+++ b/src/strbuffer.h
@@ -25,7 +25,7 @@
#include <set>
#include "window.h"
-namespace NC {//
+namespace NC {
/// Buffer template class that stores text
/// along with its properties (colors/formatting).
diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp
index 3e4c7eb7..d39be1af 100644
--- a/src/tag_editor.cpp
+++ b/src/tag_editor.cpp
@@ -47,7 +47,7 @@ using Global::MainStartY;
TagEditor *myTagEditor;
-namespace {//
+namespace {
size_t LeftColumnWidth;
size_t LeftColumnStartX;
@@ -950,7 +950,7 @@ void TagEditor::LocateSong(const MPD::Song &s)
}
}
-namespace {//
+namespace {
bool isAnyModified(const NC::Menu<MPD::MutableSong> &m)
{
diff --git a/src/tags.cpp b/src/tags.cpp
index 3610f80c..dfbafe21 100644
--- a/src/tags.cpp
+++ b/src/tags.cpp
@@ -215,7 +215,7 @@ Tags::ReplayGainInfo getReplayGain(TagLib::Ogg::XiphComment *tag)
}
-namespace Tags {//
+namespace Tags {
void setAttribute(mpd_song *s, const char *name, const std::string &value)
{
diff --git a/src/tags.h b/src/tags.h
index f69406ed..43d11500 100644
--- a/src/tags.h
+++ b/src/tags.h
@@ -28,7 +28,7 @@
#include <tfile.h>
#include "mutable_song.h"
-namespace Tags {//
+namespace Tags {
struct ReplayGainInfo
{
diff --git a/src/utility/comparators.cpp b/src/utility/comparators.cpp
index bfb4b2ce..85ada86f 100644
--- a/src/utility/comparators.cpp
+++ b/src/utility/comparators.cpp
@@ -22,7 +22,7 @@
#include "comparators.h"
#include "utility/string.h"
-namespace {//
+namespace {
bool hasTheWord(const std::string &s)
{