[stdstring] get rid of CStdString in network/upnp/

xbmc/network/upnp/UPnP.cpp

@@ -208,7 +208,7 @@ class CMediaBrowser : public PLT_SyncMediaBrowser,
     {
         NPT_String path = "upnp://"+device->GetUUID()+"/";
         if (!NPT_StringsEqual(item_id, "0")) {
-            CStdString id(CURL::Encode(item_id));
+            std::string id(CURL::Encode(item_id));
             URIUtils::AddSlashAtEnd(id);
             path += id.c_str();
         }
@@ -584,7 +584,7 @@ CUPnP::CreateServer(int port /* = 0 */)
     // trying to set optional upnp values for XP UPnP UI Icons to detect us
     // but it doesn't work anyways as it requires multicast for XP to detect us
     device->m_PresentationURL =
-        NPT_HttpUrl(m_IP,
+        NPT_HttpUrl(m_IP.c_str(),
                     CSettings::Get().GetInt("services.webserverport"),
                     "/").ToString();
 
@@ -608,7 +608,7 @@ CUPnP::StartServer()
     if (!m_ServerHolder->m_Device.IsNull()) return false;
 
     // load upnpserver.xml
-    CStdString filename = URIUtils::AddFileToFolder(CProfilesManager::Get().GetUserDataFolder(), "upnpserver.xml");
+    std::string filename = URIUtils::AddFileToFolder(CProfilesManager::Get().GetUserDataFolder(), "upnpserver.xml");
     CUPnPSettings::Get().Load(filename);
 
     // create the server with a XBox compatible friendlyname and UUID from upnpserver.xml if found
@@ -667,7 +667,7 @@ CUPnP::CreateRenderer(int port /* = 0 */)
                           port);
 
     device->m_PresentationURL =
-        NPT_HttpUrl(m_IP,
+        NPT_HttpUrl(m_IP.c_str(),
                     CSettings::Get().GetInt("services.webserverport"),
                     "/").ToString();
     device->m_ModelName        = "Kodi";
@@ -687,7 +687,7 @@ bool CUPnP::StartRenderer()
 {
     if (!m_RendererHolder->m_Device.IsNull()) return false;
 
-    CStdString filename = URIUtils::AddFileToFolder(CProfilesManager::Get().GetUserDataFolder(), "upnpserver.xml");
+    std::string filename = URIUtils::AddFileToFolder(CProfilesManager::Get().GetUserDataFolder(), "upnpserver.xml");
     CUPnPSettings::Get().Load(filename);
 
     m_RendererHolder->m_Device = CreateRenderer(CUPnPSettings::Get().GetRendererPort());

xbmc/network/upnp/UPnP.h

@@ -23,7 +23,7 @@
  */
 #pragma once
 
-#include "utils/StdString.h"
+#include <string>
 
 class NPT_LogHandler;
 class PLT_UPnP;
@@ -88,7 +88,7 @@ class CUPnP
     PLT_MediaController*        m_MediaController;
 
 private:
-    CStdString                  m_IP;
+    std::string                 m_IP;
     PLT_UPnP*                   m_UPnP;
     NPT_LogHandler*             m_LogHandler;
     CDeviceHostReferenceHolder* m_ServerHolder;

xbmc/network/upnp/UPnPInternal.cpp

@@ -113,7 +113,7 @@ NPT_String
 GetMimeType(const CFileItem& item,
             const PLT_HttpRequestContext* context /* = NULL */)
 {
-    CStdString path = item.GetPath();
+    std::string path = item.GetPath();
     if (item.HasVideoInfoTag() && !item.GetVideoInfoTag()->GetPath().empty()) {
         path = item.GetVideoInfoTag()->GetPath();
     } else if (item.HasMusicInfoTag() && !item.GetMusicInfoTag()->GetURL().empty()) {
@@ -567,9 +567,9 @@ BuildObject(CFileItem&                    item,
     // set a title for the object
     if (object->m_Title.IsEmpty()) {
         if (!item.GetLabel().empty()) {
-            CStdString title = item.GetLabel();
+            std::string title = item.GetLabel();
             if (item.IsPlayList() || !item.m_bIsFolder) URIUtils::RemoveExtension(title);
-            object->m_Title = title;
+            object->m_Title = title.c_str();
         }
     }
 
@@ -616,15 +616,15 @@ BuildObject(CFileItem&                    item,
 /*----------------------------------------------------------------------
 |   CUPnPServer::CorrectAllItemsSortHack
 +---------------------------------------------------------------------*/
-const CStdString&
-CorrectAllItemsSortHack(const CStdString &item)
+const std::string&
+CorrectAllItemsSortHack(const std::string &item)
 {
     // This is required as in order for the "* All Albums" etc. items to sort
     // correctly, they must have fake artist/album etc. information generated.
     // This looks nasty if we attempt to render it to the GUI, thus this (further)
     // workaround
     if ((item.size() == 1 && item[0] == 0x01) || (item.size() > 1 && ((unsigned char) item[1]) == 0xff))
-        return StringUtils::EmptyString;
+        return StringUtils::Empty;
 
     return item;
 }
@@ -984,7 +984,7 @@ bool GetResource(const PLT_MediaObject* entry, CFileItem& item)
     {
       if(info.Match(PLT_ProtocolInfo("*", "*", allowed[type], "*")))
       {
-        CStdString prop = StringUtils::Format("subtitle:%d", ++subs);
+        std::string prop = StringUtils::Format("subtitle:%d", ++subs);
         item.SetProperty(prop, (const char*)res.m_Uri);
         break;
       }

xbmc/network/upnp/UPnPInternal.h

@@ -23,8 +23,8 @@
 #include <Neptune/Source/Core/NptStrings.h>
 
 #include "system.h"
-#include "utils/StdString.h"
 #include "FileItem.h"
+#include <string>
 
 class CUPnPServer;
 class CFileItem;
@@ -82,7 +82,7 @@ namespace UPNP
   const NPT_String GetProtocolInfo(const CFileItem& item, const char* protocol, const PLT_HttpRequestContext* context = NULL);
 
 
-  const CStdString& CorrectAllItemsSortHack(const CStdString &item);
+  const std::string& CorrectAllItemsSortHack(const std::string &item);
 
   NPT_Result PopulateTagFromObject(MUSIC_INFO::CMusicInfoTag& tag,
                                    PLT_MediaObject&           object,

xbmc/network/upnp/UPnPPlayer.h

@@ -20,6 +20,7 @@
  */
 
 #include "cores/IPlayer.h"
+#include <string>
 
 class PLT_MediaController;
 class CGUIDialogBusy;

xbmc/network/upnp/UPnPRenderer.cpp

@@ -214,7 +214,7 @@ CUPnPRenderer::ProcessHttpGetRequest(NPT_HttpRequest&              request,
             }
 
             // open the file
-            CStdString path (CURL::Decode((const char*) filepath));
+            std::string path (CURL::Decode((const char*) filepath));
             NPT_File file(path.c_str());
             NPT_Result result = file.Open(NPT_FILE_OPEN_MODE_READ);
             if (NPT_FAILED(result)) {
@@ -277,7 +277,7 @@ CUPnPRenderer::Announce(AnnouncementFlag flag, const char *sender, const char *m
         if (NPT_FAILED(FindServiceByType("urn:schemas-upnp-org:service:RenderingControl:1", rct)))
             return;
 
-        CStdString buffer;
+        std::string buffer;
 
         buffer = StringUtils::Format("%" PRId64, data["volume"].asInteger());
         rct->SetStateVariable("Volume", buffer.c_str());
@@ -314,7 +314,7 @@ CUPnPRenderer::UpdateState()
         avt->SetStateVariable("NumberOfTracks", "1");
         avt->SetStateVariable("CurrentTrack", "1");
 
-        CStdString buffer = g_infoManager.GetCurrentPlayTime(TIME_FORMAT_HH_MM_SS);
+        std::string buffer = g_infoManager.GetCurrentPlayTime(TIME_FORMAT_HH_MM_SS);
         avt->SetStateVariable("RelativeTimePosition", buffer.c_str());
         avt->SetStateVariable("AbsoluteTimePosition", buffer.c_str());
 
@@ -337,7 +337,7 @@ CUPnPRenderer::UpdateState()
         CGUIWindowSlideShow *slideshow = (CGUIWindowSlideShow *)g_windowManager.GetWindow(WINDOW_SLIDESHOW);
         if (slideshow)
         {
-          CStdString index;
+          std::string index;
           index = StringUtils::Format("%d", slideshow->NumSlides());
           avt->SetStateVariable("NumberOfTracks", index.c_str());
           index = StringUtils::Format("%d", slideshow->CurrentSlide());
@@ -403,7 +403,7 @@ CUPnPRenderer::GetMetadata(NPT_String& meta)
     PLT_MediaObject* object = BuildObject(item, file_path, false, thumb_loader);
     if (object) {
         // fetch the item's artwork
-        CStdString thumb;
+        std::string thumb;
         if (object->m_ObjectClass.type == "object.item.audioItem.musicTrack")
             thumb = g_infoManager.GetImage(MUSICPLAYER_COVER, -1);
         else