From bed4f81fc616d6ca920e5ab534d4accea9c1a9ef Mon Sep 17 00:00:00 2001 From: Einar Johan Trøan Sømåen Date: Fri, 15 Jun 2012 01:21:28 +0200 Subject: WINTERMUTE: Clean out some un-needed headers, and some FORBIDDEN_SYMBOL_EXCEPTIONs --- engines/wintermute/utils/PathUtil.cpp | 23 ++++++----------------- 1 file changed, 6 insertions(+), 17 deletions(-) (limited to 'engines/wintermute/utils') diff --git a/engines/wintermute/utils/PathUtil.cpp b/engines/wintermute/utils/PathUtil.cpp index e2e6c56b9f..284db8acfc 100644 --- a/engines/wintermute/utils/PathUtil.cpp +++ b/engines/wintermute/utils/PathUtil.cpp @@ -25,26 +25,12 @@ * http://dead-code.org/redir.php?target=wmelite * Copyright (c) 2011 Jan Nedoma */ -#define FORBIDDEN_SYMBOL_ALLOW_ALL +#define FORBIDDEN_SYMBOL_EXCEPTION_ifstream #include "engines/wintermute/dcgf.h" -#include #include #include "PathUtil.h" #include "StringUtil.h" - -#ifdef __WIN32__ -# include -#endif - -#ifdef __MACOSX__ -# include -#endif - -#ifdef __IPHONEOS__ -# include "ios_utils.h" -#endif - namespace WinterMute { ////////////////////////////////////////////////////////////////////////// @@ -155,6 +141,8 @@ bool PathUtil::MatchesMask(const AnsiString &fileName, const AnsiString &mask) { ////////////////////////////////////////////////////////////////////////// bool PathUtil::FileExists(const AnsiString &fileName) { + warning("PathUtil::FileExists(%s)", fileName.c_str()); + std::ifstream stream; stream.open(fileName.c_str()); @@ -167,8 +155,9 @@ bool PathUtil::FileExists(const AnsiString &fileName) { ////////////////////////////////////////////////////////////////////////// AnsiString PathUtil::GetUserDirectory() { + warning("PathUtil::GetUserDirectory - stubbed"); AnsiString userDir = "./"; - +#if 0 #ifdef __WIN32__ char buffer[MAX_PATH]; buffer[0] = '\0'; @@ -197,7 +186,7 @@ AnsiString PathUtil::GetUserDirectory() { IOS_GetDataDir(path); userDir = AnsiString(path); #endif - +#endif // 0 return userDir; } -- cgit v1.2.3