move lots of includes into implementation files

chigraph · Nov 27, 2019 · 7960d4c · 7960d4c
1 parent 41eb13b
commit 7960d4c
Show file tree

Hide file tree

Showing 14 changed files with 43 additions and 29 deletions.
diff --git a/src/centraltabview.cpp b/src/centraltabview.cpp
@@ -6,6 +6,7 @@
 #include <chi/GraphFunction.hpp>
 #include <chi/GraphModule.hpp>
 #include <chi/GraphStruct.hpp>
+#include <chi/NodeInstance.hpp>
 #include <chi/Support/Result.hpp>
 
 #include "functionview.hpp"

diff --git a/src/chigraphnodemodel.cpp b/src/chigraphnodemodel.cpp
@@ -11,6 +11,7 @@
 #include <chi/GraphFunction.hpp>
 #include <chi/GraphModule.hpp>
 #include <chi/NodeInstance.hpp>
+#include <chi/NodeType.hpp>
 #include <chi/Support/Result.hpp>
 #include <nodes/NodeData>
 
@@ -258,6 +259,11 @@ bool ChigraphFlowSceneModel::getTypeConvertable(QtNodes::TypeConverterId const&
 	}
 }
 
+QtNodes::NodeIndex ChigraphFlowSceneModel::nodeIndex(const chi::NodeInstance& node) const {
+	return nodeIndex(
+	    QUuid::fromRfc4122(QByteArray(reinterpret_cast<const char*>(node.id().data().data()), 16)));
+}
+
 QList<QUuid> ChigraphFlowSceneModel::nodeUUids() const {
 	QList<QUuid> ret;
 

diff --git a/src/chigraphnodemodel.hpp b/src/chigraphnodemodel.hpp
@@ -13,8 +13,7 @@
 #include <QPushButton>
 #include <QTextEdit>
 #include <QValidator>
-#include <chi/NodeInstance.hpp>
-#include <chi/NodeType.hpp>
+#include <chi/Fwd.hpp>
 #include <chi/Support/Result.hpp>
 #include <memory>
 #include <nodes/FlowSceneModel>
@@ -34,10 +33,7 @@ class ChigraphFlowSceneModel : public QtNodes::FlowSceneModel {
 	// Retrieval functions
 	//////////////////////
 
-	QtNodes::NodeIndex nodeIndex(const chi::NodeInstance& node) const {
-		return nodeIndex(QUuid::fromRfc4122(
-		    QByteArray(reinterpret_cast<const char*>(node.id().data().data()), 16)));
-	}
+	QtNodes::NodeIndex nodeIndex(const chi::NodeInstance& node) const;
 
 	QList<QUuid>                 nodeUUids() const override;
 	QtNodes::NodeIndex           nodeIndex(const QUuid& ID) const override;

diff --git a/src/functiondetails.cpp b/src/functiondetails.cpp
@@ -4,6 +4,7 @@
 #include <QHBoxLayout>
 #include <QLabel>
 #include <QVBoxLayout>
+#include <chi/GraphFunction.hpp>
 
 #include "functioninouts.hpp"
 #include "functionview.hpp"

diff --git a/src/functioninouts.hpp b/src/functioninouts.hpp
@@ -4,7 +4,7 @@
 #define CHIGGUI_FUNCTION_IN_OUTS_HPP
 
 #include <QWidget>
-#include <chi/GraphFunction.hpp>
+#include <chi/Fwd.hpp>
 
 #include "execparamlistwidget.hpp"
 #include "paramlistwidget.hpp"

diff --git a/src/functionview.cpp b/src/functionview.cpp
@@ -6,6 +6,7 @@
 #include <chi/FunctionValidator.hpp>
 #include <chi/GraphModule.hpp>
 #include <chi/NodeInstance.hpp>
+#include <chi/NodeType.hpp>
 #include <chi/Support/Result.hpp>
 #include <nodes/ConnectionStyle>
 #include <nodes/NodeGraphicsObject>

diff --git a/src/localvariables.cpp b/src/localvariables.cpp
@@ -3,8 +3,10 @@
 #include <QComboBox>
 #include <QGridLayout>
 #include <QPushButton>
+#include <chi/Context.hpp>
 #include <chi/DataType.hpp>
 #include <chi/GraphFunction.hpp>
+#include <chi/GraphModule.hpp>
 #include <chi/LangModule.hpp>
 
 #include "execparamlistwidget.hpp"

diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
@@ -26,6 +26,7 @@
 #include <chi/GraphFunction.hpp>
 #include <chi/GraphModule.hpp>
 #include <chi/LangModule.hpp>
+#include <chi/NodeInstance.hpp>
 #include <chi/Support/Result.hpp>
 #include <chi/Support/json.hpp>
 #include <fstream>

diff --git a/src/mainwindow.hpp b/src/mainwindow.hpp
@@ -10,9 +10,8 @@
 #include <QProcess>
 #include <QTabWidget>
 #include <QUrl>
-#include <chi/ChiModule.hpp>
 #include <chi/Context.hpp>
-#include <chi/GraphModule.hpp>
+#include <chi/Fwd.hpp>
 #include <nodes/FlowScene>
 #include <nodes/FlowView>
 

diff --git a/src/modulebrowser.cpp b/src/modulebrowser.cpp
@@ -8,7 +8,10 @@
 #include <QMenu>
 #include <QTreeWidgetItem>
 #include <chi/GraphFunction.hpp>
+#include <chi/GraphModule.hpp>
 #include <chi/GraphStruct.hpp>
+#include <chi/NodeInstance.hpp>
+#include <chi/NodeType.hpp>
 #include <chi/Support/Result.hpp>
 #include <filesystem>
 

diff --git a/src/paramlistwidget.cpp b/src/paramlistwidget.cpp
@@ -10,11 +10,30 @@
 #include <chi/Context.hpp>
 #include <chi/DataType.hpp>
 #include <chi/GraphFunction.hpp>
+#include <chi/GraphModule.hpp>
 
 #include "execparamlistwidget.hpp"
 #include "functionview.hpp"
 #include "typeselector.hpp"
 
+QStringList createTypeOptions(const chi::GraphModule& mod) {
+	QStringList ret;
+
+	// add the module
+	for (const auto& ty : mod.typeNames()) {
+		ret << QString::fromStdString(mod.fullName() + ":" + ty);
+	}
+
+	// and its dependencies
+	for (auto dep : mod.dependencies()) {
+		auto depMod = mod.context().moduleByFullName(dep);
+		for (const auto& type : depMod->typeNames()) {
+			ret << QString::fromStdString(depMod->fullName() + ":" + type);
+		}
+	}
+	return ret;
+}
+
 ParamListWidget::ParamListWidget(QWidget* parent) : QWidget(parent) {}
 
 void ParamListWidget::setFunction(FunctionView* func, Type ty) {

diff --git a/src/paramlistwidget.hpp b/src/paramlistwidget.hpp
@@ -5,28 +5,12 @@
 
 #include <QListWidget>
 #include <QTableView>
-#include <chi/Context.hpp>
-#include <chi/GraphModule.hpp>
+#include <chi/Fwd.hpp>
 
 class FunctionView;
 
-inline QStringList createTypeOptions(const chi::GraphModule& mod) {
-	QStringList ret;
-
-	// add the module
-	for (const auto& ty : mod.typeNames()) {
-		ret << QString::fromStdString(mod.fullName() + ":" + ty);
-	}
-
-	// and its dependencies
-	for (auto dep : mod.dependencies()) {
-		auto depMod = mod.context().moduleByFullName(dep);
-		for (const auto& type : depMod->typeNames()) {
-			ret << QString::fromStdString(depMod->fullName() + ":" + type);
-		}
-	}
-	return ret;
-}
+QStringList createTypeOptions(const chi::GraphModule& mod);
+
 class ParamListWidget : public QWidget {
 	Q_OBJECT
 

diff --git a/src/subprocessoutputview.cpp b/src/subprocessoutputview.cpp
@@ -9,6 +9,7 @@
 #include <QPlainTextEdit>
 #include <QVBoxLayout>
 #include <chi/Context.hpp>
+#include <chi/GraphModule.hpp>
 #include <chi/Support/Result.hpp>
 #include <chi/Support/TempFile.hpp>
 #include <filesystem>

diff --git a/src/subprocessoutputview.hpp b/src/subprocessoutputview.hpp
@@ -5,7 +5,7 @@
 
 #include <QPlainTextEdit>
 #include <QProcess>
-#include <chi/GraphModule.hpp>
+#include <chi/Fwd.hpp>
 
 class SubprocessOutputView : public QPlainTextEdit {
 	Q_OBJECT