Commit 4a0204bd authored by NICLAUSSE Nicolas's avatar NICLAUSSE Nicolas

clean includes

parent 46002cb3
......@@ -13,7 +13,7 @@
*
*/
#include <dtkComposerControlsListItem.h>
#include "dtkComposerControlsListItem.h"
dtkComposerControlsListItem::dtkComposerControlsListItem(QWidget *parent, dtkComposerSceneNode *node) : dtkToolBoxItem(parent)
{
......@@ -22,7 +22,3 @@ dtkComposerControlsListItem::dtkComposerControlsListItem(QWidget *parent, dtkCom
dtkComposerControlsListItem::~dtkComposerControlsListItem(void)
{
}
......@@ -13,9 +13,7 @@
*
*/
#include <dtkComposerExport.h>
#include <dtkComposerControlsListItemReal.h>
#include "dtkComposerControlsListItemReal.h"
#include <dtkComposerNodeReal.h>
#include "dtkComposerSceneNode.h"
......@@ -77,4 +75,3 @@ void dtkComposerControlsListItemReal::onValueChanged(double value)
{
d->r_node->setValue(value);
}
......@@ -13,6 +13,35 @@
// Code:
#include "dtkComposerDefaultExtensions.h"
#include "dtkComposerNodeFactory.h"
#include "dtkComposerNodeBoolean.h"
#include "dtkComposerNodeBooleanOperator.h"
#include "dtkComposerNodeComposite.h"
#include "dtkComposerNodeConstants.h"
#include "dtkComposerNodeControlCase.h"
#include "dtkComposerNodeControlDoWhile.h"
#include "dtkComposerNodeControlFor.h"
#include "dtkComposerNodeControlForEach.h"
#include "dtkComposerNodeControlIf.h"
#include "dtkComposerNodeControlMap.h"
#include "dtkComposerNodeControlParallelMap.h"
#include "dtkComposerNodeControlWhile.h"
#include "dtkComposerNodeDistributed.h"
#include "dtkComposerNodeExec.h"
#include "dtkComposerNodeFile.h"
#include "dtkComposerNodeInteger.h"
#include "dtkComposerNodeRange.h"
#include "dtkComposerNodeMetaContainer.h"
#include "dtkComposerNodeNumberOperator.h"
#include "dtkComposerNodeReal.h"
#include "dtkComposerNodeRemote.h"
#include "dtkComposerNodeSpawn.h"
#include "dtkComposerNodeSpawnEmbedded.h"
#include "dtkComposerNodeString.h"
#include "dtkComposerNodeStringOperator.h"
#include "dtkComposerNodeLogger.h"
#include "dtkComposerNodePrint.h"
// /////////////////////////////////////////////////////////////////
//
......
......@@ -17,34 +17,8 @@
#include <dtkComposerExport.h>
#include "dtkComposerExtension.h"
#include "dtkComposerNodeFactory.h"
#include "dtkComposerNodeBoolean.h"
#include "dtkComposerNodeBooleanOperator.h"
#include "dtkComposerNodeComposite.h"
#include "dtkComposerNodeConstants.h"
#include "dtkComposerNodeControlCase.h"
#include "dtkComposerNodeControlDoWhile.h"
#include "dtkComposerNodeControlFor.h"
#include "dtkComposerNodeControlForEach.h"
#include "dtkComposerNodeControlIf.h"
#include "dtkComposerNodeControlMap.h"
#include "dtkComposerNodeControlParallelMap.h"
#include "dtkComposerNodeControlWhile.h"
#include "dtkComposerNodeDistributed.h"
#include "dtkComposerNodeExec.h"
#include "dtkComposerNodeFile.h"
#include "dtkComposerNodeInteger.h"
#include "dtkComposerNodeRange.h"
#include "dtkComposerNodeMetaContainer.h"
#include "dtkComposerNodeNumberOperator.h"
#include "dtkComposerNodeReal.h"
#include "dtkComposerNodeRemote.h"
#include "dtkComposerNodeSpawn.h"
#include "dtkComposerNodeSpawnEmbedded.h"
#include "dtkComposerNodeString.h"
#include "dtkComposerNodeStringOperator.h"
#include "dtkComposerNodeLogger.h"
#include "dtkComposerNodePrint.h"
class dtkComposerNodeFactory;
// -- Base nodes
......
......@@ -13,15 +13,16 @@
*
*/
#include "dtkComposer/dtkComposer.h"
#include "dtkComposer/dtkComposerEvaluator.h"
#include "dtkComposer/dtkComposerEvaluatorProcess.h"
#include "dtkComposer/dtkComposerGraph.h"
#include "dtkComposer/dtkComposerGraphNode.h"
#include "dtkComposer/dtkComposerNodeFactory.h"
#include "dtkComposer/dtkComposerReaderNoScene.h"
#include "dtkComposer/dtkComposerNodeSpawn.h"
#include "dtkComposer/dtkComposerNodeSpawnEmbedded.h"
#include "dtkComposerEvaluatorProcess.h"
#include "dtkComposer.h"
#include "dtkComposerEvaluator.h"
#include "dtkComposerGraph.h"
#include "dtkComposerGraphNode.h"
#include "dtkComposerNodeFactory.h"
#include "dtkComposerReaderNoScene.h"
#include "dtkComposerNodeSpawn.h"
#include "dtkComposerNodeSpawnEmbedded.h"
#include <dtkMeta/dtkMetaContainerSequential.h>
......
......@@ -19,11 +19,9 @@
#include <QtCore>
class dtkComposerNodeFactory;
class dtkComposerNodeComposite;
class dtkDistributedCommunicator;
class dtkComposerEvaluatorProcessPrivate;
class dtkMetaContainerSequential;
class DTKCOMPOSER_EXPORT dtkComposerEvaluatorProcess : public QRunnable
{
......
......@@ -14,14 +14,14 @@
*/
#include "dtkComposerEvaluatorSlave.h"
#include "dtkComposer/dtkComposerEvaluator.h"
#include "dtkComposer/dtkComposerEvaluatorSlave.h"
#include "dtkComposer/dtkComposerNodeFactory.h"
#include "dtkComposer/dtkComposerNodeGraph.h"
#include "dtkComposer/dtkComposerGraph.h"
#include "dtkComposer/dtkComposerReaderNoScene.h"
#include "dtkComposer/dtkComposerNodeRemote.h"
#include "dtkComposerEvaluator.h"
#include "dtkComposerNodeFactory.h"
#include "dtkComposerNodeGraph.h"
#include "dtkComposerGraph.h"
#include "dtkComposerReaderNoScene.h"
#include "dtkComposerNodeRemote.h"
#include <dtkDistributed/dtkDistributedCommunicator.h>
#include <dtkDistributed/dtkDistributedMessage.h>
......@@ -247,7 +247,7 @@ void dtkComposerEvaluatorSlave::run(void)
dtkDebug() << "parse composition" ;
d->reader->readString(composition);
d->node_graph = d->reader->nodeGraph();
} else {
dtkInfo() << "composition hasn't changed";
......
......@@ -20,7 +20,6 @@
#include <dtkDistributed/dtkDistributedSlave.h>
class dtkComposerNodeFactory;
class dtkDistributedCommunicator;
class dtkComposerEvaluatorSlavePrivate;
class DTKCOMPOSER_EXPORT dtkComposerEvaluatorSlave : public dtkDistributedSlave, public QRunnable
......
......@@ -21,10 +21,11 @@
#include <dtkComposerExport.h>
#include "dtkComposerGraph.h"
#include "dtkComposerGraphNode.h"
#include <QtCore>
class dtkComposerGraph;
class dtkComposerGraphNode;
class DTKCOMPOSER_EXPORT dtkComposerEvaluatorPrivate : public QThread
{
public:
......
......@@ -24,9 +24,7 @@ class dtkComposerGraphEdgeList;
class dtkComposerGraphNode;
class dtkComposerGraphNodeList;
class dtkComposerGraphPrivate;
class dtkComposerEdge;
class dtkComposerNode;
class dtkComposerNodeComposite;
class dtkGraph;
class DTKCOMPOSER_EXPORT dtkComposerGraph : public QObject
......
......@@ -18,8 +18,6 @@
*/
#include "dtkComposerGraphEdge.h"
#include "dtkComposerGraphNode.h"
class dtkComposerGraphEdgePrivate
{
......
......@@ -25,7 +25,6 @@
#include "dtkComposerGraphNode.h"
class dtkComposerGraphEdgePrivate;
class dtkGraphEdge;
// /////////////////////////////////////////////////////////////////
// dtkComposerGraphEdge
......@@ -61,4 +60,3 @@ public:
dtkComposerGraphEdgeList(void);
dtkComposerGraphEdgeList(const QList<dtkComposerGraphEdge *>& other);
};
......@@ -20,8 +20,6 @@
#include <dtkConfig.h>
#include "dtkComposerGraph.h"
#include "dtkComposerGraphNodeBegin.h"
#include "dtkComposerGraphNode.h"
#include "dtkComposerNode.h"
#include "dtkComposerNodeControl.h"
#include "dtkComposerNodeComposite.h"
#if defined(DTK_BUILD_DISTRIBUTED)
......@@ -159,4 +157,3 @@ dtkComposerGraphNodeList dtkComposerGraphNodeBegin::successors(void)
return dtkComposerGraphNode::successors();
#endif
}
......@@ -18,10 +18,8 @@
*/
#include <dtkConfig.h>
#include "dtkComposerGraphNode.h"
#include "dtkComposerGraphNodeBegin.h"
#include "dtkComposerGraphNodeEnd.h"
#include "dtkComposerNode.h"
#include "dtkComposerNodeControl.h"
#include "dtkComposerNodeComposite.h"
#if defined(DTK_BUILD_DISTRIBUTED)
......
......@@ -13,7 +13,6 @@
// Code:
#include "dtkComposerNodeBoolean.h"
#include "dtkComposerNodeBoolean_p.h"
// /////////////////////////////////////////////////////////////////
// dtkComposerNodeBooleanEditor implementation
......
......@@ -19,8 +19,6 @@
#include "dtkComposerNodeBoolean_p.h"
#include "dtkComposerNodeLeaf.h"
class dtkComposerNodeBooleanPrivate;
class DTKCOMPOSER_EXPORT dtkComposerNodeBoolean : public dtkComposerNodeLeaf
{
public:
......@@ -40,7 +38,7 @@ public:
dtkComposerNodeBooleanEditor *editor(void);
private:
dtkComposerNodeBooleanPrivate *d;
class dtkComposerNodeBooleanPrivate *d;
};
//
......
......@@ -19,11 +19,8 @@
#include <QtCore>
#include <QtWidgets>
class dtkComposerFactory;
class dtkComposerNodeFactoryViewPrivate;
class dtkComposerSceneNode;
class dtkWidgetsItemView;
class dtkWidgetsTagCloud;
class dtkWidgetsTagCloudScope;
class dtkWidgetsTagCloudView;
......
......@@ -21,7 +21,6 @@
#include "dtkComposerNodeGraphEdge.h"
class dtkComposerNode;
class dtkComposerNodeGraphPrivate;
// /////////////////////////////////////////////////////////////////
// dtkComposerNodeGraph interface
......
......@@ -19,13 +19,9 @@
#include "dtkComposerTransmitterReceiver.h"
#include "dtkComposerTransmitterProxyVariant.h"
#include <dtkDistributed/dtkDistributed.h>
#include <dtkDistributed/dtkDistributedController.h>
#include <dtkDistributed/dtkDistributedCommunicator.h>
#include <dtkDistributed/dtkDistributedSettings.h>
#include <dtkDistributed/dtkDistributedSlave.h>
#include <dtkDistributed>
#include <dtkLog/dtkLog.h>
#include <dtkLog>
#include <QApplication>
......
......@@ -15,9 +15,7 @@
#pragma once
#include <dtkComposerExport.h>
#include "dtkComposerNodeComposite.h"
#include "dtkComposerNodeRemote.h"
#include "dtkComposerNodeLeaf.h"
#include <QDomDocument>
......@@ -26,9 +24,6 @@
// /////////////////////////////////////////////////////////////////
class dtkComposerNodeSpawnPrivate;
class dtkDistributedCommunicator;
class dtkDistributedController;
class dtkDistributedSlave;
class dtkComposerNodeComposite;
class DTKCOMPOSER_EXPORT dtkComposerNodeSpawn : public dtkComposerNodeRemote
......
// Version: $Id$
//
//
//
//
// Commentary:
//
//
// Commentary:
//
//
// Change Log:
//
//
//
//
// Code:
#pragma once
#include <dtkComposerExport.h>
#include "dtkComposerNodeComposite.h"
#include "dtkComposerNodeRemote.h"
#include "dtkComposerNodeLeaf.h"
#include <QDomDocument>
......@@ -26,12 +24,7 @@
// /////////////////////////////////////////////////////////////////
class dtkComposerNodeSpawnEmbeddedPrivate;
class dtkDistributedCommunicator;
class dtkDistributedController;
class dtkDistributedSlave;
class dtkComposerNodeComposite;
class dtkComposerNodeControl;
class dtkMetaContainerSequential;
class DTKCOMPOSER_EXPORT dtkComposerNodeSpawnEmbedded : public dtkComposerNodeRemote
{
......@@ -64,5 +57,5 @@ private:
dtkComposerNodeSpawnEmbeddedPrivate *d;
};
//
//
// dtkComposerNodeSpawnEmbedded.h ends here
......@@ -19,6 +19,7 @@
#include <dtkMeta/dtkMetaContainerSequential.h>
#include <dtkDistributed/dtkDistributedCommunicator.h>
#include <dtkDistributed/dtkDistributedPolicy.h>
#include "dtkComposerEvaluatorProcess.h"
class dtkComposerNodeControl;
......@@ -64,6 +65,3 @@ public:
dtkComposerTransmitterReceiverVariant newitem_emitter;
};
......@@ -17,6 +17,7 @@
#include "dtkComposerNodeRemote_p.h"
#include <dtkDistributed/dtkDistributedPolicy.h>
#include <dtkDistributed/dtkDistributedCommunicator.h>
#include "dtkComposerEvaluatorProcess.h"
......@@ -49,6 +50,3 @@ public:
dtkComposerTransmitterReceiver<qlonglong > nthreads_receiver;
};
......@@ -21,11 +21,9 @@
class dtkComposerNode;
class dtkComposerNodeFactory;
class dtkComposerGraph;
class dtkComposerSceneEdge;
class dtkComposerSceneNode;
class dtkComposerSceneNodeComposite;
class dtkComposerSceneNodeLeaf;
class dtkComposerSceneNote;
class dtkComposerScenePort;
class dtkComposerScenePrivate;
class dtkComposerStack;
......
......@@ -19,7 +19,6 @@
#include "dtkComposerNodeComposite.h"
#include "dtkComposerSceneEdge.h"
#include "dtkComposerSceneNode.h"
#include "dtkComposerSceneNodeComposite.h"
#include "dtkComposerSceneNodeControl.h"
#include "dtkComposerSceneNote.h"
......
......@@ -20,7 +20,6 @@
class dtkComposerSceneEdge;
class dtkComposerSceneEdgeList;
class dtkComposerSceneNodeList;
class dtkComposerSceneNodeCompositePrivate;
class dtkComposerSceneNote;
class dtkComposerSceneNoteList;
......@@ -119,4 +118,3 @@ protected:
private:
dtkComposerSceneNodeCompositePrivate *d;
};
......@@ -18,8 +18,6 @@
#include "dtkComposerSceneNode.h"
class dtkComposerNodeControl;
class dtkComposerSceneEdgeList;
class dtkComposerSceneNodeComposite;
class dtkComposerSceneNodeControlPrivate;
class dtkComposerSceneNodeLeaf;
......
......@@ -14,7 +14,6 @@
#include "dtkComposerNode.h"
#include "dtkComposerNodeMetaData.h"
#include "dtkComposerSceneNode.h"
#include "dtkComposerSceneNode_p.h"
#include "dtkComposerSceneNodeLeaf.h"
#include "dtkComposerScenePort.h"
......
......@@ -22,10 +22,10 @@
#include <QtCore>
#include "dtkComposerSceneEdge.h"
#include "dtkComposerSceneNode.h"
#include "dtkComposerScenePort.h"
class dtkComposerNode;
class dtkComposerSceneNode;
class dtkComposerSceneNodePrivate
{
......@@ -48,4 +48,3 @@ public:
public:
bool embedded;
};
......@@ -27,11 +27,8 @@
class dtkComposerNodeFactory;
class dtkComposerGraph;
class dtkComposerSceneEdge;
class dtkComposerSceneNode;
class dtkComposerSceneNodeComposite;
class dtkComposerSceneNodeLeaf;
class dtkComposerSceneNote;
class dtkComposerStack;
class dtkComposerScenePrivate
......
......@@ -37,7 +37,6 @@
#include "dtkComposerScenePort.h"
#include "dtkComposerStackCommand.h"
#include "dtkComposerStackUtils.h"
#include "dtkComposerTransmitter.h"
#include "dtkComposerTransmitterProxy.h"
#include "dtkComposerTransmitterProxyLoop.h"
#include "dtkComposerTransmitterProxyVariant.h"
......@@ -3230,4 +3229,3 @@ void dtkComposerStackCommandCopyNodes::undo(void)
d->scene->modify(true);
}
......@@ -24,7 +24,6 @@ class dtkComposerNodeFactory;
class dtkComposerGraph;
class dtkComposerScene;
class dtkComposerSceneEdge;
class dtkComposerSceneEdgeList;
class dtkComposerSceneNode;
class dtkComposerSceneNodeComposite;
class dtkComposerSceneNodeControl;
......
......@@ -25,7 +25,6 @@
#include "dtkComposerSceneNote.h"
#include "dtkComposerScenePort.h"
#include "dtkComposerStackUtils.h"
#include "dtkComposerTransmitter.h"
void dtkComposerPropagateEdgeValidity(dtkComposerSceneNodeComposite *node, const dtkComposerTransmitterLinkList& valid_links, const dtkComposerTransmitterLinkList& invalid_links)
{
......
......@@ -22,10 +22,8 @@
#include "dtkComposerTransmitter.h"
class dtkComposerSceneEdge;
class dtkComposerSceneNode;
class dtkComposerSceneNodeComposite;
class dtkComposerSceneNodeList;
class dtkComposerSceneNote;
class dtkComposerSceneNoteList;
// /////////////////////////////////////////////////////////////////
......@@ -44,4 +42,3 @@ void dtkComposerTransmitterDisconnection(dtkComposerSceneNodeComposite *root, dt
bool areBrothers(dtkComposerSceneNodeList nodes);
bool areBrothers(dtkComposerSceneNoteList notes);
bool areBrothers(dtkComposerSceneNodeList nodes, dtkComposerSceneNoteList notes);
......@@ -23,7 +23,6 @@ class dtkComposerNode;
class dtkComposerTransmitterPrivate;
class dtkComposerTransmitterLink;
class dtkComposerTransmitterLinkList;
class dtkComposerTransmitterVariant;
// /////////////////////////////////////////////////////////////////
// dtkComposerTransmitter interface
......
......@@ -27,7 +27,6 @@
#include "dtkComposerSceneNodeControl.h"
#include "dtkComposerStack.h"
#include "dtkComposerView.h"
#include "dtkComposerWriter.h"
#include "dtkComposerReader.h"
#include "dtkComposer.h"
......
......@@ -29,7 +29,6 @@ class dtkComposerStack;
class dtkComposerView;
class dtkComposerCompass;
class dtkComposerPath;
class dtkComposerWriter;
class dtkComposerReader;
class dtkComposerWidgetPrivate;
......
......@@ -40,7 +40,6 @@ public:
// ///////////////////////////////////////////////////////////////////
class dtkCorePluginBase;
template <typename T> class dtkCorePluginTuner;
template <typename T> class dtkCorePluginFactory : public dtkCorePluginFactoryBase
{
......
......@@ -45,7 +45,7 @@
****************************************************************************/
#include "dtkIOCompressor.h"
#include "zlib.h"
#include <zlib.h>
#include <QDebug>
#include <QFile>
#include <QFileInfo>
......
......@@ -5,6 +5,7 @@
#include "dtkDistributedBufferManager.h"
#include "dtkDistributedCommunicator.h"
#include "dtkDistributedCommunicatorStatus.h"
#include "dtkDistributedController.h"
#include "dtkDistributedGraphTopology.h"
#include "dtkDistributedItem.h"
#include "dtkDistributedIterator.h"
......
......@@ -21,7 +21,6 @@
#include <dtkCore/dtkArray.h>
#include <dtkCore/dtkArrayData.h>
class dtkDistributedCommunicator;
class dtkDistributedMapper;
class dtkDistributedBufferManager;
......
......@@ -15,6 +15,7 @@
#pragma once
#include <QVarLengthArray>
#include <QDebug>
template<typename T> class dtkDistributedArray;
......@@ -56,8 +57,6 @@ private:
// ///////////////////////////////////////////////////////////////////
#include "dtkDistributedArray.h"
#include "dtkDistributedMapper.h"
#include "dtkDistributedCommunicator.h"
template <typename T, int Prealloc, int Length> inline dtkDistributedArrayCache<T, Prealloc, Length>::dtkDistributedArrayCache(DSArray *array) : m_array(array)
{
......
......@@ -17,12 +17,8 @@
#include <dtkDistributedExport.h>
#include "dtkDistributedPolicy.h"
#include <dtkCore/dtkCorePlugin.h>
class dtkDistributedWork;
class dtkDistributedCommunicatorPrivate;
class dtkDistributedCommunicatorStatus;
class dtkDistributedBufferManager;
class dtkDistributedRequest;
......
......@@ -13,6 +13,7 @@
*/
#include "dtkDistributedController.h"
#include "dtkDistributedMessage.h"
#include "dtkDistributedResourceManager.h"
#include <dtkCore/dtkCore.h>
......
......@@ -14,15 +14,13 @@
#pragma once
#include "dtkDistributedMessage.h"
#include <dtkDistributedExport.h>
#include <QtCore>
#include <QtNetwork>
class dtkDistributedMessage;
class dtkDistributedControllerPrivate;
class dtkDistributedJob;
class dtkDistributedNode;
class DTKDISTRIBUTED_EXPORT dtkDistributedController : public QObject
{
......
......@@ -18,8 +18,6 @@
#include <QtCore>
template <typename T> class QVector;
class dtkDistributedMapperPrivate;
// /////////////////////////////////////////////////////////////////
......
......@@ -14,12 +14,13 @@
#pragma once
#include "dtkDistributedResourceManager.h"
#include <dtkDistributedExport.h>
#include <QtCore>
#include <QtNetwork>
class dtkDistributedResourceManager;
class DTKDISTRIBUTED_EXPORT dtkDistributedServerDaemonPrivate;
class DTKDISTRIBUTED_EXPORT dtkDistributedServerDaemon : public QTcpServer
......
......@@ -19,7 +19,6 @@
#include <QtCore>
class dtkGraph;
class dtkGraphEdgePrivate;
class DTKMATH_EXPORT dtkGraphEdge
......@@ -45,6 +44,3 @@ public:
private:
dtkGraphEdgePrivate *d;
};
......@@ -18,7 +18,6 @@
#include <QtCore>
class dtkMatrix;
class dtkMatrixPluginFactory;
class dtkMatrixPluginManager;
......
......@@ -19,7 +19,7 @@
#pragma once
#include "dtkScriptExport.h"
#include <dtkScriptExport.h>
#include <QtCore>
......