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

adjust indentation of remaining classes in headers

Browse Source
This commit is contained in:
Andrzej Rybczak
2012-09-13 22:09:39 +02:00
parent bb5d72d558
commit 58a26b1e18
23 changed files with 951 additions and 967 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/browser.h
View File

@@ -25,9 +25,8 @@
#include "mpdpp.h" #include "mpdpp.h"
#include "screen.h" #include "screen.h"
class Browser : public Screen< NC::Menu<MPD::Item> >, public Filterable, public HasSongs, public Searchable struct Browser : public Screen< NC::Menu<MPD::Item> >, public Filterable, public HasSongs, public Searchable
{ {
public:
Browser() : itsBrowseLocally(0), itsScrollBeginning(0), itsBrowsedDir("/") { } Browser() : itsBrowseLocally(0), itsScrollBeginning(0), itsBrowsedDir("/") { }
// Screen< NC::Menu<MPD::Item> > implementation // Screen< NC::Menu<MPD::Item> > implementation

3
src/clock.h
View File

@@ -28,9 +28,8 @@
#include "window.h" #include "window.h"
#include "screen.h" #include "screen.h"
class Clock : public Screen<NC::Window> struct Clock : public Screen<NC::Window>
{ {
public:
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;
virtual void switchTo() OVERRIDE; virtual void switchTo() OVERRIDE;

17
src/display.h
View File

@@ -26,19 +26,15 @@
#include "mutable_song.h" #include "mutable_song.h"
#include "search_engine.h" #include "search_engine.h"
namespace Display namespace Display {//
{
std::string Columns(size_t); std::string Columns(size_t);
template <typename T> void Default(NC::Menu<T> &menu) template <typename ItemT>
{ void Default(NC::Menu<ItemT> &menu) { menu << menu.drawn()->value(); }
menu << menu.drawn()->value();
}
template <typename A, typename B> void Pair(NC::Menu< std::pair<A, B> > &menu) template <typename A, typename B>
{ void Pair(NC::Menu< std::pair<A, B> > &menu) { menu << menu.drawn()->value().first; }
menu << menu.drawn()->value().first;
}
void SongsInColumns(NC::Menu<MPD::Song> &menu, HasSongs *screen); void SongsInColumns(NC::Menu<MPD::Song> &menu, HasSongs *screen);
@@ -51,6 +47,7 @@ namespace Display
void SearchEngine(NC::Menu<SEItem> &menu); void SearchEngine(NC::Menu<SEItem> &menu);
void Items(NC::Menu<MPD::Item> &menu); void Items(NC::Menu<MPD::Item> &menu);
} }
#endif #endif

30
src/global.cpp
View File

@@ -20,20 +20,24 @@
#include "global.h" #include "global.h"
BasicScreen *Global::myScreen; namespace Global {//
BasicScreen *Global::myOldScreen;
BasicScreen *Global::myPrevScreen;
BasicScreen *Global::myLockedScreen;
BasicScreen *Global::myInactiveScreen;
NC::Window *Global::wHeader; BasicScreen *myScreen;
NC::Window *Global::wFooter; BasicScreen *myOldScreen;
BasicScreen *myPrevScreen;
BasicScreen *myLockedScreen;
BasicScreen *myInactiveScreen;
size_t Global::MainStartY; NC::Window *wHeader;
size_t Global::MainHeight; NC::Window *wFooter;
bool Global::ShowMessages = false; size_t MainStartY;
bool Global::SeekingInProgress = false; size_t MainHeight;
std::string Global::VolumeState; bool ShowMessages = false;
timeval Global::Timer; bool SeekingInProgress = false;
std::string VolumeState;
timeval Timer;
}

5
src/global.h
View File

@@ -26,8 +26,8 @@
#include "mpdpp.h" #include "mpdpp.h"
#include "screen.h" #include "screen.h"
namespace Global namespace Global {//
{
// currently active screen (displayed in main window) // currently active screen (displayed in main window)
extern BasicScreen *myScreen; extern BasicScreen *myScreen;
@@ -67,6 +67,7 @@ namespace Global
// global timer // global timer
extern timeval Timer; extern timeval Timer;
} }
#endif #endif

3
src/help.h
View File

@@ -24,9 +24,8 @@
#include "actions.h" #include "actions.h"
#include "screen.h" #include "screen.h"
class Help : public Screen<NC::Scrollpad> struct Help : public Screen<NC::Scrollpad>
{ {
public:
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;
virtual void switchTo() OVERRIDE; virtual void switchTo() OVERRIDE;

3
src/lastfm.h
View File

@@ -31,9 +31,8 @@
#include "lastfm_service.h" #include "lastfm_service.h"
#include "screen.h" #include "screen.h"
class Lastfm : public Screen<NC::Scrollpad> struct Lastfm : public Screen<NC::Scrollpad>
{ {
public:
Lastfm() : isReadyToTake(0), isDownloadInProgress(0) { } Lastfm() : isReadyToTake(0), isDownloadInProgress(0) { }
// Screen<NC::Scrollpad> // Screen<NC::Scrollpad>

3
src/lyrics.h
View File

@@ -28,9 +28,8 @@
#include "screen.h" #include "screen.h"
#include "lyrics_fetcher.h" #include "lyrics_fetcher.h"
class Lyrics : public Screen<NC::Scrollpad> struct Lyrics : public Screen<NC::Scrollpad>
{ {
public:
Lyrics() : ReloadNP(0), Lyrics() : ReloadNP(0),
# ifdef HAVE_CURL_CURL_H # ifdef HAVE_CURL_CURL_H
isReadyToTake(0), isDownloadInProgress(0), isReadyToTake(0), isDownloadInProgress(0),

3
src/media_library.h
View File

@@ -24,9 +24,8 @@
#include "interfaces.h" #include "interfaces.h"
#include "screen.h" #include "screen.h"
class MediaLibrary : public Screen<NC::Window>, public Filterable, public HasColumns, public HasSongs, public Searchable struct MediaLibrary : public Screen<NC::Window>, public Filterable, public HasColumns, public HasSongs, public Searchable
{ {
public:
virtual void switchTo() OVERRIDE; virtual void switchTo() OVERRIDE;
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;

4
src/outputs.h
View File

@@ -29,10 +29,8 @@
#include "mpdpp.h" #include "mpdpp.h"
#include "screen.h" #include "screen.h"
class Outputs : public Screen< NC::Menu<MPD::Output> > struct Outputs : public Screen< NC::Menu<MPD::Output> >
{ {
public:
// Screen< NC::Menu<MPD::Output> > implementation // Screen< NC::Menu<MPD::Output> > implementation
virtual void switchTo() OVERRIDE; virtual void switchTo() OVERRIDE;
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;

3
src/playlist.h
View File

@@ -27,9 +27,8 @@
#include "screen.h" #include "screen.h"
#include "song.h" #include "song.h"
class Playlist : public Screen<NC::Menu<MPD::Song>>, public Filterable, public HasSongs, public Searchable struct Playlist : public Screen<NC::Menu<MPD::Song>>, public Filterable, public HasSongs, public Searchable
{ {
public:
Playlist() : itsTotalLength(0), itsRemainingTime(0), itsScrollBegin(0) { } Playlist() : itsTotalLength(0), itsRemainingTime(0), itsScrollBegin(0) { }
~Playlist() { } ~Playlist() { }

3
src/playlist_editor.h
View File

@@ -24,9 +24,8 @@
#include "interfaces.h" #include "interfaces.h"
#include "screen.h" #include "screen.h"
class PlaylistEditor : public Screen<NC::Window>, public Filterable, public HasColumns, public HasSongs, public Searchable struct PlaylistEditor : public Screen<NC::Window>, public Filterable, public HasColumns, public HasSongs, public Searchable
{ {
public:
virtual void switchTo() OVERRIDE; virtual void switchTo() OVERRIDE;
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;

3
src/search_engine.h
View File

@@ -73,9 +73,8 @@ struct SEItem
MPD::Song itsSong; MPD::Song itsSong;
}; };
class SearchEngine : public Screen< NC::Menu<SEItem> >, public Filterable, public HasSongs, public Searchable struct SearchEngine : public Screen< NC::Menu<SEItem> >, public Filterable, public HasSongs, public Searchable
{ {
public:
// Screen< NC::Menu<SEItem> > implementation // Screen< NC::Menu<SEItem> > implementation
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;
virtual void switchTo() OVERRIDE; virtual void switchTo() OVERRIDE;

3
src/sel_items_adder.h
View File

@@ -23,9 +23,8 @@
#include "screen.h" #include "screen.h"
class SelectedItemsAdder : public Screen< NC::Menu<std::string> > struct SelectedItemsAdder : public Screen< NC::Menu<std::string> >
{ {
public:
SelectedItemsAdder() : itsPSWidth(35), itsPSHeight(11) { } SelectedItemsAdder() : itsPSWidth(35), itsPSHeight(11) { }
// Screen< NC::Menu<std::string> > implementation // Screen< NC::Menu<std::string> > implementation

3
src/server_info.h
View File

@@ -23,9 +23,8 @@
#include "screen.h" #include "screen.h"
class ServerInfo : public Screen<NC::Scrollpad> struct ServerInfo : public Screen<NC::Scrollpad>
{ {
public:
// Screen<NC::Scrollpad> implementation // Screen<NC::Scrollpad> implementation
virtual void switchTo() OVERRIDE; virtual void switchTo() OVERRIDE;
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;

4
src/song_info.h
View File

@@ -24,9 +24,8 @@
#include "screen.h" #include "screen.h"
#include "mutable_song.h" #include "mutable_song.h"
class SongInfo : public Screen<NC::Scrollpad> struct SongInfo : public Screen<NC::Scrollpad>
{ {
public:
struct Metadata struct Metadata
{ {
const char *Name; const char *Name;
@@ -49,7 +48,6 @@ class SongInfo : public Screen<NC::Scrollpad>
virtual bool isTabbable() OVERRIDE { return false; } virtual bool isTabbable() OVERRIDE { return false; }
// private members // private members
static const Metadata Tags[]; static const Metadata Tags[];
protected: protected:

3
src/tag_editor.h
View File

@@ -33,9 +33,8 @@
#include "regex_filter.h" #include "regex_filter.h"
#include "screen.h" #include "screen.h"
class TagEditor : public Screen<NC::Window>, public Filterable, public HasColumns, public HasSongs, public Searchable struct TagEditor : public Screen<NC::Window>, public Filterable, public HasColumns, public HasSongs, public Searchable
{ {
public:
TagEditor() : FParser(0), FParserHelper(0), FParserLegend(0), FParserPreview(0), itsBrowsedDir("/") { } TagEditor() : FParser(0), FParserHelper(0), FParserLegend(0), FParserPreview(0), itsBrowsedDir("/") { }
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;

3
src/tiny_tag_editor.h
View File

@@ -28,9 +28,8 @@
#include "mutable_song.h" #include "mutable_song.h"
#include "screen.h" #include "screen.h"
class TinyTagEditor : public Screen< NC::Menu<NC::Buffer> > struct TinyTagEditor : public Screen< NC::Menu<NC::Buffer> >
{ {
public:
// Screen< NC::Menu<NC::Buffer> > implementation // Screen< NC::Menu<NC::Buffer> > implementation
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;
virtual void switchTo() OVERRIDE; virtual void switchTo() OVERRIDE;

3
src/visualizer.h
View File

@@ -32,9 +32,8 @@
# include <fftw3.h> # include <fftw3.h>
#endif #endif
class Visualizer : public Screen<NC::Window> struct Visualizer : public Screen<NC::Window>
{ {
public:
virtual void switchTo() OVERRIDE; virtual void switchTo() OVERRIDE;
virtual void resize() OVERRIDE; virtual void resize() OVERRIDE;