mirror/OpenMW
1
0
Fork 0
mirror of https://gitlab.com/OpenMW/openmw.git synced 2025-01-26 09:35:28 +00:00
Code Issues Projects Releases Wiki Activity

move include from .hpp to .cpp; line.empty() instead of line.size() > 0; change type of startPos and pos and move to other scope

Browse Source
This commit is contained in:
Sebastian Wick 2012-01-17 23:19:17 +01:00
parent 16c214a17a
commit 62eaaab69d
2 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
components/files/linuxpath.cpp
View File

@ -28,6 +28,7 @@
#include <cstring> #include <cstring>
#include <pwd.h> #include <pwd.h>
#include <unistd.h> #include <unistd.h>
#include <boost/filesystem/fstream.hpp>
/** /**
* \namespace Files * \namespace Files
@ -179,11 +180,10 @@ boost::filesystem::path LinuxPath::getInstallPath() const
boost::filesystem::ifstream file(wineDefaultRegistry); boost::filesystem::ifstream file(wineDefaultRegistry);
bool isRegEntry = false; bool isRegEntry = false;
std::string line; std::string line;
int startPos, pos;
while (std::getline(file, line)) while (std::getline(file, line))
{ {
if(line.length() > 0 && line[0] == '[') // we found an entry if(!line.empty() && line[0] == '[') // we found an entry
{ {
std::string regkey = line.substr(1, line.find(']')-1); std::string regkey = line.substr(1, line.find(']')-1);
if( regkey.compare("SOFTWARE\\\\Wow6432Node\\\\Bethesda Softworks\\\\Morrowind") == 0 if( regkey.compare("SOFTWARE\\\\Wow6432Node\\\\Bethesda Softworks\\\\Morrowind") == 0
@ -194,12 +194,14 @@ boost::filesystem::path LinuxPath::getInstallPath() const
} }
else if(isRegEntry) else if(isRegEntry)
{ {
if(line.length() == 0 || line[0] != '"') // empty line means new registry key if(line.empty() || line[0] != '"') // empty line means new registry key
{ {
break; break;
} }
std::string key = line.substr(1, line.find('"', 1)-1); std::string key = line.substr(1, line.find('"', 1)-1);
if(key.compare("Installed Path") == 0) { if(key.compare("Installed Path") == 0) {
std::string::size_type pos, startPos;
startPos = line.find('=')+2; startPos = line.find('=')+2;
std::string installPath = line.substr(startPos, line.find('"', startPos+1)-startPos); std::string installPath = line.substr(startPos, line.find('"', startPos+1)-startPos);
installPath.replace(0, 2, wineDriveC.string()); installPath.replace(0, 2, wineDriveC.string());
@ -207,8 +209,8 @@ boost::filesystem::path LinuxPath::getInstallPath() const
pos = -1; pos = -1;
do do
{ {
pos = static_cast<int>(installPath.find("\\\\", pos+1)); pos = installPath.find("\\\\", pos+1);
if(static_cast<size_t>(pos) == std::string::npos) if(pos == std::string::npos)
{ {
break; break;
} }

1
components/files/linuxpath.hpp
View File

@ -26,7 +26,6 @@
#if defined(__linux__) #if defined(__linux__)
#include <boost/filesystem.hpp> #include <boost/filesystem.hpp>
#include <boost/filesystem/fstream.hpp>
/** /**
* \namespace Files * \namespace Files