convert most char[...] configuration values to std::string

Signed-off-by: Jacek Jendrzej <crashdvb@googlemail.com>
This commit is contained in:
martii
2013-06-11 13:32:19 +02:00
committed by Jacek Jendrzej
parent fce161b70b
commit cbc9299df8
40 changed files with 483 additions and 470 deletions

View File

@@ -97,10 +97,10 @@ CPictureViewerGui::CPictureViewerGui()
selected = 0;
m_sort = FILENAME;
m_viewer = new CPictureViewer();
if (strlen(g_settings.network_nfs_picturedir)!=0)
Path = g_settings.network_nfs_picturedir;
else
if (g_settings.network_nfs_picturedir.empty())
Path = "/";
else
Path = g_settings.network_nfs_picturedir;
picture_filter.addFilter("png");
picture_filter.addFilter("bmp");
@@ -426,7 +426,7 @@ int CPictureViewerGui::show()
{
if (m_state == MENU)
{
CFileBrowser filebrowser((g_settings.filebrowser_denydirectoryleave) ? g_settings.network_nfs_picturedir : "");
CFileBrowser filebrowser((g_settings.filebrowser_denydirectoryleave) ? g_settings.network_nfs_picturedir.c_str() : "");
filebrowser.Multi_Select = true;
filebrowser.Dirs_Selectable = true;