qi-hardware/gmenu2x
1
0
Fork 0
mirror of git://projects.qi-hardware.com/gmenu2x.git synced 2024-11-22 12:48:26 +02:00
Code

Remove unnecessary file existence check in GMenu2X::readTmp()

Browse Source 
A file existence check is already performed, atomically with respect to
the filesystem, by ifstream's constructor. The result of this check is
available using ifstream::is_open().
This commit is contained in:
Nebuleon Fumika 2014-08-13 06:10:48 +00:00 committed by Maarten ter Huurne
parent 82ac7ef44b
commit 8cd3ab8cb8
1 changed files with 17 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
src/gmenu2x.cpp
View File

@ -537,27 +537,25 @@ void GMenu2X::writeSkinConfig() {
void GMenu2X::readTmp() { void GMenu2X::readTmp() {
lastSelectorElement = -1; lastSelectorElement = -1;
if (fileExists("/tmp/gmenu2x.tmp")) { ifstream inf("/tmp/gmenu2x.tmp", ios_base::in);
ifstream inf("/tmp/gmenu2x.tmp", ios_base::in); if (inf.is_open()) {
if (inf.is_open()) { string line;
string line; string section = "";
string section = ""; while (getline(inf, line, '\n')) {
while (getline(inf, line, '\n')) { string::size_type pos = line.find("=");
string::size_type pos = line.find("="); string name = trim(line.substr(0,pos));
string name = trim(line.substr(0,pos)); string value = trim(line.substr(pos+1,line.length()));
string value = trim(line.substr(pos+1,line.length()));
if (name=="section") if (name=="section")
menu->setSectionIndex(atoi(value.c_str())); menu->setSectionIndex(atoi(value.c_str()));
else if (name=="link") else if (name=="link")
menu->setLinkIndex(atoi(value.c_str())); menu->setLinkIndex(atoi(value.c_str()));
else if (name=="selectorelem") else if (name=="selectorelem")
lastSelectorElement = atoi(value.c_str()); lastSelectorElement = atoi(value.c_str());
else if (name=="selectordir") else if (name=="selectordir")
lastSelectorDir = value; lastSelectorDir = value;
}
inf.close();
} }
inf.close();
} }
} }