Merge pull request #273 from 'paradox/clang'

Conflicts:
	Sources/Tools/MaxConvert/Pch.h
	Sources/Tools/MaxConvert/hsControlConverter.cpp

Sources/Tools/MaxConvert/Pch.h

@@ -50,11 +50,11 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 // Standard Library
 #include <algorithm>
-#include <float.h>
+#include <cfloat>
+#include <cmath>
+#include <cstring>
 #include <functional>
-#include <math.h>
 #include <memory>
-#include <string.h>
 #include <vector>
 
 // Core Plasma

Sources/Tools/MaxConvert/StringTokenizer.cpp

@@ -40,7 +40,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 *==LICENSE==*/
 
-#include <string.h>
+#include <cstring>
 #pragma hdrstop
 
 #include "StringTokenizer.h"

Sources/Tools/MaxConvert/hsControlConverter.cpp

@@ -49,6 +49,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsTemplates.h"
 #include "hsWindows.h"
 #include <commdlg.h>
+#include <cmath>
 #include <stdmat.h>
 #include <bmmlib.h>
 #include <istdplug.h>

Sources/Tools/MaxConvert/hsConverterUtils.cpp

@@ -45,7 +45,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include "hsHashTable.h"
 #include "hsStringTokenizer.h"
 #include "hsResMgr.h"
-#include <math.h>
+#include <cmath>
 
 #include <max.h>
 #include <stdmat.h>

Sources/Tools/MaxConvert/hsMaterialConverter.cpp

@@ -49,8 +49,8 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 
 #include "MaxComponent/plComponent.h"
 
-#include <math.h>
-#include <float.h>
+#include <cmath>
+#include <cfloat>
 
 #include <commdlg.h>
 #include <bmmlib.h>

Sources/Tools/plFontConverter/plFontConverterProc.cpp

@@ -47,7 +47,7 @@ You can contact Cyan Worlds, Inc. by email legal@cyan.com
 #include <shlobj.h>
 #include <commdlg.h>
 #include <commctrl.h>
-#include <time.h>
+#include <ctime>
 
 #include "hsStream.h"
 #include "hsResMgr.h"

Sources/Tools/plLocalizationEditor/plLocalizationEditor.cpp

@@ -66,7 +66,6 @@ REGISTER_CREATABLE(plInitialAgeStateLoadedMsg);
 
 #include "HeadSpin.h"
 #include <Commdlg.h>
-#include <stdio.h>
 #include <commctrl.h>
 #include <shlwapi.h>
 #include <shlobj.h>