endif()
# the macro calls bellow are generted via the incfsck script
-katie_generate_obsolete(qmutablemapiterator.h QtCore qmap.h)
-katie_generate_obsolete(qtendian.h QtCore qendian.h)
-katie_generate_obsolete(qbitref.h QtCore qbitarray.h)
-katie_generate_obsolete(qcharref.h QtCore qstring.h)
-katie_generate_obsolete(qflag.h QtCore qglobal.h)
-katie_generate_obsolete(qflags.h QtCore qglobal.h)
-katie_generate_obsolete(qvariantmap.h QtCore qvariant.h)
-katie_generate_obsolete(qmetaproperty.h QtCore qmetaobject.h)
-katie_generate_obsolete(qexplicitlyshareddatapointer.h QtCore qsharedpointer.h)
-katie_generate_obsolete(qmultihash.h QtCore qhash.h)
-katie_generate_obsolete(qt.h QtCore qnamespace.h)
-katie_generate_obsolete(qtplugin.h QtCore qplugin.h)
-katie_generate_obsolete(qtdebug.h QtCore qdebug.h)
-katie_generate_obsolete(qmutablelinkedlistiterator.h QtCore qlist.h)
-katie_generate_obsolete(qmutablesetiterator.h QtCore qset.h)
-katie_generate_obsolete(qmutablestringlistiterator.h QtCore qstringlist.h)
-katie_generate_obsolete(qabstracttablemodel.h QtCore qabstractitemmodel.h)
-katie_generate_obsolete(qsysinfo.h QtCore qglobal.h)
-katie_generate_obsolete(qmutablehashiterator.h QtCore qhash.h)
-katie_generate_obsolete(qxmlstreamattributes.h QtCore qxmlstream.h)
-katie_generate_obsolete(qxmlstreamnamespacedeclaration.h QtCore qxmlstream.h)
-katie_generate_obsolete(qmultimap.h QtCore qmap.h)
-katie_generate_obsolete(qxmlstreamnotationdeclaration.h QtCore qxmlstream.h)
-katie_generate_obsolete(qshareddatapointer.h QtCore qshareddata.h)
-katie_generate_obsolete(qxmlstreamattribute.h QtCore qxmlstream.h)
-katie_generate_obsolete(qchildevent.h QtCore qcoreevent.h)
-katie_generate_obsolete(qfileinfolist.h QtCore qfileinfo.h)
-katie_generate_obsolete(qrectf.h QtCore qrect.h)
-katie_generate_obsolete(qmapiterator.h QtCore qmap.h)
-katie_generate_obsolete(qxmlstreamreader.h QtCore qxmlstream.h)
-katie_generate_obsolete(qbasicatomicint.h QtCore qbasicatomic.h)
-katie_generate_obsolete(qlistiterator.h QtCore qlist.h)
-katie_generate_obsolete(qmutablelistiterator.h QtCore qlist.h)
-katie_generate_obsolete(qmutablevectoriterator.h QtCore qvector.h)
-katie_generate_obsolete(qmetaenum.h QtCore qmetaobject.h)
-katie_generate_obsolete(qargument.h QtCore qobjectdefs.h)
-katie_generate_obsolete(qdate.h QtCore qdatetime.h)
-katie_generate_obsolete(qsizef.h QtCore qsize.h)
katie_generate_obsolete(qtglobal.h QtCore qglobal.h)
-katie_generate_obsolete(qtextdecoder.h QtCore qtextcodec.h)
-katie_generate_obsolete(qlinef.h QtCore qline.h)
+katie_generate_obsolete(qmodelindex.h QtCore qabstractitemmodel.h)
+katie_generate_obsolete(qmodelindexlist.h QtCore qabstractitemmodel.h)
+katie_generate_obsolete(qgenericargument.h QtCore qobjectdefs.h)
+katie_generate_obsolete(qprocessenvironment.h QtCore qprocess.h)
+katie_generate_obsolete(qmutablehashiterator.h QtCore qhash.h)
katie_generate_obsolete(qobjectlist.h QtCore qobject.h)
-katie_generate_obsolete(qdynamicpropertychangeevent.h QtCore qcoreevent.h)
-katie_generate_obsolete(qhashiterator.h QtCore qhash.h)
-katie_generate_obsolete(qreadlocker.h QtCore qreadwritelock.h)
-katie_generate_obsolete(qxmlstreamnotationdeclarations.h QtCore qxmlstream.h)
+katie_generate_obsolete(qmapiterator.h QtCore qmap.h)
katie_generate_obsolete(qmutexlocker.h QtCore qmutex.h)
+katie_generate_obsolete(qscopedarraypointer.h QtCore qscopedpointer.h)
+katie_generate_obsolete(qweakpointer.h QtCore qsharedpointer.h)
+katie_generate_obsolete(qargument.h QtCore qobjectdefs.h)
+katie_generate_obsolete(qbyteref.h QtCore qbytearray.h)
+katie_generate_obsolete(qchildevent.h QtCore qcoreevent.h)
+katie_generate_obsolete(qmultimap.h QtCore qmap.h)
+katie_generate_obsolete(qmetaenum.h QtCore qmetaobject.h)
katie_generate_obsolete(qlatin1string.h QtCore qstring.h)
+katie_generate_obsolete(qpointf.h QtCore qpoint.h)
+katie_generate_obsolete(qtimerevent.h QtCore qcoreevent.h)
+katie_generate_obsolete(qexplicitlyshareddatapointer.h QtCore qsharedpointer.h)
katie_generate_obsolete(qatomicpointer.h QtCore qatomic.h)
+katie_generate_obsolete(qreadlocker.h QtCore qreadwritelock.h)
+katie_generate_obsolete(qwritelocker.h QtCore qreadwritelock.h)
+katie_generate_obsolete(qatomicint.h QtCore qatomic.h)
+katie_generate_obsolete(qrectf.h QtCore qrect.h)
+katie_generate_obsolete(qsizef.h QtCore qsize.h)
+katie_generate_obsolete(qlinef.h QtCore qline.h)
+katie_generate_obsolete(qbitref.h QtCore qbitarray.h)
+katie_generate_obsolete(qtalgorithms.h QtCore qalgorithms.h)
katie_generate_obsolete(qabstractlistmodel.h QtCore qabstractitemmodel.h)
-katie_generate_obsolete(qpersistentmodelindex.h QtCore qabstractitemmodel.h)
+katie_generate_obsolete(qtime.h QtCore qdatetime.h)
+katie_generate_obsolete(qdate.h QtCore qdatetime.h)
+katie_generate_obsolete(qmetaproperty.h QtCore qmetaobject.h)
+katie_generate_obsolete(qmutablelistiterator.h QtCore qlist.h)
+katie_generate_obsolete(qshareddatapointer.h QtCore qshareddata.h)
katie_generate_obsolete(qmetamethod.h QtCore qmetaobject.h)
-katie_generate_obsolete(qgenericargument.h QtCore qobjectdefs.h)
-katie_generate_obsolete(qprocessenvironment.h QtCore qprocess.h)
-katie_generate_obsolete(qmodelindex.h QtCore qabstractitemmodel.h)
+katie_generate_obsolete(qlatin1char.h QtCore qchar.h)
+katie_generate_obsolete(qtplugin.h QtCore qplugin.h)
+katie_generate_obsolete(qcharref.h QtCore qstring.h)
katie_generate_obsolete(qbool.h QtCore qglobal.h)
-katie_generate_obsolete(qxmlstreamwriter.h QtCore qxmlstream.h)
+katie_generate_obsolete(qmutablestringlistiterator.h QtCore qstringlist.h)
+katie_generate_obsolete(qtdebug.h QtCore qdebug.h)
+katie_generate_obsolete(qtendian.h QtCore qendian.h)
+katie_generate_obsolete(qbasicatomicint.h QtCore qbasicatomic.h)
+katie_generate_obsolete(q_pid.h QtCore qprocess.h)
+katie_generate_obsolete(qmetaclassinfo.h QtCore qmetaobject.h)
+katie_generate_obsolete(qflag.h QtCore qglobal.h)
+katie_generate_obsolete(qflags.h QtCore qglobal.h)
+katie_generate_obsolete(qpersistentmodelindex.h QtCore qabstractitemmodel.h)
+katie_generate_obsolete(qsysinfo.h QtCore qglobal.h)
+katie_generate_obsolete(qmutablevectoriterator.h QtCore qvector.h)
+katie_generate_obsolete(qt.h QtCore qnamespace.h)
+katie_generate_obsolete(qabstracttablemodel.h QtCore qabstractitemmodel.h)
+katie_generate_obsolete(qhashiterator.h QtCore qhash.h)
+katie_generate_obsolete(qmultihash.h QtCore qhash.h)
+katie_generate_obsolete(qmutablemapiterator.h QtCore qmap.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(qvarianthash.h QtCore qvariant.h)
-katie_generate_obsolete(qwritelocker.h QtCore qreadwritelock.h)
-katie_generate_obsolete(qtalgorithms.h QtCore qalgorithms.h)
-katie_generate_obsolete(qweakpointer.h QtCore qsharedpointer.h)
-katie_generate_obsolete(qtime.h QtCore qdatetime.h)
-katie_generate_obsolete(qscopedarraypointer.h QtCore qscopedpointer.h)
-katie_generate_obsolete(qmodelindexlist.h QtCore qabstractitemmodel.h)
-katie_generate_obsolete(qxmlstreamentityresolver.h QtCore qxmlstream.h)
+katie_generate_obsolete(qfileinfolist.h QtCore qfileinfo.h)
katie_generate_obsolete(qglobalstatic.h QtCore qglobal.h)
-katie_generate_obsolete(qxmlstreamentitydeclaration.h QtCore qxmlstream.h)
-katie_generate_obsolete(qatomicint.h QtCore qatomic.h)
-katie_generate_obsolete(qvariantlist.h QtCore qvariant.h)
-katie_generate_obsolete(qxmlstreamnamespacedeclarations.h QtCore qxmlstream.h)
-katie_generate_obsolete(qmetaclassinfo.h QtCore qmetaobject.h)
-katie_generate_obsolete(q_pid.h QtCore qprocess.h)
-katie_generate_obsolete(qtimerevent.h QtCore qcoreevent.h)
-katie_generate_obsolete(qbyteref.h QtCore qbytearray.h)
-katie_generate_obsolete(qpointf.h QtCore qpoint.h)
-katie_generate_obsolete(qxmlstreamentitydeclarations.h QtCore qxmlstream.h)
-katie_generate_obsolete(qlatin1char.h QtCore qchar.h)
+katie_generate_obsolete(qmutablesetiterator.h QtCore qset.h)
+katie_generate_obsolete(qdynamicpropertychangeevent.h QtCore qcoreevent.h)
+katie_generate_obsolete(qmutablelinkedlistiterator.h QtCore qlist.h)
+katie_generate_obsolete(qtextdecoder.h QtCore qtextcodec.h)
+katie_generate_obsolete(qjsonparseerror.h QtCore qjsondocument.h)
katie_generate_obsolete(qdbuspendingcallwatcher.h QtDBus qdbuspendingcall.h)
-katie_generate_obsolete(qdbussignature.h QtDBus qdbusextratypes.h)
katie_generate_obsolete(qdbusobjectpath.h QtDBus qdbusextratypes.h)
+katie_generate_obsolete(qdbusabstractinterfacebase.h QtDBus qdbusabstractinterface.h)
katie_generate_obsolete(qdbuspendingreplydata.h QtDBus qdbuspendingreply.h)
+katie_generate_obsolete(qdbussignature.h QtDBus qdbusextratypes.h)
katie_generate_obsolete(qdbusvariant.h QtDBus qdbusextratypes.h)
-katie_generate_obsolete(qdbusabstractinterfacebase.h QtDBus qdbusabstractinterface.h)
katie_generate_obsolete(qdeclarativelistproperty.h QtDeclarative qdeclarativelist.h)
-katie_generate_obsolete(qdesignertaskmenuextension.h QtDesigner taskmenu.h)
+katie_generate_obsolete(qdesignerwidgetboxinterface.h QtDesigner abstractwidgetbox.h)
+katie_generate_obsolete(qdesignerpropertyeditorinterface.h QtDesigner abstractpropertyeditor.h)
katie_generate_obsolete(qdesignerformwindowmanagerinterface.h QtDesigner abstractformwindowmanager.h)
-katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner customwidget.h)
-katie_generate_obsolete(qdesignermetadatabaseiteminterface.h QtDesigner abstractmetadatabase.h)
+katie_generate_obsolete(qdesignermetadatabaseinterface.h QtDesigner abstractmetadatabase.h)
+katie_generate_obsolete(qdesignerwidgetdatabaseinterface.h QtDesigner abstractwidgetdatabase.h)
katie_generate_obsolete(qdesignerwidgetfactoryinterface.h QtDesigner abstractwidgetfactory.h)
-katie_generate_obsolete(qdesignercontainerextension.h QtDesigner container.h)
-katie_generate_obsolete(qdesignerdnditeminterface.h QtDesigner abstractdnditem.h)
katie_generate_obsolete(qdesignerobjectinspectorinterface.h QtDesigner abstractobjectinspector.h)
-katie_generate_obsolete(qdesignerformwindowinterface.h QtDesigner abstractformwindow.h)
-katie_generate_obsolete(qdesignerextrainfoextension.h QtDesigner extrainfo.h)
katie_generate_obsolete(qdesignerintegrationinterface.h QtDesigner abstractintegration.h)
katie_generate_obsolete(qdesignerformeditorinterface.h QtDesigner abstractformeditor.h)
-katie_generate_obsolete(qdesignerlayoutdecorationextension.h QtDesigner layoutdecoration.h)
katie_generate_obsolete(qdesignerpromotioninterface.h QtDesigner abstractpromotioninterface.h)
-katie_generate_obsolete(qdesignerformeditorplugininterface.h QtDesigner abstractformeditorplugin.h)
-katie_generate_obsolete(qdesignerformwindowcursorinterface.h QtDesigner abstractformwindowcursor.h)
-katie_generate_obsolete(qdesignermembersheetextension.h QtDesigner membersheet.h)
-katie_generate_obsolete(qdesignerresourcebrowserinterface.h QtDesigner abstractresourcebrowser.h)
+katie_generate_obsolete(qdesignerformwindowinterface.h QtDesigner abstractformwindow.h)
+katie_generate_obsolete(qdesignerlayoutdecorationextension.h QtDesigner layoutdecoration.h)
katie_generate_obsolete(qdesignerbrushmanagerinterface.h QtDesigner abstractbrushmanager.h)
+katie_generate_obsolete(qabstractformbuilder.h QtDesigner abstractformbuilder.h)
+katie_generate_obsolete(qdesignericoncacheinterface.h QtDesigner abstracticoncache.h)
katie_generate_obsolete(qdesignerpropertysheetextension.h QtDesigner propertysheet.h)
+katie_generate_obsolete(qdesignercontainerextension.h QtDesigner container.h)
+katie_generate_obsolete(qdesigneractioneditorinterface.h QtDesigner abstractactioneditor.h)
+katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner customwidget.h)
+katie_generate_obsolete(qdesignerlanguageextension.h QtDesigner abstractlanguage.h)
+katie_generate_obsolete(qdesignerresourcebrowserinterface.h QtDesigner abstractresourcebrowser.h)
+katie_generate_obsolete(qdesignermembersheetextension.h QtDesigner membersheet.h)
+katie_generate_obsolete(qdesignertaskmenuextension.h QtDesigner taskmenu.h)
+katie_generate_obsolete(qdesignerformwindowcursorinterface.h QtDesigner abstractformwindowcursor.h)
katie_generate_obsolete(qdesignerwidgetdatabaseiteminterface.h QtDesigner abstractwidgetdatabase.h)
katie_generate_obsolete(qdesignercustomwidgetcollectioninterface.h QtDesigner customwidget.h)
+katie_generate_obsolete(qdesignerdynamicpropertysheetextension.h QtDesigner dynamicpropertysheet.h)
+katie_generate_obsolete(qdesignerformeditorplugininterface.h QtDesigner abstractformeditorplugin.h)
+katie_generate_obsolete(qdesignerformwindowtoolinterface.h QtDesigner abstractformwindowtool.h)
+katie_generate_obsolete(qdesignerextrainfoextension.h QtDesigner extrainfo.h)
katie_generate_obsolete(qextensionfactory.h QtDesigner default_extensionfactory.h)
-katie_generate_obsolete(qdesignericoncacheinterface.h QtDesigner abstracticoncache.h)
-katie_generate_obsolete(qdesignerpropertyeditorinterface.h QtDesigner abstractpropertyeditor.h)
+katie_generate_obsolete(qdesignermetadatabaseiteminterface.h QtDesigner abstractmetadatabase.h)
+katie_generate_obsolete(qdesignerdnditeminterface.h QtDesigner abstractdnditem.h)
katie_generate_obsolete(qdesignercomponents.h QtDesigner qdesigner_components.h)
-katie_generate_obsolete(qdesignerformwindowtoolinterface.h QtDesigner abstractformwindowtool.h)
-katie_generate_obsolete(qdesignerlanguageextension.h QtDesigner abstractlanguage.h)
-katie_generate_obsolete(qabstractformbuilder.h QtDesigner abstractformbuilder.h)
-katie_generate_obsolete(qdesigneractioneditorinterface.h QtDesigner abstractactioneditor.h)
-katie_generate_obsolete(qdesignerdynamicpropertysheetextension.h QtDesigner dynamicpropertysheet.h)
-katie_generate_obsolete(qdesignermetadatabaseinterface.h QtDesigner abstractmetadatabase.h)
-katie_generate_obsolete(qdesignerwidgetdatabaseinterface.h QtDesigner abstractwidgetdatabase.h)
-katie_generate_obsolete(qdesignerwidgetboxinterface.h QtDesigner abstractwidgetbox.h)
-katie_generate_obsolete(qdoublespinbox.h QtGui qspinbox.h)
-katie_generate_obsolete(qmoveevent.h QtGui qevent.h)
-katie_generate_obsolete(qiconenginepluginv2.h QtGui qiconengineplugin.h)
-katie_generate_obsolete(qstyleoptionrubberband.h QtGui qstyleoption.h)
-katie_generate_obsolete(qtexttableformat.h QtGui qtextformat.h)
-katie_generate_obsolete(qaccessibleinterfaceex.h QtGui qaccessible.h)
-katie_generate_obsolete(qundocommand.h QtGui qundostack.h)
-katie_generate_obsolete(qtextblock.h QtGui qtextobject.h)
-katie_generate_obsolete(qtextblockuserdata.h QtGui qtextobject.h)
-katie_generate_obsolete(qfileopenevent.h QtGui qevent.h)
-katie_generate_obsolete(qshortcutevent.h QtGui qevent.h)
-katie_generate_obsolete(qlistwidgetitem.h QtGui qlistwidget.h)
-katie_generate_obsolete(qaccessibleimageinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qitemselectionrange.h QtGui qitemselectionmodel.h)
-katie_generate_obsolete(qmouseevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptiondockwidget.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptiondockwidgetv2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstylehintreturnmask.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptionviewitem.h QtGui qstyleoption.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(qtexttablecell.h QtGui qtexttable.h)
+katie_generate_obsolete(qpainterpathstroker.h QtGui qpainterpath.h)
+katie_generate_obsolete(qgraphicspolygonitem.h QtGui qgraphicsitem.h)
katie_generate_obsolete(qgraphicsellipseitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qwheelevent.h QtGui qevent.h)
+katie_generate_obsolete(qsplitterhandle.h QtGui qsplitter.h)
+katie_generate_obsolete(qgraphicsdropshadoweffect.h QtGui qgraphicseffect.h)
katie_generate_obsolete(qgraphicspixmapitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qtextframe.h QtGui qtextobject.h)
-katie_generate_obsolete(qstyleoptiontabv3.h QtGui qstyleoption.h)
-katie_generate_obsolete(qiconenginefactoryinterface.h QtGui qiconengineplugin.h)
-katie_generate_obsolete(qstyleoptionslider.h QtGui qstyleoption.h)
-katie_generate_obsolete(qtextlistformat.h QtGui qtextformat.h)
-katie_generate_obsolete(qspaceritem.h QtGui qlayoutitem.h)
+katie_generate_obsolete(qgraphicsrectitem.h QtGui qgraphicsitem.h)
+katie_generate_obsolete(qgraphicsscale.h QtGui qgraphicstransform.h)
+katie_generate_obsolete(qgraphicsitemgroup.h QtGui qgraphicsitem.h)
+katie_generate_obsolete(qgraphicslineitem.h QtGui qgraphicsitem.h)
+katie_generate_obsolete(qgraphicspathitem.h QtGui qgraphicsitem.h)
+katie_generate_obsolete(qconicalgradient.h QtGui qbrush.h)
+katie_generate_obsolete(qplaintextdocumentlayout.h QtGui qplaintextedit.h)
katie_generate_obsolete(qgraphicsopacityeffect.h QtGui qgraphicseffect.h)
-katie_generate_obsolete(qgraphicsobject.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qlineargradient.h QtGui qbrush.h)
+katie_generate_obsolete(qpinchgesture.h QtGui qgesture.h)
katie_generate_obsolete(qgestureevent.h QtGui qevent.h)
-katie_generate_obsolete(qtextblockformat.h QtGui qtextformat.h)
-katie_generate_obsolete(qstyleoptionbutton.h QtGui qstyleoption.h)
+katie_generate_obsolete(qicondragevent.h QtGui qevent.h)
+katie_generate_obsolete(qiconenginefactoryinterface.h QtGui qiconengineplugin.h)
+katie_generate_obsolete(qiconenginefactoryinterfacev2.h QtGui qiconengineplugin.h)
+katie_generate_obsolete(qiconenginepluginv2.h QtGui qiconengineplugin.h)
katie_generate_obsolete(qimageiohandlerfactoryinterface.h QtGui qimageiohandler.h)
-katie_generate_obsolete(qtouchevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptiongraphicsitem.h QtGui qstyleoption.h)
-katie_generate_obsolete(qaccessibleinterface.h QtGui qaccessible.h)
-katie_generate_obsolete(qactionevent.h QtGui qevent.h)
+katie_generate_obsolete(qinputcontextfactoryinterface.h QtGui qinputcontextplugin.h)
+katie_generate_obsolete(qinputmethodevent.h QtGui qevent.h)
+katie_generate_obsolete(qitemeditorcreator.h QtGui qitemeditorfactory.h)
+katie_generate_obsolete(qitemeditorcreatorbase.h QtGui qitemeditorfactory.h)
+katie_generate_obsolete(qgraphicsscenehoverevent.h QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(qgraphicssceneresizeevent.h QtGui qgraphicssceneevent.h)
katie_generate_obsolete(qgraphicsscenedragdropevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qhelpevent.h QtGui qevent.h)
-katie_generate_obsolete(qabstractundoitem.h QtGui qtextdocument.h)
-katie_generate_obsolete(qiconenginev2.h QtGui qiconengine.h)
-katie_generate_obsolete(qgraphicsscale.h QtGui qgraphicstransform.h)
-katie_generate_obsolete(qtextlength.h QtGui qtextformat.h)
+katie_generate_obsolete(qgraphicsscenecontextmenuevent.h QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(qgraphicsscenehelpevent.h QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(qgraphicsscenemoveevent.h QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(qgraphicstextitem.h QtGui qgraphicsitem.h)
+katie_generate_obsolete(qgraphicssimpletextitem.h QtGui qgraphicsitem.h)
+katie_generate_obsolete(qgraphicsrotation.h QtGui qgraphicstransform.h)
+katie_generate_obsolete(qgraphicsobject.h QtGui qgraphicsitem.h)
+katie_generate_obsolete(qintvalidator.h QtGui qvalidator.h)
+katie_generate_obsolete(qpolygonf.h QtGui qpolygon.h)
+katie_generate_obsolete(qgraphicsscenewheelevent.h QtGui qgraphicssceneevent.h)
+katie_generate_obsolete(qgraphicsscenemouseevent.h QtGui qgraphicssceneevent.h)
katie_generate_obsolete(qresizeevent.h QtGui qevent.h)
-katie_generate_obsolete(qtablewidgetitem.h QtGui qtablewidget.h)
-katie_generate_obsolete(qstyleoptionprogressbar.h QtGui qstyleoption.h)
+katie_generate_obsolete(qmouseevent.h QtGui qevent.h)
+katie_generate_obsolete(qkeyevent.h QtGui qevent.h)
+katie_generate_obsolete(qwheelevent.h QtGui qevent.h)
katie_generate_obsolete(qdragenterevent.h QtGui qevent.h)
-katie_generate_obsolete(qtreewidgetitem.h QtGui qtreewidget.h)
-katie_generate_obsolete(qwizardpage.h QtGui qwizard.h)
-katie_generate_obsolete(qhoverevent.h QtGui qevent.h)
-katie_generate_obsolete(qgraphicsscenehoverevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qtextline.h QtGui qtextlayout.h)
-katie_generate_obsolete(qgraphicsscenemouseevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qgraphicsscenewheelevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qiconenginefactoryinterfacev2.h QtGui qiconengineplugin.h)
+katie_generate_obsolete(qwindowstatechangeevent.h QtGui qevent.h)
katie_generate_obsolete(qtevents.h QtGui qevent.h)
-katie_generate_obsolete(qradialgradient.h QtGui qbrush.h)
-katie_generate_obsolete(qaccessibleapplication.h QtGui qaccessibleobject.h)
-katie_generate_obsolete(qgraphicssimpletextitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qgraphicssceneresizeevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qaccessiblebridgeplugin.h QtGui qaccessiblebridge.h)
+katie_generate_obsolete(qtextline.h QtGui qtextlayout.h)
+katie_generate_obsolete(qtextframe.h QtGui qtextobject.h)
+katie_generate_obsolete(qtextcharformat.h QtGui qtextformat.h)
+katie_generate_obsolete(qtextblockformat.h QtGui qtextformat.h)
+katie_generate_obsolete(qundocommand.h QtGui qundostack.h)
+katie_generate_obsolete(qtouchevent.h QtGui qevent.h)
+katie_generate_obsolete(qdropevent.h QtGui qevent.h)
+katie_generate_obsolete(qmoveevent.h QtGui qevent.h)
+katie_generate_obsolete(qstylehintreturnmask.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiongroupbox.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptioncombobox.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionspinbox.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptioncomplex.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionbutton.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionframe.h QtGui qstyleoption.h)
katie_generate_obsolete(qstyleoptionframev2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qtexttablecell.h QtGui qtexttable.h)
-katie_generate_obsolete(qinputevent.h QtGui qevent.h)
+katie_generate_obsolete(qstyleoptionframev3.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionprogressbar.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionprogressbarv2.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiontoolbar.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionslider.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiontoolbutton.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionrubberband.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiontab.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiontabv2.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiontabv3.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiontabbarbase.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiontabwidgetframe.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiontabwidgetframev2.h QtGui qstyleoption.h)
+katie_generate_obsolete(qtextlistformat.h QtGui qtextformat.h)
+katie_generate_obsolete(qgradient.h QtGui qbrush.h)
+katie_generate_obsolete(qfontmetricsf.h QtGui qfontmetrics.h)
+katie_generate_obsolete(qstyleoptiontitlebar.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionfocusrect.h QtGui qstyleoption.h)
katie_generate_obsolete(qwidgetitem.h QtGui qlayoutitem.h)
-katie_generate_obsolete(qplaintextdocumentlayout.h QtGui qplaintextedit.h)
-katie_generate_obsolete(qgraphicsitemgroup.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qstyleoptiongroupbox.h QtGui qstyleoption.h)
-katie_generate_obsolete(qitemeditorcreatorbase.h QtGui qitemeditorfactory.h)
-katie_generate_obsolete(qhboxlayout.h QtGui qboxlayout.h)
+katie_generate_obsolete(qshortcutevent.h QtGui qevent.h)
+katie_generate_obsolete(qactionevent.h QtGui qevent.h)
+katie_generate_obsolete(qstandarditem.h QtGui qstandarditemmodel.h)
+katie_generate_obsolete(qabstractundoitem.h QtGui qtextdocument.h)
+katie_generate_obsolete(qwidgetlist.h QtGui qwindowdefs.h)
+katie_generate_obsolete(qlistwidgetitem.h QtGui qlistwidget.h)
katie_generate_obsolete(qcloseevent.h QtGui qevent.h)
-katie_generate_obsolete(qgraphicsrotation.h QtGui qgraphicstransform.h)
-katie_generate_obsolete(qintvalidator.h QtGui qvalidator.h)
-katie_generate_obsolete(qaccessibleactioninterface.h QtGui qaccessible2.h)
+katie_generate_obsolete(qhideevent.h QtGui qevent.h)
+katie_generate_obsolete(qshowevent.h QtGui qevent.h)
+katie_generate_obsolete(qdragmoveevent.h QtGui qevent.h)
+katie_generate_obsolete(qhelpevent.h QtGui qevent.h)
+katie_generate_obsolete(qdoublevalidator.h QtGui qvalidator.h)
+katie_generate_obsolete(qtreewidgetitem.h QtGui qtreewidget.h)
+katie_generate_obsolete(qtexttableformat.h QtGui qtextformat.h)
+katie_generate_obsolete(qiconenginev2.h QtGui qiconengine.h)
+katie_generate_obsolete(qitemselection.h QtGui qitemselectionmodel.h)
+katie_generate_obsolete(qcontextmenuevent.h QtGui qevent.h)
katie_generate_obsolete(qpaintevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptiontitlebar.h QtGui qstyleoption.h)
-katie_generate_obsolete(qgraphicsdropshadoweffect.h QtGui qgraphicseffect.h)
-katie_generate_obsolete(qstyleoptiontab.h QtGui qstyleoption.h)
-katie_generate_obsolete(qwidgetlist.h QtGui qwindowdefs.h)
-katie_generate_obsolete(qstyleoptionframev3.h QtGui qstyleoption.h)
-katie_generate_obsolete(qconicalgradient.h QtGui qbrush.h)
-katie_generate_obsolete(qgraphicspathitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qfontmetricsf.h QtGui qfontmetrics.h)
+katie_generate_obsolete(qhoverevent.h QtGui qevent.h)
+katie_generate_obsolete(qinputevent.h QtGui qevent.h)
+katie_generate_obsolete(qdragleaveevent.h QtGui qevent.h)
+katie_generate_obsolete(qfileopenevent.h QtGui qevent.h)
katie_generate_obsolete(qabstractgraphicsshapeitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qinputcontextfactoryinterface.h QtGui qinputcontextplugin.h)
-katie_generate_obsolete(qaccessibleevent.h QtGui qaccessible.h)
+katie_generate_obsolete(qitemselectionrange.h QtGui qitemselectionmodel.h)
+katie_generate_obsolete(qimageioplugin.h QtGui qimageiohandler.h)
katie_generate_obsolete(qfocusevent.h QtGui qevent.h)
-katie_generate_obsolete(qgraphicspolygonitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qstyleoptionspinbox.h QtGui qstyleoption.h)
-katie_generate_obsolete(qaccessibletable2interface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qaccessibleobjectex.h QtGui qaccessibleobject.h)
-katie_generate_obsolete(qwindowstatechangeevent.h QtGui qevent.h)
-katie_generate_obsolete(qaccessiblefactoryinterface.h QtGui qaccessibleplugin.h)
-katie_generate_obsolete(qgraphicsrectitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qstyleoptiontabv2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptiontoolbutton.h QtGui qstyleoption.h)
-katie_generate_obsolete(qaccessibletable2cellinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qtextcharformat.h QtGui qtextformat.h)
-katie_generate_obsolete(qkeyevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptiontabbarbase.h QtGui qstyleoption.h)
+katie_generate_obsolete(qlineargradient.h QtGui qbrush.h)
+katie_generate_obsolete(qdoublespinbox.h QtGui qspinbox.h)
+katie_generate_obsolete(qstyleoptionviewitem.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionviewitemv2.h QtGui qstyleoption.h)
katie_generate_obsolete(qstyleoptionviewitemv3.h QtGui qstyleoption.h)
-katie_generate_obsolete(qdropevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptionheader.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptionframe.h QtGui qstyleoption.h)
-katie_generate_obsolete(qdragleaveevent.h QtGui qevent.h)
-katie_generate_obsolete(qgraphicslineitem.h QtGui qgraphicsitem.h)
katie_generate_obsolete(qstyleoptionviewitemv4.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstandarditem.h QtGui qstandarditemmodel.h)
-katie_generate_obsolete(qstyleoptionprogressbarv2.h QtGui qstyleoption.h)
-katie_generate_obsolete(qgraphicstextitem.h QtGui qgraphicsitem.h)
-katie_generate_obsolete(qpainterpathstroker.h QtGui qpainterpath.h)
-katie_generate_obsolete(qdateedit.h QtGui qdatetimeedit.h)
-katie_generate_obsolete(qvboxlayout.h QtGui qboxlayout.h)
-katie_generate_obsolete(qgradient.h QtGui qbrush.h)
+katie_generate_obsolete(qstyleoptiondockwidget.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptiondockwidgetv2.h QtGui qstyleoption.h)
+katie_generate_obsolete(qstyleoptionheader.h QtGui qstyleoption.h)
katie_generate_obsolete(qtimeedit.h QtGui qdatetimeedit.h)
-katie_generate_obsolete(qitemselection.h QtGui qitemselectionmodel.h)
-katie_generate_obsolete(qgraphicsscenemoveevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qstyleoptionviewitemv2.h QtGui qstyleoption.h)
katie_generate_obsolete(qstyleoptionmenuitem.h QtGui qstyleoption.h)
-katie_generate_obsolete(qaccessiblesimpleeditabletextinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qsplitterhandle.h QtGui qsplitter.h)
-katie_generate_obsolete(qaccessibleeditabletextinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qhideevent.h QtGui qevent.h)
-katie_generate_obsolete(qpolygonf.h QtGui qpolygon.h)
-katie_generate_obsolete(qicondragevent.h QtGui qevent.h)
-katie_generate_obsolete(qimagetextkeylang.h QtGui qimage.h)
-katie_generate_obsolete(qimageioplugin.h QtGui qimageiohandler.h)
-katie_generate_obsolete(qgraphicsscenehelpevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qdoublevalidator.h QtGui qvalidator.h)
-katie_generate_obsolete(qstyleoptioncomplex.h QtGui qstyleoption.h)
-katie_generate_obsolete(qstyleoptionfocusrect.h QtGui qstyleoption.h)
-katie_generate_obsolete(qaccessiblebridgefactoryinterface.h QtGui qaccessiblebridge.h)
-katie_generate_obsolete(qdragmoveevent.h QtGui qevent.h)
-katie_generate_obsolete(qstyleoptiontoolbar.h QtGui qstyleoption.h)
-katie_generate_obsolete(qinputmethodevent.h QtGui qevent.h)
+katie_generate_obsolete(qstyleoptiongraphicsitem.h QtGui qstyleoption.h)
+katie_generate_obsolete(qtextblock.h QtGui qtextobject.h)
+katie_generate_obsolete(qtextblockuserdata.h QtGui qtextobject.h)
+katie_generate_obsolete(qtablewidgetitem.h QtGui qtablewidget.h)
+katie_generate_obsolete(qdateedit.h QtGui qdatetimeedit.h)
+katie_generate_obsolete(qwizardpage.h QtGui qwizard.h)
+katie_generate_obsolete(qradialgradient.h QtGui qbrush.h)
katie_generate_obsolete(qregexpvalidator.h QtGui qvalidator.h)
-katie_generate_obsolete(qgraphicsscenecontextmenuevent.h QtGui qgraphicssceneevent.h)
-katie_generate_obsolete(qpinchgesture.h QtGui qgesture.h)
-katie_generate_obsolete(qshowevent.h QtGui qevent.h)
katie_generate_obsolete(qaccessible2interface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qitemeditorcreator.h QtGui qitemeditorfactory.h)
-katie_generate_obsolete(qcontextmenuevent.h QtGui qevent.h)
+katie_generate_obsolete(qaccessibleactioninterface.h QtGui qaccessible2.h)
+katie_generate_obsolete(qaccessibleapplication.h QtGui qaccessibleobject.h)
+katie_generate_obsolete(qaccessiblebridgefactoryinterface.h QtGui qaccessiblebridge.h)
+katie_generate_obsolete(qaccessiblebridgeplugin.h QtGui qaccessiblebridge.h)
+katie_generate_obsolete(qaccessibleeditabletextinterface.h QtGui qaccessible2.h)
+katie_generate_obsolete(qaccessiblefactoryinterface.h QtGui qaccessibleplugin.h)
+katie_generate_obsolete(qaccessibleimageinterface.h QtGui qaccessible2.h)
+katie_generate_obsolete(qaccessibleevent.h QtGui qaccessible.h)
+katie_generate_obsolete(qaccessibleinterface.h QtGui qaccessible.h)
+katie_generate_obsolete(qaccessibleinterfaceex.h QtGui qaccessible.h)
+katie_generate_obsolete(qaccessibleobjectex.h QtGui qaccessibleobject.h)
+katie_generate_obsolete(qaccessiblesimpleeditabletextinterface.h QtGui qaccessible2.h)
+katie_generate_obsolete(qaccessibletable2cellinterface.h QtGui qaccessible2.h)
+katie_generate_obsolete(qaccessibletable2interface.h QtGui qaccessible2.h)
katie_generate_obsolete(qaccessibletableinterface.h QtGui qaccessible2.h)
-katie_generate_obsolete(qstyleoptioncombobox.h QtGui qstyleoption.h)
-katie_generate_obsolete(qhttpheader.h QtNetwork qhttp.h)
-katie_generate_obsolete(qhttprequestheader.h QtNetwork qhttp.h)
+katie_generate_obsolete(qtextlength.h QtGui qtextformat.h)
katie_generate_obsolete(qnetworkproxyfactory.h QtNetwork qnetworkproxy.h)
-katie_generate_obsolete(qnetworkcachemetadata.h QtNetwork qabstractnetworkcache.h)
+katie_generate_obsolete(qnetworkproxyquery.h QtNetwork qnetworkproxy.h)
+katie_generate_obsolete(qhttprequestheader.h QtNetwork qhttp.h)
katie_generate_obsolete(qhttpresponseheader.h QtNetwork qhttp.h)
+katie_generate_obsolete(qhttpheader.h QtNetwork qhttp.h)
katie_generate_obsolete(qhttppart.h QtNetwork qhttpmultipart.h)
-katie_generate_obsolete(qnetworkproxyquery.h QtNetwork qnetworkproxy.h)
-katie_generate_obsolete(qnetworkaddressentry.h QtNetwork qnetworkinterface.h)
katie_generate_obsolete(qnetworkconfigurationmanager.h QtNetwork qnetworkconfigmanager.h)
-katie_generate_obsolete(qtestaccessibility.h QtTest qtestaccessible.h)
+katie_generate_obsolete(qnetworkaddressentry.h QtNetwork qnetworkinterface.h)
+katie_generate_obsolete(qnetworkcachemetadata.h QtNetwork qabstractnetworkcache.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(qtestdelayevent.h QtTest qtestevent.h)
katie_generate_obsolete(qspontanekeyevent.h QtTest qtestspontaneevent.h)
+katie_generate_obsolete(qtestaccessibility.h QtTest qtestaccessible.h)
katie_generate_obsolete(qtestaccessibilityevent.h QtTest qtestaccessible.h)
-katie_generate_obsolete(qttestgui.h QtTest qtest_gui.h)
-katie_generate_obsolete(qtestmouseevent.h QtTest qtestevent.h)
+katie_generate_obsolete(qtestdelayevent.h QtTest qtestevent.h)
+katie_generate_obsolete(qtesteventlist.h QtTest qtestevent.h)
+katie_generate_obsolete(qtestkeyclicksevent.h QtTest qtestevent.h)
katie_generate_obsolete(qtestkeyevent.h QtTest qtestevent.h)
-katie_generate_obsolete(qdomprocessinginstruction.h QtXml qdom.h)
-katie_generate_obsolete(qdomnamednodemap.h QtXml qdom.h)
-katie_generate_obsolete(qdomnodelist.h QtXml qdom.h)
-katie_generate_obsolete(qxmlsimplereader.h QtXml qxml.h)
-katie_generate_obsolete(qdomtext.h QtXml qdom.h)
-katie_generate_obsolete(qxmldtdhandler.h QtXml qxml.h)
+katie_generate_obsolete(qtestmouseevent.h QtTest qtestevent.h)
+katie_generate_obsolete(qttestgui.h QtTest qtest_gui.h)
+katie_generate_obsolete(qdomattr.h QtXml qdom.h)
katie_generate_obsolete(qdomdocument.h QtXml qdom.h)
-katie_generate_obsolete(qdomnotation.h QtXml qdom.h)
-katie_generate_obsolete(qdomdocumenttype.h QtXml qdom.h)
-katie_generate_obsolete(qxmlerrorhandler.h QtXml qxml.h)
-katie_generate_obsolete(qdomimplementation.h QtXml qdom.h)
-katie_generate_obsolete(qxmldefaulthandler.h QtXml qxml.h)
-katie_generate_obsolete(qxmlreader.h QtXml qxml.h)
katie_generate_obsolete(qdomelement.h QtXml qdom.h)
-katie_generate_obsolete(qdomcharacterdata.h QtXml qdom.h)
katie_generate_obsolete(qdomnode.h QtXml qdom.h)
-katie_generate_obsolete(qxmlattributes.h QtXml qxml.h)
-katie_generate_obsolete(qxmlinputsource.h QtXml qxml.h)
-katie_generate_obsolete(qxmlentityresolver.h QtXml qxml.h)
-katie_generate_obsolete(qdomattr.h QtXml qdom.h)
-katie_generate_obsolete(qxmlparseexception.h QtXml qxml.h)
-katie_generate_obsolete(qdomdocumentfragment.h QtXml qdom.h)
+katie_generate_obsolete(qdomnodelist.h QtXml qdom.h)
katie_generate_obsolete(qdomcdatasection.h QtXml qdom.h)
-katie_generate_obsolete(qxmllexicalhandler.h QtXml qxml.h)
+katie_generate_obsolete(qdomcharacterdata.h QtXml qdom.h)
+katie_generate_obsolete(qdomcomment.h QtXml qdom.h)
+katie_generate_obsolete(qdomdocumentfragment.h QtXml qdom.h)
+katie_generate_obsolete(qdomdocumenttype.h QtXml qdom.h)
+katie_generate_obsolete(qdomentity.h QtXml qdom.h)
katie_generate_obsolete(qdomentityreference.h QtXml qdom.h)
+katie_generate_obsolete(qdomimplementation.h QtXml qdom.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(qdomtext.h QtXml qdom.h)
katie_generate_obsolete(qxmldeclhandler.h QtXml qxml.h)
+katie_generate_obsolete(qxmldtdhandler.h QtXml qxml.h)
+katie_generate_obsolete(qxmlentityresolver.h QtXml qxml.h)
+katie_generate_obsolete(qxmlerrorhandler.h QtXml qxml.h)
+katie_generate_obsolete(qxmllexicalhandler.h QtXml qxml.h)
+katie_generate_obsolete(qxmllocator.h QtXml qxml.h)
katie_generate_obsolete(qxmlnamespacesupport.h QtXml qxml.h)
+katie_generate_obsolete(qxmlreader.h QtXml qxml.h)
+katie_generate_obsolete(qxmlsimplereader.h QtXml qxml.h)
+katie_generate_obsolete(qxmlattributes.h QtXml qxml.h)
+katie_generate_obsolete(qxmldefaulthandler.h QtXml qxml.h)
+katie_generate_obsolete(qxmlparseexception.h QtXml qxml.h)
katie_generate_obsolete(qxmlcontenthandler.h QtXml qxml.h)
-katie_generate_obsolete(qxmllocator.h QtXml qxml.h)
-katie_generate_obsolete(qdomcomment.h QtXml qdom.h)
-katie_generate_obsolete(qdomentity.h QtXml qdom.h)
+katie_generate_obsolete(qxmlinputsource.h QtXml qxml.h)
+katie_generate_obsolete(qxmlstreamattributes.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamentitydeclaration.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamentitydeclarations.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamentityresolver.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamnamespacedeclaration.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamnamespacedeclarations.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamnotationdeclaration.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamnotationdeclarations.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamreader.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamwriter.h QtXml qxmlstream.h)
+katie_generate_obsolete(qxmlstreamattribute.h QtXml qxmlstream.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)
katie_generate_obsolete(qx11embedwidget.h QtGui qx11embed_x11.h)
endif()
-# those have shuffled from QtXml to QtCore
-katie_generate_obsolete(qxmlstream.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamattribute.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamattributes.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamnotationdeclaration.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamnotationdeclarations.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamentitydeclaration.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamentitydeclarations.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamnamespacedeclaration.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamnamespacedeclarations.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamentityresolver.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamreader.h QtXml ../QtCore/qxmlstream.h)
-katie_generate_obsolete(qxmlstreamwriter.h QtXml ../QtCore/qxmlstream.h)
-# and those from QtDesigner to QtUiTools
+# those have shuffled from QtDesigner to QtUiTools
katie_generate_obsolete(customwidget.h QtDesigner ../QtUiTools/customwidget.h)
katie_generate_obsolete(qdesignercustomwidgetinterface.h QtDesigner ../QtUiTools/customwidget.h)
'QMutableSetIterator': 'qset.h',
'QDynamicPropertyChangeEvent': 'qcoreevent.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',
- 'QXmlStreamWriter': 'qxmlstream.h',
- 'QXmlStreamAttribute': 'qxmlstream.h',
'QTextDecoder': 'qtextcodec.h',
'QJsonParseError': 'qjsondocument.h',
},
'QXmlContentHandler': 'qxml.h',
'QXmlInputSource': 'qxml.h',
'QXmlDefaultHandler': 'qxml.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',
+ 'QXmlStreamWriter': 'qxmlstream.h',
+ 'QXmlStreamAttribute': 'qxmlstream.h',
},
'QtDeclarative': {
'QDeclarativeListProperty': 'qdeclarativelist.h',
QTypeInfo
QtConcurrentMap
QBitArray
- QAbstractAnimation
QChar
QTextCodecPlugin
- QParallelAnimationGroup
QMap
QTextStream
QDebug
QPlugin
QPluginLoader
QAtomicPointer
- QSequentialAnimationGroup
QFSFileEngine
QLine
QIODevice
QVector
QLibraryInfo
QTextStreamFunction
- QVariantAnimation
QLinkedList
QEvent
QVectorIterator
- QAnimationGroup
QGenericArgument
QObjectData
QTextEncoder
QNoDebug
QListData
QTextCodecFactoryInterface
- QPropertyAnimation
QStack
QMutableListIterator
QScopedPointerPodDeleter
QRegExp
QVariantComparisonHelper
QMetaObject
- QPauseAnimation
QMapData
QByteRef
QIntegerForSize
QMapNode
QLinkedListData
QLatin1Char
- QAnimationDriver
QBBSystemLocaleData
QDir
QObject
# obsolete
QFlags
Qt
- # both in core and xml
- QXmlStreamAttribute
- QXmlStreamAttributes
- QXmlStreamNotationDeclaration
- QXmlStreamNotationDeclarations
- QXmlStreamEntityDeclaration
- QXmlStreamEntityDeclarations
- QXmlStreamNamespaceDeclaration
- QXmlStreamNamespaceDeclarations
- QXmlStreamEntityResolver
- QXmlStreamReader
- QXmlStreamWriter
)
-include(animation/animation.cmake)
include(codecs/codecs.cmake)
include(concurrent/concurrent.cmake)
include(global/global.cmake)
include(plugin/plugin.cmake)
include(thread/thread.cmake)
include(tools/tools.cmake)
-include(xml/xml.cmake)
include_directories(
${CMAKE_BINARY_DIR}/include
${CMAKE_BINARY_DIR}/privateinclude
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/privateinclude/QtCore
- ${CMAKE_CURRENT_SOURCE_DIR}/animation
${CMAKE_CURRENT_SOURCE_DIR}/codecs
${CMAKE_CURRENT_SOURCE_DIR}/concurrent
${CMAKE_CURRENT_SOURCE_DIR}/global
${CMAKE_CURRENT_SOURCE_DIR}/plugin
${CMAKE_CURRENT_SOURCE_DIR}/thread
${CMAKE_CURRENT_SOURCE_DIR}/tools
- ${CMAKE_CURRENT_SOURCE_DIR}/xml
- ${CMAKE_CURRENT_BINARY_DIR}/animation
${CMAKE_CURRENT_BINARY_DIR}/codecs
${CMAKE_CURRENT_BINARY_DIR}/concurrent
${CMAKE_CURRENT_BINARY_DIR}/global
${CMAKE_CURRENT_BINARY_DIR}/plugin
${CMAKE_CURRENT_BINARY_DIR}/thread
${CMAKE_CURRENT_BINARY_DIR}/tools
- ${CMAKE_CURRENT_BINARY_DIR}/xml
${ZLIB_INCLUDE_DIRS}
${OPENSSL_INCLUDE_DIR}
)
+++ /dev/null
-set(CORE_HEADERS
- ${CORE_HEADERS}
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qabstractanimation.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qabstractanimation_p.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qvariantanimation.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qvariantanimation_p.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpropertyanimation.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpropertyanimation_p.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qanimationgroup.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qanimationgroup_p.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qsequentialanimationgroup.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qsequentialanimationgroup_p.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qparallelanimationgroup.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qparallelanimationgroup_p.h
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpauseanimation.h
-)
-
-set(CORE_SOURCES
- ${CORE_SOURCES}
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qabstractanimation.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qvariantanimation.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpropertyanimation.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qanimationgroup.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qsequentialanimationgroup.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qparallelanimationgroup.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpauseanimation.cpp
-)
+++ /dev/null
-set(CORE_HEADERS
- ${CORE_HEADERS}
- ${CMAKE_CURRENT_SOURCE_DIR}/xml/qxmlstream.h
- ${CMAKE_CURRENT_SOURCE_DIR}/xml/qxmlstream_p.h
- ${CMAKE_CURRENT_SOURCE_DIR}/xml/qxmlutils_p.h
-)
-
-set(CORE_SOURCES
- ${CORE_SOURCES}
- ${CMAKE_CURRENT_SOURCE_DIR}/xml/qxmlstream.cpp
- ${CMAKE_CURRENT_SOURCE_DIR}/xml/qxmlutils.cpp
-)
#include <QtCore/qvariant.h>
#include <QtCore/qeasingcurve.h>
-#include <QtCore/QAbstractAnimation>
+#include <QtGui/QAbstractAnimation>
#include <QtGui/qcolor.h>
QT_BEGIN_HEADER
#include <qdeclarativeitem.h>
#include <qdeclarativecontext.h>
-#include <QtCore/QPauseAnimation>
-#include <QtCore/QVariantAnimation>
-#include <QtCore/QAnimationGroup>
+#include <QtGui/QPauseAnimation>
+#include <QtGui/QVariantAnimation>
+#include <QtGui/QAnimationGroup>
#include <QtGui/QColor>
#include <QDebug>
#include <qdeclarativepropertyvaluesource.h>
#include <qdeclarativepropertyvalueinterceptor.h>
#include <qdeclarative.h>
-#include <QtCore/QAbstractAnimation>
+#include <QtGui/QAbstractAnimation>
QT_BEGIN_HEADER
//
#include <QtCore/QObject>
-#include <QtCore/QAbstractAnimation>
+#include <QtGui/QAbstractAnimation>
QT_BEGIN_NAMESPACE
#include "qdeclarativetimer_p.h"
#include <QtCore/qcoreapplication.h>
-#include <QtCore/qpauseanimation.h>
+#include <QtGui/qpauseanimation.h>
#include <qdebug.h>
#include <qobject_p.h>
#include <qdeclarative.h>
#include <QtCore/qobject.h>
-#include <QtCore/qabstractanimation.h>
+#include <QtGui/qabstractanimation.h>
#include <qdeclarativeglobal_p.h>
#include <qwidget.h>
#include <qgraphicswidget.h>
#include <qbasictimer.h>
-#include <QtCore/qabstractanimation.h>
+#include <qabstractanimation.h>
#include <qgraphicsview_p.h>
#include <qdeclarativeitem_p.h>
#include <qabstractanimation_p.h>
#include <QtCore/qdebug.h>
#include <QtCore/QBuffer>
#include <QtCore/QTimer>
-#include <QtCore/qxmlstream.h>
+#include <QtXml/QXmlStreamReader>
#include <QtGui/QMenu>
#include <QtGui/QAction>
#include <QtGui/QActionGroup>
#include <QtGui/QStackedWidget>
#include <QtGui/QTabWidget>
#include <QtGui/QButtonGroup>
-#include <QtGui/qpen.h>
+#include <QtGui/QPen>
Q_DECLARE_METATYPE(QWidget*)
#include <QtCore/QDir>
#include <QtCore/qmetaobject.h>
#include <QtCore/qdebug.h>
-#include <QtCore/qxmlstream.h>
+#include <QtXml/qxmlstream.h>
QT_BEGIN_NAMESPACE
#include <qdesigner_widgetbox_p.h>
-#include <QtGui/QTreeWidget>
-#include <QtGui/QIcon>
#include <QtCore/QList>
#include <QtCore/QHash>
-#include <QtCore/qxmlstream.h> // Cannot forward declare them on Mac
-#include <QtCore/qxmlstream.h>
+#include <QtXml/qxmlstream.h>
+#include <QtGui/QTreeWidget>
+#include <QtGui/QIcon>
QT_BEGIN_NAMESPACE
#include <widgetfactory_p.h>
#include <qdesigner_utils_p.h>
+#include <QtCore/QSharedData>
+#include <QtCore/QTextStream>
+#include <QtXml/qxmlstream.h>
#include <QtGui/QApplication>
#include <QtGui/QFont>
#include <QtGui/QDesktopWidget>
#include <QtGui/QStyleFactory>
#include <QtGui/QApplication>
-#include <QtCore/QSharedData>
-#include <QtCore/QTextStream>
-
-#include <QtCore/qxmlstream.h>
-#include <QtCore/qxmlstream.h>
-
static const char *dpiXPropertyC = "_q_customDpiX";
static const char *dpiYPropertyC = "_q_customDpiY";
#include "filterwidget_p.h"
#include "iconloader_p.h"
+#include <QtCore/QDebug>
#include <QtGui/QVBoxLayout>
#include <QtGui/QHBoxLayout>
#include <QtGui/QLineEdit>
#include <QtGui/QPainter>
#include <QtGui/QStyle>
#include <QtGui/QStyleOption>
-
-#include <QtCore/QDebug>
-#include <QtCore/QPropertyAnimation>
+#include <QtGui/QPropertyAnimation>
enum { debugFilter = 0 };
#include <QtCore/QMap>
#include <QtCore/QSettings>
#include <QtCore/QCoreApplication>
-
-#include <QtCore/qxmlstream.h>
-#include <QtCore/qxmlstream.h>
-#include <QtCore/qxmlstream.h>
+#include <QtXml/qxmlstream.h>
static const char *uiElementC = "ui";
static const char *languageAttributeC = "language";
#include <QtCore/QRegExp>
#include <QtCore/QDebug>
-#include <QtCore/qxmlstream.h>
+#include <QtXml/qxmlstream.h>
QT_BEGIN_NAMESPACE
#include <QtCore/QList>
#include <QtCore/QMap>
#include <QtCore/QPointer>
-#include <QtCore/qxmlstream.h>
-#include <QtCore/qxmlstream.h>
-#include <QtCore/qxmlstream.h>
-
+#include <QtXml/qxmlstream.h>
#include <QtGui/QAction>
#include <QtGui/QColorDialog>
#include <QtGui/QComboBox>
add_definitions(-DQT_BUILD_GUI_LIB)
-set(EXTRA_GUI_LIBS KtCore ${FREETYPE_LIBRARIES})
+set(EXTRA_GUI_LIBS KtCore KtXml ${FREETYPE_LIBRARIES})
set(GUI_PUBLIC_HEADERS
${GUI_PUBLIC_HEADERS}
+ QPropertyAnimation
+ QPauseAnimation
+ QAnimationDriver
+ QAnimationGroup
+ QVariantAnimation
+ QSequentialAnimationGroup
+ QParallelAnimationGroup
+ QAbstractAnimation
QAbstractButton
QAbstractItemDelegate
QAbstractItemView
${CMAKE_BINARY_DIR}/privateinclude
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/privateinclude/QtCore
+ ${CMAKE_BINARY_DIR}/include/QtXml
+ ${CMAKE_BINARY_DIR}/privateinclude/QtXml
${CMAKE_BINARY_DIR}/include/QtGui
${CMAKE_BINARY_DIR}/privateinclude/QtGui
${CMAKE_CURRENT_SOURCE_DIR}/accessible
katie_generate_misc("${GUI_HEADERS}" QtGui)
katie_generate_public("${GUI_PUBLIC_HEADERS}" QtGui)
-katie_generate_package(KtGui "KtCore")
+katie_generate_package(KtGui "KtCore KtXml")
katie_setup_target(KtGui ${GUI_SOURCES} ${GUI_HEADERS})
if(WITH_NSL AND NSL_FOUND)
+set(GUI_HEADERS
+ ${GUI_HEADERS}
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qabstractanimation.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qabstractanimation_p.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qvariantanimation.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qvariantanimation_p.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpropertyanimation.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpropertyanimation_p.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qanimationgroup.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qanimationgroup_p.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qsequentialanimationgroup.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qsequentialanimationgroup_p.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qparallelanimationgroup.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qparallelanimationgroup_p.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpauseanimation.h
+)
+
set(GUI_SOURCES
${GUI_SOURCES}
${CMAKE_CURRENT_SOURCE_DIR}/animation/qguivariantanimation.cpp
-)
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qabstractanimation.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qvariantanimation.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpropertyanimation.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qanimationgroup.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qsequentialanimationgroup.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qparallelanimationgroup.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/animation/qpauseanimation.cpp
+)
\ No newline at end of file
class QAnimationDriver;
class QAbstractAnimationPrivate;
-class Q_CORE_EXPORT QAbstractAnimation : public QObject
+class Q_GUI_EXPORT QAbstractAnimation : public QObject
{
Q_OBJECT
Q_ENUMS(State)
};
class QAnimationDriverPrivate;
-class Q_CORE_EXPORT QAnimationDriver : public QObject
+class Q_GUI_EXPORT QAnimationDriver : public QObject
{
Q_OBJECT
Q_DECLARE_PRIVATE(QAnimationDriver)
QBasicTimer m_timer;
};
-class Q_CORE_EXPORT QAnimationDriverPrivate : public QObjectPrivate
+class Q_GUI_EXPORT QAnimationDriverPrivate : public QObjectPrivate
{
public:
QAnimationDriverPrivate() : running(false) {}
bool running;
};
-class Q_CORE_EXPORT QUnifiedTimer : public QObject
+class Q_GUI_EXPORT QUnifiedTimer : public QObject
{
private:
QUnifiedTimer();
#ifndef QANIMATIONGROUP_H
#define QANIMATIONGROUP_H
-#include <QtCore/qabstractanimation.h>
+#include <QtGui/qabstractanimation.h>
QT_BEGIN_HEADER
#ifndef QT_NO_ANIMATION
class QAnimationGroupPrivate;
-class Q_CORE_EXPORT QAnimationGroup : public QAbstractAnimation
+class Q_GUI_EXPORT QAnimationGroup : public QAbstractAnimation
{
Q_OBJECT
** $QT_END_LICENSE$
**
****************************************************************************/
-#include <QtCore/qvariantanimation.h>
+#include <qvariantanimation.h>
#include <qvariantanimation_p.h>
#ifndef QT_NO_ANIMATION
#ifndef QPARALLELANIMATIONGROUP_H
#define QPARALLELANIMATIONGROUP_H
-#include <QtCore/qanimationgroup.h>
+#include <QtGui/qanimationgroup.h>
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
-
#ifndef QT_NO_ANIMATION
class QParallelAnimationGroupPrivate;
-class Q_CORE_EXPORT QParallelAnimationGroup : public QAnimationGroup
+class Q_GUI_EXPORT QParallelAnimationGroup : public QAnimationGroup
{
Q_OBJECT
#ifndef QPAUSEANIMATION_P_H
#define QPAUSEANIMATION_P_H
-#include <QtCore/qanimationgroup.h>
+#include <QtGui/qanimationgroup.h>
QT_BEGIN_HEADER
class QPauseAnimationPrivate;
-class Q_CORE_EXPORT QPauseAnimation : public QAbstractAnimation
+class Q_GUI_EXPORT QPauseAnimation : public QAbstractAnimation
{
Q_OBJECT
Q_PROPERTY(int duration READ duration WRITE setDuration)
#ifndef QPROPERTYANIMATION_H
#define QPROPERTYANIMATION_H
-#include <QtCore/qvariantanimation.h>
+#include <QtGui/qvariantanimation.h>
QT_BEGIN_HEADER
#ifndef QT_NO_ANIMATION
class QPropertyAnimationPrivate;
-class Q_CORE_EXPORT QPropertyAnimation : public QVariantAnimation
+class Q_GUI_EXPORT QPropertyAnimation : public QVariantAnimation
{
Q_OBJECT
Q_PROPERTY(QByteArray propertyName READ propertyName WRITE setPropertyName)
#ifndef QSEQUENTIALANIMATIONGROUP_H
#define QSEQUENTIALANIMATIONGROUP_H
-#include <QtCore/qanimationgroup.h>
+#include <QtGui/qanimationgroup.h>
QT_BEGIN_HEADER
class QPauseAnimation;
class QSequentialAnimationGroupPrivate;
-class Q_CORE_EXPORT QSequentialAnimationGroup : public QAnimationGroup
+class Q_GUI_EXPORT QSequentialAnimationGroup : public QAnimationGroup
{
Q_OBJECT
Q_PROPERTY(QAbstractAnimation* currentAnimation READ currentAnimation NOTIFY currentAnimationChanged)
#define QANIMATION_H
#include <QtCore/qeasingcurve.h>
-#include <QtCore/qabstractanimation.h>
#include <QtCore/qvector.h>
#include <QtCore/qvariant.h>
#include <QtCore/qpair.h>
+#include <QtGui/qabstractanimation.h>
QT_BEGIN_HEADER
#ifndef QT_NO_ANIMATION
class QVariantAnimationPrivate;
-class Q_CORE_EXPORT QVariantAnimation : public QAbstractAnimation
+class Q_GUI_EXPORT QVariantAnimation : public QAbstractAnimation
{
Q_OBJECT
Q_PROPERTY(QVariant startValue READ startValue WRITE setStartValue)
void updateInterpolator();
//XXX this is needed by dui
- static Q_CORE_EXPORT QVariantAnimation::Interpolator getInterpolator(int interpolationType);
+ static Q_GUI_EXPORT QVariantAnimation::Interpolator getInterpolator(int interpolationType);
};
//this should make the interpolation faster
#include <qabstractitemview_p.h>
#include <QtCore/qabstractitemmodel.h>
-#include <QtCore/qpropertyanimation.h>
+#include <QtGui/qpropertyanimation.h>
#include <QtGui/qabstractitemdelegate.h>
#include <QtGui/qabstractitemview.h>
#include <QtGui/qitemdelegate.h>
//
#include "qabstractitemview_p.h"
-#include <QtCore/qvariantanimation.h>
#include <QtCore/qabstractitemmodel.h>
+#include <QtGui/qvariantanimation.h>
#ifndef QT_NO_TREEVIEW
// We mean it.
//
-#include <QtCore/qxmlstream.h>
+#include <QtXml/qxmlstream.h>
#include <QtCore/qset.h>
#include <QtCore/qstack.h>
**
****************************************************************************/
-#include <QtCore/qpropertyanimation.h>
+#include <QtGui/qpropertyanimation.h>
#include <QtGui/qwidget.h>
#include <QtGui/qmainwindowlayout_p.h>
#include <qdeclarativeitem_p.h>
#include <qdeclarativepixmapcache_p.h>
-#include <QtCore/QAbstractAnimation>
+#include <QAbstractAnimation>
#include <QPainter>
#include <QVarLengthArray>
#include "qscriptxmlparser_p.h"
#include <QtCore/qstringlist.h>
-#include <QtCore/qxmlstream.h>
#include <QtCore/qdebug.h>
+#include <QtXml/qxmlstream.h>
QT_BEGIN_NAMESPACE
{ "QTextDecoder", "QtCore/qtextcodec.h"},
{ "QTextCodecFactoryInterface", "QtCore/qtextcodecplugin.h"},
{ "QTextCodecPlugin", "QtCore/qtextcodecplugin.h"},
- { "QXmlStreamAttribute", "QtCore/qxmlstream.h"},
- { "QXmlStreamAttributes", "QtCore/qxmlstream.h"},
- { "QXmlStreamNamespaceDeclaration", "QtCore/qxmlstream.h"},
- { "QXmlStreamNotationDeclaration", "QtCore/qxmlstream.h"},
- { "QXmlStreamEntityDeclaration", "QtCore/qxmlstream.h"},
- { "QXmlStreamEntityResolver", "QtCore/qxmlstream.h"},
- { "QXmlStreamReader", "QtCore/qxmlstream.h"},
- { "QXmlStreamWriter", "QtCore/qxmlstream.h"},
{ "QFutureInterfaceBase", "QtCore/qfutureinterface.h"},
{ "QFutureWatcherBase", "QtCore/qfuturewatcher.h"},
{ "Exception", "QtCore/qtconcurrentexception.h"},
{ "QLibrary", "QtCore/qlibrary.h"},
{ "QPluginLoader", "QtCore/qpluginloader.h"},
{ "QUuid", "QtCore/quuid.h"},
- { "QAbstractAnimation", "QtCore/qabstractanimation.h"},
- { "QAnimationDriver", "QtCore/qabstractanimation.h"},
- { "QAnimationGroup", "QtCore/qanimationgroup.h"},
- { "QParallelAnimationGroup", "QtCore/qparallelanimationgroup.h"},
- { "QPauseAnimation", "QtCore/qpauseanimation.h"},
- { "QPropertyAnimation", "QtCore/qpropertyanimation.h"},
- { "QSequentialAnimationGroup", "QtCore/qsequentialanimationgroup.h"},
- { "QVariantAnimation", "QtCore/qvariantanimation.h"},
{ "QLibraryInfo", "QtCore/qlibraryinfo.h"},
{ "QInternal", "QtCore/qnamespace.h"},
{ "QJsonArray", "QtCore/qjsonarray.h"},
{ "QGraphicsBlurEffect", "QtGui/qgraphicseffect.h"},
{ "QGraphicsDropShadowEffect", "QtGui/qgraphicseffect.h"},
{ "QGraphicsOpacityEffect", "QtGui/qgraphicseffect.h"},
+ { "QAbstractAnimation", "QtGui/qabstractanimation.h"},
+ { "QAnimationDriver", "QtGui/qabstractanimation.h"},
+ { "QAnimationGroup", "QtGui/qanimationgroup.h"},
+ { "QParallelAnimationGroup", "QtGui/qparallelanimationgroup.h"},
+ { "QPauseAnimation", "QtGui/qpauseanimation.h"},
+ { "QPropertyAnimation", "QtGui/qpropertyanimation.h"},
+ { "QSequentialAnimationGroup", "QtGui/qsequentialanimationgroup.h"},
+ { "QVariantAnimation", "QtGui/qvariantanimation.h"},
{ "QMatrix4x4", "QtGui/qmatrix4x4.h"},
{ "QQuaternion", "QtGui/qquaternion.h"},
{ "QVector2D", "QtGui/qvector2d.h"},
{ "QXmlLexicalHandler", "QtXml/qxml.h"},
{ "QXmlDeclHandler", "QtXml/qxml.h"},
{ "QXmlDefaultHandler", "QtXml/qxml.h"},
+ { "QXmlStreamAttribute", "QtXml/qxmlstream.h"},
+ { "QXmlStreamAttributes", "QtXml/qxmlstream.h"},
+ { "QXmlStreamNamespaceDeclaration", "QtXml/qxmlstream.h"},
+ { "QXmlStreamNotationDeclaration", "QtXml/qxmlstream.h"},
+ { "QXmlStreamEntityDeclaration", "QtXml/qxmlstream.h"},
+ { "QXmlStreamEntityResolver", "QtXml/qxmlstream.h"},
+ { "QXmlStreamReader", "QtXml/qxmlstream.h"},
+ { "QXmlStreamWriter", "QtXml/qxmlstream.h"},
{ "QScriptable", "QtScript/qscriptable.h"},
{ "QScriptClass", "QtScript/qscriptclass.h"},
{ "QScriptClassPropertyIterator", "QtScript/qscriptclasspropertyiterator.h"},
add_definitions(-DQT_BUILD_SVG_LIB)
-set(EXTRA_SVG_LIBS KtCore KtGui)
+set(EXTRA_SVG_LIBS KtCore KtXml KtGui)
set(SVG_PUBLIC_HEADERS
${SVG_PUBLIC_HEADERS}
${CMAKE_BINARY_DIR}/privateinclude
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/privateinclude/QtCore
+ ${CMAKE_BINARY_DIR}/include/QtXml
+ ${CMAKE_BINARY_DIR}/privateinclude/QtXml
${CMAKE_BINARY_DIR}/include/QtGui
${CMAKE_BINARY_DIR}/privateinclude/QtGui
${CMAKE_BINARY_DIR}/include/QtSvg
katie_generate_misc("${SVG_HEADERS}" QtSvg)
katie_generate_public("${SVG_PUBLIC_HEADERS}" QtSvg)
-katie_generate_package(KtSvg "KtCore KtGui")
+katie_generate_package(KtSvg "KtCore KtXml KtGui")
katie_setup_target(KtSvg ${SVG_SOURCES} ${SVG_HEADERS})
add_library(KtSvg ${KATIE_TYPE} ${KtSvg_SOURCES})
#include <QtCore/qobject.h>
#include <QtCore/qsize.h>
#include <QtCore/qrect.h>
-#include <QtCore/qxmlstream.h>
+#include <QtXml/qxmlstream.h>
QT_BEGIN_HEADER
#include "QtCore/qlist.h"
#include "QtCore/qhash.h"
#include "QtCore/qdatetime.h"
-#include "QtCore/qxmlstream.h"
+#include "QtXml/qxmlstream.h"
#include "qsvgstyle_p.h"
#include "qsvgfont_p.h"
add_definitions(-DQT_UIC)
-set(EXTRA_UIC_LIBS KtCore)
+set(EXTRA_UIC_LIBS KtCore KtXml)
include_directories(
${CMAKE_BINARY_DIR}/include
${CMAKE_BINARY_DIR}/privateinclude
${CMAKE_BINARY_DIR}/include/QtCore
${CMAKE_BINARY_DIR}/privateinclude/QtCore
+ ${CMAKE_BINARY_DIR}/include/QtXml
+ ${CMAKE_BINARY_DIR}/privateinclude/QtXml
${CMAKE_CURRENT_SOURCE_DIR}
${CMAKE_CURRENT_SOURCE_DIR}/cpp
)
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtCore/QStringList>
-
-#include <QtCore/qxmlstream.h>
-#include <QtCore/qglobal.h>
+#include <QtXml/qxmlstream.h>
QT_BEGIN_NAMESPACE
-
-
#define QDESIGNER_UILIB_EXTERN Q_DECL_EXPORT
#define QDESIGNER_UILIB_IMPORT Q_DECL_IMPORT
#include "cppwriteincludes.h"
#include "cppwritedeclaration.h"
-#include <QtCore/qxmlstream.h>
#include <QtCore/QFileInfo>
#include <QtCore/QRegExp>
#include <QtCore/QTextStream>
#include <QtCore/QDateTime>
+#include <QtXml/qxmlstream.h>
QT_BEGIN_NAMESPACE
#include <QtCore/QStringList>
#include <QtCore/QHash>
#include <QtCore/QStack>
-#include <QtCore/qxmlstream.h>
+#include <QtXml/qxmlstream.h>
QT_BEGIN_NAMESPACE
#include <QtCore/QList>
#include <QtCore/QString>
#include <QtCore/QStringList>
-#include <QtCore/qxmlstream.h>
-#include <QtCore/qxmlstream.h>
+#include <QtXml/qxmlstream.h>
QT_BEGIN_NAMESPACE
QXmlReader
QXmlDefaultHandler
QXmlInputSource
- # both in core and xml
QXmlStreamAttribute
QXmlStreamAttributes
QXmlStreamNotationDeclaration
)
include(dom/dom.cmake)
+include(kernel/kernel.cmake)
include(sax/sax.cmake)
include_directories(
${CMAKE_BINARY_DIR}/include/QtXml
${CMAKE_BINARY_DIR}/privateinclude/QtXml
${CMAKE_CURRENT_SOURCE_DIR}/dom
+ ${CMAKE_CURRENT_SOURCE_DIR}/kernel
${CMAKE_CURRENT_SOURCE_DIR}/sax
)
+set(XML_HEADERS
+ ${XML_HEADERS}
+ ${CMAKE_CURRENT_SOURCE_DIR}/qxmlcommon_p.h
+)
+
katie_generate_misc("${XML_HEADERS}" QtXml)
katie_generate_public("${XML_PUBLIC_HEADERS}" QtXml)
katie_generate_package(KtXml "KtCore")
--- /dev/null
+set(XML_HEADERS
+ ${XML_HEADERS}
+ ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qxmlstream.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qxmlstream_p.h
+ ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qxmlutils_p.h
+)
+
+set(XML_SOURCES
+ ${XML_SOURCES}
+ ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qxmlstream.cpp
+ ${CMAKE_CURRENT_SOURCE_DIR}/kernel/qxmlutils.cpp
+)
**
****************************************************************************/
-#include "QtCore/qxmlstream.h"
+#include "qxmlstream.h"
#ifndef QT_NO_XMLSTREAM
#include <qstack.h>
#include <qbuffer.h>
#include <qcoreapplication.h>
+#include "qxmlcommon_p.h"
QT_BEGIN_NAMESPACE
return 0;
}
-enum NameChar { NameBeginning, NameNotBeginning, NotName };
-
-static const char Begi = static_cast<char>(NameBeginning);
-static const char NtBg = static_cast<char>(NameNotBeginning);
-static const char NotN = static_cast<char>(NotName);
-
-static const char nameCharTable[128] =
-{
-// 0x00
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
-// 0x10
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
-// 0x20 (0x2D is '-', 0x2E is '.')
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
- NotN, NotN, NotN, NotN, NotN, NtBg, NtBg, NotN,
-// 0x30 (0x30..0x39 are '0'..'9', 0x3A is ':')
- NtBg, NtBg, NtBg, NtBg, NtBg, NtBg, NtBg, NtBg,
- NtBg, NtBg, Begi, NotN, NotN, NotN, NotN, NotN,
-// 0x40 (0x41..0x5A are 'A'..'Z')
- NotN, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
- Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
-// 0x50 (0x5F is '_')
- Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
- Begi, Begi, Begi, NotN, NotN, NotN, NotN, Begi,
-// 0x60 (0x61..0x7A are 'a'..'z')
- NotN, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
- Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
-// 0x70
- Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
- Begi, Begi, Begi, NotN, NotN, NotN, NotN, NotN
-};
-
-static inline NameChar fastDetermineNameChar(QChar ch)
-{
- ushort uc = ch.unicode();
- if (!(uc & ~0x7f)) // uc < 128
- return static_cast<NameChar>(nameCharTable[uc]);
-
- QChar::Category cat = ch.category();
- // ### some these categories might be slightly wrong
- if ((cat >= QChar::Letter_Uppercase && cat <= QChar::Letter_Other)
- || cat == QChar::Number_Letter)
- return NameBeginning;
- if ((cat >= QChar::Number_DecimalDigit && cat <= QChar::Number_Other)
- || (cat >= QChar::Mark_NonSpacing && cat <= QChar::Mark_Enclosing))
- return NameNotBeginning;
- return NotName;
-}
-
inline int QXmlStreamReaderPrivate::fastScanNMTOKEN()
{
int n = 0;
uint c;
while ((c = getChar())) {
- if (fastDetermineNameChar(c) == NotName) {
+ if (determineNameChar(c) == NotName) {
putChar(c);
return n;
} else {
class QXmlStreamReaderPrivate;
class QXmlStreamAttributes;
-class Q_CORE_EXPORT QXmlStreamAttribute {
+class Q_XML_EXPORT QXmlStreamAttribute {
QStringRef m_name, m_namespaceUri, m_qualifiedName, m_value;
bool m_isDefault : 1;
friend class QXmlStreamReaderPrivate;
Q_DECLARE_TYPEINFO(QXmlStreamAttribute, Q_MOVABLE_TYPE);
-class Q_CORE_EXPORT QXmlStreamAttributes : public QVector<QXmlStreamAttribute>
+class Q_XML_EXPORT QXmlStreamAttributes : public QVector<QXmlStreamAttribute>
{
public:
inline QXmlStreamAttributes() {}
#endif
};
-class Q_CORE_EXPORT QXmlStreamNamespaceDeclaration {
+class Q_XML_EXPORT QXmlStreamNamespaceDeclaration {
QStringRef m_prefix, m_namespaceUri;
friend class QXmlStreamReaderPrivate;
Q_DECLARE_TYPEINFO(QXmlStreamNamespaceDeclaration, Q_MOVABLE_TYPE);
typedef QVector<QXmlStreamNamespaceDeclaration> QXmlStreamNamespaceDeclarations;
-class Q_CORE_EXPORT QXmlStreamNotationDeclaration {
+class Q_XML_EXPORT QXmlStreamNotationDeclaration {
QStringRef m_name, m_systemId, m_publicId;
friend class QXmlStreamReaderPrivate;
Q_DECLARE_TYPEINFO(QXmlStreamNotationDeclaration, Q_MOVABLE_TYPE);
typedef QVector<QXmlStreamNotationDeclaration> QXmlStreamNotationDeclarations;
-class Q_CORE_EXPORT QXmlStreamEntityDeclaration {
+class Q_XML_EXPORT QXmlStreamEntityDeclaration {
QStringRef m_name, m_notationName, m_systemId, m_publicId, m_value;
friend class QXmlStreamReaderPrivate;
typedef QVector<QXmlStreamEntityDeclaration> QXmlStreamEntityDeclarations;
-class Q_CORE_EXPORT QXmlStreamEntityResolver
+class Q_XML_EXPORT QXmlStreamEntityResolver
{
public:
virtual ~QXmlStreamEntityResolver();
};
#ifndef QT_NO_XMLSTREAMREADER
-class Q_CORE_EXPORT QXmlStreamReader {
+class Q_XML_EXPORT QXmlStreamReader {
Q_GADGET
Q_PROPERTY(bool namespaceProcessing READ namespaceProcessing WRITE setNamespaceProcessing)
public:
class QXmlStreamWriterPrivate;
-class Q_CORE_EXPORT QXmlStreamWriter
+class Q_XML_EXPORT QXmlStreamWriter
{
Q_GADGET
Q_PROPERTY(bool autoFormatting READ autoFormatting WRITE setAutoFormatting)
\short This class contains helper functions related to XML, for validating character classes,
productions in the XML specification, and so on.
*/
-class Q_CORE_EXPORT QXmlUtils
+class Q_XML_EXPORT QXmlUtils
{
public:
static bool isEncName(const QString &encName);
--- /dev/null
+#ifndef QXMLCOMMON_P_H
+#define QXMLCOMMON_P_H
+
+#include "qstring.h"
+
+QT_BEGIN_NAMESPACE
+
+enum NameChar { NameBeginning, NameNotBeginning, NotName };
+
+static const char Begi = (char)NameBeginning;
+static const char NtBg = (char)NameNotBeginning;
+static const char NotN = (char)NotName;
+
+static const char nameCharTable[128] =
+{
+// 0x00
+ NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
+ NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
+// 0x10
+ NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
+ NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
+// 0x20 (0x2D is '-', 0x2E is '.')
+ NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
+ NotN, NotN, NotN, NotN, NotN, NtBg, NtBg, NotN,
+// 0x30 (0x30..0x39 are '0'..'9', 0x3A is ':')
+ NtBg, NtBg, NtBg, NtBg, NtBg, NtBg, NtBg, NtBg,
+ NtBg, NtBg, Begi, NotN, NotN, NotN, NotN, NotN,
+// 0x40 (0x41..0x5A are 'A'..'Z')
+ NotN, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
+ Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
+// 0x50 (0x5F is '_')
+ Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
+ Begi, Begi, Begi, NotN, NotN, NotN, NotN, Begi,
+// 0x60 (0x61..0x7A are 'a'..'z')
+ NotN, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
+ Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
+// 0x70
+ Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
+ Begi, Begi, Begi, NotN, NotN, NotN, NotN, NotN
+};
+
+static NameChar determineNameChar(QChar ch)
+{
+ ushort uc = ch.unicode();
+ if (!(uc & ~0x7f)) // uc < 128
+ return (NameChar)nameCharTable[uc];
+
+ QChar::Category cat = ch.category();
+ // ### some these categories might be slightly wrong
+ if ((cat >= QChar::Letter_Uppercase && cat <= QChar::Letter_Other)
+ || cat == QChar::Number_Letter)
+ return NameBeginning;
+ if ((cat >= QChar::Number_DecimalDigit && cat <= QChar::Number_Other)
+ || (cat >= QChar::Mark_NonSpacing && cat <= QChar::Mark_Enclosing))
+ return NameNotBeginning;
+ return NotName;
+}
+
+QT_END_NAMESPACE
+
+#endif // QXMLCOMMON_P_H
#include "qmap.h"
#include "qhash.h"
#include "qstack.h"
-#include <qdebug.h>
+#include "qdebug.h"
+#include "qxmlcommon_p.h"
//#define QT_QXML_DEBUG
//
// local helper functions
//
+static inline bool is_S(QChar ch)
+{
+ ushort uc = ch.unicode();
+ return (uc == ' ' || uc == '\t' || uc == '\n' || uc == '\r');
+}
/*
This function strips the TextDecl [77] ("<?xml ...?>") from the string \a
locking mechanism, such as a QMutex.
*/
-static inline bool is_S(QChar ch)
-{
- ushort uc = ch.unicode();
- return (uc == ' ' || uc == '\t' || uc == '\n' || uc == '\r');
-}
-
-enum NameChar { NameBeginning, NameNotBeginning, NotName };
-
-static const char Begi = (char)NameBeginning;
-static const char NtBg = (char)NameNotBeginning;
-static const char NotN = (char)NotName;
-
-static const char nameCharTable[128] =
-{
-// 0x00
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
-// 0x10
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
-// 0x20 (0x2D is '-', 0x2E is '.')
- NotN, NotN, NotN, NotN, NotN, NotN, NotN, NotN,
- NotN, NotN, NotN, NotN, NotN, NtBg, NtBg, NotN,
-// 0x30 (0x30..0x39 are '0'..'9', 0x3A is ':')
- NtBg, NtBg, NtBg, NtBg, NtBg, NtBg, NtBg, NtBg,
- NtBg, NtBg, Begi, NotN, NotN, NotN, NotN, NotN,
-// 0x40 (0x41..0x5A are 'A'..'Z')
- NotN, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
- Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
-// 0x50 (0x5F is '_')
- Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
- Begi, Begi, Begi, NotN, NotN, NotN, NotN, Begi,
-// 0x60 (0x61..0x7A are 'a'..'z')
- NotN, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
- Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
-// 0x70
- Begi, Begi, Begi, Begi, Begi, Begi, Begi, Begi,
- Begi, Begi, Begi, NotN, NotN, NotN, NotN, NotN
-};
-
-static inline NameChar fastDetermineNameChar(QChar ch)
-{
- ushort uc = ch.unicode();
- if (!(uc & ~0x7f)) // uc < 128
- return (NameChar)nameCharTable[uc];
-
- QChar::Category cat = ch.category();
- // ### some these categories might be slightly wrong
- if ((cat >= QChar::Letter_Uppercase && cat <= QChar::Letter_Other)
- || cat == QChar::Number_Letter)
- return NameBeginning;
- if ((cat >= QChar::Number_DecimalDigit && cat <= QChar::Number_Other)
- || (cat >= QChar::Mark_NonSpacing && cat <= QChar::Mark_Enclosing))
- return NameNotBeginning;
- return NotName;
-}
-
-static NameChar determineNameChar(QChar ch)
-{
- return fastDetermineNameChar(ch);
-}
-
/*!
Constructs a simple XML reader.
unexpectedEof(&QXmlSimpleReaderPrivate::parseElement, state);
return false;
}
- if (fastDetermineNameChar(c) == NameBeginning) {
+ if (determineNameChar(c) == NameBeginning) {
input = InpNameBe;
} else if (c == QLatin1Char('>')) {
input = InpGt;
}
// we can safely do the (int) cast thanks to the Q_ASSERTs earlier in this function
- state = table[state][(int)fastDetermineNameChar(c)];
+ state = table[state][(int)determineNameChar(c)];
switch (state) {
case Name1:
OSDN Git Service
