From de019db1a81efacb83e1ead500eef0097e002f84 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Thu, 20 Oct 2016 00:28:54 +0000 Subject: [PATCH] add QEvent to incfsck script Signed-off-by: Ivailo Monev --- CMakeLists.txt | 18 ++++++++---------- scripts/incfsck.py | 1 + 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 9458002df..58515d115 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -656,7 +656,6 @@ katie_generate_obsolete(qmutablelinkedlistiterator.h QtCore qlist.h) katie_generate_obsolete(qprocessenvironment.h QtCore qprocess.h) katie_generate_obsolete(qlatin1char.h QtCore qchar.h) katie_generate_obsolete(qbasicatomicint.h QtCore qbasicatomic.h) -katie_generate_obsolete(qmodelindex.h QtCore qabstractitemmodel.h) katie_generate_obsolete(qmodelindexlist.h QtCore qabstractitemmodel.h) katie_generate_obsolete(qmetaproperty.h QtCore qmetaobject.h) katie_generate_obsolete(qflags.h QtCore qglobal.h) @@ -683,9 +682,10 @@ katie_generate_obsolete(qobjectlist.h QtCore qobject.h) katie_generate_obsolete(qmutablevectoriterator.h QtCore qvector.h) katie_generate_obsolete(qmultihash.h QtCore qhash.h) katie_generate_obsolete(qfileinfolist.h QtCore qfileinfo.h) +katie_generate_obsolete(qmodelindex.h QtCore qabstractitemmodel.h) katie_generate_obsolete(qhashiterator.h QtCore qhash.h) katie_generate_obsolete(qtglobal.h QtCore qglobal.h) -katie_generate_obsolete(qscopedarraypointer.h QtCore qscopedpointer.h) +katie_generate_obsolete(qshareddatapointer.h QtCore qshareddata.h) katie_generate_obsolete(qxmlstreamentitydeclaration.h QtCore qxmlstream.h) katie_generate_obsolete(qtplugin.h QtCore qplugin.h) katie_generate_obsolete(qdynamicpropertychangeevent.h QtCore qcoreevent.h) @@ -701,9 +701,10 @@ katie_generate_obsolete(qlistiterator.h QtCore qlist.h) katie_generate_obsolete(qreadlocker.h QtCore qreadwritelock.h) katie_generate_obsolete(qxmlstreamreader.h QtCore qxmlstream.h) katie_generate_obsolete(qxmlstreamentitydeclarations.h QtCore qxmlstream.h) -katie_generate_obsolete(qmetamethod.h QtCore qmetaobject.h) +katie_generate_obsolete(qevent.h QtCore qcoreevent.h) katie_generate_obsolete(q_pid.h QtCore qprocess.h) katie_generate_obsolete(qtdebug.h QtCore qdebug.h) +katie_generate_obsolete(qcharref.h QtCore qstring.h) katie_generate_obsolete(qtimerevent.h QtCore qcoreevent.h) katie_generate_obsolete(qtalgorithms.h QtCore qalgorithms.h) katie_generate_obsolete(qxmlstreamstringref.h QtCore qxmlstream.h) @@ -711,15 +712,16 @@ katie_generate_obsolete(qmutablemapiterator.h QtCore qmap.h) katie_generate_obsolete(qlatin1literal.h QtCore qstringbuilder.h) katie_generate_obsolete(qtendian.h QtCore qendian.h) katie_generate_obsolete(qxmlstreamattributes.h QtCore qxmlstream.h) +katie_generate_obsolete(qmetamethod.h QtCore qmetaobject.h) katie_generate_obsolete(qabstracttablemodel.h QtCore qabstractitemmodel.h) katie_generate_obsolete(qsizef.h QtCore qsize.h) katie_generate_obsolete(qvariantmap.h QtCore qvariant.h) katie_generate_obsolete(qexplicitlyshareddatapointer.h QtCore qsharedpointer.h) katie_generate_obsolete(qweakpointer.h QtCore qsharedpointer.h) -katie_generate_obsolete(qcharref.h QtCore qstring.h) +katie_generate_obsolete(qlinef.h QtCore qline.h) katie_generate_obsolete(qpointf.h QtCore qpoint.h) katie_generate_obsolete(qatomicpointer.h QtCore qatomic.h) -katie_generate_obsolete(qshareddatapointer.h QtCore qshareddata.h) +katie_generate_obsolete(qscopedarraypointer.h QtCore qscopedpointer.h) katie_generate_obsolete(qxmlstreamnamespacedeclarations.h QtCore qxmlstream.h) katie_generate_obsolete(qdbuspendingreplydata.h QtDBus qdbuspendingreply.h) katie_generate_obsolete(qdbusabstractinterfacebase.h QtDBus qdbusabstractinterface.h) @@ -811,7 +813,6 @@ katie_generate_obsolete(qgraphicsscenehelpevent.h QtGui qgraphicssceneevent.h) katie_generate_obsolete(qgraphicsobject.h QtGui qgraphicsitem.h) katie_generate_obsolete(qgraphicspolygonitem.h QtGui qgraphicsitem.h) katie_generate_obsolete(qtextcharformat.h QtGui qtextformat.h) -katie_generate_obsolete(qtextblockformat.h QtGui qtextformat.h) katie_generate_obsolete(qinputevent.h QtGui qevent.h) katie_generate_obsolete(qkeyevent.h QtGui qevent.h) katie_generate_obsolete(qiconenginefactoryinterface.h QtGui qiconengineplugin.h) @@ -828,6 +829,7 @@ katie_generate_obsolete(qstyleoptionprogressbarv2.h QtGui qstyleoption.h) katie_generate_obsolete(qcloseevent.h QtGui qevent.h) katie_generate_obsolete(qwindowstatechangeevent.h QtGui qevent.h) katie_generate_obsolete(qshowevent.h QtGui qevent.h) +katie_generate_obsolete(qtextblockformat.h QtGui qtextformat.h) katie_generate_obsolete(qaccessibleinterfaceex.h QtGui qaccessible.h) katie_generate_obsolete(qwheelevent.h QtGui qevent.h) katie_generate_obsolete(qhboxlayout.h QtGui qboxlayout.h) @@ -900,8 +902,6 @@ katie_generate_obsolete(qgraphicsrotation.h QtGui qgraphicstransform.h) katie_generate_obsolete(qaccessibleeditabletextinterface.h QtGui qaccessible2.h) katie_generate_obsolete(qsplitterhandle.h QtGui qsplitter.h) katie_generate_obsolete(qaccessibleobjectex.h QtGui qaccessibleobject.h) -katie_generate_obsolete(qhelpindexmodel.h QtHelp qhelpindexwidget.h) -katie_generate_obsolete(qhelpcontentmodel.h QtHelp qhelpcontentwidget.h) katie_generate_obsolete(qhttprequestheader.h QtNetwork qhttp.h) katie_generate_obsolete(qnetworkproxyquery.h QtNetwork qnetworkproxy.h) katie_generate_obsolete(qhttpresponseheader.h QtNetwork qhttp.h) @@ -955,8 +955,6 @@ katie_generate_obsolete(qxmlparseexception.h QtXml qxml.h) katie_generate_obsolete(qdomnodelist.h QtXml qdom.h) katie_generate_obsolete(qdomcdatasection.h QtXml qdom.h) katie_generate_obsolete(qxmldtdhandler.h QtXml qxml.h) -katie_generate_obsolete(qxmlitem.h QtXmlPatterns qabstractxmlnodemodel.h) -katie_generate_obsolete(qxmlnodemodelindex.h QtXmlPatterns qabstractxmlnodemodel.h) # aliases are not handled by the incfsck script on purpose if(UNIX AND WITH_X11 AND X11_FOUND) katie_generate_obsolete(qx11info.h QtGui qx11info_x11.h) diff --git a/scripts/incfsck.py b/scripts/incfsck.py index 60b3c99b9..1b93ecf0c 100755 --- a/scripts/incfsck.py +++ b/scripts/incfsck.py @@ -18,6 +18,7 @@ incmap = { 'QWeakPointer': 'qsharedpointer.h', 'QArgument': 'qobjectdefs.h', 'QByteRef': 'qbytearray.h', + 'QEvent': 'qcoreevent.h', 'QChildEvent': 'qcoreevent.h', 'QMultiMap': 'qmap.h', 'QMetaEnum': 'qmetaobject.h', -- 2.11.0