Merge branch 'master' into new_vfs_library

Conflicts:
	src/gameinfoimpl.cpp
	src/installationmanager.cpp
	src/mainwindow.cpp
	src/organizercore.cpp
	src/organizercore.h
	src/organizerproxy.cpp
	src/organizerproxy.h
	src/savegamegamebryo.cpp
	src/savegamegamebyro.h
	src/selfupdater.h
	src/shared/fallout3info.cpp
	src/shared/fallout3info.h
	src/shared/falloutnvinfo.cpp
	src/shared/falloutnvinfo.h
	src/shared/gameinfo.cpp
	src/shared/gameinfo.h
	src/shared/oblivioninfo.cpp
	src/shared/oblivioninfo.h
	src/shared/skyriminfo.cpp
	src/shared/skyriminfo.h
	src/spawn.cpp
	src/transfersavesdialog.cpp

1 files changed, 30 insertions, 0 deletions

diff --git a/mappings.imp b/mappings.imp
new file mode 100644
index 00000000..6af65e3c
--- /dev/null
+++ b/mappings.imp
@@ -0,0 +1,30 @@
+[
+
+# for boost???
+# These are probably correct but might need a revisit as if you look at the boost documentation pages, it
+# can give you huge lists of alternate includes...
+    { symbol: [ "BOOST_FOREACH",                            "private", "<boost/foreach.hpp>", "public" ] },
+
+    { include: [ "@\"boost/bind/.*\"",                      "private", "<boost/bind.hpp>", "public" ] },
+    { include: [ "@\"boost/algorithm/string/.*\"",          "private", "<boost/algorithm/string.hpp>", "public" ] },
+    { include: [ "@\"boost/assign/.*\"",                    "private", "<boost/assign.hpp>", "public" ] },
+    { include: [ "@\"boost/filesystem/.*\"",                "private", "<boost/filesystem.hpp>", "public" ] },
+    { include: [ "@\"boost/format/.*\"",                    "private", "<boost/format.hpp>", "public" ] },
+    { include: [ "@\"boost/function/.*\"",                  "private", "<boost/function.hpp>", "public" ] },
+    { include: [ "@\"boost/local/.*\"",                     "private", "<boost/locale.hpp>", "public" ] },
+    { include: [ "@\"boost/python/.*\"",                    "private", "<boost/python.hpp>", "public" ] },
+    { include: [ "@\"boost/signals2/.*\"",                  "private", "<boost/signals2.hpp>", "public" ] },
+    { include: [ "\"boost/smart_ptr/scoped_array.hpp\"",    "private", "<boost/scoped_array.hpp>", "public" ] },
+    { include: [ "\"boost/smart_ptr/shared_ptr.hpp\"",      "private", "<boost/shared_ptr.hpp>", "public" ] },
+    # this appears to be excessive
+    #{ include: [ "@\"boost/thread/.*\"",                    "private", "<boost/thread.hpp>", "public" ] },
+
+# And this is specific to us
+    { include: [ "\"appconfig.inc\"", "private", "\"appconfig.h\"", "public" ] },
+
+]
+
+# Ones I don't yet know how to deal with
+#include "boost/fusion/container/vector/vector10_fwd.hpp"  // for fusion
+#include "boost/iterator/iterator_facade.hpp"  // for operator!=
+#include "boost/iterator/iterator_facade.hpp"