mirror/musikcube
1
0
Fork 0
mirror of https://github.com/clangen/musikcube.git synced 2024-11-19 20:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed a couple compiler warnings.

Browse Source
This commit is contained in:
casey langen 2020-10-21 17:38:09 -07:00
parent 62cd360c3d
commit a010a7b709
4 changed files with 20 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/musikcube/app/layout/BrowseLayout.h
View File

@ -58,8 +58,9 @@ namespace musik {
virtual ~BrowseLayout(); virtual ~BrowseLayout();
virtual bool KeyPress(const std::string& key) override; /* IWindow */
virtual void ProcessMessage(musik::core::runtime::IMessage &message) override; bool KeyPress(const std::string& key) override;
void ProcessMessage(musik::core::runtime::IMessage &message) override;
void ScrollTo(const std::string& fieldType, int64_t fieldId); void ScrollTo(const std::string& fieldType, int64_t fieldId);
void SwitchCategory(const std::string& fieldName); void SwitchCategory(const std::string& fieldName);
@ -68,7 +69,8 @@ namespace musik {
void LoadLastSession(); void LoadLastSession();
protected: protected:
virtual void OnLayout() override; /* LayoutBase */
void OnLayout() override;
private: private:
void InitializeWindows(); void InitializeWindows();

8
src/musikcube/app/layout/NowPlayingLayout.h
View File

@ -58,11 +58,13 @@ namespace musik {
virtual ~NowPlayingLayout(); virtual ~NowPlayingLayout();
virtual void OnVisibilityChanged(bool visible); /* IWindow */
virtual bool KeyPress(const std::string& key); void OnVisibilityChanged(bool visible) override;
bool KeyPress(const std::string& key) override;
protected: protected:
virtual void OnLayout(); /* LayoutBase */
void OnLayout() override;
private: private:
void InitializeWindows(); void InitializeWindows();

17
src/musikcube/app/window/CategoryListView.h
View File

@ -75,19 +75,20 @@ namespace musik {
void Reset(); void Reset();
virtual bool KeyPress(const std::string& key);
int64_t GetSelectedId(); int64_t GetSelectedId();
std::string GetSelectedValue(); std::string GetSelectedValue();
std::string GetFilter(); std::string GetFilter();
std::string GetFieldName(); std::string GetFieldName();
void SetFieldName(const std::string& fieldName); void SetFieldName(const std::string& fieldName);
virtual void OnVisibilityChanged(bool visible) override; /* IWindow */
bool KeyPress(const std::string& key) override;
void OnVisibilityChanged(bool visible) override;
protected: protected:
virtual cursespp::IScrollAdapter& GetScrollAdapter(); /* IListWindow */
virtual bool OnEntryContextMenu(size_t index); cursespp::IScrollAdapter& GetScrollAdapter() override;
bool OnEntryContextMenu(size_t index) override;
void OnQueryCompleted(musik::core::db::IQuery* query); void OnQueryCompleted(musik::core::db::IQuery* query);
void ShowContextMenu(); void ShowContextMenu();
@ -96,10 +97,10 @@ namespace musik {
public: public:
Adapter(CategoryListView &parent); Adapter(CategoryListView &parent);
virtual size_t GetEntryCount(); size_t GetEntryCount() override;
virtual cursespp::IScrollAdapter::EntryPtr cursespp::IScrollAdapter::EntryPtr
GetEntry(cursespp::ScrollableWindow* window, size_t index); GetEntry(cursespp::ScrollableWindow* window, size_t index) override;
private: private:
CategoryListView &parent; CategoryListView &parent;

2
src/musikcube/cursespp/DialogOverlay.cpp
View File

@ -158,7 +158,7 @@ bool DialogOverlay::ProcessKey(const std::string& key) {
return true; return true;
} }
if (this->escDismiss && key == "^[" || key == "ESC") { if (this->escDismiss && (key == "^[" || key == "ESC")) {
this->Dismiss(); this->Dismiss();
return true; return true;
} }