From d83c37598116e449ea91bfc056fd445445092de9 Mon Sep 17 00:00:00 2001 From: dfighter1985 Date: Wed, 24 Oct 2012 18:16:01 +0200 Subject: [PATCH] CHANGED: #1471 GUI library will now build with the new externals and Visual Studio 2010. --HG-- branch : gsoc2012-gui-editor --- code/nel/include/nel/gui/group_html.h | 2 +- code/nel/include/nel/gui/libwww.h | 2 +- code/nel/include/nel/gui/libwww_nel_stream.h | 2 +- code/nel/include/nel/gui/lua_loadlib.h | 6 +++--- code/nel/include/nel/gui/proc.h | 1 + code/nel/src/gui/ctrl_base.cpp | 2 +- code/nel/src/gui/group_editbox.cpp | 2 +- code/nel/src/gui/group_html.cpp | 8 +++++--- code/nel/src/gui/interface_link.cpp | 2 ++ code/nel/src/gui/libwww.cpp | 8 +++++--- code/nel/src/gui/libwww_nel_stream.cpp | 20 ++++++++++---------- 11 files changed, 31 insertions(+), 24 deletions(-) diff --git a/code/nel/include/nel/gui/group_html.h b/code/nel/include/nel/gui/group_html.h index 833c05f44..5cdf2f930 100644 --- a/code/nel/include/nel/gui/group_html.h +++ b/code/nel/include/nel/gui/group_html.h @@ -31,7 +31,7 @@ typedef std::map TStyle; extern "C" { -#include "WWWInit.h" +#include "libwww/WWWInit.h" } namespace NLGUI diff --git a/code/nel/include/nel/gui/libwww.h b/code/nel/include/nel/gui/libwww.h index 1997931cf..ed7d4ca13 100644 --- a/code/nel/include/nel/gui/libwww.h +++ b/code/nel/include/nel/gui/libwww.h @@ -22,7 +22,7 @@ extern "C" { -#include "WWWInit.h" +#include "libwww/WWWInit.h" } namespace NLGUI diff --git a/code/nel/include/nel/gui/libwww_nel_stream.h b/code/nel/include/nel/gui/libwww_nel_stream.h index e9cb8d9ee..8168b5b22 100644 --- a/code/nel/include/nel/gui/libwww_nel_stream.h +++ b/code/nel/include/nel/gui/libwww_nel_stream.h @@ -20,7 +20,7 @@ #define LIBWWW_NEL_STREAM_H -#include "HTProt.h" +#include "libwww/HTProt.h" extern "C" HTProtCallback HTLoadNeLFile; extern "C" PUBLIC HTInputStream * HTNeLReader_new (HTHost * host, HTChannel * ch, void * param, int mode); diff --git a/code/nel/include/nel/gui/lua_loadlib.h b/code/nel/include/nel/gui/lua_loadlib.h index adab3ec0b..1fe0abcd3 100644 --- a/code/nel/include/nel/gui/lua_loadlib.h +++ b/code/nel/include/nel/gui/lua_loadlib.h @@ -19,9 +19,9 @@ extern "C" { -#include -#include -#include +#include +#include +#include } // load the lua dll, return 1 on success diff --git a/code/nel/include/nel/gui/proc.h b/code/nel/include/nel/gui/proc.h index e80615c49..aec51160f 100644 --- a/code/nel/include/nel/gui/proc.h +++ b/code/nel/include/nel/gui/proc.h @@ -22,6 +22,7 @@ #include #include #include +#include namespace NLGUI { diff --git a/code/nel/src/gui/ctrl_base.cpp b/code/nel/src/gui/ctrl_base.cpp index febd3608f..c50290202 100644 --- a/code/nel/src/gui/ctrl_base.cpp +++ b/code/nel/src/gui/ctrl_base.cpp @@ -468,7 +468,7 @@ namespace NLGUI AHMap[ key ] = value; } - std::string CCtrlBase::getAHString( const stlpx_std::string &key ) const + std::string CCtrlBase::getAHString( const std::string &key ) const { std::map< std::string, std::map< std::string, std::string > >::const_iterator itr = AHCache.find( getId() ); if( itr == AHCache.end() ) diff --git a/code/nel/src/gui/group_editbox.cpp b/code/nel/src/gui/group_editbox.cpp index 40fdd2bcf..0fe5164a8 100644 --- a/code/nel/src/gui/group_editbox.cpp +++ b/code/nel/src/gui/group_editbox.cpp @@ -100,7 +100,7 @@ namespace NLGUI } } - std::string CGroupEditBox::getProperty( const stlpx_std::string &name ) const + std::string CGroupEditBox::getProperty( const std::string &name ) const { if( name == "onchange" ) { diff --git a/code/nel/src/gui/group_html.cpp b/code/nel/src/gui/group_html.cpp index 2f27f0ba5..78d0e86f8 100644 --- a/code/nel/src/gui/group_html.cpp +++ b/code/nel/src/gui/group_html.cpp @@ -18,12 +18,14 @@ #define NOMINMAX +#include "nel/gui/group_html.h" + // LibWWW extern "C" { -#include "WWWLib.h" /* Global Library Include file */ -#include "WWWApp.h" -#include "WWWInit.h" +#include "libwww/WWWLib.h" /* Global Library Include file */ +#include "libwww/WWWApp.h" +#include "libwww/WWWInit.h" } #include diff --git a/code/nel/src/gui/interface_link.cpp b/code/nel/src/gui/interface_link.cpp index 0dffc3d4d..4e67abee7 100644 --- a/code/nel/src/gui/interface_link.cpp +++ b/code/nel/src/gui/interface_link.cpp @@ -26,6 +26,8 @@ #include "nel/gui/widget_manager.h" #include "nel/misc/algo.h" +#include + using namespace std; using namespace NLMISC; diff --git a/code/nel/src/gui/libwww.cpp b/code/nel/src/gui/libwww.cpp index fa996ac13..347e0e119 100644 --- a/code/nel/src/gui/libwww.cpp +++ b/code/nel/src/gui/libwww.cpp @@ -16,12 +16,14 @@ #define NOMINMAX +#include "nel/gui/group_html.h" + // LibWWW extern "C" { -#include "WWWLib.h" /* Global Library Include file */ -#include "WWWApp.h" -#include "WWWInit.h" +#include "libwww/WWWLib.h" /* Global Library Include file */ +#include "libwww/WWWApp.h" +#include "libwww/WWWInit.h" } #include "nel/gui/group_html.h" diff --git a/code/nel/src/gui/libwww_nel_stream.cpp b/code/nel/src/gui/libwww_nel_stream.cpp index ca79ccde2..6405ad38a 100644 --- a/code/nel/src/gui/libwww_nel_stream.cpp +++ b/code/nel/src/gui/libwww_nel_stream.cpp @@ -21,16 +21,16 @@ extern "C" { /* Library Includes */ -#include "wwwsys.h" -#include "WWWUtil.h" -#include "WWWCore.h" -#include "WWWDir.h" -#include "WWWTrans.h" -#include "HTReqMan.h" -#include "HTBind.h" -#include "HTMulti.h" -#include "HTNetMan.h" -#include "HTChannl.h" +#include "libwww/wwwsys.h" +#include "libwww/WWWUtil.h" +#include "libwww/WWWCore.h" +#include "libwww/WWWDir.h" +#include "libwww/WWWTrans.h" +#include "libwww/HTReqMan.h" +#include "libwww/HTBind.h" +#include "libwww/HTMulti.h" +#include "libwww/HTNetMan.h" +#include "libwww/HTChannl.h" #include "nel/gui/libwww_nel_stream.h" /* Implemented here */ }