diff options
-rw-r--r-- | lib/addons/library.kodi.guilib/libKODI_guilib.cpp | 6 | ||||
-rw-r--r-- | tools/depends/native/TexturePacker/src/decoder/PNGDecoder.cpp | 1 | ||||
-rw-r--r-- | xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h | 6 | ||||
-rw-r--r-- | xbmc/guilib/GUILabel.cpp | 1 | ||||
-rw-r--r-- | xbmc/guilib/GUILabel.h | 1 | ||||
-rw-r--r-- | xbmc/input/joysticks/KeymapHandler.cpp | 1 | ||||
-rw-r--r-- | xbmc/input/joysticks/KeymapHandler.h | 1 | ||||
-rw-r--r-- | xbmc/interfaces/legacy/PlayList.cpp | 2 | ||||
-rw-r--r-- | xbmc/interfaces/legacy/PlayList.h | 1 | ||||
-rw-r--r-- | xbmc/music/tags/TagLibVFSStream.h | 1 | ||||
-rw-r--r-- | xbmc/settings/MediaSettings.cpp | 2 | ||||
-rw-r--r-- | xbmc/utils/HttpParser.cpp | 1 | ||||
-rw-r--r-- | xbmc/utils/HttpParser.h | 1 | ||||
-rw-r--r-- | xbmc/video/dialogs/GUIDialogCMSSettings.h | 1 |
14 files changed, 2 insertions, 24 deletions
diff --git a/lib/addons/library.kodi.guilib/libKODI_guilib.cpp b/lib/addons/library.kodi.guilib/libKODI_guilib.cpp index 1e7e841fb1..14662cd5cd 100644 --- a/lib/addons/library.kodi.guilib/libKODI_guilib.cpp +++ b/lib/addons/library.kodi.guilib/libKODI_guilib.cpp @@ -476,7 +476,6 @@ DLLEXPORT void GUI_control_release_spin(CAddonGUISpinControl* p) CAddonGUISpinControl::CAddonGUISpinControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId) : m_Window(window) - , m_ControlId(controlId) { m_Handle = hdl; m_cb = cb; @@ -536,7 +535,6 @@ DLLEXPORT void GUI_control_release_radiobutton(CAddonGUIRadioButton* p) CAddonGUIRadioButton::CAddonGUIRadioButton(void *hdl, void *cb, CAddonGUIWindow *window, int controlId) : m_Window(window) - , m_ControlId(controlId) , m_Handle(hdl) , m_cb(cb) { @@ -585,7 +583,6 @@ DLLEXPORT void GUI_control_release_progress(CAddonGUIProgressControl* p) CAddonGUIProgressControl::CAddonGUIProgressControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId) : m_Window(window) - , m_ControlId(controlId) , m_Handle(hdl) , m_cb(cb) { @@ -644,7 +641,6 @@ DLLEXPORT void GUI_control_release_slider(CAddonGUISliderControl* p) CAddonGUISliderControl::CAddonGUISliderControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId) : m_Window(window) - , m_ControlId(controlId) , m_Handle(hdl) , m_cb(cb) { @@ -745,7 +741,6 @@ DLLEXPORT void GUI_control_release_settings_slider(CAddonGUISettingsSliderContro CAddonGUISettingsSliderControl::CAddonGUISettingsSliderControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId) : m_Window(window) - , m_ControlId(controlId) , m_Handle(hdl) , m_cb(cb) { @@ -963,7 +958,6 @@ DLLEXPORT bool GUI_control_rendering_dirty(GUIHANDLE handle) CAddonGUIRenderingControl::CAddonGUIRenderingControl(void *hdl, void *cb, CAddonGUIWindow *window, int controlId) : m_Window(window) - , m_ControlId(controlId) , m_Handle(hdl) , m_cb(cb) , m_cbhdl(nullptr) diff --git a/tools/depends/native/TexturePacker/src/decoder/PNGDecoder.cpp b/tools/depends/native/TexturePacker/src/decoder/PNGDecoder.cpp index 09ee59486e..f2d10eb5d2 100644 --- a/tools/depends/native/TexturePacker/src/decoder/PNGDecoder.cpp +++ b/tools/depends/native/TexturePacker/src/decoder/PNGDecoder.cpp @@ -72,7 +72,6 @@ bool PNGDecoder::CanDecode(const std::string &filename) bool PNGDecoder::LoadFile(const std::string &filename, DecodedFrames &frames) { png_byte header[8]; - RGBAImage *ret = NULL; CFile fp; if (!fp.Open(filename)) diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h index 3fe12c9b5c..b699fa092d 100644 --- a/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h +++ b/xbmc/addons/kodi-addon-dev-kit/include/kodi/libKODI_guilib.h @@ -615,7 +615,6 @@ public: private: CAddonGUIWindow *m_Window; - int m_ControlId; GUIHANDLE m_SpinHandle; void *m_Handle; void *m_cb; @@ -634,7 +633,6 @@ public: private: CAddonGUIWindow *m_Window; - int m_ControlId; GUIHANDLE m_ButtonHandle; void *m_Handle; void *m_cb; @@ -654,7 +652,6 @@ public: private: CAddonGUIWindow *m_Window; - int m_ControlId; GUIHANDLE m_ProgressHandle; void *m_Handle; void *m_cb; @@ -684,7 +681,6 @@ public: private: CAddonGUIWindow *m_Window; - int m_ControlId; GUIHANDLE m_SliderHandle; void *m_Handle; void *m_cb; @@ -715,7 +711,6 @@ public: private: CAddonGUIWindow *m_Window; - int m_ControlId; GUIHANDLE m_SettingsSliderHandle; void *m_Handle; void *m_cb; @@ -825,7 +820,6 @@ public: private: CAddonGUIWindow *m_Window; - int m_ControlId; GUIHANDLE m_RenderingHandle; void *m_Handle; void *m_cb; diff --git a/xbmc/guilib/GUILabel.cpp b/xbmc/guilib/GUILabel.cpp index db201317a1..f15e847ec4 100644 --- a/xbmc/guilib/GUILabel.cpp +++ b/xbmc/guilib/GUILabel.cpp @@ -26,7 +26,6 @@ CGUILabel::CGUILabel(float posX, float posY, float width, float height, const CL , m_textLayout(labelInfo.font, overflow == OVER_FLOW_WRAP, height) , m_scrolling(overflow == OVER_FLOW_SCROLL) , m_overflowType(overflow) - , m_selected(false) , m_scrollInfo(50, 0, labelInfo.scrollSpeed, labelInfo.scrollSuffix) , m_renderRect() , m_maxRect(posX, posY, posX + width, posY + height) diff --git a/xbmc/guilib/GUILabel.h b/xbmc/guilib/GUILabel.h index a08542b2ee..f94b8846ac 100644 --- a/xbmc/guilib/GUILabel.h +++ b/xbmc/guilib/GUILabel.h @@ -236,7 +236,6 @@ private: bool m_scrolling; OVER_FLOW m_overflowType; - bool m_selected; CScrollInfo m_scrollInfo; CRect m_renderRect; ///< actual sizing of text CRect m_maxRect; ///< maximum sizing of text diff --git a/xbmc/input/joysticks/KeymapHandler.cpp b/xbmc/input/joysticks/KeymapHandler.cpp index 859bfcd467..8e45c3ebcc 100644 --- a/xbmc/input/joysticks/KeymapHandler.cpp +++ b/xbmc/input/joysticks/KeymapHandler.cpp @@ -36,7 +36,6 @@ using namespace MESSAGING; using namespace JOYSTICK; CKeymapHandler::CKeymapHandler(void) : - m_state(STATE_UNPRESSED), m_lastButtonPress(0), m_lastDigitalActionMs(0) { diff --git a/xbmc/input/joysticks/KeymapHandler.h b/xbmc/input/joysticks/KeymapHandler.h index ca27bccf96..fa25fc5d32 100644 --- a/xbmc/input/joysticks/KeymapHandler.h +++ b/xbmc/input/joysticks/KeymapHandler.h @@ -53,7 +53,6 @@ namespace JOYSTICK static bool SendDigitalAction(unsigned int keyId, unsigned int holdTimeMs = 0); static bool SendAnalogAction(unsigned int keyId, float magnitude); - BUTTON_STATE m_state; unsigned int m_lastButtonPress; unsigned int m_lastDigitalActionMs; std::vector<unsigned int> m_pressedButtons; diff --git a/xbmc/interfaces/legacy/PlayList.cpp b/xbmc/interfaces/legacy/PlayList.cpp index 5d97a2d163..228d6068e7 100644 --- a/xbmc/interfaces/legacy/PlayList.cpp +++ b/xbmc/interfaces/legacy/PlayList.cpp @@ -33,7 +33,7 @@ namespace XBMCAddon //! @todo need a means to check for a valid construction //! either by throwing an exception or by an "isValid" check PlayList::PlayList(int playList) : - refs(1), iPlayList(playList), pPlayList(NULL) + iPlayList(playList), pPlayList(NULL) { // we do not create our own playlist, just using the ones from playlistplayer if (iPlayList != PLAYLIST_MUSIC && diff --git a/xbmc/interfaces/legacy/PlayList.h b/xbmc/interfaces/legacy/PlayList.h index 8a3b88b2dc..7101a1c33f 100644 --- a/xbmc/interfaces/legacy/PlayList.h +++ b/xbmc/interfaces/legacy/PlayList.h @@ -61,7 +61,6 @@ namespace XBMCAddon // class PlayList : public AddonClass { - long refs; int iPlayList; PLAYLIST::CPlayList *pPlayList; diff --git a/xbmc/music/tags/TagLibVFSStream.h b/xbmc/music/tags/TagLibVFSStream.h index f0c81c5229..dc20e12a86 100644 --- a/xbmc/music/tags/TagLibVFSStream.h +++ b/xbmc/music/tags/TagLibVFSStream.h @@ -126,7 +126,6 @@ namespace MUSIC_INFO XFILE::CFile m_file; bool m_bIsReadOnly; bool m_bIsOpen; - int m_bufferSize; }; } diff --git a/xbmc/settings/MediaSettings.cpp b/xbmc/settings/MediaSettings.cpp index d441d83a13..444a76b053 100644 --- a/xbmc/settings/MediaSettings.cpp +++ b/xbmc/settings/MediaSettings.cpp @@ -86,7 +86,7 @@ bool CMediaSettings::Load(const TiXmlNode *settings) if (pElement != NULL) { int interlaceMethod; - bool interlaceMethodPresent = XMLUtils::GetInt(pElement, "interlacemethod", interlaceMethod, VS_INTERLACEMETHOD_NONE, VS_INTERLACEMETHOD_MAX); + XMLUtils::GetInt(pElement, "interlacemethod", interlaceMethod, VS_INTERLACEMETHOD_NONE, VS_INTERLACEMETHOD_MAX); m_defaultVideoSettings.m_InterlaceMethod = (EINTERLACEMETHOD)interlaceMethod; int scalingMethod; diff --git a/xbmc/utils/HttpParser.cpp b/xbmc/utils/HttpParser.cpp index deab1a5e2c..1057569c85 100644 --- a/xbmc/utils/HttpParser.cpp +++ b/xbmc/utils/HttpParser.cpp @@ -27,7 +27,6 @@ HttpParser::HttpParser() : _headerStart(0), - _bodyStart(0), _parsedTo( 0 ), _state( 0 ), _keyIndex(0), diff --git a/xbmc/utils/HttpParser.h b/xbmc/utils/HttpParser.h index 0e91ad26fe..7beb8d790a 100644 --- a/xbmc/utils/HttpParser.h +++ b/xbmc/utils/HttpParser.h @@ -79,7 +79,6 @@ private: std::string _data; unsigned _headerStart; - unsigned _bodyStart; unsigned _parsedTo; int _state; unsigned _keyIndex; diff --git a/xbmc/video/dialogs/GUIDialogCMSSettings.h b/xbmc/video/dialogs/GUIDialogCMSSettings.h index ebd6c6e24d..8c3cba8a07 100644 --- a/xbmc/video/dialogs/GUIDialogCMSSettings.h +++ b/xbmc/video/dialogs/GUIDialogCMSSettings.h @@ -42,7 +42,6 @@ protected: virtual void InitializeSettings() override; private: - bool m_viewModeChanged; static void Cms3dLutsFiller( const CSetting *setting, std::vector< std::pair<std::string, std::string> > &list, |