mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

- fb_generic: formatting getIconPath() using astyle

Browse Source 
Signed-off-by: Thilo Graf <dbt@novatux.de>
This commit is contained in:
svenhoefer
2021-10-29 20:01:01 +02:00
committed by Thilo Graf
parent 19f81835fd
commit ff564e3fd7
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/driver/fb_generic.cpp
View File

@@ -706,7 +706,7 @@ void CFrameBuffer::setIconBasePath(const std::string & iconPath)
std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_type) std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_type)
{ {
// why search when we have an absolut path ? // why search when we have an absolut path?
if (icon_name.find("/", 0) != std::string::npos) if (icon_name.find("/", 0) != std::string::npos)
return icon_name; return icon_name;
@@ -715,11 +715,14 @@ std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_ty
std::string::size_type pos = icon_name.find_last_of("."); std::string::size_type pos = icon_name.find_last_of(".");
if (pos != std::string::npos && file_type.empty()) if (pos != std::string::npos && file_type.empty())
{
if (std::find(filetypes.begin(), filetypes.end(), icon_name.substr(pos)) != filetypes.end()) if (std::find(filetypes.begin(), filetypes.end(), icon_name.substr(pos)) != filetypes.end())
{ {
icon_name = path.substr(0,pos); icon_name = path.substr(0, pos);
file_type = path.substr(pos+1); file_type = path.substr(pos + 1);
} }
}
if (!file_type.empty()) if (!file_type.empty())
{ {
filetypes.clear(); filetypes.clear();
@@ -734,9 +737,9 @@ std::string CFrameBuffer::getIconPath(std::string icon_name, std::string file_ty
iconBasePath iconBasePath
}; };
for(unsigned int t=0; t<filetypes.size(); t++) for (unsigned int t = 0; t < filetypes.size(); t++)
{ {
for(unsigned int i=0; i<dir.size(); i++) for (unsigned int i = 0; i < dir.size(); i++)
{ {
path = std::string(dir[i]) + "/" + icon_name + filetypes[t]; path = std::string(dir[i]) + "/" + icon_name + filetypes[t];
if (access(path.c_str(), F_OK) == 0) if (access(path.c_str(), F_OK) == 0)