From d97a0f33d8a48b703bcf2a1bb8b43911ac5ba375 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 20 Aug 2016 18:12:01 +0000 Subject: [PATCH] headers comapt werk Signed-off-by: Ivailo Monev --- CMakeLists.txt | 349 ++++++++++++++++++++++++++++++++++++++------- scripts/incfsck.py | 69 +++++---- src/core/CMakeLists.txt | 8 +- src/gui/CMakeLists.txt | 9 +- src/network/CMakeLists.txt | 18 +-- src/xml/CMakeLists.txt | 22 +-- 6 files changed, 367 insertions(+), 108 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0d9ffb066..744d90643 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -651,73 +651,319 @@ add_subdirectory(util/unicode) add_subdirectory(util/xkbdatagen) add_subdirectory(util/generaterun) -# obsolete but still widely required headers, unlikely to go away -katie_generate_obsolete(qtglobal.h QtCore qglobal.h) -katie_generate_obsolete(qmultihash.h QtCore qhash.h) -katie_generate_obsolete(qshareddatapointer.h QtCore qshareddata.h) -katie_generate_obsolete(qscopedarraypointer.h QtCore qscopedpointer.h) +# the macro calls bellow are generted via the incfsck script +katie_generate_obsolete(qxmlstreamnotationdeclaration.h QtCore qxmlstream.h) +katie_generate_obsolete(qxmlstreamnamespacedeclaration.h QtCore qxmlstream.h) +katie_generate_obsolete(qmutablestringlistiterator.h QtCore qstringlist.h) +katie_generate_obsolete(qvariantlist.h QtCore qvariant.h) +katie_generate_obsolete(qbyteref.h QtCore qbytearray.h) katie_generate_obsolete(qtime.h QtCore qdatetime.h) -katie_generate_obsolete(qdate.h QtCore qdatetime.h) -katie_generate_obsolete(qwizardpage.h QtGui qwizard.h) -katie_generate_obsolete(qtimeedit.h QtGui qdatetimeedit.h) -katie_generate_obsolete(qdateedit.h QtGui qdatetimeedit.h) -katie_generate_obsolete(qhboxlayout.h QtGui qboxlayout.h) -katie_generate_obsolete(qvboxlayout.h QtGui qboxlayout.h) -katie_generate_obsolete(qspaceritem.h QtGui qlayoutitem.h) -katie_generate_obsolete(qdoublespinbox.h QtGui qspinbox.h) -katie_generate_obsolete(qdomdocument.h QtXml qdom.h) -katie_generate_obsolete(qdomelement.h QtXml qdom.h) -katie_generate_obsolete(qdomnode.h QtXml qdom.h) -katie_generate_obsolete(qxmlstream.h QtXml ../QtCore/qxmlstream.h) -katie_generate_obsolete(qxmlstreamwriter.h QtXml ../QtCore/qxmlstream.h) -katie_generate_obsolete(qxmlstreamreader.h QtXml ../QtCore/qxmlstream.h) -katie_generate_obsolete(qnetworkconfigurationmanager.h QtNetwork qnetworkconfigmanager.h) -katie_generate_obsolete(qnetworkcachemetadata.h QtNetwork qabstractnetworkcache.h) -# obsolete, not so important +katie_generate_obsolete(qglobalstatic.h QtCore qglobal.h) +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(qmodelindexlist.h QtCore qabstractitemmodel.h) +katie_generate_obsolete(qmetaproperty.h QtCore qmetaobject.h) katie_generate_obsolete(qflags.h QtCore qglobal.h) -katie_generate_obsolete(qtplugin.h QtCore qplugin.h) -katie_generate_obsolete(qtdebug.h QtCore qdebug.h) -katie_generate_obsolete(qtalgorithms.h QtCore qalgorithms.h) -katie_generate_obsolete(qdbuspendingcallwatcher.h QtDBus qdbuspendingcall.h) -# mixed headers +katie_generate_obsolete(qmutablehashiterator.h QtCore qhash.h) +katie_generate_obsolete(qmutablesetiterator.h QtCore qset.h) +katie_generate_obsolete(qmapiterator.h QtCore qmap.h) +katie_generate_obsolete(qxmlstreamwriter.h QtCore qxmlstream.h) +katie_generate_obsolete(qwritelocker.h QtCore qreadwritelock.h) +katie_generate_obsolete(qmutablelistiterator.h QtCore qlist.h) +katie_generate_obsolete(qsysinfo.h QtCore qglobal.h) +katie_generate_obsolete(qmetaclassinfo.h QtCore qmetaobject.h) +katie_generate_obsolete(qxmlstreamentityresolver.h QtCore qxmlstream.h) +katie_generate_obsolete(qgenericargument.h QtCore qobjectdefs.h) katie_generate_obsolete(qmetaenum.h QtCore qmetaobject.h) -katie_generate_obsolete(qmetamethod.h QtCore qmetaobject.h) -katie_generate_obsolete(qlistiterator.h QtCore qlist.h) -katie_generate_obsolete(qvariantmap.h QtCore qvariant.h) -katie_generate_obsolete(qvariantlist.h QtCore qvariant.h) +katie_generate_obsolete(qxmlstreamnotationdeclarations.h QtCore qxmlstream.h) katie_generate_obsolete(qvarianthash.h QtCore qvariant.h) -katie_generate_obsolete(qsizef.h QtCore qsize.h) +katie_generate_obsolete(qbitref.h QtCore qbitarray.h) katie_generate_obsolete(qrectf.h QtCore qrect.h) -katie_generate_obsolete(qtimerevent.h QtCore qcoreevent.h) -katie_generate_obsolete(qpointf.h QtCore qpoint.h) -katie_generate_obsolete(qprocessenvironment.h QtCore qprocess.h) +katie_generate_obsolete(qmultimap.h QtCore qmap.h) +katie_generate_obsolete(qchildevent.h QtCore qcoreevent.h) +katie_generate_obsolete(qargument.h QtCore qobjectdefs.h) +katie_generate_obsolete(qt.h QtCore qnamespace.h) +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(qhashiterator.h QtCore qhash.h) +katie_generate_obsolete(qtglobal.h QtCore qglobal.h) +katie_generate_obsolete(qscopearraypointer.h QtCore qscopedpointer.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) +katie_generate_obsolete(qdate.h QtCore qdatetime.h) katie_generate_obsolete(qabstractlistmodel.h QtCore qabstractitemmodel.h) +katie_generate_obsolete(qxmlstreamattribute.h QtCore qxmlstream.h) +katie_generate_obsolete(qatomicint.h QtCore qatomic.h) +katie_generate_obsolete(qlatin1string.h QtCore qstring.h) +katie_generate_obsolete(qpersistentmodelindex.h QtCore qabstractitemmodel.h) +katie_generate_obsolete(qbool.h QtCore qglobal.h) +katie_generate_obsolete(qmutexlocker.h QtCore qmutex.h) +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(q_pid.h QtCore qprocess.h) +katie_generate_obsolete(qtdebug.h QtCore qdebug.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) +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(qabstracttablemodel.h QtCore qabstractitemmodel.h) -katie_generate_obsolete(qmodelindex.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(qpointf.h QtCore qpoint.h) +katie_generate_obsolete(qatomicpointer.h QtCore qatomic.h) +katie_generate_obsolete(qshareddatapointer.h QtCore qshareddata.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) +katie_generate_obsolete(qdbuspendingcallwatcher.h QtDBus qdbuspendingcall.h) katie_generate_obsolete(qdbusobjectpath.h QtDBus qdbusextratypes.h) -katie_generate_obsolete(qlistwidgetitem.h QtGui qlistwidget.h) +katie_generate_obsolete(qdbusvariant.h QtDBus qdbusextratypes.h) +katie_generate_obsolete(qdbussignature.h QtDBus qdbusextratypes.h) +katie_generate_obsolete(qdeclarativelistproperty.h QtDeclarative qdeclarativelist.h) +katie_generate_obsolete(qdesignerextrainfoextension.h QtDesigner extrainfo.h) +katie_generate_obsolete(qdesignerlayoutdecorationextension.h QtDesigner layoutdecoration.h) +katie_generate_obsolete(qdesignerpromotioninterface.h QtDesigner abstractpromotioninterface.h) +katie_generate_obsolete(qdesignerbrushmanagerinterface.h QtDesigner abstractbrushmanager.h) +katie_generate_obsolete(qdesignerdnditeminterface.h QtDesigner abstractdnditem.h) +katie_generate_obsolete(qdesignermembersheetextension.h QtDesigner membersheet.h) +katie_generate_obsolete(qdesignerwidgetdatabaseiteminterface.h QtDesigner abstractwidgetdatabase.h) +katie_generate_obsolete(qdesignercomponents.h QtDesigner qdesigner_components.h) +katie_generate_obsolete(qdesignerformwindowmanagerinterface.h QtDesigner abstractformwindowmanager.h) +katie_generate_obsolete(qdesignerformwindowtoolinterface.h QtDesigner abstractformwindowtool.h) +katie_generate_obsolete(qdesignerdynamicpropertysheetextension.h QtDesigner dynamicpropertysheet.h) +katie_generate_obsolete(qdesignerwidgetboxinterface.h QtDesigner abstractwidgetbox.h) +katie_generate_obsolete(qdesignerpropertysheetextension.h QtDesigner propertysheet.h) +katie_generate_obsolete(qdesignericoncacheinterface.h QtDesigner abstracticoncache.h) +katie_generate_obsolete(qdesignerobjectinspectorinterface.h QtDesigner abstractobjectinspector.h) +katie_generate_obsolete(qdesignerintegrationinterface.h QtDesigner abstractintegration.h) +katie_generate_obsolete(qdesignerformeditorplugininterface.h QtDesigner abstractformeditorplugin.h) +katie_generate_obsolete(qdesigneractioneditorinterface.h QtDesigner abstractactioneditor.h) +katie_generate_obsolete(qdesignertaskmenuextension.h QtDesigner taskmenu.h) +katie_generate_obsolete(qdesignerformeditorinterface.h QtDesigner abstractformeditor.h) +katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner customwidget.h) +katie_generate_obsolete(qdesignermetadatabaseiteminterface.h QtDesigner abstractmetadatabase.h) +katie_generate_obsolete(qdesignerformwindowinterface.h QtDesigner abstractformwindow.h) +katie_generate_obsolete(qdesignercustomwidgetcollectioninterface.h QtDesigner customwidget.h) +katie_generate_obsolete(qdesignerformwindowcursorinterface.h QtDesigner abstractformwindowcursor.h) +katie_generate_obsolete(qabstractformbuilder.h QtDesigner abstractformbuilder.h) +katie_generate_obsolete(qdesignerpropertyeditorinterface.h QtDesigner abstractpropertyeditor.h) +katie_generate_obsolete(qdesignerresourcebrowserinterface.h QtDesigner abstractresourcebrowser.h) +katie_generate_obsolete(qdesignerwidgetfactoryinterface.h QtDesigner abstractwidgetfactory.h) +katie_generate_obsolete(qextensionfactory.h QtDesigner default_extensionfactory.h) +katie_generate_obsolete(qdesignercontainerextension.h QtDesigner container.h) +katie_generate_obsolete(qdesignerlanguageextension.h QtDesigner abstractlanguage.h) +katie_generate_obsolete(qdesignermetadatabaseinterface.h QtDesigner abstractmetadatabase.h) +katie_generate_obsolete(qdesignerwidgetdatabaseinterface.h QtDesigner abstractwidgetdatabase.h) +katie_generate_obsolete(qstyleoptionviewitem.h QtGui qstyleoption.h) +katie_generate_obsolete(qintvalidator.h QtGui qvalidator.h) +katie_generate_obsolete(qtexttableformat.h QtGui qtextformat.h) +katie_generate_obsolete(qmimesource.h QtGui qmime.h) +katie_generate_obsolete(qstyleoptiongraphicsitem.h QtGui qstyleoption.h) +katie_generate_obsolete(qaccessiblebridgefactoryinterface.h QtGui qaccessiblebridge.h) +katie_generate_obsolete(qiconenginev2.h QtGui qiconengine.h) +katie_generate_obsolete(qdragenterevent.h QtGui qevent.h) +katie_generate_obsolete(qradialgradient.h QtGui qbrush.h) +katie_generate_obsolete(qdateedit.h QtGui qdatetimeedit.h) +katie_generate_obsolete(qgraphicssceneresizeevent.h QtGui qgraphicssceneevent.h) +katie_generate_obsolete(qaccessibleapplication.h QtGui qaccessibleobject.h) +katie_generate_obsolete(qaccessibletableinterface.h QtGui qaccessible2.h) +katie_generate_obsolete(qgraphicsscenehoverevent.h QtGui qgraphicssceneevent.h) +katie_generate_obsolete(qstyleoptionfocusrect.h QtGui qstyleoption.h) +katie_generate_obsolete(qstyleoptiongroupbox.h QtGui qstyleoption.h) +katie_generate_obsolete(qaccessibleactioninterface.h QtGui qaccessible2.h) +katie_generate_obsolete(qwidgetlist.h QtGui qwindowdefs.h) +katie_generate_obsolete(qiconenginefactoryinterfacev2.h QtGui qiconengineplugin.h) katie_generate_obsolete(qtreewidgetitem.h QtGui qtreewidget.h) -katie_generate_obsolete(qstandarditem.h QtGui qstandarditemmodel.h) +katie_generate_obsolete(qgraphicslineitem.h QtGui qgraphicsitem.h) +katie_generate_obsolete(qstyleoptiontabbarbase.h QtGui qstyleoption.h) +katie_generate_obsolete(qgraphicstextitem.h QtGui qgraphicsitem.h) +katie_generate_obsolete(qstyleoptiontabv3.h QtGui qstyleoption.h) +katie_generate_obsolete(qiconenginepluginv2.h QtGui qiconengineplugin.h) +katie_generate_obsolete(qstyleoptionframev2.h QtGui qstyleoption.h) +katie_generate_obsolete(qgraphicsrectitem.h QtGui qgraphicsitem.h) +katie_generate_obsolete(qspaceritem.h QtGui qlayoutitem.h) +katie_generate_obsolete(qabstractundoitem.h QtGui qtextdocument.h) +katie_generate_obsolete(qimagetextkeylang.h QtGui qimage.h) +katie_generate_obsolete(qitemeditorcreatorbase.h QtGui qitemeditorfactory.h) +katie_generate_obsolete(qstyleoptiontoolbutton.h QtGui qstyleoption.h) +katie_generate_obsolete(qaccessibletable2interface.h QtGui qaccessible2.h) +katie_generate_obsolete(qgraphicsscenemouseevent.h QtGui qgraphicssceneevent.h) +katie_generate_obsolete(qgraphicspixmapitem.h QtGui qgraphicsitem.h) +katie_generate_obsolete(qdropevent.h QtGui qevent.h) +katie_generate_obsolete(qcontextmenuevent.h QtGui qevent.h) +katie_generate_obsolete(qstyleoptionrubberband.h QtGui qstyleoption.h) +katie_generate_obsolete(qaccessibletable2cellinterface.h QtGui qaccessible2.h) +katie_generate_obsolete(qgraphicsscenewheelevent.h QtGui qgraphicssceneevent.h) +katie_generate_obsolete(qstyleoptionviewitemv3.h QtGui qstyleoption.h) katie_generate_obsolete(qitemselection.h QtGui qitemselectionmodel.h) -katie_generate_obsolete(qtextframe.h QtGui qtextobject.h) -katie_generate_obsolete(qtextlistformat.h QtGui qtextformat.h) +katie_generate_obsolete(qgraphicsscenecontextmenuevent.h QtGui qgraphicssceneevent.h) +katie_generate_obsolete(qundocommand.h QtGui qundostack.h) +katie_generate_obsolete(qgraphicsdropshadoweffect.h QtGui qgraphicseffect.h) +katie_generate_obsolete(qactionevent.h QtGui qevent.h) +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(qinputevent.h QtGui qevent.h) +katie_generate_obsolete(qkeyevent.h QtGui qevent.h) +katie_generate_obsolete(qiconenginefactoryinterface.h QtGui qiconengineplugin.h) +katie_generate_obsolete(qstyleoptionmenuitem.h QtGui qstyleoption.h) +katie_generate_obsolete(qstyleoptionspinbox.h QtGui qstyleoption.h) +katie_generate_obsolete(qshortcutevent.h QtGui qevent.h) +katie_generate_obsolete(qgraphicsscenemoveevent.h QtGui qgraphicssceneevent.h) +katie_generate_obsolete(qaccessibleinterface.h QtGui qaccessible.h) +katie_generate_obsolete(qinputcontextfactoryinterface.h QtGui qinputcontextplugin.h) +katie_generate_obsolete(qtextlength.h QtGui qtextformat.h) +katie_generate_obsolete(qtextblock.h QtGui qtextobject.h) +katie_generate_obsolete(qdragmoveevent.h QtGui qevent.h) +katie_generate_obsolete(qstyleoptionprogressbarv2.h QtGui qstyleoption.h) katie_generate_obsolete(qcloseevent.h QtGui qevent.h) -katie_generate_obsolete(qresizeevent.h QtGui qevent.h) +katie_generate_obsolete(qwindowstatechangeevent.h QtGui qevent.h) katie_generate_obsolete(qshowevent.h QtGui qevent.h) -katie_generate_obsolete(qmouseevent.h QtGui qevent.h) -katie_generate_obsolete(qkeyevent.h QtGui qevent.h) +katie_generate_obsolete(qaccessibleinterfaceex.h QtGui qaccessible.h) katie_generate_obsolete(qwheelevent.h QtGui qevent.h) -katie_generate_obsolete(qdragenterevent.h QtGui qevent.h) -katie_generate_obsolete(qintvalidator.h QtGui qvalidator.h) -katie_generate_obsolete(qdoublevalidator.h QtGui qvalidator.h) +katie_generate_obsolete(qhboxlayout.h QtGui qboxlayout.h) +katie_generate_obsolete(qstyleoptioncombobox.h QtGui qstyleoption.h) +katie_generate_obsolete(qgraphicsitemgroup.h QtGui qgraphicsitem.h) +katie_generate_obsolete(qgestureevent.h QtGui qevent.h) +katie_generate_obsolete(qstyleoptionframev3.h QtGui qstyleoption.h) +katie_generate_obsolete(qvboxlayout.h QtGui qboxlayout.h) +katie_generate_obsolete(qaccessiblebridgeplugin.h QtGui qaccessiblebridge.h) +katie_generate_obsolete(qlistwidgetitem.h QtGui qlistwidget.h) +katie_generate_obsolete(qpolygonf.h QtGui qpolygon.h) +katie_generate_obsolete(qitemselectionrange.h QtGui qitemselectionmodel.h) +katie_generate_obsolete(qtablewidgetitem.h QtGui qtablewidget.h) +katie_generate_obsolete(qimageioplugin.h QtGui qimageiohandler.h) +katie_generate_obsolete(qfocusevent.h QtGui qevent.h) +katie_generate_obsolete(qaccessibleimageinterface.h QtGui qaccessible2.h) +katie_generate_obsolete(qmoveevent.h QtGui qevent.h) +katie_generate_obsolete(qstyleoptionviewitemv4.h QtGui qstyleoption.h) +katie_generate_obsolete(qtextline.h QtGui qtextlayout.h) +katie_generate_obsolete(qconicalgradient.h QtGui qbrush.h) +katie_generate_obsolete(qstandarditem.h QtGui qstandarditemmodel.h) +katie_generate_obsolete(qstyleoptionviewitemv2.h QtGui qstyleoption.h) +katie_generate_obsolete(qstyleoptionbutton.h QtGui qstyleoption.h) +katie_generate_obsolete(qgraphicsscale.h QtGui qgraphicstransform.h) +katie_generate_obsolete(qaccessiblesimpleeditabletextinterface.h QtGui qaccessible2.h) +katie_generate_obsolete(qfileopenevent.h QtGui qevent.h) +katie_generate_obsolete(qstyleoptionframe.h QtGui qstyleoption.h) +katie_generate_obsolete(qabstractgraphicsshapeitem.h QtGui qgraphicsitem.h) +katie_generate_obsolete(qtextlistformat.h QtGui qtextformat.h) +katie_generate_obsolete(qwidgetitem.h QtGui qlayoutitem.h) +katie_generate_obsolete(qstyleoptionslider.h QtGui qstyleoption.h) +katie_generate_obsolete(qregexpvalidator.h QtGui qvalidator.h) +katie_generate_obsolete(qpinchgesture.h QtGui qgesture.h) +katie_generate_obsolete(qgraphicsscenedragdropevent.h QtGui qgraphicssceneevent.h) +katie_generate_obsolete(qgraphicsopacityeffect.h QtGui qgraphicseffect.h) +katie_generate_obsolete(qpaintevent.h QtGui qevent.h) katie_generate_obsolete(qfontmetricsf.h QtGui qfontmetrics.h) -katie_generate_obsolete(qstyleoptionslider QtGui qstyleoption.h) +katie_generate_obsolete(qhideevent.h QtGui qevent.h) +katie_generate_obsolete(qstyleoptiontoolbar.h QtGui qstyleoption.h) +katie_generate_obsolete(qtevents.h QtGui qevent.h) +katie_generate_obsolete(qinputmethodevent.h QtGui qevent.h) +katie_generate_obsolete(qdoublespinbox.h QtGui qspinbox.h) +katie_generate_obsolete(qaccessible2interface.h QtGui qaccessible2.h) +katie_generate_obsolete(qtimeedit.h QtGui qdatetimeedit.h) +katie_generate_obsolete(qicondragevent.h QtGui qevent.h) +katie_generate_obsolete(qstyleoptiontitlebar.h QtGui qstyleoption.h) +katie_generate_obsolete(qhoverevent.h QtGui qevent.h) +katie_generate_obsolete(qwizardpage.h QtGui qwizard.h) +katie_generate_obsolete(qdragleaveevent.h QtGui qevent.h) +katie_generate_obsolete(qstyleoptioncomplex.h QtGui qstyleoption.h) +katie_generate_obsolete(qtouchevent.h QtGui qevent.h) +katie_generate_obsolete(qgraphicspathitem.h QtGui qgraphicsitem.h) +katie_generate_obsolete(qgradient.h QtGui qbrush.h) +katie_generate_obsolete(qstyleoptionheader.h QtGui qstyleoption.h) +katie_generate_obsolete(qaccessiblefactoryinterface.h QtGui qaccessibleplugin.h) +katie_generate_obsolete(qresizeevent.h QtGui qevent.h) +katie_generate_obsolete(qtextframe.h QtGui qtextobject.h) +katie_generate_obsolete(qtexttablecell.h QtGui qtexttable.h) +katie_generate_obsolete(qitemeditorcreator.h QtGui qitemeditorfactory.h) +katie_generate_obsolete(qpainterpathstroker.h QtGui qpainterpath.h) +katie_generate_obsolete(qaccessibleevent.h QtGui qaccessible.h) +katie_generate_obsolete(qplaintextdocumentlayout.h QtGui qplaintextedit.h) +katie_generate_obsolete(qhelpevent.h QtGui qevent.h) +katie_generate_obsolete(qmouseevent.h QtGui qevent.h) +katie_generate_obsolete(qdoublevalidator.h QtGui qvalidator.h) +katie_generate_obsolete(qimageiohandlerfactoryinterface.h QtGui qimageiohandler.h) +katie_generate_obsolete(qlineargradient.h QtGui qbrush.h) +katie_generate_obsolete(qgraphicssimpletextitem.h QtGui qgraphicsitem.h) +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) +katie_generate_obsolete(qnetworkcachemetadata.h QtNetwork qabstractnetworkcache.h) katie_generate_obsolete(qnetworkaddressentry.h QtNetwork qnetworkinterface.h) -katie_generate_obsolete(qglwidget.h QtOpenGL qgl.h) +katie_generate_obsolete(qnetworkconfigurationmanager.h QtNetwork qnetworkconfigmanager.h) +katie_generate_obsolete(qnetworkproxyfactory.h QtNetwork qnetworkproxy.h) +katie_generate_obsolete(qhttppart.h QtNetwork qhttpmultipart.h) +katie_generate_obsolete(qhttpheader.h QtNetwork qhttp.h) katie_generate_obsolete(qglshader.h QtOpenGL qglshaderprogram.h) -# those are aliases -katie_generate_obsolete(qweakpointer.h QtCore qsharedpointer.h) +katie_generate_obsolete(qglcontext.h QtOpenGL qgl.h) +katie_generate_obsolete(qglwidget.h QtOpenGL qgl.h) +katie_generate_obsolete(qtestaccessibility.h QtTest qtestaccessible.h) +katie_generate_obsolete(qeventsizeofchecker.h QtTest qtestspontaneevent.h) +katie_generate_obsolete(qtestkeyclicksevent.h QtTest qtestevent.h) +katie_generate_obsolete(qtesteventlist.h QtTest qtestevent.h) +katie_generate_obsolete(qtestaccessibilityevent.h QtTest qtestaccessible.h) +katie_generate_obsolete(qttestgui.h QtTest qtest_gui.h) +katie_generate_obsolete(qtestdelayevent.h QtTest qtestevent.h) +katie_generate_obsolete(qtestkeyevent.h QtTest qtestevent.h) +katie_generate_obsolete(qspontanekeyevent.h QtTest qtestspontaneevent.h) +katie_generate_obsolete(qtestmouseevent.h QtTest qtestevent.h) +katie_generate_obsolete(qxmlnamespacesupport.h QtXml qxml.h) +katie_generate_obsolete(qdomcomment.h QtXml qdom.h) +katie_generate_obsolete(qdomtext.h QtXml qdom.h) +katie_generate_obsolete(qxmlentityresolver.h QtXml qxml.h) +katie_generate_obsolete(qxmllexicalhandler.h QtXml qxml.h) +katie_generate_obsolete(qxmlcontenthandler.h QtXml qxml.h) +katie_generate_obsolete(qxmlattributes.h QtXml qxml.h) +katie_generate_obsolete(qxmlinputsource.h QtXml qxml.h) +katie_generate_obsolete(qxmlsimplereader.h QtXml qxml.h) +katie_generate_obsolete(qdomentity.h QtXml qdom.h) +katie_generate_obsolete(qxmldefaulthandler.h QtXml qxml.h) +katie_generate_obsolete(qdomdocumenttype.h QtXml qdom.h) +katie_generate_obsolete(qdomattr.h QtXml qdom.h) +katie_generate_obsolete(qdomdocument.h QtXml qdom.h) +katie_generate_obsolete(qdomdocumentfragment.h QtXml qdom.h) +katie_generate_obsolete(qxmldeclhandler.h QtXml qxml.h) +katie_generate_obsolete(qdomnamednodemap.h QtXml qdom.h) +katie_generate_obsolete(qdomnotation.h QtXml qdom.h) +katie_generate_obsolete(qdomprocessinginstruction.h QtXml qdom.h) +katie_generate_obsolete(qdomcharacterdata.h QtXml qdom.h) +katie_generate_obsolete(qxmlreader.h QtXml qxml.h) +katie_generate_obsolete(qxmllocator.h QtXml qxml.h) +katie_generate_obsolete(qdomimplementation.h QtXml qdom.h) +katie_generate_obsolete(qxmlerrorhandler.h QtXml qxml.h) +katie_generate_obsolete(qdomelement.h QtXml qdom.h) +katie_generate_obsolete(qdomnode.h QtXml qdom.h) +katie_generate_obsolete(qdomentityreference.h QtXml qdom.h) +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) katie_generate_obsolete(qx11embedcontainer.h QtGui qx11embed_x11.h) @@ -725,9 +971,10 @@ if(UNIX AND WITH_X11 AND X11_FOUND) endif() if(KATIE_PLATFORM STREQUAL "mac") katie_generate_obsolete(qmacstyle.h QtGui qmacstyle_mac.h) + katie_generate_obsolete(qmaccocoaviewcontainer.h QtGui qmaccocoaviewcontainer_mac.h) endif() katie_generate_obsolete(qttestgui.h QtTest qtest_gui.h) -# those have shuffled, e.g. from QtDesginer to QtUiTools +# those have shuffled from QtDesginer to QtUiTools katie_generate_obsolete(customwidget.h QtDesginer ../QtUiTools/customwidget.h) katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner ../QtUiTools/customwidget.h) diff --git a/scripts/incfsck.py b/scripts/incfsck.py index ccbaf0413..536cb0a5a 100755 --- a/scripts/incfsck.py +++ b/scripts/incfsck.py @@ -4,6 +4,7 @@ import sys, os, re incmap = { 'QtCore': { + 'QtGlobal': 'qglobal.h', 'QModelIndexList': 'qabstractitemmodel.h', 'QGenericArgument': 'qobjectdefs.h', 'QProcessEnvironment': 'qprocess.h', @@ -12,6 +13,7 @@ incmap = { 'QObjectList': 'qobject.h', 'QMapIterator': 'qmap.h', 'QMutexLocker': 'qmutex.h', + 'QScopeArrayPointer': 'qscopedpointer.h', 'QWeakPointer': 'qsharedpointer.h', 'QArgument': 'qobjectdefs.h', 'QByteRef': 'qbytearray.h', @@ -19,11 +21,9 @@ incmap = { 'QMultiMap': 'qmap.h', 'QMetaEnum': 'qmetaobject.h', 'QLatin1String': 'qstring.h', - 'QModelIndex': 'qabstractitemmodel.h', 'QPointF': 'qpoint.h', 'QTimerEvent': 'qcoreevent.h', 'QExplicitlySharedDataPointer': 'qsharedpointer.h', - 'QXmlStreamNamespaceDeclarations': 'qxmlstream.h', 'QAtomicPointer': 'qatomic.h', 'QReadLocker': 'qreadwritelock.h', 'QWriteLocker': 'qreadwritelock.h', @@ -31,8 +31,6 @@ incmap = { 'QRectF': 'qrect.h', 'QSizeF': 'qsize.h', 'QBitRef': 'qbitarray.h', - 'QXmlStreamReader': 'qxmlstream.h', - 'QXmlStreamWriter': 'qxmlstream.h', 'QtAlgorithms': 'qalgorithms.h', 'QAbstractListModel': 'qabstractitemmodel.h', 'QTime': 'qdatetime.h', @@ -57,22 +55,35 @@ incmap = { 'QMutableVectorIterator': 'qvector.h', 'Qt': 'qnamespace.h', 'QAbstractTableModel': 'qabstractitemmodel.h', - 'QVariantList': 'qvariant.h', 'QHashIterator': 'qhash.h', + 'QMultiHash': 'qhash.h', 'QMutableMapIterator': 'qmap.h', 'QListIterator': 'qlist.h', 'QVariantMap': 'qvariant.h', - 'QXmlStreamAttributes': 'qxmlstream.h', - 'QXmlStreamAttribute': 'qxmlstream.h', + 'QVariantList': 'qvariant.h', + 'QVariantHash': 'qvariant.h', 'QFileInfoList': 'qfileinfo.h', 'QGlobalStatic': 'qglobal.h', 'QMutableSetIterator': 'qset.h', - 'QVariantHash': 'qvariant.h', 'QDynamicPropertyChangeEvent': 'qcoreevent.h', - 'QXmlStreamEntityResolver': 'qxmlstream.h', 'QMutableLinkedListIterator': 'qlist.h', + 'QXmlStreamAttributes': 'qxmlstream.h', + 'QXmlStreamEntityDeclaration': 'qxmlstream.h', + 'QXmlStreamEntityDeclarations': 'qxmlstream.h', + 'QXmlStreamEntityResolver': 'qxmlstream.h', + 'QXmlStreamNamespaceDeclaration': 'qxmlstream.h', + 'QXmlStreamNamespaceDeclarations': 'qxmlstream.h', + 'QXmlStreamNotationDeclaration': 'qxmlstream.h', + 'QXmlStreamNotationDeclarations': 'qxmlstream.h', + 'QXmlStreamReader': 'qxmlstream.h', + 'QXmlStreamStringRef': 'qxmlstream.h', + 'QXmlStreamWriter': 'qxmlstream.h', + 'QXmlStreamAttribute': 'qxmlstream.h', }, 'QtGui': { + 'QHBoxLayout': 'qboxlayout.h', + 'QVBoxLayout': 'qboxlayout.h', + 'QSpacerItem': 'qlayoutitem.h', 'QTextTableCell': 'qtexttable.h', 'QPainterPathStroker': 'qpainterpath.h', 'QGraphicsPolygonItem': 'qgraphicsitem.h', @@ -110,7 +121,6 @@ incmap = { 'QGraphicsRotation': 'qgraphicstransform.h', 'QGraphicsObject': 'qgraphicsitem.h', 'QIntValidator': 'qvalidator.h', - 'QX11EmbedContainer': 'qx11embed_x11.h', 'QPolygonF': 'qpolygon.h', 'QGraphicsSceneWheelEvent': 'qgraphicssceneevent.h', 'QGraphicsSceneMouseEvent': 'qgraphicssceneevent.h', @@ -128,7 +138,6 @@ incmap = { 'QTouchEvent': 'qevent.h', 'QDropEvent': 'qevent.h', 'QMoveEvent': 'qevent.h', - 'QMacStyle': 'qmacstyle_mac.h', 'QStyleOptionGroupBox': 'qstyleoption.h', 'QStyleOptionComboBox': 'qstyleoption.h', 'QStyleOptionSpinBox': 'qstyleoption.h', @@ -177,6 +186,7 @@ incmap = { 'QImageIOPlugin': 'qimageiohandler.h', 'QFocusEvent': 'qevent.h', 'QLinearGradient': 'qbrush.h', + 'QDoubleSpinBox': 'qspinbox.h', 'QStyleOptionViewItem': 'qstyleoption.h', 'QStyleOptionViewItemV2': 'qstyleoption.h', 'QStyleOptionViewItemV3': 'qstyleoption.h', @@ -209,9 +219,6 @@ incmap = { 'QAccessibleTable2Interface': 'qaccessible2.h', 'QAccessibleTableInterface': 'qaccessible2.h', 'QTextLength': 'qtextformat.h', - 'QMacCocoaViewContainer': 'qmaccocoaviewcontainer_mac.h', - # 'QPlatformIntegrationPlugin': 'qplatformintegrationplugin_qpa.h', - # 'QPlatformIntegration': 'qplatformintegration_qpa.h', }, 'QtDBus': { 'QDBusPendingCallWatcher': 'qdbuspendingcall.h', @@ -227,21 +234,37 @@ incmap = { 'QGLShader': 'qglshaderprogram.h', }, 'QtXml': { - 'QXmlSimpleReader': 'qxml.h', 'QDomAttr': 'qdom.h', 'QDomDocument': 'qdom.h', 'QDomElement': 'qdom.h', 'QDomNode': 'qdom.h', - 'QXmlStreamAttribute': 'qxmlstream.h', + 'QDomNodeList': 'qdom.h', + 'QDomCDATASection': 'qdom.h', + 'QDomCharacterData': 'qdom.h', + 'QDomComment': 'qdom.h', + 'QDomDocumentFragment': 'qdom.h', + 'QDomDocumentType': 'qdom.h', + 'QDomEntity': 'qdom.h', + 'QDomEntityReference': 'qdom.h', + 'QDomImplementation': 'qdom.h', + 'QDomNamedNodeMap': 'qdom.h', + 'QDomNotation': 'qdom.h', + 'QDomProcessingInstruction': 'qdom.h', + 'QDomText': 'qdom.h', + 'QXmlDeclHandler': 'qxml.h', + 'QXmlDTDHandler': 'qxml.h', + 'QXmlEntityResolver': 'qxml.h', + 'QXmlErrorHandler': 'qxml.h', + 'QXmlLexicalHandler': 'qxml.h', + 'QXmlLocator': 'qxml.h', + 'QXmlNamespaceSupport': 'qxml.h', + 'QXmlReader': 'qxml.h', + 'QXmlSimpleReader': 'qxml.h', 'QXmlAttributes': 'qxml.h', 'QXmlDefaultHandler': 'qxml.h', 'QXmlParseException': 'qxml.h', - 'QXmlLocator': 'qxml.h', 'QXmlContentHandler': 'qxml.h', 'QXmlInputSource': 'qxml.h', - 'QDomNodeList': 'qdom.h', - 'QDomText': 'qdom.h', - 'QDomNamedNodeMap': 'qdom.h', }, 'QtXmlPatterns': { 'QXmlItem': 'qabstractxmlnodemodel.h', @@ -256,6 +279,7 @@ incmap = { 'QHttpRequestHeader': 'qhttp.h', 'QHttpResponseHeader': 'qhttp.h', 'QHttpHeader': 'qhttp.h', + 'QHttpPart': 'qhttpmultipart.h', 'QNetworkConfigurationManager': 'qnetworkconfigmanager.h', 'QNetworkAddressEntry': 'qnetworkinterface.h', 'QNetworkCacheMetaData': 'qabstractnetworkcache.h', @@ -312,14 +336,11 @@ incmap = { 'QHelpIndexModel': 'qhelpindexwidget.h', 'QHelpContentModel': 'qhelpcontentwidget.h', }, - 'QtWebKit': { - 'QWebHitTestResult': 'qwebframe.h', - }, } if '--printmap' in sys.argv: - for component in incmap: + for component in sorted(incmap): for key in incmap[component]: print('katie_generate_obsolete(%s.h %s %s)' % (key.lower(), component, incmap[component][key])) sys.exit(0) diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt index 98db31429..cfe0371f8 100644 --- a/src/core/CMakeLists.txt +++ b/src/core/CMakeLists.txt @@ -78,7 +78,6 @@ set(CORE_PUBLIC_HEADERS QHashDummyValue QFutureWatcherBase QPoint - QVariantHash QXmlStreamEntityDeclarations QByteArray QWriteLocker @@ -90,9 +89,7 @@ set(CORE_PUBLIC_HEADERS QtConcurrentRun QSignalMapper QEventLoop - QMetaEnum QHashNode - QMutexLocker QDataStream QPointF QAbstractFileEngineIterator @@ -153,7 +150,6 @@ set(CORE_PUBLIC_HEADERS QXmlStreamReader QForeachContainer QtCleanUpFunction - QScopedArrayPointer QSharedPointer QInternal QSize @@ -241,6 +237,7 @@ set(CORE_PUBLIC_HEADERS # mixed QVariantMap QVariantList + QVariantHash QAbstractListModel QAbstractTableModel QProcessEnvironment @@ -252,6 +249,9 @@ set(CORE_PUBLIC_HEADERS QTime QListIterator QMetaMethod + QMetaEnum + QMutexLocker + QScopedArrayPointer # obsolete QFlags ) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index e877a466a..43e00fae8 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -55,7 +55,6 @@ set(GUI_PUBLIC_HEADERS QDialogButtonBox QDirModel QDockWidget - QDoubleSpinBox QDrag QDragResponseEvent QErrorMessage @@ -111,7 +110,6 @@ set(GUI_PUBLIC_HEADERS QGridLayout QGroupBox QGtkStyle - QHBoxLayout QHeaderView QIcon QIconDragEvent @@ -237,7 +235,6 @@ set(GUI_PUBLIC_HEADERS QSlider QSortFilterProxyModel QSound - QSpacerItem QSpinBox QSplashScreen QSplitter @@ -335,7 +332,6 @@ set(GUI_PUBLIC_HEADERS QUnixPrintWidget QUpdateLaterEvent QValidator - QVBoxLayout QVector2D QVector3D QVector4D @@ -379,6 +375,7 @@ set(GUI_PUBLIC_HEADERS QMouseEvent QKeyEvent QWheelEvent + QTouchEvent QDragEnterEvent QItemSelection QIntValidator @@ -388,6 +385,10 @@ set(GUI_PUBLIC_HEADERS QTextFrame QTextListFormat QTextCharFormat + QSpacerItem + QVBoxLayout + QHBoxLayout + QDoubleSpinBox # pure aliases, but required by UI generator QTimeEdit QDateEdit diff --git a/src/network/CMakeLists.txt b/src/network/CMakeLists.txt index 0ea2d1ca7..58c3a038b 100644 --- a/src/network/CMakeLists.txt +++ b/src/network/CMakeLists.txt @@ -10,26 +10,17 @@ set(NETWORK_PUBLIC_HEADERS QHostAddress QHostInfo QHttp - QHttpHeader - QHttpMultiPart - QHttpPart - QHttpRequestHeader - QHttpResponseHeader Q_IPV6ADDR QIPv6Address QLocalServer QLocalSocket QNetworkAccessManager - QNetworkCacheMetaData QNetworkConfiguration - QNetworkConfigurationManager QNetworkCookie QNetworkCookieJar QNetworkDiskCache QNetworkInterface QNetworkProxy - QNetworkProxyFactory - QNetworkProxyQuery QNetworkReply QNetworkRequest QNetworkSession @@ -44,8 +35,17 @@ set(NETWORK_PUBLIC_HEADERS QTcpSocket QUdpSocket QUrlInfo + QHttpMultiPart # mixed QNetworkAddressEntry + QNetworkConfigurationManager + QNetworkCacheMetaData + QHttpHeader + QHttpPart + QHttpRequestHeader + QHttpResponseHeader + QNetworkProxyFactory + QNetworkProxyQuery ) include(access/access.cmake) diff --git a/src/xml/CMakeLists.txt b/src/xml/CMakeLists.txt index c3cd64bfa..7c3d05092 100644 --- a/src/xml/CMakeLists.txt +++ b/src/xml/CMakeLists.txt @@ -3,6 +3,11 @@ set(EXTRA_XML_LIBS KtCore) set(XML_PUBLIC_HEADERS ${XML_PUBLIC_HEADERS} + # mixed + QDomDocument + QDomElement + QDomNode + QDomNodeList QDomCDATASection QDomCharacterData QDomComment @@ -12,7 +17,6 @@ set(XML_PUBLIC_HEADERS QDomEntityReference QDomImplementation QDomNamedNodeMap - QDomNodeList QDomNotation QDomProcessingInstruction QDomText @@ -24,21 +28,7 @@ set(XML_PUBLIC_HEADERS QXmlLocator QXmlNamespaceSupport QXmlReader - QXmlStreamAttributes - QXmlStreamEntityDeclaration - QXmlStreamEntityDeclarations - QXmlStreamEntityResolver - QXmlStreamNamespaceDeclaration - QXmlStreamNamespaceDeclarations - QXmlStreamNotationDeclaration - QXmlStreamNotationDeclarations - QXmlStreamReader - QXmlStreamStringRef - QXmlStreamWriter - # mixed - QDomDocument - QDomElement - QDomNode + # TODO: figure out what to do with QXmlStream, the classes are now in core ) include(dom/dom.cmake) -- 2.11.0