Use add-on supplied StringUtils and remove local version

kodi-pvr · Oct 4, 2020 · 40539b9 · 40539b9
1 parent ff3cad9
commit 40539b9
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 1,368 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -33,7 +33,6 @@ set(IPTV_SOURCES src/PVRIptvData.cpp
                  src/iptvsimple/utilities/FileUtils.cpp
                  src/iptvsimple/utilities/Logger.cpp
                  src/iptvsimple/utilities/StreamUtils.cpp
-                 src/iptvsimple/utilities/StringUtils.cpp
                  src/iptvsimple/utilities/WebUtils.cpp)
 
 set(IPTV_HEADERS src/PVRIptvData.h
@@ -53,7 +52,6 @@ set(IPTV_HEADERS src/PVRIptvData.h
                  src/iptvsimple/utilities/FileUtils.h
                  src/iptvsimple/utilities/Logger.h
                  src/iptvsimple/utilities/StreamUtils.h
-                 src/iptvsimple/utilities/StringUtils.h
                  src/iptvsimple/utilities/WebUtils.h
                  src/iptvsimple/utilities/XMLUtils.h)
 

diff --git a/src/iptvsimple/CatchupController.cpp b/src/iptvsimple/CatchupController.cpp
@@ -13,11 +13,12 @@
 #include "Settings.h"
 #include "data/Channel.h"
 #include "utilities/Logger.h"
-#include "utilities/StringUtils.h"
 
 #include <regex>
 
+#include <kodi/tools/StringUtils.h>
 
+using namespace kodi::tools;
 using namespace iptvsimple;
 using namespace iptvsimple::data;
 using namespace iptvsimple::utilities;

diff --git a/src/iptvsimple/Channels.cpp b/src/iptvsimple/Channels.cpp
@@ -12,10 +12,12 @@
 #include "Settings.h"
 #include "utilities/FileUtils.h"
 #include "utilities/Logger.h"
-#include "utilities/StringUtils.h"
 
 #include <regex>
 
+#include <kodi/tools/StringUtils.h>
+
+using namespace kodi::tools;
 using namespace iptvsimple;
 using namespace iptvsimple::data;
 using namespace iptvsimple::utilities;

diff --git a/src/iptvsimple/Epg.cpp b/src/iptvsimple/Epg.cpp
@@ -12,14 +12,15 @@
 #include "utilities/FileUtils.h"
 #include "utilities/Logger.h"
 #include "utilities/XMLUtils.h"
-#include "utilities/StringUtils.h"
 
 #include <chrono>
 #include <regex>
 #include <thread>
 
+#include <kodi/tools/StringUtils.h>
 #include <pugixml.hpp>
 
+using namespace kodi::tools;
 using namespace iptvsimple;
 using namespace iptvsimple::data;
 using namespace iptvsimple::utilities;

diff --git a/src/iptvsimple/PlaylistLoader.cpp b/src/iptvsimple/PlaylistLoader.cpp
@@ -12,7 +12,6 @@
 #include "utilities/FileUtils.h"
 #include "utilities/Logger.h"
 #include "utilities/WebUtils.h"
-#include "utilities/StringUtils.h"
 
 #include <chrono>
 #include <cstdlib>
@@ -22,7 +21,9 @@
 #include <vector>
 
 #include <kodi/General.h>
+#include <kodi/tools/StringUtils.h>
 
+using namespace kodi::tools;
 using namespace iptvsimple;
 using namespace iptvsimple::data;
 using namespace iptvsimple::utilities;

diff --git a/src/iptvsimple/data/Channel.cpp b/src/iptvsimple/data/Channel.cpp
@@ -12,13 +12,14 @@
 #include "../utilities/FileUtils.h"
 #include "../utilities/Logger.h"
 #include "../utilities/StreamUtils.h"
-#include "../utilities/StringUtils.h"
 #include "../utilities/WebUtils.h"
 
 #include <regex>
 
 #include <kodi/General.h>
+#include <kodi/tools/StringUtils.h>
 
+using namespace kodi::tools;
 using namespace iptvsimple;
 using namespace iptvsimple::data;
 using namespace iptvsimple::utilities;

diff --git a/src/iptvsimple/data/EpgEntry.cpp b/src/iptvsimple/data/EpgEntry.cpp
@@ -9,15 +9,16 @@
 #include "EpgEntry.h"
 
 #include "../Settings.h"
-#include "../utilities/StringUtils.h"
 #include "../utilities/XMLUtils.h"
 
 #include <cmath>
 #include <cstdlib>
 #include <regex>
 
+#include <kodi/tools/StringUtils.h>
 #include <pugixml.hpp>
 
+using namespace kodi::tools;
 using namespace iptvsimple;
 using namespace iptvsimple::data;
 using namespace pugi;

diff --git a/src/iptvsimple/data/EpgGenre.cpp b/src/iptvsimple/data/EpgGenre.cpp
@@ -9,10 +9,12 @@
 #include "EpgGenre.h"
 
 #include "../utilities/XMLUtils.h"
-#include "../utilities/StringUtils.h"
 
 #include <cstdlib>
 
+#include <kodi/tools/StringUtils.h>
+
+using namespace kodi::tools;
 using namespace iptvsimple;
 using namespace iptvsimple::data;
 using namespace pugi;

diff --git a/src/iptvsimple/utilities/Logger.cpp b/src/iptvsimple/utilities/Logger.cpp
@@ -8,10 +8,12 @@
 
 #include "Logger.h"
 
-#include "StringUtils.h"
 
 #include <cstdarg>
 
+#include <kodi/tools/StringUtils.h>
+
+using namespace kodi::tools;
 using namespace iptvsimple::utilities;
 
 Logger::Logger()

diff --git a/src/iptvsimple/utilities/StreamUtils.cpp b/src/iptvsimple/utilities/StreamUtils.cpp
@@ -11,11 +11,12 @@
 #include "../Settings.h"
 #include "FileUtils.h"
 #include "Logger.h"
-#include "StringUtils.h"
 #include "WebUtils.h"
 
 #include <kodi/General.h>
+#include <kodi/tools/StringUtils.h>
 
+using namespace kodi::tools;
 using namespace iptvsimple;
 using namespace iptvsimple::data;
 using namespace iptvsimple::utilities;

diff --git a/src/iptvsimple/utilities/StringUtils.cpp b/src/iptvsimple/utilities/StringUtils.cpp
diff --git a/src/iptvsimple/utilities/StringUtils.h b/src/iptvsimple/utilities/StringUtils.h
diff --git a/src/iptvsimple/utilities/WebUtils.cpp b/src/iptvsimple/utilities/WebUtils.cpp
@@ -8,14 +8,15 @@
 
 #include "WebUtils.h"
 
-#include "StringUtils.h"
 
 #include <cctype>
 #include <iomanip>
 #include <sstream>
 
 #include <kodi/Filesystem.h>
+#include <kodi/tools/StringUtils.h>
 
+using namespace kodi::tools;
 using namespace iptvsimple;
 using namespace iptvsimple::utilities;