Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Kent Hansen authored and Qt by Nokia committed Oct 17, 2011
1 parent cbedc09 commit 7fa3aa4
Show file tree
Hide file tree
Showing 160 changed files with 516 additions and 543 deletions.
2 changes: 0 additions & 2 deletions src/declarative/debugger/debugger.pri
@@ -1,5 +1,3 @@
INCLUDEPATH += $$PWD

SOURCES += \
$$PWD/qdeclarativedebuggerstatus.cpp \
$$PWD/qpacketprotocol.cpp \
Expand Down
4 changes: 2 additions & 2 deletions src/declarative/debugger/qdeclarativedebugclient.cpp
Expand Up @@ -39,9 +39,9 @@
**
****************************************************************************/

#include "private/qdeclarativedebugclient_p.h"
#include "qdeclarativedebugclient_p.h"

#include "private/qpacketprotocol_p.h"
#include "qpacketprotocol_p.h"

#include <QtCore/qdebug.h>
#include <QtCore/qstringlist.h>
Expand Down
2 changes: 1 addition & 1 deletion src/declarative/debugger/qdeclarativedebuggerstatus.cpp
Expand Up @@ -39,7 +39,7 @@
**
****************************************************************************/

#include "private/qdeclarativedebuggerstatus_p.h"
#include "qdeclarativedebuggerstatus_p.h"

QT_BEGIN_NAMESPACE

Expand Down
2 changes: 1 addition & 1 deletion src/declarative/debugger/qdeclarativedebughelper.cpp
Expand Up @@ -39,7 +39,7 @@
**
****************************************************************************/

#include "private/qdeclarativedebughelper_p.h"
#include "qdeclarativedebughelper_p.h"

#include <QtCore/QAbstractAnimation>
#include <QtDeclarative/QJSEngine>
Expand Down
8 changes: 4 additions & 4 deletions src/declarative/debugger/qdeclarativedebugserver.cpp
Expand Up @@ -39,10 +39,10 @@
**
****************************************************************************/

#include "private/qdeclarativedebugserver_p.h"
#include "private/qdeclarativedebugservice_p.h"
#include "private/qdeclarativedebugservice_p_p.h"
#include "private/qdeclarativeengine_p.h"
#include "qdeclarativedebugserver_p.h"
#include "qdeclarativedebugservice_p.h"
#include "qdeclarativedebugservice_p_p.h"
#include <private/qdeclarativeengine_p.h>

#include <QtCore/QDir>
#include <QtCore/QPluginLoader>
Expand Down
Expand Up @@ -42,7 +42,7 @@
#ifndef QDECLARATIVEDEBUGSERVERCONNECTION_H
#define QDECLARATIVEDEBUGSERVERCONNECTION_H

#include <QtDeclarative/private/qdeclarativeglobal_p.h>
#include <private/qdeclarativeglobal_p.h>

//
// W A R N I N G
Expand Down
6 changes: 3 additions & 3 deletions src/declarative/debugger/qdeclarativedebugservice.cpp
Expand Up @@ -39,9 +39,9 @@
**
****************************************************************************/

#include "private/qdeclarativedebugservice_p.h"
#include "private/qdeclarativedebugservice_p_p.h"
#include "private/qdeclarativedebugserver_p.h"
#include "qdeclarativedebugservice_p.h"
#include "qdeclarativedebugservice_p_p.h"
#include "qdeclarativedebugserver_p.h"

#include <QtCore/QDebug>
#include <QtCore/QStringList>
Expand Down
6 changes: 3 additions & 3 deletions src/declarative/debugger/qdeclarativeenginedebug.cpp
Expand Up @@ -39,11 +39,11 @@
**
****************************************************************************/

#include "private/qdeclarativeenginedebug_p.h"
#include "qdeclarativeenginedebug_p.h"

#include "private/qdeclarativedebugclient_p.h"
#include "qdeclarativedebugclient_p.h"

#include <qdeclarativeenginedebugservice_p.h>
#include "qdeclarativeenginedebugservice_p.h"

#include <private/qobject_p.h>

Expand Down
28 changes: 14 additions & 14 deletions src/declarative/debugger/qdeclarativeenginedebugservice.cpp
Expand Up @@ -39,20 +39,20 @@
**
****************************************************************************/

#include "private/qdeclarativeenginedebugservice_p.h"

#include "private/qdeclarativeboundsignal_p.h"
#include "qdeclarativeengine.h"
#include "private/qdeclarativemetatype_p.h"
#include "qdeclarativeproperty.h"
#include "private/qdeclarativeproperty_p.h"
#include "private/qdeclarativebinding_p.h"
#include "private/qdeclarativecontext_p.h"
#include "private/qdeclarativewatcher_p.h"
#include "private/qdeclarativevaluetype_p.h"
#include "private/qdeclarativevmemetaobject_p.h"
#include "private/qdeclarativeexpression_p.h"
#include "private/qdeclarativepropertychanges_p.h"
#include "qdeclarativeenginedebugservice_p.h"

#include <private/qdeclarativeboundsignal_p.h>
#include <qdeclarativeengine.h>
#include <private/qdeclarativemetatype_p.h>
#include <qdeclarativeproperty.h>
#include <private/qdeclarativeproperty_p.h>
#include <private/qdeclarativebinding_p.h>
#include <private/qdeclarativecontext_p.h>
#include <private/qdeclarativewatcher_p.h>
#include <private/qdeclarativevaluetype_p.h>
#include <private/qdeclarativevmemetaobject_p.h>
#include <private/qdeclarativeexpression_p.h>
#include <private/qdeclarativepropertychanges_p.h>

#include <QtCore/qdebug.h>
#include <QtCore/qmetaobject.h>
Expand Down
Expand Up @@ -53,7 +53,7 @@
// We mean it.
//

#include <QtDeclarative/private/qdeclarativeglobal_p.h>
#include <private/qdeclarativeglobal_p.h>

QT_BEGIN_HEADER

Expand Down
4 changes: 2 additions & 2 deletions src/declarative/debugger/qdeclarativeinspectorservice.cpp
Expand Up @@ -39,8 +39,8 @@
**
****************************************************************************/

#include "private/qdeclarativeinspectorservice_p.h"
#include "private/qdeclarativeinspectorinterface_p.h"
#include "qdeclarativeinspectorservice_p.h"
#include "qdeclarativeinspectorinterface_p.h"

#include <QtCore/QCoreApplication>
#include <QtCore/QDebug>
Expand Down
2 changes: 1 addition & 1 deletion src/declarative/debugger/qdeclarativeinspectorservice_p.h
Expand Up @@ -53,7 +53,7 @@
// We mean it.
//

#include "private/qdeclarativedebugservice_p.h"
#include "qdeclarativedebugservice_p.h"
#include <private/qdeclarativeglobal_p.h>

#include <QtCore/QList>
Expand Down
2 changes: 1 addition & 1 deletion src/declarative/debugger/qpacketprotocol.cpp
Expand Up @@ -39,7 +39,7 @@
**
****************************************************************************/

#include "private/qpacketprotocol_p.h"
#include "qpacketprotocol_p.h"

#include <QtCore/QBuffer>
#include <QtCore/QElapsedTimer>
Expand Down
6 changes: 3 additions & 3 deletions src/declarative/debugger/qv8debugservice.cpp
Expand Up @@ -41,9 +41,9 @@

#include "qv8debugservice_p.h"
#include "qdeclarativedebugservice_p_p.h"
#include "qv8debug_p.h"
#include "qv8engine_p.h"
#include "qdeclarativeengine_p.h"
#include <private/qv8debug_p.h>
#include <private/qv8engine_p.h>
#include <private/qdeclarativeengine_p.h>

#include <QtCore/QEventLoop>
#include <QtCore/QHash>
Expand Down
2 changes: 1 addition & 1 deletion src/declarative/debugger/qv8debugservice_p.h
Expand Up @@ -53,7 +53,7 @@
// We mean it.
//

#include "private/qdeclarativedebugservice_p.h"
#include "qdeclarativedebugservice_p.h"

QT_BEGIN_HEADER

Expand Down
5 changes: 2 additions & 3 deletions src/declarative/debugger/qv8profilerservice.cpp
Expand Up @@ -41,9 +41,8 @@

#include "qv8profilerservice_p.h"
#include "qdeclarativedebugservice_p_p.h"
#include "qdeclarativeengine_p.h"
#include "private/qv8profiler_p.h"
#include "qjsconverter_p.h"
#include <private/qdeclarativeengine_p.h>
#include <private/qv8profiler_p.h>

#include <QtCore/QHash>

Expand Down
2 changes: 1 addition & 1 deletion src/declarative/debugger/qv8profilerservice_p.h
Expand Up @@ -53,7 +53,7 @@
// We mean it.
//

#include "private/qdeclarativedebugservice_p.h"
#include <private/qdeclarativedebugservice_p.h>

QT_BEGIN_HEADER

Expand Down
12 changes: 6 additions & 6 deletions src/declarative/designer/designersupport.cpp
Expand Up @@ -40,13 +40,13 @@
****************************************************************************/

#include "designersupport.h"
#include "qsgitem_p.h"
#include <private/qsgitem_p.h>

#include <QtDeclarative/private/qsgshadereffectsource_p.h>
#include <QtDeclarative/private/qsgrectangle_p.h>
#include <QtDeclarative/private/qdeclarativeengine_p.h>
#include <QtDeclarative/private/qsgview_p.h>
#include <QtDeclarative/private/qdeclarativestategroup_p.h>
#include <private/qsgshadereffectsource_p.h>
#include <private/qsgrectangle_p.h>
#include <private/qdeclarativeengine_p.h>
#include <private/qsgview_p.h>
#include <private/qdeclarativestategroup_p.h>
#include <QtGui/QImage>

QT_BEGIN_NAMESPACE
Expand Down
2 changes: 0 additions & 2 deletions src/declarative/items/context2d/context2d.pri
@@ -1,5 +1,3 @@
INCLUDEPATH += $$PWD

SOURCES += \
$$PWD/qsgcanvasitem.cpp \
$$PWD/qsgcontext2d.cpp \
Expand Down
8 changes: 4 additions & 4 deletions src/declarative/items/context2d/qsgcanvasitem.cpp
Expand Up @@ -39,16 +39,16 @@
**
****************************************************************************/

#include "private/qsgadaptationlayer_p.h"
#include <private/qsgadaptationlayer_p.h>
#include "qsgcanvasitem_p.h"
#include "qsgitem_p.h"
#include <private/qsgitem_p.h>
#include "qsgcontext2d_p.h"
#include "qsgcontext2dnode_p.h"
#include "qsgcontext2dtexture_p.h"
#include "qdeclarativepixmapcache_p.h"
#include <private/qdeclarativepixmapcache_p.h>

#include <qdeclarativeinfo.h>
#include "qdeclarativeengine_p.h"
#include <private/qdeclarativeengine_p.h>
#include <QtCore/QBuffer>

QT_BEGIN_NAMESPACE
Expand Down
2 changes: 1 addition & 1 deletion src/declarative/items/context2d/qsgcanvasitem_p.h
Expand Up @@ -42,7 +42,7 @@
#ifndef QSGCANVASITEM_P_H
#define QSGCANVASITEM_P_H

#include "qsgitem.h"
#include <qsgitem.h>
#include <private/qv8engine_p.h>

QT_BEGIN_HEADER
Expand Down
18 changes: 9 additions & 9 deletions src/declarative/items/context2d/qsgcontext2d.cpp
Expand Up @@ -42,24 +42,24 @@
#include "qsgcontext2d_p.h"
#include "qsgcontext2dcommandbuffer_p.h"
#include "qsgcanvasitem_p.h"
#include "qsgitem_p.h"
#include "qsgshadereffectsource_p.h"
#include <private/qsgitem_p.h>
#include <private/qsgshadereffectsource_p.h>
#include <QtGui/qopenglframebufferobject.h>

#include <QtCore/qdebug.h>
#include "private/qsgcontext_p.h"
#include "private/qdeclarativesvgparser_p.h"
#include "private/qdeclarativepath_p.h"
#include <private/qsgcontext_p.h>
#include <private/qdeclarativesvgparser_p.h>
#include <private/qdeclarativepath_p.h>

#include "private/qsgimage_p_p.h"
#include <private/qsgimage_p_p.h>

#include <QtGui/qguiapplication.h>
#include <qdeclarativeinfo.h>
#include <QtCore/qmath.h>
#include "qv8engine_p.h"
#include <private/qv8engine_p.h>

#include "qdeclarativeengine.h"
#include "qv8domerrors_p.h"
#include <qdeclarativeengine.h>
#include <private/qv8domerrors_p.h>
#include <QtCore/qnumeric.h>

QT_BEGIN_NAMESPACE
Expand Down
Expand Up @@ -41,7 +41,7 @@

#include "qsgcontext2dcommandbuffer_p.h"
#include "qsgcanvasitem_p.h"
#include "qdeclarative.h"
#include <qdeclarative.h>
#include <QtCore/QMutex>

#define HAS_SHADOW(offsetX, offsetY, blur, color) (color.isValid() && color.alpha() && (blur || offsetX || offsetY))
Expand Down
Expand Up @@ -43,7 +43,7 @@
#define QSGCONTEXT2DCOMMANDBUFFER_P_H

#include "qsgcontext2d_p.h"
#include "qdeclarativepixmapcache_p.h"
#include <private/qdeclarativepixmapcache_p.h>


QT_BEGIN_HEADER
Expand Down
4 changes: 2 additions & 2 deletions src/declarative/items/context2d/qsgcontext2dnode_p.h
Expand Up @@ -42,8 +42,8 @@
#ifndef QSGCONTEXT2DNODE_P_H
#define QSGCONTEXT2DNODE_P_H

#include "qsgnode.h"
#include "qsgtexturematerial.h"
#include <qsgnode.h>
#include <qsgtexturematerial.h>

#include "qsgcanvasitem_p.h"
#include "qsgcontext2dtexture_p.h"
Expand Down
4 changes: 2 additions & 2 deletions src/declarative/items/context2d/qsgcontext2dtexture.cpp
Expand Up @@ -42,8 +42,8 @@
#include "qsgcontext2dtexture_p.h"
#include "qsgcontext2dtile_p.h"
#include "qsgcanvasitem_p.h"
#include "qsgitem_p.h"
#include "private/qsgtexture_p.h"
#include <private/qsgitem_p.h>
#include <private/qsgtexture_p.h>
#include "qsgcontext2dcommandbuffer_p.h"
#include <QOpenGLPaintDevice>

Expand Down
2 changes: 1 addition & 1 deletion src/declarative/items/context2d/qsgcontext2dtexture_p.h
Expand Up @@ -42,7 +42,7 @@
#ifndef QSGCONTEXT2DTEXTURE_P_H
#define QSGCONTEXT2DTEXTURE_P_H

#include "qsgtexture.h"
#include <qsgtexture.h>
#include "qsgcanvasitem_p.h"
#include "qsgcontext2d_p.h"

Expand Down
2 changes: 0 additions & 2 deletions src/declarative/items/items.pri
@@ -1,5 +1,3 @@
INCLUDEPATH += $$PWD

HEADERS += \
$$PWD/qsgevents_p_p.h \
$$PWD/qsgitemchangelistener_p.h \
Expand Down
4 changes: 2 additions & 2 deletions src/declarative/items/qsganimation.cpp
Expand Up @@ -43,8 +43,8 @@
#include "qsganimation_p_p.h"
#include "qsgstateoperations_p.h"

#include <qdeclarativeproperty_p.h>
#include <qdeclarativepath_p.h>
#include <private/qdeclarativeproperty_p.h>
#include <private/qdeclarativepath_p.h>

#include <QtDeclarative/qdeclarativeinfo.h>
#include <QtCore/qmath.h>
Expand Down
4 changes: 2 additions & 2 deletions src/declarative/items/qsgimplicitsizeitem.cpp
Expand Up @@ -39,8 +39,8 @@
**
****************************************************************************/

#include "private/qsgimplicitsizeitem_p.h"
#include "private/qsgimplicitsizeitem_p_p.h"
#include "qsgimplicitsizeitem_p.h"
#include "qsgimplicitsizeitem_p_p.h"

QT_BEGIN_NAMESPACE

Expand Down
6 changes: 3 additions & 3 deletions src/declarative/items/qsgimplicitsizeitem_p_p.h
Expand Up @@ -54,9 +54,9 @@
// We mean it.
//

#include "private/qsgitem_p.h"
#include "private/qsgpainteditem_p.h"
#include "private/qsgimplicitsizeitem_p.h"
#include "qsgitem_p.h"
#include "qsgpainteditem_p.h"
#include "qsgimplicitsizeitem_p.h"

QT_BEGIN_NAMESPACE

Expand Down
6 changes: 3 additions & 3 deletions src/declarative/items/qsgitemsmodule.cpp
Expand Up @@ -73,9 +73,9 @@
#include "qsganimation_p.h"
#include <private/qsgshadereffect_p.h>
#include <private/qsgshadereffectsource_p.h>
//#include "private/qsgpincharea_p.h"
#include "qsgcanvasitem_p.h"
#include "qsgcontext2d_p.h"
//#include <private/qsgpincharea_p.h>
#include <private/qsgcanvasitem_p.h>
#include <private/qsgcontext2d_p.h>
#include "qsgsprite_p.h"
#include "qsgspriteimage_p.h"
#include "qsgdrag_p.h"
Expand Down

0 comments on commit 7fa3aa4

Please sign in to comment.