From 5ba69b43ec1dbceeb2f1a51a2ea3f18aa4ed0876 Mon Sep 17 00:00:00 2001
From: Jacek Jendrzej <satbaby@kawaii.com>
Date: Mon, 2 Oct 2017 14:23:17 +0200
Subject: [PATCH] fix compil after merge

---
 src/gui/hdd_menu.cpp    | 10 +++++-----
 src/gui/streaminfo2.cpp |  4 ++--
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/gui/hdd_menu.cpp b/src/gui/hdd_menu.cpp
index 1a6424e2c..2baa3a6d6 100644
--- a/src/gui/hdd_menu.cpp
+++ b/src/gui/hdd_menu.cpp
@@ -133,11 +133,11 @@ int CHDDMenuHandler::filterDevName(const char * name)
 	return 0;
 }
 
-static string readlink(const char *path)
+static std::string readlink(const char *path)
 {
 	char link[PATH_MAX + 1];
 	if (realpath(path, link))
-		return string(link);
+		return std::string(link);
 	return "";
 }
 
@@ -151,7 +151,7 @@ bool CHDDMenuHandler::is_mounted(const char *dev)
 		snprintf(devpath, sizeof(devpath), "/dev/%s", dev);
 
 	char buffer[255];
-	string realdev = readlink(devpath);
+	std::string realdev = readlink(devpath);
 	realdev = trim(realdev);
 	FILE *f = fopen("/proc/mounts", "r");
 	if(f) {
@@ -164,7 +164,7 @@ bool CHDDMenuHandler::is_mounted(const char *dev)
 			if (!strcmp(buffer, devpath)) /* default '/dev/sda1' mount */
 				res = true;
 			else {	/* now the case of '/dev/disk/by-label/myharddrive' mounts */
-				string realmount = readlink(buffer);
+				std::string realmount = readlink(buffer);
 				if (realdev == trim(realmount))
 					res = true;
 			}
@@ -259,7 +259,7 @@ void CHDDMenuHandler::check_kernel_fs()
 		if (! tab)	/* should not happen in any kernel I have seen */
 			continue;
 		tab++;
-		kernel_fs_list.insert(string(tab));
+		kernel_fs_list.insert(std::string(tab));
 	}
 	fclose(f);
 }
diff --git a/src/gui/streaminfo2.cpp b/src/gui/streaminfo2.cpp
index d0a57a15f..c5f68771e 100644
--- a/src/gui/streaminfo2.cpp
+++ b/src/gui/streaminfo2.cpp
@@ -150,8 +150,8 @@ int CStreamInfo2::doSignalStrengthLoop ()
 	const int delay = 15;
 	int sw = g_Font[font_info]->getRenderWidth("99999");
 	maxb = minb = lastb = tmp_rate = 0;
-	string br_str = string(g_Locale->getText(LOCALE_STREAMINFO_BITRATE)) + ":";
-	string avg_str = "(" + string(g_Locale->getText(LOCALE_STREAMINFO_AVERAGE_BITRATE)) + ")";
+	std::string br_str = std::string(g_Locale->getText(LOCALE_STREAMINFO_BITRATE)) + ":";
+	std::string avg_str = "(" + std::string(g_Locale->getText(LOCALE_STREAMINFO_AVERAGE_BITRATE)) + ")";
 	int offset = g_Font[font_info]->getRenderWidth(avg_str);
 	int dheight = g_Font[font_info]->getHeight ();
 	int dx1 = x + 10;