From 830a2832b53f32ccde9d8c5ed4a102089ad08cd0 Mon Sep 17 00:00:00 2001 From: Andrzej Rybczak Date: Fri, 14 Sep 2012 17:43:11 +0200 Subject: [PATCH] screen: change ScreenType to WindowType and add WindowReference typedef --- src/browser.cpp | 2 +- src/media_library.cpp | 6 +++--- src/outputs.cpp | 2 +- src/playlist.cpp | 2 +- src/playlist_editor.cpp | 4 ++-- src/screen.h | 14 ++++++++------ src/search_engine.cpp | 2 +- src/sel_items_adder.cpp | 2 +- src/sort_playlist.cpp | 2 +- src/sort_playlist.h | 4 ++-- src/tag_editor.cpp | 10 +++++----- src/tiny_tag_editor.cpp | 2 +- 12 files changed, 27 insertions(+), 25 deletions(-) diff --git a/src/browser.cpp b/src/browser.cpp index 9f7ab520..3d6e2fbb 100644 --- a/src/browser.cpp +++ b/src/browser.cpp @@ -253,7 +253,7 @@ void Browser::mouseButtonPressed(MEVENT me) } } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } /***********************************************************************/ diff --git a/src/media_library.cpp b/src/media_library.cpp index 6b43fe97..e7403097 100644 --- a/src/media_library.cpp +++ b/src/media_library.cpp @@ -444,7 +444,7 @@ void MediaLibrary::mouseButtonPressed(MEVENT me) } } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); Albums.clear(); Songs.clear(); } @@ -472,7 +472,7 @@ void MediaLibrary::mouseButtonPressed(MEVENT me) } } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); Songs.clear(); } else if (!Songs.empty() && Songs.hasCoords(me.x, me.y)) @@ -493,7 +493,7 @@ void MediaLibrary::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } } diff --git a/src/outputs.cpp b/src/outputs.cpp index 60795815..e0c1c003 100644 --- a/src/outputs.cpp +++ b/src/outputs.cpp @@ -107,7 +107,7 @@ void Outputs::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } void Outputs::FetchList() diff --git a/src/playlist.cpp b/src/playlist.cpp index cbf74dcc..0d255906 100644 --- a/src/playlist.cpp +++ b/src/playlist.cpp @@ -138,7 +138,7 @@ void Playlist::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } } diff --git a/src/playlist_editor.cpp b/src/playlist_editor.cpp index 3f332eba..20bc00d3 100644 --- a/src/playlist_editor.cpp +++ b/src/playlist_editor.cpp @@ -295,7 +295,7 @@ void PlaylistEditor::mouseButtonPressed(MEVENT me) } } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); Content->clear(); } else if (!Content->empty() && Content->hasCoords(me.x, me.y)) @@ -321,7 +321,7 @@ void PlaylistEditor::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } } diff --git a/src/screen.h b/src/screen.h index c9ab300b..7c40f2a1 100644 --- a/src/screen.h +++ b/src/screen.h @@ -115,14 +115,18 @@ bool isVisible(BasicScreen *screen); /// for the screen to be working properly and assumes that we didn't forget /// about anything vital. /// -template class Screen : public BasicScreen +template struct Screen : public BasicScreen { + typedef WindowT WindowType; + typedef typename std::add_lvalue_reference::type WindowReference; + +private: template struct access { }; template struct access { - static Result apply(WindowT w) { return *w; } + static Result apply(WindowType w) { return *w; } }; template struct access { - static Result apply(WindowT &w) { return w; } + static Result apply(WindowReference w) { return w; } }; typedef access< @@ -133,8 +137,6 @@ template class Screen : public BasicScreen > accessor; public: - typedef WindowT ScreenType; - Screen() { } Screen(WindowT w_) : w(w_) { } @@ -178,7 +180,7 @@ public: } /// @return currently active window - typename std::add_lvalue_reference::type main() { + WindowReference main() { return w; } diff --git a/src/search_engine.cpp b/src/search_engine.cpp index c65562a8..2b1e5552 100644 --- a/src/search_engine.cpp +++ b/src/search_engine.cpp @@ -264,7 +264,7 @@ void SearchEngine::mouseButtonPressed(MEVENT me) } } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } /***********************************************************************/ diff --git a/src/sel_items_adder.cpp b/src/sel_items_adder.cpp index a3a8c310..cdfb3175 100644 --- a/src/sel_items_adder.cpp +++ b/src/sel_items_adder.cpp @@ -244,7 +244,7 @@ void SelectedItemsAdder::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } void SelectedItemsAdder::SetDimensions() diff --git a/src/sort_playlist.cpp b/src/sort_playlist.cpp index 2e67ca01..2568abf2 100644 --- a/src/sort_playlist.cpp +++ b/src/sort_playlist.cpp @@ -175,7 +175,7 @@ void SortPlaylistDialog::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } } diff --git a/src/sort_playlist.h b/src/sort_playlist.h index ac9a5c1a..2f8f2e74 100644 --- a/src/sort_playlist.h +++ b/src/sort_playlist.h @@ -56,8 +56,8 @@ private: size_t m_height; size_t m_width; - const std::remove_pointer::type::Item::Type m_sort_entry; - const std::remove_pointer::type::Item::Type m_cancel_entry; + const std::remove_pointer::type::Item::Type m_sort_entry; + const std::remove_pointer::type::Item::Type m_cancel_entry; }; extern SortPlaylistDialog *mySortPlaylistDialog; diff --git a/src/tag_editor.cpp b/src/tag_editor.cpp index 4e60b4cc..d0fcf839 100644 --- a/src/tag_editor.cpp +++ b/src/tag_editor.cpp @@ -641,7 +641,7 @@ void TagEditor::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } } else if (w == FParser || w == FParserHelper) @@ -662,7 +662,7 @@ void TagEditor::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } else if (FParserHelper->hasCoords(me.x, me.y)) { @@ -689,7 +689,7 @@ void TagEditor::mouseButtonPressed(MEVENT me) spacePressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); Tags->clear(); } else if (!TagTypes->empty() && TagTypes->hasCoords(me.x, me.y)) @@ -714,7 +714,7 @@ void TagEditor::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } else if (!Tags->empty() && Tags->hasCoords(me.x, me.y)) { @@ -728,7 +728,7 @@ void TagEditor::mouseButtonPressed(MEVENT me) enterPressed(); } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } } diff --git a/src/tiny_tag_editor.cpp b/src/tiny_tag_editor.cpp index 5a4d293d..7ab0950d 100644 --- a/src/tiny_tag_editor.cpp +++ b/src/tiny_tag_editor.cpp @@ -167,7 +167,7 @@ void TinyTagEditor::mouseButtonPressed(MEVENT me) } } else - Screen::mouseButtonPressed(me); + Screen::mouseButtonPressed(me); } void TinyTagEditor::SetEdited(const MPD::Song &s)