From 6dd1ce7a78d33caa2756ad0bf7088de2fd518cb2 Mon Sep 17 00:00:00 2001 From: xhaggi Date: Thu, 9 Jul 2015 11:58:46 +0200 Subject: [gui] renames OnInfo to OnItemInfo as CGUIWindow::OnInfo will be introduced --- xbmc/music/dialogs/GUIDialogSongInfo.cpp | 2 +- xbmc/music/windows/GUIWindowMusicBase.cpp | 12 ++++++------ xbmc/music/windows/GUIWindowMusicBase.h | 6 +++--- xbmc/music/windows/GUIWindowMusicNav.cpp | 6 +++--- xbmc/pictures/GUIWindowPictures.cpp | 6 +++--- xbmc/pictures/GUIWindowPictures.h | 2 +- xbmc/programs/GUIWindowPrograms.cpp | 6 +++--- xbmc/programs/GUIWindowPrograms.h | 2 +- xbmc/video/windows/GUIWindowVideoBase.cpp | 12 ++++++------ xbmc/video/windows/GUIWindowVideoBase.h | 4 ++-- xbmc/video/windows/GUIWindowVideoNav.cpp | 4 ++-- xbmc/video/windows/GUIWindowVideoNav.h | 2 +- 12 files changed, 32 insertions(+), 32 deletions(-) diff --git a/xbmc/music/dialogs/GUIDialogSongInfo.cpp b/xbmc/music/dialogs/GUIDialogSongInfo.cpp index db92a2da2a..59b5d4b104 100644 --- a/xbmc/music/dialogs/GUIDialogSongInfo.cpp +++ b/xbmc/music/dialogs/GUIDialogSongInfo.cpp @@ -98,7 +98,7 @@ bool CGUIDialogSongInfo::OnMessage(CGUIMessage& message) std::string path = StringUtils::Format("musicdb://albums/%li",m_albumId); item.SetPath(path); item.m_bIsFolder = true; - window->OnInfo(&item, true); + window->OnItemInfo(&item, true); } return true; } diff --git a/xbmc/music/windows/GUIWindowMusicBase.cpp b/xbmc/music/windows/GUIWindowMusicBase.cpp index af868dced3..3d99f624c9 100644 --- a/xbmc/music/windows/GUIWindowMusicBase.cpp +++ b/xbmc/music/windows/GUIWindowMusicBase.cpp @@ -238,7 +238,7 @@ bool CGUIWindowMusicBase::OnMessage(CGUIMessage& message) } else if (iAction == ACTION_SHOW_INFO) { - OnInfo(iItem); + OnItemInfo(iItem); } else if (iAction == ACTION_DELETE_ITEM) { @@ -311,7 +311,7 @@ bool CGUIWindowMusicBase::OnAction(const CAction &action) return CGUIMediaWindow::OnAction(action); } -void CGUIWindowMusicBase::OnInfoAll(int iItem, bool bCurrent /* = false */, bool refresh /* = false */) +void CGUIWindowMusicBase::OnItemInfoAll(int iItem, bool bCurrent /* = false */, bool refresh /* = false */) { CMusicDatabaseDirectory dir; std::string strPath = m_vecItems->GetPath(); @@ -328,7 +328,7 @@ void CGUIWindowMusicBase::OnInfoAll(int iItem, bool bCurrent /* = false */, bool /// \brief Retrieves music info for albums from allmusic.com and displays them in CGUIDialogMusicInfo /// \param iItem Item in list/thumb control -void CGUIWindowMusicBase::OnInfo(int iItem, bool bShowInfo) +void CGUIWindowMusicBase::OnItemInfo(int iItem, bool bShowInfo) { if ( iItem < 0 || iItem >= m_vecItems->Size() ) return; @@ -347,10 +347,10 @@ void CGUIWindowMusicBase::OnInfo(int iItem, bool bShowInfo) return; } - OnInfo(item.get(), bShowInfo); + OnItemInfo(item.get(), bShowInfo); } -void CGUIWindowMusicBase::OnInfo(CFileItem *pItem, bool bShowInfo) +void CGUIWindowMusicBase::OnItemInfo(CFileItem *pItem, bool bShowInfo) { if ((pItem->IsMusicDb() && !pItem->HasMusicInfoTag()) || pItem->IsParentFolder() || URIUtils::IsSpecial(pItem->GetPath()) || StringUtils::StartsWithNoCase(pItem->GetPath(), "musicsearch://")) @@ -929,7 +929,7 @@ bool CGUIWindowMusicBase::OnContextButton(int itemNumber, CONTEXT_BUTTON button) return true; case CONTEXT_BUTTON_INFO: - OnInfo(itemNumber); + OnItemInfo(itemNumber); return true; case CONTEXT_BUTTON_SONG_INFO: diff --git a/xbmc/music/windows/GUIWindowMusicBase.h b/xbmc/music/windows/GUIWindowMusicBase.h index 81263eebae..1e2bdce052 100644 --- a/xbmc/music/windows/GUIWindowMusicBase.h +++ b/xbmc/music/windows/GUIWindowMusicBase.h @@ -46,7 +46,7 @@ public: virtual bool OnAction(const CAction &action); virtual bool OnBack(int actionID); - void OnInfo(CFileItem *pItem, bool bShowInfo = false); + void OnItemInfo(CFileItem *pItem, bool bShowInfo = false); void DoScan(const std::string &strPath); protected: @@ -81,8 +81,8 @@ protected: virtual bool OnPlayMedia(int iItem); void RetrieveMusicInfo(); - void OnInfo(int iItem, bool bShowInfo = true); - void OnInfoAll(int iItem, bool bCurrent=false, bool refresh=false); + void OnItemInfo(int iItem, bool bShowInfo = true); + void OnItemInfoAll(int iItem, bool bCurrent=false, bool refresh=false); virtual void OnQueueItem(int iItem); enum ALLOW_SELECTION { SELECTION_ALLOWED = 0, SELECTION_AUTO, SELECTION_FORCED }; bool FindAlbumInfo(const CFileItem* album, MUSIC_GRABBER::CMusicAlbumInfo& albumInfo, ALLOW_SELECTION allowSelection); diff --git a/xbmc/music/windows/GUIWindowMusicNav.cpp b/xbmc/music/windows/GUIWindowMusicNav.cpp index cee7a23413..259ba8c312 100644 --- a/xbmc/music/windows/GUIWindowMusicNav.cpp +++ b/xbmc/music/windows/GUIWindowMusicNav.cpp @@ -646,7 +646,7 @@ bool CGUIWindowMusicNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button) if (pWindow) { ADDON::ScraperPtr info; - pWindow->OnInfo(item.get(),info); + pWindow->OnItemInfo(item.get(),info); Refresh(); } } @@ -654,7 +654,7 @@ bool CGUIWindowMusicNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button) } case CONTEXT_BUTTON_INFO_ALL: - OnInfoAll(itemNumber); + OnItemInfoAll(itemNumber); return true; case CONTEXT_BUTTON_SET_DEFAULT: @@ -747,7 +747,7 @@ bool CGUIWindowMusicNav::OnContextButton(int itemNumber, CONTEXT_BUTTON button) m_musicdatabase.SetScraperForPath(path,scraper); if (CGUIDialogYesNo::ShowAndGetInput(CVariant{20442}, CVariant{20443})) { - OnInfoAll(itemNumber,true,true); + OnItemInfoAll(itemNumber,true,true); } } diff --git a/xbmc/pictures/GUIWindowPictures.cpp b/xbmc/pictures/GUIWindowPictures.cpp index 9cfef28b3a..5ee0576bb8 100644 --- a/xbmc/pictures/GUIWindowPictures.cpp +++ b/xbmc/pictures/GUIWindowPictures.cpp @@ -162,7 +162,7 @@ bool CGUIWindowPictures::OnMessage(CGUIMessage& message) } else if (iAction == ACTION_SHOW_INFO) { - OnInfo(iItem); + OnItemInfo(iItem); return true; } } @@ -525,7 +525,7 @@ bool CGUIWindowPictures::OnContextButton(int itemNumber, CONTEXT_BUTTON button) OnSlideShowRecursive(item->GetPath()); return true; case CONTEXT_BUTTON_INFO: - OnInfo(itemNumber); + OnItemInfo(itemNumber); return true; case CONTEXT_BUTTON_REFRESH_THUMBS: OnRegenerateThumbs(); @@ -593,7 +593,7 @@ void CGUIWindowPictures::LoadPlayList(const std::string& strPlayList) } } -void CGUIWindowPictures::OnInfo(int itemNumber) +void CGUIWindowPictures::OnItemInfo(int itemNumber) { CFileItemPtr item = (itemNumber >= 0 && itemNumber < m_vecItems->Size()) ? m_vecItems->Get(itemNumber) : CFileItemPtr(); if (!item) diff --git a/xbmc/pictures/GUIWindowPictures.h b/xbmc/pictures/GUIWindowPictures.h index f97e86d2e5..a6eae4d811 100644 --- a/xbmc/pictures/GUIWindowPictures.h +++ b/xbmc/pictures/GUIWindowPictures.h @@ -36,7 +36,7 @@ public: protected: virtual bool GetDirectory(const std::string &strDirectory, CFileItemList& items); - virtual void OnInfo(int item); + virtual void OnItemInfo(int item); virtual bool OnClick(int iItem); virtual void UpdateButtons(); virtual void OnPrepareFileItems(CFileItemList& items); diff --git a/xbmc/programs/GUIWindowPrograms.cpp b/xbmc/programs/GUIWindowPrograms.cpp index 319a261c17..381e49b11f 100644 --- a/xbmc/programs/GUIWindowPrograms.cpp +++ b/xbmc/programs/GUIWindowPrograms.cpp @@ -84,7 +84,7 @@ bool CGUIWindowPrograms::OnMessage(CGUIMessage& message) } else if (iAction == ACTION_SHOW_INFO) { - OnInfo(iItem); + OnItemInfo(iItem); return true; } } @@ -137,7 +137,7 @@ bool CGUIWindowPrograms::OnContextButton(int itemNumber, CONTEXT_BUTTON button) return true; case CONTEXT_BUTTON_INFO: - OnInfo(itemNumber); + OnItemInfo(itemNumber); return true; default: @@ -219,7 +219,7 @@ std::string CGUIWindowPrograms::GetStartFolder(const std::string &dir) return CGUIMediaWindow::GetStartFolder(dir); } -void CGUIWindowPrograms::OnInfo(int iItem) +void CGUIWindowPrograms::OnItemInfo(int iItem) { if (iItem < 0 || iItem >= m_vecItems->Size()) return; diff --git a/xbmc/programs/GUIWindowPrograms.h b/xbmc/programs/GUIWindowPrograms.h index 22d864b4c4..dbf840bfc4 100644 --- a/xbmc/programs/GUIWindowPrograms.h +++ b/xbmc/programs/GUIWindowPrograms.h @@ -31,7 +31,7 @@ public: CGUIWindowPrograms(void); virtual ~CGUIWindowPrograms(void); virtual bool OnMessage(CGUIMessage& message); - virtual void OnInfo(int iItem); + virtual void OnItemInfo(int iItem); protected: virtual void OnItemLoaded(CFileItem* pItem) {}; virtual bool Update(const std::string& strDirectory, bool updateFilterPath = true); diff --git a/xbmc/video/windows/GUIWindowVideoBase.cpp b/xbmc/video/windows/GUIWindowVideoBase.cpp index 1373d3726f..b9bc244e99 100644 --- a/xbmc/video/windows/GUIWindowVideoBase.cpp +++ b/xbmc/video/windows/GUIWindowVideoBase.cpp @@ -153,7 +153,7 @@ bool CGUIWindowVideoBase::OnMessage(CGUIMessage& message) } else if (iAction == ACTION_SHOW_INFO) { - return OnInfo(iItem); + return OnItemInfo(iItem); } else if (iAction == ACTION_PLAYER_PLAY) { @@ -201,7 +201,7 @@ bool CGUIWindowVideoBase::OnMessage(CGUIMessage& message) return CGUIMediaWindow::OnMessage(message); } -void CGUIWindowVideoBase::OnInfo(CFileItem* pItem, ADDON::ScraperPtr& scraper) +void CGUIWindowVideoBase::OnItemInfo(CFileItem* pItem, ADDON::ScraperPtr& scraper) { if (!pItem) return; @@ -693,7 +693,7 @@ bool CGUIWindowVideoBase::OnFileAction(int iItem, int action) return OnClick(iItem); } -bool CGUIWindowVideoBase::OnInfo(int iItem) +bool CGUIWindowVideoBase::OnItemInfo(int iItem) { if (iItem < 0 || iItem >= m_vecItems->Size()) return false; @@ -736,7 +736,7 @@ bool CGUIWindowVideoBase::OnInfo(int iItem) return true; } - OnInfo(item.get(), scraper); + OnItemInfo(item.get(), scraper); return true; } @@ -1034,7 +1034,7 @@ bool CGUIWindowVideoBase::OnContextButton(int itemNumber, CONTEXT_BUTTON button) return OnFileAction(itemNumber, SELECT_ACTION_RESUME); case CONTEXT_BUTTON_INFO: - OnInfo(itemNumber); + OnItemInfo(itemNumber); return true; case CONTEXT_BUTTON_STOP_SCANNING: @@ -1065,7 +1065,7 @@ bool CGUIWindowVideoBase::OnContextButton(int itemNumber, CONTEXT_BUTTON button) OnScan(strPath, true); } else - OnInfo(item.get(),info); + OnItemInfo(item.get(),info); return true; } diff --git a/xbmc/video/windows/GUIWindowVideoBase.h b/xbmc/video/windows/GUIWindowVideoBase.h index 423753e86c..66b6316ca1 100644 --- a/xbmc/video/windows/GUIWindowVideoBase.h +++ b/xbmc/video/windows/GUIWindowVideoBase.h @@ -49,7 +49,7 @@ public: static bool HasResumeItemOffset(const CFileItem *item); void AddToDatabase(int iItem); - virtual void OnInfo(CFileItem* pItem, ADDON::ScraperPtr& scraper); + virtual void OnItemInfo(CFileItem* pItem, ADDON::ScraperPtr& scraper); /*! \brief Show the resume menu for this item (if it has a resume bookmark) @@ -109,7 +109,7 @@ protected: \param item the selected item \return true if the action is performed, false otherwise */ - bool OnInfo(int item); + bool OnItemInfo(int item); /*! \brief perform a given action on a file \param item the selected item \param action the action to perform diff --git a/xbmc/video/windows/GUIWindowVideoNav.cpp b/xbmc/video/windows/GUIWindowVideoNav.cpp index 3ada52101f..5d57344151 100644 --- a/xbmc/video/windows/GUIWindowVideoNav.cpp +++ b/xbmc/video/windows/GUIWindowVideoNav.cpp @@ -733,7 +733,7 @@ void CGUIWindowVideoNav::PlayItem(int iItem) CGUIWindowVideoBase::PlayItem(iItem); } -void CGUIWindowVideoNav::OnInfo(CFileItem* pItem, ADDON::ScraperPtr& scraper) +void CGUIWindowVideoNav::OnItemInfo(CFileItem* pItem, ADDON::ScraperPtr& scraper) { if (!scraper || scraper->Content() == CONTENT_NONE) { @@ -748,7 +748,7 @@ void CGUIWindowVideoNav::OnInfo(CFileItem* pItem, ADDON::ScraperPtr& scraper) } m_database.Close(); } - CGUIWindowVideoBase::OnInfo(pItem,scraper); + CGUIWindowVideoBase::OnItemInfo(pItem,scraper); } void CGUIWindowVideoNav::OnDeleteItem(CFileItemPtr pItem) diff --git a/xbmc/video/windows/GUIWindowVideoNav.h b/xbmc/video/windows/GUIWindowVideoNav.h index 34f05011cc..dca57bfb76 100644 --- a/xbmc/video/windows/GUIWindowVideoNav.h +++ b/xbmc/video/windows/GUIWindowVideoNav.h @@ -49,7 +49,7 @@ public: virtual bool OnAction(const CAction &action); virtual bool OnMessage(CGUIMessage& message); - virtual void OnInfo(CFileItem* pItem, ADDON::ScraperPtr &info); + virtual void OnItemInfo(CFileItem* pItem, ADDON::ScraperPtr &info); /*! \brief Load video information from the database for these items (public static version) Useful for grabbing information for file listings, from watched status to full metadata -- cgit v1.2.3