From d82ca00733c629df6e89e181192696afaeba1936 Mon Sep 17 00:00:00 2001
From: Thomas Tanner <trtanner@btinternet.com>
Date: Sun, 8 Nov 2015 09:46:30 +0000
Subject: Separated out the include what you use mappings into separate files,
 more improvements

---
 win.imp | 82 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 82 insertions(+)
 create mode 100644 win.imp

(limited to 'win.imp')

diff --git a/win.imp b/win.imp
new file mode 100644
index 00000000..90e8e69c
--- /dev/null
+++ b/win.imp
@@ -0,0 +1,82 @@
+[
+    # Microsft visual C?
+
+    { include: [ "<xiosbase>", "private", "<ios_base>", "public" ] },
+    { include: [ "<xlocale>", "private", "<locale>", "public" ] },
+    { include: [ "<xstring>", "private", "<string>", "public" ] },
+    { include: [ "<xutility>", "private", "<utility>", "public" ] },
+
+    { include: [ "<sys/stat.inl>", "private", "<sys/stat.h>", "public" ] },
+
+# Windows
+# Looks like the doucmentation says the 1st char is u/c the rest are l/c
+# You have to be kidding me. ULONG is defined in winsmcrd.h?
+    { symbol: [ "ULONG",    "private", "<windef.h>", "private" ] },
+
+    { include: [ "<winnls.h>", "private", "<stringapiset.h>", "private" ] }, # Stringapiset.h
+    { include: [ "<stringapiset.h>", "private", "<Windows.h>", "public" ] },
+
+# These are all in windef.h apparently. Which m/s then says 'use Windows.h'
+    { include: [ "<basetsd.h>", "private", "<windef.h>", "private" ] }, # or in winnt apparently
+    { include: [ "<handleapi.h>", "private", "<windef.h>", "private" ] },
+    { include: [ "<libloaderapi.h>", "private", "<windef.h>", "private" ] },
+    { include: [ "<minwindef.h>", "private", "<windef.h>", "private" ] },
+
+# Similary, but for winbase.h
+    { include: [ "<LMCons.h>", "private", "<winbase.h>", "private" ] },
+    { include: [ "<errhandlingapi.h>", "private", "<winbase.h>", "private" ] },
+    { include: [ "<excpt.h>", "private", "<winbase.h>", "private" ] },
+    { include: [ "<minwinbase.h>", "private", "<winbase.h>", "private" ] },
+    { include: [ "<namedpipeapi.h>", "private", "<winbase.h>", "private" ] },
+    { include: [ "<securitybaseapi.h>", "private", "<winbase.h>", "private" ] },
+
+# These ones say xxxx.h (include Windows.h) on the ms web site
+    { include: [ "<datetimeapi.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<fileapi.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<verrsrc.h>", "private", "<Windows.h>", "public" ] }, # VerRsrc.h
+    { include: [ "<winbase.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<windef.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<winerror.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<winnt.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<winuser.h>", "private", "<Windows.h>", "public" ] },
+
+# These ones are in Windows.h but the documentation post windows 8 says they are individual headers,
+# which looks like M/S are trying to get their act together. Maybe.
+    { include: [ "<processenv.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<processthreadsapi.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<synchapi.h>", "private", "<Windows.h>", "public" ] },
+
+# These ones are *not* defined to be in Windows.h, but it seems to work. These should probably be cleaned up
+    { include: [ "<DbgHelp.h>", "private", "<Windows.h>", "public" ] },
+    # These 3 should go to Shellapi.h
+    { include: [ "<ShellAPI.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<Shellapi.h>", "private", "<Windows.h>", "public" ] }, # official name according to website
+    { include: [ "<shellapi.h>", "private", "<Windows.h>", "public" ] },
+    #
+    { include: [ "<knownfolders.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<ShlObj.h>", "private", "<Windows.h>", "public" ] },
+    { include: [ "<objidl.h>", "private", "<Windows.h>", "public" ] },
+
+# Files that are included by other files which seem to then come for free in Windows.h but
+# shouldn't. Again, should be cleaned up.
+    
+    { include: [ "<basetyps.h>", "private", "<objbase.h>", "private" ] },
+    { include: [ "<combaseapi.h>", "private", "<objbase.h>", "private" ] },
+    { include: [ "<objbase.h>", "private", "<Windows.h>", "public" ] },
+
+    { include: [ "<wtypesbase.h>", "private", "<WTypes.h>", "private" ] },
+    { include: [ "<WTypes.h>", "private", "<Windows.h>", "public" ] },
+
+    { include: [ "<guiddef.h>", "private", "<Rpc.h>", "private" ] },
+    { include: [ "<Rpc.h>", "private", "<Windows.h>", "public" ] },
+
+# Huh? This one is sane?
+    { include: [ "<shlguid.h>", "private", "<shobjidl.h>", "public" ] },
+
+
+]
+
+#include <crtdbg.h>                                // for operator delete[], etc
+
+#include <xmemory0>                 // for _Simple_types<>::value_type
+#include <xtree>                          // for _Tree_const_iterator
-- 
cgit v1.3.1


From d1932bfc8ec190db2ac8878f32e77ea45e897a02 Mon Sep 17 00:00:00 2001
From: Thomas Tanner <trtanner@btinternet.com>
Date: Thu, 12 Nov 2015 21:48:40 +0000
Subject: Better header matching

---
 qt5_4.imp | 2 +-
 win.imp   | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

(limited to 'win.imp')

diff --git a/qt5_4.imp b/qt5_4.imp
index 5d75fd9e..0c688042 100644
--- a/qt5_4.imp
+++ b/qt5_4.imp
@@ -2464,6 +2464,7 @@
     { include: [ "@\"(QtCore/)?qnamespace\\.h\"", "private", "<Qt>", "public" ] },
     { include: [ "@\"(QtCore/)?qlogging\\.h\"", "private", "<QtDebug>", "public" ] }, #qDebug, qWarning, etc
     { include: [ "@\"(QtCore/)?qalgorithms\\.h\"", "private", "<QAlgorithms>", "public" ] }, #qSort, etc
+    { include: [ "@\"(QtWinExtras/)?qwinfunctions\\.h\"", "private", "<QtWin>", "public" ] },  // for fromHICON
 
 # These ones are just madness. For instance, why with the above do we get
 #    #include "QtCore/qcoreevent.h"      // for QEvent (ptr only), etc
@@ -2473,6 +2474,5 @@
 #include "QtCore/qtypetraits.h"  // for remove_reference<>::type
 #include "QtCore/qsharedpointer_impl.h"            // for swap
 #include "QtCore/qatomic_msvc.h"
-#include "qwinfunctions.h"  // for fromHICON
 
 ]
diff --git a/win.imp b/win.imp
index 90e8e69c..cbecdc43 100644
--- a/win.imp
+++ b/win.imp
@@ -9,9 +9,10 @@
     { include: [ "<sys/stat.inl>", "private", "<sys/stat.h>", "public" ] },
 
 # Windows
-# Looks like the doucmentation says the 1st char is u/c the rest are l/c
+# Looks like the documentation says the 1st char is u/c the rest are l/c
+
 # You have to be kidding me. ULONG is defined in winsmcrd.h?
-    { symbol: [ "ULONG",    "private", "<windef.h>", "private" ] },
+    { symbol: [ "ULONG", "private", "<windef.h>", "private" ] },
 
     { include: [ "<winnls.h>", "private", "<stringapiset.h>", "private" ] }, # Stringapiset.h
     { include: [ "<stringapiset.h>", "private", "<Windows.h>", "public" ] },
-- 
cgit v1.3.1