Clean up declarative includes
authorKent Hansen <kent.hansen@nokia.com>
Wed, 12 Oct 2011 06:26:22 +0000 (08:26 +0200)
committerQt by Nokia <qt-info@nokia.com>
Mon, 17 Oct 2011 10:20:11 +0000 (12:20 +0200)
commit7fa3aa4d48c3b7d9bf17b6135bc6bdeb62e899d2
treee5dfde8932ae195d5f1d60e34afaa7f9a27410de
parentcbedc09b7c28c178813371a6cf9c0e7de58f96cc
Clean up declarative includes

(This commit is in preparation of moving several files
to a separate library (QtQuick2).)

Don't add all subfolders to the includepath (from the
.pri files). There's no good reason to do that.

For headers (both public and private) that are in the
same folder as the file that includes them, prefer to use

 #include "foo.h"
 #include "bar_p.h"

For public headers that are outside the current folder
but have "unambiguous" names (e.g. qdeclarative prefix), use

 #include <foo.h>

For private headers that are outside the current folder, use

 #include <private/baz_p.h>

Also change

 #include <QtDeclarative/private/foo_p.h>

to

 #include <private/foo_p.h>

The header filenames already have a qdeclarative or qsg
prefix; there's no need to prefix by module name to
disambiguate.

Finally,

 #include "private/foo_p.h"

should be avoided. private/ is used for auto-generated
(forwarding) headers, which never reside in the current
(source) directory. Use angle brackets instead.

Change-Id: I04f8477fdba043546064ee276475c09dc373f8f2
Reviewed-by: Jędrzej Nowacki <jedrzej.nowacki@nokia.com>
160 files changed:
src/declarative/debugger/debugger.pri
src/declarative/debugger/qdeclarativedebugclient.cpp
src/declarative/debugger/qdeclarativedebuggerstatus.cpp
src/declarative/debugger/qdeclarativedebughelper.cpp
src/declarative/debugger/qdeclarativedebugserver.cpp
src/declarative/debugger/qdeclarativedebugserverconnection_p.h
src/declarative/debugger/qdeclarativedebugservice.cpp
src/declarative/debugger/qdeclarativeenginedebug.cpp
src/declarative/debugger/qdeclarativeenginedebugservice.cpp
src/declarative/debugger/qdeclarativeinspectorinterface_p.h
src/declarative/debugger/qdeclarativeinspectorservice.cpp
src/declarative/debugger/qdeclarativeinspectorservice_p.h
src/declarative/debugger/qpacketprotocol.cpp
src/declarative/debugger/qv8debugservice.cpp
src/declarative/debugger/qv8debugservice_p.h
src/declarative/debugger/qv8profilerservice.cpp
src/declarative/debugger/qv8profilerservice_p.h
src/declarative/designer/designersupport.cpp
src/declarative/items/context2d/context2d.pri
src/declarative/items/context2d/qsgcanvasitem.cpp
src/declarative/items/context2d/qsgcanvasitem_p.h
src/declarative/items/context2d/qsgcontext2d.cpp
src/declarative/items/context2d/qsgcontext2dcommandbuffer.cpp
src/declarative/items/context2d/qsgcontext2dcommandbuffer_p.h
src/declarative/items/context2d/qsgcontext2dnode_p.h
src/declarative/items/context2d/qsgcontext2dtexture.cpp
src/declarative/items/context2d/qsgcontext2dtexture_p.h
src/declarative/items/items.pri
src/declarative/items/qsganimation.cpp
src/declarative/items/qsgimplicitsizeitem.cpp
src/declarative/items/qsgimplicitsizeitem_p_p.h
src/declarative/items/qsgitemsmodule.cpp
src/declarative/items/qsgloader_p_p.h
src/declarative/items/qsgshadereffect.cpp
src/declarative/items/qsgtextinput.cpp
src/declarative/items/qsgtextnode_p.h
src/declarative/items/qsgview_p.h
src/declarative/items/qsgvisualadaptormodel_p.h
src/declarative/particles/particles.pri
src/declarative/particles/qsgcustomparticle_p.h
src/declarative/particles/qsggroupgoal.cpp
src/declarative/particles/qsgimageparticle.cpp
src/declarative/particles/qsgitemparticle.cpp
src/declarative/particles/qsgparticlegroup_p.h
src/declarative/particles/qsgparticlesystem.cpp
src/declarative/particles/qsgparticlesystem_p.h
src/declarative/particles/qsgspritegoal.cpp
src/declarative/qml/ftw/ftw.pri
src/declarative/qml/parser/parser.pri
src/declarative/qml/qdeclarativebinding.cpp
src/declarative/qml/qdeclarativebinding_p.h
src/declarative/qml/qdeclarativebinding_p_p.h
src/declarative/qml/qdeclarativeboundsignal.cpp
src/declarative/qml/qdeclarativecleanup.cpp
src/declarative/qml/qdeclarativecompileddata.cpp
src/declarative/qml/qdeclarativecompiler.cpp
src/declarative/qml/qdeclarativecompiler_p.h
src/declarative/qml/qdeclarativecomponent.cpp
src/declarative/qml/qdeclarativecomponent_p.h
src/declarative/qml/qdeclarativecontext.cpp
src/declarative/qml/qdeclarativecontext_p.h
src/declarative/qml/qdeclarativecustomparser.cpp
src/declarative/qml/qdeclarativecustomparser_p.h
src/declarative/qml/qdeclarativecustomparser_p_p.h
src/declarative/qml/qdeclarativedirparser.cpp
src/declarative/qml/qdeclarativeengine.cpp
src/declarative/qml/qdeclarativeengine_p.h
src/declarative/qml/qdeclarativeexpression.cpp
src/declarative/qml/qdeclarativefastproperties.cpp
src/declarative/qml/qdeclarativeimport.cpp
src/declarative/qml/qdeclarativeincubator.cpp
src/declarative/qml/qdeclarativeinfo.cpp
src/declarative/qml/qdeclarativeinstruction.cpp
src/declarative/qml/qdeclarativeintegercache.cpp
src/declarative/qml/qdeclarativeintegercache_p.h
src/declarative/qml/qdeclarativelist.cpp
src/declarative/qml/qdeclarativelist_p.h
src/declarative/qml/qdeclarativemetatype.cpp
src/declarative/qml/qdeclarativenotifier.cpp
src/declarative/qml/qdeclarativenotifier_p.h
src/declarative/qml/qdeclarativeproperty.cpp
src/declarative/qml/qdeclarativepropertycache.cpp
src/declarative/qml/qdeclarativepropertycache_p.h
src/declarative/qml/qdeclarativeproxymetaobject.cpp
src/declarative/qml/qdeclarativerewrite.cpp
src/declarative/qml/qdeclarativescript.cpp
src/declarative/qml/qdeclarativesqldatabase.cpp
src/declarative/qml/qdeclarativestringconverters.cpp
src/declarative/qml/qdeclarativetypenamecache.cpp
src/declarative/qml/qdeclarativetypenamecache_p.h
src/declarative/qml/qdeclarativevaluetype.cpp
src/declarative/qml/qdeclarativevaluetype_p.h
src/declarative/qml/qdeclarativevme.cpp
src/declarative/qml/qdeclarativevme_p.h
src/declarative/qml/qdeclarativevmemetaobject.cpp
src/declarative/qml/qdeclarativevmemetaobject_p.h
src/declarative/qml/qdeclarativewatcher.cpp
src/declarative/qml/qdeclarativeworkerscript.cpp
src/declarative/qml/qdeclarativexmlhttprequest.cpp
src/declarative/qml/qml.pri
src/declarative/qml/rewriter/rewriter.pri
src/declarative/qml/rewriter/textwriter.cpp
src/declarative/qml/v4/qv4bindings.cpp
src/declarative/qml/v4/qv4ir_p.h
src/declarative/qml/v4/v4.pri
src/declarative/qml/v8/qjsvalueiterator_impl_p.h
src/declarative/qml/v8/qv8bindings_p.h
src/declarative/qml/v8/qv8variantwrapper.cpp
src/declarative/qml/v8/script.pri
src/declarative/qml/v8/v8.pri
src/declarative/scenegraph/coreapi/qsgrenderer.cpp
src/declarative/scenegraph/qsgdistancefieldglyphnode_p.h
src/declarative/scenegraph/scenegraph.pri
src/declarative/scenegraph/util/qsgtextureprovider.cpp
src/declarative/util/qdeclarativeanimation.cpp
src/declarative/util/qdeclarativeanimation_p.h
src/declarative/util/qdeclarativeanimation_p_p.h
src/declarative/util/qdeclarativebehavior.cpp
src/declarative/util/qdeclarativebehavior_p.h
src/declarative/util/qdeclarativebind.cpp
src/declarative/util/qdeclarativeconnections.cpp
src/declarative/util/qdeclarativefontloader.cpp
src/declarative/util/qdeclarativelistaccessor.cpp
src/declarative/util/qdeclarativelistmodel.cpp
src/declarative/util/qdeclarativelistmodel_p_p.h
src/declarative/util/qdeclarativelistmodelworkeragent.cpp
src/declarative/util/qdeclarativelistmodelworkeragent_p.h
src/declarative/util/qdeclarativeopenmetaobject.cpp
src/declarative/util/qdeclarativepackage.cpp
src/declarative/util/qdeclarativepath.cpp
src/declarative/util/qdeclarativepath_p.h
src/declarative/util/qdeclarativepath_p_p.h
src/declarative/util/qdeclarativepathinterpolator.cpp
src/declarative/util/qdeclarativepixmapcache.cpp
src/declarative/util/qdeclarativepropertychanges.cpp
src/declarative/util/qdeclarativepropertychanges_p.h
src/declarative/util/qdeclarativepropertymap.cpp
src/declarative/util/qdeclarativesmoothedanimation.cpp
src/declarative/util/qdeclarativesmoothedanimation_p.h
src/declarative/util/qdeclarativesmoothedanimation_p_p.h
src/declarative/util/qdeclarativespringanimation.cpp
src/declarative/util/qdeclarativespringanimation_p.h
src/declarative/util/qdeclarativestate.cpp
src/declarative/util/qdeclarativestate_p_p.h
src/declarative/util/qdeclarativestategroup.cpp
src/declarative/util/qdeclarativestategroup_p.h
src/declarative/util/qdeclarativestateoperations.cpp
src/declarative/util/qdeclarativestateoperations_p.h
src/declarative/util/qdeclarativestyledtext.cpp
src/declarative/util/qdeclarativesystempalette.cpp
src/declarative/util/qdeclarativetimeline.cpp
src/declarative/util/qdeclarativetimer.cpp
src/declarative/util/qdeclarativetransition.cpp
src/declarative/util/qdeclarativetransition_p.h
src/declarative/util/qdeclarativetransitionmanager.cpp
src/declarative/util/qdeclarativetransitionmanager_p_p.h
src/declarative/util/qdeclarativeutilmodule.cpp
src/declarative/util/qdeclarativexmllistmodel.cpp
src/declarative/util/qlistmodelinterface.cpp
src/declarative/util/util.pri