From d82ca00733c629df6e89e181192696afaeba1936 Mon Sep 17 00:00:00 2001 From: Thomas Tanner Date: Sun, 8 Nov 2015 09:46:30 +0000 Subject: Separated out the include what you use mappings into separate files, more improvements --- qtmappings.imp | 320 --------------------------------------------------------- 1 file changed, 320 deletions(-) delete mode 100644 qtmappings.imp (limited to 'qtmappings.imp') diff --git a/qtmappings.imp b/qtmappings.imp deleted file mode 100644 index deea653f..00000000 --- a/qtmappings.imp +++ /dev/null @@ -1,320 +0,0 @@ -[ -# Overrides. Some classes are defined by the spec to reside in their own headers but actually use the same -# header as another class. It might make some sense using this for every class in QT... - { symbol: [ "QAbstractItemModel", "private", "", "public" ] }, - { symbol: [ "QAbstractTableModel", "private", "", "public" ] }, - { symbol: [ "QAtomicInt", "private", "", "public"] }, - { symbol: [ "QCloseEvent", "private", "", "public" ] }, - { symbol: [ "QDate", "private", "", "public"] }, - { symbol: [ "QDragEnterEvent", "private", "", "public" ] }, - { symbol: [ "QDropEvent", "private", "", "public" ] }, - { symbol: [ "QIntValidator", "private", "", "public" ] }, - { symbol: [ "QKeyEvent", "private", "", "public" ] }, - { symbol: [ "QListWidgetItem", "private", "", "public" ] }, - { symbol: [ "QModelIndex", "private", "", "public" ] }, - { symbol: [ "QModelIndexList", "private", "", "public" ] }, - { symbol: [ "QMouseEvent", "private", "", "public" ] }, - { symbol: [ "@QMutableHashIterator(::.*)?", "private", "", "public" ] }, - { symbol: [ "QPersistentModelIndex", "private", "", "public" ] }, - { symbol: [ "QResizeEvent", "private", "", "public" ] }, - { symbol: [ "QScopedArrayPointer", "private", "", "public" ] }, - { symbol: [ "QStyleOptionSlider", "private", "", "public" ] }, - { symbol: [ "QStyleOptionViewItem", "private", "", "public" ] }, - { symbol: [ "QTableWidgetItem", "private", "", "public" ] }, - { symbol: [ "QTime", "private", "", "public"] }, - { symbol: [ "QTreeWidgetItem", "private", "", "public" ] }, - { symbol: [ "QVBoxLayout", "private", "", "public" ] }, - { symbol: [ "QWebHitTestResult", "private", "", "public" ] }, - { symbol: [ "qobject_cast", "private", "", "public"] }, - -# these are in QMetaType but the documentation is slightly unclear as to where they are meant to be defined. - { symbol: [ "QVariantList", "private", "", "public" ] }, - { symbol: [ "QVariantMap", "private", "", "public" ] }, - -#Normal header overrides -# Possibly we should add in the QtCore/ (see MOC generated files which always do) - - { include: [ "@\"(QtConcurrent/)?qtconcurrentrun\\.h\"", "private", "", "public" ] }, - - { include: [ "@\"(QtCore/)?qabstractproxymodel\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qalgorithms\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qbytearray\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qchar\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qcoreapplication\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qcoreevent\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qdatastream\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qdatetime\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qdebug\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qdir\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qdiriterator\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qfile\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qfileinfo\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qflags\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qfuture\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qglobal\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qhash\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qiodevice\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qitemselectionmodel\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qjsonvalue\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qlibrary\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qlist\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qlocale\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qlogging\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qmap\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qnamespace\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qobject\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qobjectdefs\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qpoint\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qrect\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qregexp\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qscopedpointer\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qset\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qsharedpointer_impl\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qsize\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qstandardpaths\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qstring\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qstringlist\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qurl\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtCore/)?qvariant\\.h\"", "private", "", "public" ] }, - - { include: [ "@\"(QtGui/)?qbrush\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qcolor\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qcursor\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qfont\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qfontmetrics\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qicon\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qimage\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qkeysequence\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qpainter\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qpalette\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qpen\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtGui/)?qpixmap\\.h\"", "private", "", "public" ] }, - - { include: [ "@\"(QtNetwork/)?qhostaddress\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtNetwork/)?qnetworkaccessmanager\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtNetwork/)?qnetworkrequest\\.h\"", "private", "", "public" ] }, - - { include: [ "@\"(QtWidgets/)?qabstractbutton\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qabstractitemview\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qaction\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qboxlayout\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qdialog\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qframe\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qlayout\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qlayoutitem\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qlineedit\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qsizepolicy\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qstyle\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qstyleoption\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qtabbar\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qtabwidget\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qtextedit\\.h\"", "private", "", "public" ] }, - { include: [ "@\"(QtWidgets/)?qwidget\\.h\"", "private", "", "public" ] }, - - { include: [ "@\"(QtWebKit/)?qwebsettings\\.h\"", "private", "", "public" ] }, - - { include: [ "@\"(QtWebKitWidgets/)?qwebpage\\.h\"", "private", "", "public" ] }, - - # I need to find out where these are and group them as above. - { include: [ "\"qapplication.h\"", "private", "", "public" ] }, - { include: [ "\"qbuffer.h\"", "private", "", "public" ] }, - { include: [ "\"qcheckbox.h\"", "private", "", "public" ] }, - { include: [ "\"qclipboard.h\"", "private", "", "public" ] }, - { include: [ "\"qcombobox.h\"", "private", "", "public" ] }, - { include: [ "\"qcommandlinkbutton.h\"", "private", "", "public" ] }, - { include: [ "\"qcryptographichash.h\"", "private", "", "public" ] }, - { include: [ "\"qdesktopwidget.h\"", "private", "", "public" ] }, - { include: [ "\"qdialogbuttonbox.h\"", "private", "", "public" ] }, - { include: [ "\"qfiledialog.h\"", "private", "", "public" ] }, - { include: [ "\"qfilesystemmodel.h\"", "private", "", "public" ] }, - { include: [ "\"qfilesystemwatcher.h\"", "private", "", "public" ] }, - { include: [ "\"qgroupbox.h\"", "private", "", "public" ] }, - { include: [ "\"qheaderview.h\"", "private", "", "public" ] }, - { include: [ "\"qinputdialog.h\"", "private", "", "public" ] }, - { include: [ "\"qitemdelegate.h\"", "private", "", "public" ] }, - { include: [ "\"qjsonarray.h\"", "private", "", "public" ] }, - { include: [ "\"qjsondocument.h\"", "private", "", "public" ] }, - { include: [ "\"qjsonobject.h\"", "private", "", "public" ] }, - { include: [ "\"qlabel.h\"", "private", "", "public" ] }, - { include: [ "\"qlcdnumber.h\"", "private", "", "public" ] }, - { include: [ "\"qlistwidget.h\"", "private", "", "public" ] }, - { include: [ "\"qlocalserver.h\"", "private", "", "public" ] }, - { include: [ "\"qlocalsocket.h\"", "private", "", "public" ] }, - { include: [ "\"qmainwindow.h\"", "private", "", "public" ] }, - { include: [ "\"qmenu.h\"", "private", "", "public" ] }, - { include: [ "\"qmessagebox.h\"", "private", "", "public" ] }, - { include: [ "\"qmetatype.h\"", "private", "", "public" ] }, - { include: [ "\"qmimedata.h\"", "private", "", "public" ] }, - { include: [ "\"qmutex.h\"", "private", "", "public" ] }, - { include: [ "\"qnetworkcookie.h\"", "private", "", "public" ] }, - { include: [ "\"qnetworkcookiejar.h\"", "private", "", "public" ] }, - { include: [ "\"qnetworkdiskcache.h\"", "private", "", "public" ] }, - { include: [ "\"qnetworkinterface.h\"", "private", "", "public" ] }, - { include: [ "\"qnetworkreply.h\"", "private", "", "public" ] }, - { include: [ "\"qpixmapcache.h\"", "private", "", "public" ] }, - { include: [ "\"qprocess.h\"", "private", "", "public" ] }, - { include: [ "\"qprogressbar.h\"", "private", "", "public" ] }, - { include: [ "\"qprogressdialog.h\"", "private", "", "public" ] }, - { include: [ "\"qproxystyle.h\"", "private", "", "public" ] }, - { include: [ "\"qpushbutton.h\"", "private", "", "public" ] }, - { include: [ "\"qqueue.h\"", "private", "", "public" ] }, - { include: [ "\"qradiobutton.h\"", "private", "", "public" ] }, - { include: [ "\"qscrollbar.h\"", "private", "", "public" ] }, - { include: [ "\"qsettings.h\"", "private", "", "public" ] }, - { include: [ "\"qsharedmemory.h\"", "private", "", "public" ] }, - { include: [ "\"qshortcut.h\"", "private", "", "public" ] }, - { include: [ "\"qsignalmapper.h\"", "private", "", "public" ] }, - { include: [ "\"qsortfilterproxymodel.h\"", "private", "", "public" ] }, - { include: [ "\"qsplashscreen.h\"", "private", "", "public" ] }, - { include: [ "\"qsplitter.h\"", "private", "", "public" ] }, - { include: [ "\"qsslsocket.h\"", "private", "", "public" ] }, - { include: [ "\"qstackedwidget.h\"", "private", "", "public" ] }, - { include: [ "\"qstatusbar.h\"", "private", "", "public" ] }, - { include: [ "\"qstyleditemdelegate.h\"", "private", "", "public" ] }, - { include: [ "\"qstylefactory.h\"", "private", "", "public" ] }, - { include: [ "\"qsyntaxhighlighter.h\"", "private", "", "public" ] }, - { include: [ "\"qtablewidget.h\"", "private", "", "public" ] }, - { include: [ "\"qtemporaryfile.h\"", "private", "", "public" ] }, - { include: [ "\"qtextbrowser.h\"", "private", "", "public" ] }, - { include: [ "\"qtextcodec.h\"", "private", "", "public" ] }, - { include: [ "\"qtextstream.h\"", "private", "", "public" ] }, - { include: [ "\"qthread.h\"", "private", "", "public" ] }, - { include: [ "\"qtimer.h\"", "private", "", "public" ] }, - { include: [ "\"qtoolbar.h\"", "private", "", "public" ] }, - { include: [ "\"qtoolbutton.h\"", "private", "", "public" ] }, - { include: [ "\"qtooltip.h\"", "private", "", "public" ] }, - { include: [ "\"qtranslator.h\"", "private", "", "public" ] }, - { include: [ "\"qtreeview.h\"", "private", "", "public" ] }, - { include: [ "\"qtreewidget.h\"", "private", "", "public" ] }, - { include: [ "\"qurlquery.h\"", "private", "", "public" ] }, - { include: [ "\"qvalidator.h\"", "private", "", "public" ] }, - { include: [ "\"qvector.h\"", "private", "", "public" ] }, - { include: [ "\"qwebframe.h\"", "private", "", "public" ] }, - { include: [ "\"qwebhistory.h\"", "private", "", "public" ] }, - { include: [ "\"qwebview.h\"", "private", "", "public" ] }, - { include: [ "\"qwhatsthis.h\"", "private", "", "public" ] }, - { include: [ "\"qwidgetaction.h\"", "private", "", "public" ] }, - { include: [ "\"qimagereader.h\"", "private", "", "public" ] }, - { include: [ "\"qdeclarativecontext.h\"", "private", "", "public" ] }, - { include: [ "\"qdeclarativeview.h\"", "private", "", "public" ] }, -# looks wrong -# { include: [ "\"qgraphicsitem.h\"", "private", "", "public" ] }, - - # Microsft visual C? - - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "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", "", "private" ] }, - - { include: [ "", "private", "", "private" ] }, # Stringapiset.h - { include: [ "", "private", "", "public" ] }, - -# These are all in windef.h apparently. Which m/s then says 'use Windows.h' - { include: [ "", "private", "", "private" ] }, # or in winnt apparently - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "private" ] }, - -# Similary, but for winbase.h - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "private" ] }, - -# These ones say xxxx.h (include Windows.h) on the ms web site - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, # VerRsrc.h - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "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: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, - -# These ones are *not* defined to be in Windows.h, but it seems to work. These should probably be cleaned up - { include: [ "", "private", "", "public" ] }, - # These 3 should go to Shellapi.h - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, # official name according to website - { include: [ "", "private", "", "public" ] }, - # - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "public" ] }, - { include: [ "", "private", "", "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: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "public" ] }, - - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "public" ] }, - - { include: [ "", "private", "", "private" ] }, - { include: [ "", "private", "", "public" ] }, - -# Huh? This one is sane? - { include: [ "", "private", "", "public" ] }, - -# And 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", "", "public" ] }, - - { include: [ "@\"boost/bind/.*\"", "private", "", "public" ] }, - { include: [ "@\"boost/algorithm/string/.*\"", "private", "", "public" ] }, - { include: [ "@\"boost/assign/.*\"", "private", "", "public" ] }, - { include: [ "@\"boost/filesystem/.*\"", "private", "", "public" ] }, - { include: [ "@\"boost/format/.*\"", "private", "", "public" ] }, - { include: [ "@\"boost/function/.*\"", "private", "", "public" ] }, - { include: [ "@\"boost/python/.*\"", "private", "", "public" ] }, - { include: [ "@\"boost/signals2/.*\"", "private", "", "public" ] }, - { include: [ "\"boost/smart_ptr/scoped_array.hpp\"", "private", "", "public" ] }, - { include: [ "\"boost/smart_ptr/shared_ptr.hpp\"", "private", "", "public" ] }, - -# And this is specific to us - { include: [ "\"appconfig.inc\"", "private", "\"appconfig.h\"", "public" ] }, - -] - -# Warning: QtGroupingProxy is not provided by Qt - - -#include "qpluginloader.h" -#include "qnetworkproxy.h" - -# 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 // for operator delete[], etc - -#include "QtCore/qiterator.h" -#include "QtCore/qtypeinfo.h" // for swap -#include "QtCore/qtypetraits.h" -#include "QtCore/qtypetraits.h" // for remove_reference<>::type -#include "QtGui/qwindowdefs_win.h" // for HINSTANCE -#include "QtWidgets/qabstractitemdelegate.h" -#include "boost/iterator/iterator_facade.hpp" -#include // for _Simple_types<>::value_type -#include // for _Tree_const_iterator - -# typical error on stdout (?) -#source\hookdll\dllmain.cpp(220) : warning C4244: '=' : conversion from 'int' to 'char', possible loss of data -# error from include-what-you-use (on stderr? at least it's in red) -#source\hookdll\dllmain.cpp(2220) : warning: case value not in enumerated type 'FILE_INFORMATION_CLASS' (aka '_FILE_INFORMATION_CLASS') [-Wswitch] -- cgit v1.3.1