Merge pull request #17565 from AlwinEsch/remove-header

[addons] remove deprecated xbmc_addon_types.h
xbmc · Mar 27, 2020 · e1d4e5e · e1d4e5e
2 parents d6f7088 + 5e64600
commit e1d4e5e
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 15 deletions.
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/CMakeLists.txt b/xbmc/addons/kodi-addon-dev-kit/include/kodi/CMakeLists.txt
@@ -11,7 +11,6 @@ set(HEADERS AddonBase.h
             libXBMC_pvr.h
             versions.h
             xbmc_addon_dll.h
-            xbmc_addon_types.h
             xbmc_epg_types.h
             xbmc_pvr_dll.h
             xbmc_pvr_types.h)

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/kodi_vfs_types.h
@@ -17,7 +17,7 @@
 #endif
 
 #include <stdint.h>
-#include "xbmc_addon_types.h"
+#include "AddonBase.h"
 #ifdef BUILD_KODI_ADDON
 #include "IFileTypes.h"
 #else

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/versions.h
@@ -35,7 +35,6 @@
 #define ADDON_GLOBAL_VERSION_MAIN_XML_ID              "kodi.binary.global.main"
 #define ADDON_GLOBAL_VERSION_MAIN_DEPENDS             "AddonBase.h" \
                                                       "xbmc_addon_dll.h" \
-                                                      "xbmc_addon_types.h" \
                                                       "libXBMC_addon.h" \
                                                       "addon-instance/"
 

diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_addon_types.h
diff --git a/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h b/xbmc/addons/kodi-addon-dev-kit/include/kodi/xbmc_pvr_types.h
@@ -20,7 +20,7 @@
 #include <stdint.h>
 #include <stdio.h>
 
-#include "xbmc_addon_types.h"
+#include "AddonBase.h"
 #include "xbmc_epg_types.h"
 
 /*! @note Define "USE_DEMUX" at compile time if demuxing in the PVR add-on is used.