From 5dbb9090293145005ab6720cf24c899320210dda Mon Sep 17 00:00:00 2001
From: Alexey Yakovenko <wakeroid@gmail.com>
Date: Thu, 14 Feb 2008 01:00:15 +0200
Subject: [PATCH] removed tchar.h usage

---
 core/code/common/pch.h                  | 10 ++--------
 core/code/system/f_application.cpp      |  2 +-
 core/code/system/f_application.h        |  3 +--
 core/code/video/sdl/f_sdlviewport.cpp   |  4 ++--
 core/code/video/sdl/f_sdlviewport.h     |  2 +-
 core/code/video/sdl/f_sdlviewportdata.h |  2 +-
 core/code/video/x11/x11viewport.cpp     |  4 ++--
 core/code/video/x11/x11viewport.h       |  2 +-
 core/code/video/x11/x11viewportdata.h   |  2 +-
 9 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/core/code/common/pch.h b/core/code/common/pch.h
index 653c6d2..38ba8ea 100644
--- a/core/code/common/pch.h
+++ b/core/code/common/pch.h
@@ -36,11 +36,13 @@
 #include <stdlib.h>
 #endif
 
+#if 0
 #ifndef _WIN32
 #include "mstchar.h"
 #else
 #include <TCHAR.h>
 #endif
+#endif
 
 //-----------------------------------
 // misc msvc warning disables
@@ -54,14 +56,6 @@
 #pragma warning (disable:4786)
 #endif
 
-//-----------------------------------
-// stl includes
-//-----------------------------------
-
-//#include <vector>
-//#include <list>
-//#include <map>
-//#include <algorithm>
 
 //-----------------------------------
 // win32 includes
diff --git a/core/code/system/f_application.cpp b/core/code/system/f_application.cpp
index 3105261..aedec93 100644
--- a/core/code/system/f_application.cpp
+++ b/core/code/system/f_application.cpp
@@ -66,7 +66,7 @@ namespace fe
 	
 	void		application::free( void ) {}
 	
-	const TCHAR*		application::getTitle( void ) const { return _T( "FE application" ); }
+	const char*	application::getTitle( void ) const { return "FE application"; }
 	
 	const char*	application::dataPath( void ) const { return "data"; }
 	
diff --git a/core/code/system/f_application.h b/core/code/system/f_application.h
index 9ec352f..1f2b00d 100644
--- a/core/code/system/f_application.h
+++ b/core/code/system/f_application.h
@@ -73,10 +73,9 @@ namespace fe
 	
 	/**
 	 * Sets application name or window title or whatever.
-	 * Please, notice feStr usage - it is a char/wchar mapping type, so use TCHARS instead of char or wchar_t. It is required for unicode version of the engine.
 	 * @return value, which is usually will be set as the WM window title.
 	 */
-		virtual const TCHAR*		getTitle( void ) const;
+		virtual const char*		getTitle( void ) const;
 	
 	/**
 	 * @return relative path to directory which will be set as virtual filesystem root.
diff --git a/core/code/video/sdl/f_sdlviewport.cpp b/core/code/video/sdl/f_sdlviewport.cpp
index 7185cfc..f9ceeb8 100644
--- a/core/code/video/sdl/f_sdlviewport.cpp
+++ b/core/code/video/sdl/f_sdlviewport.cpp
@@ -98,7 +98,7 @@ namespace fe
 	}
 	
 	void
-	sdlViewportData::init (const TCHAR *appName)
+	sdlViewportData::init (const char *appName)
 	{
 		// create and show window
 		SDL_Init (SDL_INIT_VIDEO);
@@ -247,7 +247,7 @@ namespace fe
 	}
 	
 	void
-	sdlViewport::init (const TCHAR *appName)
+	sdlViewport::init (const char *appName)
 	{
 		mpViewportData->init (appName);
 	}
diff --git a/core/code/video/sdl/f_sdlviewport.h b/core/code/video/sdl/f_sdlviewport.h
index 35ab0ab..3e71e9a 100644
--- a/core/code/video/sdl/f_sdlviewport.h
+++ b/core/code/video/sdl/f_sdlviewport.h
@@ -41,7 +41,7 @@ namespace fe
 	
 		sdlViewportData*		mpViewportData;
 	
-		void init (const TCHAR *appName);
+		void init (const char *appName);
 	
 	public:
 	
diff --git a/core/code/video/sdl/f_sdlviewportdata.h b/core/code/video/sdl/f_sdlviewportdata.h
index c7bedeb..94a9e7a 100644
--- a/core/code/video/sdl/f_sdlviewportdata.h
+++ b/core/code/video/sdl/f_sdlviewportdata.h
@@ -44,7 +44,7 @@ namespace fe
 		sdlViewportData (void);
 		~sdlViewportData (void);
 	
-		void init (const TCHAR *appName);
+		void init (const char *appName);
 	
 		void handleEvent (SDL_Event *event);
 	};
diff --git a/core/code/video/x11/x11viewport.cpp b/core/code/video/x11/x11viewport.cpp
index 8feb09f..3e2ba8a 100644
--- a/core/code/video/x11/x11viewport.cpp
+++ b/core/code/video/x11/x11viewport.cpp
@@ -243,7 +243,7 @@ namespace fe
 		}
 	}
 	
-	void x11ViewportData::init (const TCHAR *appname)
+	void x11ViewportData::init (const char *appname)
 	{
 	}
 
@@ -264,7 +264,7 @@ namespace fe
 		}
 	}
 
-	void x11Viewport::init (const TCHAR *appName)
+	void x11Viewport::init (const char *appName)
 	{
 		mpViewportData->init (appName);
 	}
diff --git a/core/code/video/x11/x11viewport.h b/core/code/video/x11/x11viewport.h
index f082ef9..4d9b27b 100644
--- a/core/code/video/x11/x11viewport.h
+++ b/core/code/video/x11/x11viewport.h
@@ -41,7 +41,7 @@ namespace fe
 	
 		x11ViewportData*		mpViewportData;
 	
-		void init (const TCHAR *appName);
+		void init (const char *appName);
 	
 	public:
 	
diff --git a/core/code/video/x11/x11viewportdata.h b/core/code/video/x11/x11viewportdata.h
index 3aabc3d..b624c0b 100644
--- a/core/code/video/x11/x11viewportdata.h
+++ b/core/code/video/x11/x11viewportdata.h
@@ -46,7 +46,7 @@ namespace fe
 		x11ViewportData (void);
 		~x11ViewportData (void);
 	
-		void init (const TCHAR *appName);
+		void init (const char *appName);
 	
 		void handleEvent (XEvent *event);
 	};
-- 
2.11.4.GIT