aboutsummaryrefslogtreecommitdiffstats
path: root/src/client
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2019-03-08 10:53:07 +0100
committerDavid Robillard <d@drobilla.net>2019-03-09 00:43:43 +0100
commit20af728fdf07478b5a146370b59f902a70b85a68 (patch)
tree1763151b88d201c9d56984480cd42b4c3b2068a7 /src/client
parent11fe15cd9187c393cbb7df9f04ba96abc3fbcc9a (diff)
downloadingen-20af728fdf07478b5a146370b59f902a70b85a68.tar.gz
ingen-20af728fdf07478b5a146370b59f902a70b85a68.tar.bz2
ingen-20af728fdf07478b5a146370b59f902a70b85a68.zip
Clean up includes and forward declarations
Diffstat (limited to 'src/client')
-rw-r--r--src/client/BlockModel.cpp12
-rw-r--r--src/client/ClientStore.cpp10
-rw-r--r--src/client/GraphModel.cpp7
-rw-r--r--src/client/ObjectModel.cpp8
-rw-r--r--src/client/PluginModel.cpp18
-rw-r--r--src/client/PluginUI.cpp7
-rw-r--r--src/client/PortModel.cpp3
-rw-r--r--src/client/ingen_client.cpp1
8 files changed, 47 insertions, 19 deletions
diff --git a/src/client/BlockModel.cpp b/src/client/BlockModel.cpp
index a15674d4..4cee9ac0 100644
--- a/src/client/BlockModel.cpp
+++ b/src/client/BlockModel.cpp
@@ -14,13 +14,17 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <cassert>
-#include <cmath>
-#include <string>
-
#include "ingen/client/BlockModel.hpp"
+
#include "ingen/URIs.hpp"
#include "ingen/World.hpp"
+#include "ingen/client/PortModel.hpp"
+
+#include <cassert>
+#include <cmath>
+#include <cstdlib>
+#include <cstring>
+#include <string>
namespace ingen {
namespace client {
diff --git a/src/client/ClientStore.cpp b/src/client/ClientStore.cpp
index 1f71bf61..6aadcf2a 100644
--- a/src/client/ClientStore.cpp
+++ b/src/client/ClientStore.cpp
@@ -14,18 +14,24 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <boost/variant/apply_visitor.hpp>
+#include "ingen/client/ClientStore.hpp"
#include "ingen/Log.hpp"
#include "ingen/client/ArcModel.hpp"
#include "ingen/client/BlockModel.hpp"
-#include "ingen/client/ClientStore.hpp"
#include "ingen/client/GraphModel.hpp"
#include "ingen/client/ObjectModel.hpp"
#include "ingen/client/PluginModel.hpp"
#include "ingen/client/PortModel.hpp"
#include "ingen/client/SigClientInterface.hpp"
+#include <boost/variant/apply_visitor.hpp>
+
+#include <cassert>
+#include <cstdint>
+#include <string>
+#include <utility>
+
namespace ingen {
namespace client {
diff --git a/src/client/GraphModel.cpp b/src/client/GraphModel.cpp
index 31947ba7..8999ace8 100644
--- a/src/client/GraphModel.cpp
+++ b/src/client/GraphModel.cpp
@@ -14,13 +14,16 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <cassert>
+#include "ingen/client/GraphModel.hpp"
#include "ingen/URIs.hpp"
#include "ingen/client/ArcModel.hpp"
#include "ingen/client/BlockModel.hpp"
#include "ingen/client/ClientStore.hpp"
-#include "ingen/client/GraphModel.hpp"
+
+#include <cassert>
+#include <string>
+#include <utility>
namespace ingen {
namespace client {
diff --git a/src/client/ObjectModel.cpp b/src/client/ObjectModel.cpp
index 65dd1a37..ff7ab88b 100644
--- a/src/client/ObjectModel.cpp
+++ b/src/client/ObjectModel.cpp
@@ -14,9 +14,15 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "ingen/client/ObjectModel.hpp"
+
#include "ingen/Node.hpp"
#include "ingen/URIs.hpp"
-#include "ingen/client/ObjectModel.hpp"
+
+#include <cassert>
+#include <cstdint>
+#include <string>
+#include <utility>
namespace ingen {
namespace client {
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 1770022e..f0e3c3a0 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -14,20 +14,22 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <string>
-#include <algorithm>
-
-#include <boost/optional.hpp>
-
-#include "raul/Path.hpp"
+#include "ingen/client/PluginModel.hpp"
#include "ingen/Atom.hpp"
#include "ingen/client/GraphModel.hpp"
-#include "ingen/client/PluginModel.hpp"
#include "ingen/client/PluginUI.hpp"
-
+#include "raul/Path.hpp"
#include "ingen_config.h"
+#include <boost/optional/optional.hpp>
+
+#include <cctype>
+#include <cstring>
+#include <iosfwd>
+#include <string>
+#include <utility>
+
using std::string;
namespace ingen {
diff --git a/src/client/PluginUI.cpp b/src/client/PluginUI.cpp
index c093ad47..a997d716 100644
--- a/src/client/PluginUI.cpp
+++ b/src/client/PluginUI.cpp
@@ -14,15 +14,20 @@
along with Ingen. If not, see <http://www.gnu.org/licenses/>.
*/
+#include "ingen/client/PluginUI.hpp"
+
#include "ingen/Interface.hpp"
#include "ingen/Log.hpp"
#include "ingen/URIs.hpp"
#include "ingen/client/BlockModel.hpp"
-#include "ingen/client/PluginUI.hpp"
#include "ingen/client/PortModel.hpp"
#include "lv2/atom/atom.h"
#include "lv2/ui/ui.h"
+#include <cstring>
+#include <string>
+#include <utility>
+
namespace ingen {
namespace client {
diff --git a/src/client/PortModel.cpp b/src/client/PortModel.cpp
index f83e043b..79a3527a 100644
--- a/src/client/PortModel.cpp
+++ b/src/client/PortModel.cpp
@@ -17,6 +17,9 @@
#include "ingen/client/BlockModel.hpp"
#include "ingen/client/PortModel.hpp"
+#include <cstdint>
+#include <utility>
+
namespace ingen {
namespace client {
diff --git a/src/client/ingen_client.cpp b/src/client/ingen_client.cpp
index e56f42e4..f76fae0b 100644
--- a/src/client/ingen_client.cpp
+++ b/src/client/ingen_client.cpp
@@ -16,7 +16,6 @@
#include "ingen/Module.hpp"
#include "ingen/World.hpp"
-
#include "ingen_config.h"
struct IngenClientModule : public ingen::Module {