Merge pull request #44 from Rechi/cleanupStdString

[cleanup] remove StdString usage
kodi-pvr · Nov 12, 2017 · 4a5efef · 4a5efef
2 parents cc1cb56 + 7e2bb79
commit 4a5efef
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/pvr.njoy/addon.xml.in b/pvr.njoy/addon.xml.in
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <addon
   id="pvr.njoy"
-  version="3.2.0"
+  version="3.2.1"
   name="Njoy N7 PVR Client"
   provider-name="Team Kodi">
   <requires>@ADDON_DEPENDS@</requires>

diff --git a/pvr.njoy/changelog.txt b/pvr.njoy/changelog.txt
@@ -1,3 +1,6 @@
+v3.2.1
+- Remove StdString usage
+
 v3.2.0
 - Updated to PVR addon API v5.7.0
 

diff --git a/src/N7Xml.cpp b/src/N7Xml.cpp
@@ -1,6 +1,8 @@
 
 
 #include "N7Xml.h"
+
+#include <p8-platform/util/StringUtils.h>
 #include "tinyxml.h"
 #include "util/XMLUtils.h"
 
@@ -38,9 +40,9 @@ int N7Xml::getChannelsAmount()
 
 void N7Xml::list_channels()
 {
-  CStdString strUrl;
-  strUrl.Format("http://%s:%i/n7channel_nt.xml", g_strHostname.c_str(), g_iPort);
-  CStdString strXML;
+  std::string strUrl;
+  strUrl = StringUtils::Format("http://%s:%i/n7channel_nt.xml", g_strHostname.c_str(), g_iPort);
+  std::string strXML;
 
   CCurlFile http;
   if(!http.Get(strUrl, strXML))
@@ -63,7 +65,7 @@ void N7Xml::list_channels()
       TiXmlNode *pChannelNode = NULL;
       while ((pChannelNode = channelsNode->IterateChildren(pChannelNode)) != NULL)
       {
-        CStdString strTmp;
+        std::string strTmp;
         PVRChannel channel;
 
         /* unique ID */

diff --git a/src/client.cpp b/src/client.cpp
@@ -31,16 +31,16 @@ using namespace ADDON;
  * Default values are defined inside client.h
  * and exported to the other source files.
  */
-CStdString   g_strHostname     = DEFAULT_HOST;
+std::string  g_strHostname     = DEFAULT_HOST;
 int          g_iPort           = DEFAULT_PORT;
 
 ///* Client member variables */
 
 int          m_iCurrentChannel = 1;
 ADDON_STATUS m_CurStatus       = ADDON_STATUS_UNKNOWN;
 bool         g_bCreated        = false;
-CStdString   g_szUserPath      = "";
-CStdString   g_szClientPath    = "";
+std::string  g_szUserPath      = "";
+std::string  g_szClientPath    = "";
 N7Xml*       m_data            = NULL;
 CHelper_libXBMC_addon *XBMC    = NULL;
 CHelper_libXBMC_pvr   *PVR     = NULL;

diff --git a/src/client.h b/src/client.h
@@ -20,19 +20,18 @@
  *
  */
 
-#include "p8-platform/util/StdString.h"
 #include "libXBMC_addon.h"
 #include "libXBMC_pvr.h"
 
 #define DEFAULT_HOST  "127.0.0.1"
 #define DEFAULT_PORT  80
 
 extern bool         g_bCreated;           ///< Shows that the Create function was successfully called
-extern CStdString   g_szUserPath;         ///< The Path to the user directory inside user profile
-extern CStdString   g_szClientPath;       ///< The Path where this driver is located
+extern std::string  g_szUserPath;         ///< The Path to the user directory inside user profile
+extern std::string  g_szClientPath;       ///< The Path where this driver is located
 
 /* Client Settings */
-extern CStdString   g_strHostname;
+extern std::string  g_strHostname;
 extern int          g_iPort;
 
 extern ADDON::CHelper_libXBMC_addon *XBMC;