From 77cac5a2231da67a5078eeb5a1e0e9a9afe1adea Mon Sep 17 00:00:00 2001 From: Matthias Kortstiege Date: Sun, 27 Sep 2015 10:39:11 +0200 Subject: [PATCH 1/5] [cleanup] silent override warnings on newer gcc version --- xbmc/Application.h | 34 +++++++++---------- xbmc/GUIInfoManager.h | 2 +- xbmc/PlayListPlayer.h | 2 +- .../cores/AudioEngine/DSPAddons/ActiveAEDSP.h | 8 ++--- xbmc/epg/EpgContainer.h | 4 +-- xbmc/guilib/StereoscopicsManager.h | 2 +- xbmc/network/WakeOnAccess.h | 2 +- xbmc/pvr/PVRManager.h | 4 +-- xbmc/pvr/channels/PVRChannelGroup.h | 2 +- xbmc/settings/dialogs/GUIDialogSettingsBase.h | 12 +++---- .../dialogs/GUIDialogSettingsManagerBase.h | 6 ++-- xbmc/settings/lib/Setting.h | 2 +- xbmc/settings/lib/SettingsManager.h | 2 +- xbmc/utils/SeekHandler.h | 2 +- xbmc/utils/SystemInfo.h | 6 ++-- xbmc/utils/Weather.h | 8 ++--- 16 files changed, 49 insertions(+), 49 deletions(-) diff --git a/xbmc/Application.h b/xbmc/Application.h index de2b2e68bfca6..58130a9cebeaf 100644 --- a/xbmc/Application.h +++ b/xbmc/Application.h @@ -135,13 +135,13 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs CApplication(void); virtual ~CApplication(void); - virtual bool Initialize(); - virtual void FrameMove(bool processEvents, bool processGUI = true); - virtual void Render(); + virtual bool Initialize() override; + virtual void FrameMove(bool processEvents, bool processGUI = true) override; + virtual void Render() override; virtual bool RenderNoPresent(); virtual void Preflight(); - virtual bool Create(); - virtual bool Cleanup(); + virtual bool Create() override; + virtual bool Cleanup() override; bool CreateGUI(); bool InitWindow(); @@ -162,17 +162,17 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs const std::string& CurrentFile(); CFileItem& CurrentFileItem(); CFileItem& CurrentUnstackedItem(); - virtual bool OnMessage(CGUIMessage& message); + virtual bool OnMessage(CGUIMessage& message) override; PLAYERCOREID GetCurrentPlayer(); - virtual void OnPlayBackEnded(); - virtual void OnPlayBackStarted(); - virtual void OnPlayBackPaused(); - virtual void OnPlayBackResumed(); - virtual void OnPlayBackStopped(); - virtual void OnQueueNextItem(); - virtual void OnPlayBackSeek(int iTime, int seekOffset); - virtual void OnPlayBackSeekChapter(int iChapter); - virtual void OnPlayBackSpeedChanged(int iSpeed); + virtual void OnPlayBackEnded() override; + virtual void OnPlayBackStarted() override; + virtual void OnPlayBackPaused() override; + virtual void OnPlayBackResumed() override; + virtual void OnPlayBackStopped() override; + virtual void OnQueueNextItem() override; + virtual void OnPlayBackSeek(int iTime, int seekOffset) override; + virtual void OnPlayBackSeekChapter(int iChapter) override; + virtual void OnPlayBackSpeedChanged(int iSpeed) override; virtual int GetMessageMask() override; virtual void OnApplicationMessage(KODI::MESSAGING::ThreadMessage* pMsg) override; @@ -204,7 +204,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs void CloseNetworkShares(); void ShowAppMigrationMessage(); - virtual void Process(); + virtual void Process() override; void ProcessSlow(); void ResetScreenSaver(); float GetVolume(bool percentage = true) const; @@ -371,7 +371,7 @@ class CApplication : public CXBApplicationEx, public IPlayerCallback, public IMs bool SwitchToFullScreen(bool force = false); - void SetRenderGUI(bool renderGUI); + void SetRenderGUI(bool renderGUI) override; bool GetRenderGUI() const { return m_renderGUI; }; bool SetLanguage(const std::string &strLanguage); diff --git a/xbmc/GUIInfoManager.h b/xbmc/GUIInfoManager.h index e43d99a1ed4ed..dc1b894f3aab9 100644 --- a/xbmc/GUIInfoManager.h +++ b/xbmc/GUIInfoManager.h @@ -107,7 +107,7 @@ class CGUIInfoManager : public IMsgTargetCallback, public Observable, virtual ~CGUIInfoManager(void); void Clear(); - virtual bool OnMessage(CGUIMessage &message); + virtual bool OnMessage(CGUIMessage &message) override; virtual int GetMessageMask() override; virtual void OnApplicationMessage(KODI::MESSAGING::ThreadMessage* pMsg) override; diff --git a/xbmc/PlayListPlayer.h b/xbmc/PlayListPlayer.h index 478e064fa0a3d..fff56a52a588d 100644 --- a/xbmc/PlayListPlayer.h +++ b/xbmc/PlayListPlayer.h @@ -51,7 +51,7 @@ class CPlayListPlayer : public IMsgTargetCallback, public: CPlayListPlayer(void); virtual ~CPlayListPlayer(void); - virtual bool OnMessage(CGUIMessage &message); + virtual bool OnMessage(CGUIMessage &message) override; virtual int GetMessageMask() override; virtual void OnApplicationMessage(KODI::MESSAGING::ThreadMessage* pMsg) override; diff --git a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.h b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.h index a1d887cdaab50..74f7ab630fe97 100644 --- a/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.h +++ b/xbmc/cores/AudioEngine/DSPAddons/ActiveAEDSP.h @@ -173,14 +173,14 @@ namespace ActiveAE * @param bDataChanged True if the addon's data changed, false otherwise (unused). * @return True if the audio dsp addon was found and restarted, false otherwise. */ - virtual bool RequestRestart(ADDON::AddonPtr addon, bool bDataChanged); + virtual bool RequestRestart(ADDON::AddonPtr addon, bool bDataChanged) override; /*! * @brief Remove a single audio dsp add-on. * @param addon The add-on to remove. * @return True if it was found and removed, false otherwise. */ - virtual bool RequestRemoval(ADDON::AddonPtr addon); + virtual bool RequestRemoval(ADDON::AddonPtr addon) override; /*! * @brief Checks whether an add-on is loaded @@ -202,7 +202,7 @@ namespace ActiveAE * @param obs * @param msg The observed message type */ - void Notify(const Observable &obs, const ObservableMessage msg); + void Notify(const Observable &obs, const ObservableMessage msg) override; /*! * @return The amount of enabled audio dsp addons. @@ -404,7 +404,7 @@ namespace ActiveAE /*! * @brief Thread to which updates the backend information */ - virtual void Process(void); + virtual void Process(void) override; private: /*! diff --git a/xbmc/epg/EpgContainer.h b/xbmc/epg/EpgContainer.h index 866e7f9fb5197..8ff41ee57f0e4 100644 --- a/xbmc/epg/EpgContainer.h +++ b/xbmc/epg/EpgContainer.h @@ -119,7 +119,7 @@ namespace EPG * @param obs The observable that sent the update. * @param msg The update message. */ - virtual void Notify(const Observable &obs, const ObservableMessage msg); + virtual void Notify(const Observable &obs, const ObservableMessage msg) override; virtual void OnSettingChanged(const CSetting *setting) override; @@ -283,7 +283,7 @@ namespace EPG /*! * @brief EPG update thread */ - virtual void Process(void); + virtual void Process(void) override; /*! * @brief Load all tables from the database diff --git a/xbmc/guilib/StereoscopicsManager.h b/xbmc/guilib/StereoscopicsManager.h index e84c6140b5a96..ec2310fd24584 100644 --- a/xbmc/guilib/StereoscopicsManager.h +++ b/xbmc/guilib/StereoscopicsManager.h @@ -80,7 +80,7 @@ class CStereoscopicsManager : public ISettingCallback, CAction ConvertActionCommandToAction(const std::string &command, const std::string ¶meter); std::string NormalizeStereoMode(const std::string &mode); virtual void OnSettingChanged(const CSetting *setting) override; - virtual bool OnMessage(CGUIMessage &message); + virtual bool OnMessage(CGUIMessage &message) override; /*! * @brief Handle 3D specific cActions * @param action The action to process diff --git a/xbmc/network/WakeOnAccess.h b/xbmc/network/WakeOnAccess.h index 6ebe47c934bcb..47f86b4815852 100644 --- a/xbmc/network/WakeOnAccess.h +++ b/xbmc/network/WakeOnAccess.h @@ -35,7 +35,7 @@ class CWakeOnAccess : private IJobCallback, public ISettingCallback, public ISet void QueueMACDiscoveryForAllRemotes(); - virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job); + virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job) override; virtual void OnSettingChanged(const CSetting *setting) override; virtual void OnSettingsLoaded() override; diff --git a/xbmc/pvr/PVRManager.h b/xbmc/pvr/PVRManager.h index 0a6bc3c04cbb5..3824a6034e2aa 100644 --- a/xbmc/pvr/PVRManager.h +++ b/xbmc/pvr/PVRManager.h @@ -112,7 +112,7 @@ namespace PVR */ virtual ~CPVRManager(void); - virtual void Announce(ANNOUNCEMENT::AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data); + virtual void Announce(ANNOUNCEMENT::AnnouncementFlag flag, const char *sender, const char *message, const CVariant &data) override; /*! * @brief Get the instance of the PVRManager. @@ -584,7 +584,7 @@ namespace PVR /*! * @brief PVR update and control thread. */ - virtual void Process(void); + virtual void Process(void) override; private: /*! diff --git a/xbmc/pvr/channels/PVRChannelGroup.h b/xbmc/pvr/channels/PVRChannelGroup.h index 55b60b86f87f5..64a8cf45de0fe 100644 --- a/xbmc/pvr/channels/PVRChannelGroup.h +++ b/xbmc/pvr/channels/PVRChannelGroup.h @@ -379,7 +379,7 @@ namespace PVR */ void ResetChannelNumberCache(void); - void OnJobComplete(unsigned int jobID, bool success, CJob* job) {} + void OnJobComplete(unsigned int jobID, bool success, CJob* job) override {} /*! * @brief Get all EPG tables and apply a filter. diff --git a/xbmc/settings/dialogs/GUIDialogSettingsBase.h b/xbmc/settings/dialogs/GUIDialogSettingsBase.h index 47182da2a95b9..9f90768545270 100644 --- a/xbmc/settings/dialogs/GUIDialogSettingsBase.h +++ b/xbmc/settings/dialogs/GUIDialogSettingsBase.h @@ -71,19 +71,19 @@ class CGUIDialogSettingsBase virtual ~CGUIDialogSettingsBase(); // specializations of CGUIControl - virtual bool OnMessage(CGUIMessage &message); - virtual bool OnAction(const CAction &action); - virtual bool OnBack(int actionID); - virtual void DoProcess(unsigned int currentTime, CDirtyRegionList &dirtyregions); + virtual bool OnMessage(CGUIMessage &message) override; + virtual bool OnAction(const CAction &action) override; + virtual bool OnBack(int actionID) override; + virtual void DoProcess(unsigned int currentTime, CDirtyRegionList &dirtyregions) override; virtual bool IsConfirmed() const { return m_confirmed; } protected: // specializations of CGUIWindow - virtual void OnInitWindow(); + virtual void OnInitWindow() override; // implementations of ITimerCallback - virtual void OnTimeout(); + virtual void OnTimeout() override; // implementations of ISettingCallback virtual void OnSettingChanged(const CSetting *setting) override; diff --git a/xbmc/settings/dialogs/GUIDialogSettingsManagerBase.h b/xbmc/settings/dialogs/GUIDialogSettingsManagerBase.h index 63da2460c8bee..0a9bdf2582c82 100644 --- a/xbmc/settings/dialogs/GUIDialogSettingsManagerBase.h +++ b/xbmc/settings/dialogs/GUIDialogSettingsManagerBase.h @@ -31,10 +31,10 @@ class CGUIDialogSettingsManagerBase : public CGUIDialogSettingsBase protected: // implementation of CGUIDialogSettingsBase - virtual CSetting* GetSetting(const std::string &settingId); + virtual CSetting* GetSetting(const std::string &settingId) override; - virtual std::set CreateSettings(); - virtual void FreeSettingsControls(); + virtual std::set CreateSettings() override; + virtual void FreeSettingsControls() override; // implementation of ISettingControlCreator virtual ISettingControl* CreateControl(const std::string &controlType) const override; diff --git a/xbmc/settings/lib/Setting.h b/xbmc/settings/lib/Setting.h index 0ecebe4a66c77..85dd77b9c6984 100644 --- a/xbmc/settings/lib/Setting.h +++ b/xbmc/settings/lib/Setting.h @@ -111,7 +111,7 @@ class CSetting : public ISetting, void SetCallback(ISettingCallback *callback) { m_callback = callback; } // overrides of ISetting - virtual bool IsVisible() const; + virtual bool IsVisible() const override; protected: // implementation of ISettingCallback diff --git a/xbmc/settings/lib/SettingsManager.h b/xbmc/settings/lib/SettingsManager.h index d993ba018cfd4..e9f03281861b0 100644 --- a/xbmc/settings/lib/SettingsManager.h +++ b/xbmc/settings/lib/SettingsManager.h @@ -100,7 +100,7 @@ class CSettingsManager : public ISettingCreator, public ISettingControlCreator, returns to the uninitialized state. Any registered callbacks or implementations stay registered. */ - void Clear(); + void Clear() override; /*! \brief Loads the setting being represented by the given XML node with the diff --git a/xbmc/utils/SeekHandler.h b/xbmc/utils/SeekHandler.h index 953a0a180a310..af9783b4487d8 100644 --- a/xbmc/utils/SeekHandler.h +++ b/xbmc/utils/SeekHandler.h @@ -43,7 +43,7 @@ class CSeekHandler : public ISettingCallback, public IActionListener static void SettingOptionsSeekStepsFiller(const CSetting *setting, std::vector< std::pair > &list, int ¤t, void *data); virtual void OnSettingChanged(const CSetting *setting) override; - virtual bool OnAction(const CAction &action); + virtual bool OnAction(const CAction &action) override; void Seek(bool forward, float amount, float duration = 0, bool analogSeek = false, SeekType type = SEEK_TYPE_VIDEO); void SeekSeconds(int seconds); diff --git a/xbmc/utils/SystemInfo.h b/xbmc/utils/SystemInfo.h index 6ef27d4317fde..cbdc3e8763cb5 100644 --- a/xbmc/utils/SystemInfo.h +++ b/xbmc/utils/SystemInfo.h @@ -147,9 +147,9 @@ class CSysInfo : public CInfoLoader, public ISubSettings static std::string GetUsedCompilerNameAndVer(void); protected: - virtual CJob *GetJob() const; - virtual std::string TranslateInfo(int info) const; - virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job); + virtual CJob *GetJob() const override; + virtual std::string TranslateInfo(int info) const override; + virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job) override; private: CSysData m_info; diff --git a/xbmc/utils/Weather.h b/xbmc/utils/Weather.h index 86676f65d47e1..dde1fac0606eb 100644 --- a/xbmc/utils/Weather.h +++ b/xbmc/utils/Weather.h @@ -156,10 +156,10 @@ class CWeather : public CInfoLoader, void SetArea(int iLocation); int GetArea() const; protected: - virtual CJob *GetJob() const; - virtual std::string TranslateInfo(int info) const; - virtual std::string BusyInfo(int info) const; - virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job); + virtual CJob *GetJob() const override; + virtual std::string TranslateInfo(int info) const override; + virtual std::string BusyInfo(int info) const override; + virtual void OnJobComplete(unsigned int jobID, bool success, CJob *job) override; virtual void OnSettingChanged(const CSetting *setting) override; virtual void OnSettingAction(const CSetting *setting) override; From 4aeea14711f1e583db26c84279ad0b0539e105d7 Mon Sep 17 00:00:00 2001 From: Matthias Kortstiege Date: Sun, 27 Sep 2015 10:43:30 +0200 Subject: [PATCH 2/5] [cleanup] remove unused variable isExecutable --- xbmc/addons/GUIDialogAddonInfo.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/xbmc/addons/GUIDialogAddonInfo.cpp b/xbmc/addons/GUIDialogAddonInfo.cpp index a3c2cdedc934a..8acb9d599f89a 100644 --- a/xbmc/addons/GUIDialogAddonInfo.cpp +++ b/xbmc/addons/GUIDialogAddonInfo.cpp @@ -175,7 +175,6 @@ void CGUIDialogAddonInfo::UpdateControls() { bool isInstalled = NULL != m_localAddon.get(); bool isEnabled = isInstalled && m_item->GetProperty("Addon.Enabled").asBoolean(); - bool isExecutable = isInstalled && (m_localAddon->Type() == ADDON_PLUGIN || m_localAddon->Type() == ADDON_SCRIPT); if (isInstalled) GrabRollbackVersions(); From 4f5518d603ce4802e99f09ba4b5dcf6f8af3b2b8 Mon Sep 17 00:00:00 2001 From: Matthias Kortstiege Date: Sun, 27 Sep 2015 10:45:35 +0200 Subject: [PATCH 3/5] [cleanup] fix signed/unsigned compiler warning --- xbmc/addons/AddonCallbacksAudioEngine.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/addons/AddonCallbacksAudioEngine.cpp b/xbmc/addons/AddonCallbacksAudioEngine.cpp index 33734793e546a..45ef5c2e06ea9 100644 --- a/xbmc/addons/AddonCallbacksAudioEngine.cpp +++ b/xbmc/addons/AddonCallbacksAudioEngine.cpp @@ -104,7 +104,7 @@ bool CAddonCallbacksAudioEngine::AudioEngine_GetCurrentSinkFormat(void *AddonDat } SinkFormat->m_channelCount = AESinkFormat.m_channelLayout.Count(); - for (int ch = 0; ch < SinkFormat->m_channelCount; ch++) + for (unsigned int ch = 0; ch < SinkFormat->m_channelCount; ch++) { SinkFormat->m_channels[ch] = AESinkFormat.m_channelLayout[ch]; } From 8e581ff4867ec7be95a6be7d5866766c7c0579f2 Mon Sep 17 00:00:00 2001 From: Matthias Kortstiege Date: Sun, 27 Sep 2015 10:49:05 +0200 Subject: [PATCH 4/5] [cleanup] cast user ratings to int in sortutils --- xbmc/utils/SortUtils.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/xbmc/utils/SortUtils.cpp b/xbmc/utils/SortUtils.cpp index 0265decda8f37..30ce805f5ac1b 100644 --- a/xbmc/utils/SortUtils.cpp +++ b/xbmc/utils/SortUtils.cpp @@ -245,7 +245,7 @@ std::string ByRating(SortAttribute attributes, const SortItem &values) std::string ByUserRating(SortAttribute attributes, const SortItem &values) { - return StringUtils::Format("%d %s", values.at(FieldUserRating).asInteger(), ByLabel(attributes, values).c_str()); + return StringUtils::Format("%d %s", static_cast(values.at(FieldUserRating).asInteger()), ByLabel(attributes, values).c_str()); } std::string ByVotes(SortAttribute attributes, const SortItem &values) From 41b5ddebfd2a5ef044a33137b2a60589da05c86a Mon Sep 17 00:00:00 2001 From: Matthias Kortstiege Date: Mon, 28 Sep 2015 09:43:55 +0200 Subject: [PATCH 5/5] [cleanup] get rid of unused function warnings from eventlevel --- xbmc/events/EventLog.cpp | 33 +++++++++++++++++++++++ xbmc/events/EventLog.h | 3 +++ xbmc/events/IEvent.h | 33 ----------------------- xbmc/events/windows/GUIWindowEventLog.cpp | 2 +- xbmc/filesystem/EventsDirectory.cpp | 4 +-- 5 files changed, 39 insertions(+), 36 deletions(-) diff --git a/xbmc/events/EventLog.cpp b/xbmc/events/EventLog.cpp index 41edcd4d80bb7..b7d25396ba971 100644 --- a/xbmc/events/EventLog.cpp +++ b/xbmc/events/EventLog.cpp @@ -34,6 +34,39 @@ std::map > CEventLog::s_eventLogs; CCriticalSection CEventLog::s_critical; +std::string CEventLog::EventLevelToString(EventLevel level) +{ + switch (level) + { + case EventLevelBasic: + return "basic"; + + case EventLevelWarning: + return "warning"; + + case EventLevelError: + return "error"; + + case EventLevelInformation: + default: + break; + } + + return "information"; +} + +EventLevel CEventLog::EventLevelFromString(const std::string& level) +{ + if (level == "basic") + return EventLevelBasic; + if (level == "warning") + return EventLevelWarning; + if (level == "error") + return EventLevelError; + + return EventLevelInformation; +} + CEventLog& CEventLog::GetInstance() { int currentProfileId = CProfilesManager::GetInstance().GetCurrentProfileId(); diff --git a/xbmc/events/EventLog.h b/xbmc/events/EventLog.h index 3dea9099a52e4..6d41ceba64f47 100644 --- a/xbmc/events/EventLog.h +++ b/xbmc/events/EventLog.h @@ -57,6 +57,9 @@ class CEventLog : public ISettingCallback bool Execute(const std::string& eventIdentifier); + std::string EventLevelToString(EventLevel level); + EventLevel EventLevelFromString(const std::string& level); + void ShowFullEventLog(EventLevel level = EventLevelBasic, bool includeHigherLevels = true); protected: diff --git a/xbmc/events/IEvent.h b/xbmc/events/IEvent.h index 9aabd1ef379a6..84953e359a3cb 100644 --- a/xbmc/events/IEvent.h +++ b/xbmc/events/IEvent.h @@ -32,39 +32,6 @@ typedef enum EventLevel EventLevelError } EventLevel; -static std::string EventLevelToString(EventLevel level) -{ - switch (level) - { - case EventLevelBasic: - return "basic"; - - case EventLevelWarning: - return "warning"; - - case EventLevelError: - return "error"; - - case EventLevelInformation: - default: - break; - } - - return "information"; -} - -static EventLevel EventLevelFromString(const std::string& level) -{ - if (level == "basic") - return EventLevelBasic; - if (level == "warning") - return EventLevelWarning; - if (level == "error") - return EventLevelError; - - return EventLevelInformation; -} - class IEvent { public: diff --git a/xbmc/events/windows/GUIWindowEventLog.cpp b/xbmc/events/windows/GUIWindowEventLog.cpp index a2af8cfb756a4..7c94039c32a84 100644 --- a/xbmc/events/windows/GUIWindowEventLog.cpp +++ b/xbmc/events/windows/GUIWindowEventLog.cpp @@ -238,7 +238,7 @@ bool CGUIWindowEventLog::GetDirectory(const std::string &strDirectory, CFileItem if (!item->HasProperty(PROPERTY_EVENT_LEVEL)) continue; - EventLevel level = EventLevelFromString(item->GetProperty(PROPERTY_EVENT_LEVEL).asString()); + EventLevel level = CEventLog::GetInstance().EventLevelFromString(item->GetProperty(PROPERTY_EVENT_LEVEL).asString()); if (level == currentLevel || (level > currentLevel && showHigherLevels)) filteredItems.Add(item); diff --git a/xbmc/filesystem/EventsDirectory.cpp b/xbmc/filesystem/EventsDirectory.cpp index cecb7de31c2a5..1e3e03a3732b5 100644 --- a/xbmc/filesystem/EventsDirectory.cpp +++ b/xbmc/filesystem/EventsDirectory.cpp @@ -50,7 +50,7 @@ bool CEventsDirectory::GetDirectory(const CURL& url, CFileItemList &items) hostname = hostname.substr(0, hostname.size() - 1); } - EventLevel level = EventLevelFromString(hostname); + EventLevel level = CEventLog::GetInstance().EventLevelFromString(hostname); // get the events of the specified level(s) events = log.Get(level, includeHigherLevels); @@ -73,7 +73,7 @@ CFileItemPtr CEventsDirectory::EventToFileItem(const EventPtr& eventItem) item->SetIconImage(eventItem->GetIcon()); item->SetProperty(PROPERTY_EVENT_IDENTIFIER, eventItem->GetIdentifier()); - item->SetProperty(PROPERTY_EVENT_LEVEL, EventLevelToString(eventItem->GetLevel())); + item->SetProperty(PROPERTY_EVENT_LEVEL, CEventLog::GetInstance().EventLevelToString(eventItem->GetLevel())); item->SetProperty(PROPERTY_EVENT_DESCRIPTION, eventItem->GetDescription()); return item;