summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2020-08-01 13:51:14 +0200
committerDavid Robillard <d@drobilla.net>2020-08-02 01:48:48 +0200
commitf1b413575db521af0ad2017bbc4d348495a31d8b (patch)
treef8853a422bbf234e2e5f6a8b3867c9e62161444b
parent28f08605a3b2e1497341db4b5bdad27691134d6d (diff)
downloadingen-f1b413575db521af0ad2017bbc4d348495a31d8b.tar.gz
ingen-f1b413575db521af0ad2017bbc4d348495a31d8b.tar.bz2
ingen-f1b413575db521af0ad2017bbc4d348495a31d8b.zip
Fix include order
-rw-r--r--.clang-tidy1
-rw-r--r--ingen/Clock.hpp2
-rw-r--r--ingen/StreamWriter.hpp2
-rw-r--r--ingen/runtime_paths.hpp2
-rw-r--r--src/client/PluginModel.cpp2
-rw-r--r--src/gui/App.hpp2
-rw-r--r--src/gui/GraphCanvas.hpp2
-rw-r--r--src/gui/GraphPortModule.cpp2
-rw-r--r--src/gui/GraphView.cpp4
-rw-r--r--src/gui/LoadPluginWindow.cpp6
-rw-r--r--src/gui/SubgraphModule.hpp2
-rw-r--r--src/server/BufferFactory.hpp2
-rw-r--r--src/server/JackDriver.cpp6
-rw-r--r--src/server/LV2Block.hpp2
-rw-r--r--src/server/ingen_lv2.cpp1
-rw-r--r--src/server/util.hpp2
16 files changed, 20 insertions, 20 deletions
diff --git a/.clang-tidy b/.clang-tidy
index 3d784d49..615e565b 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -59,7 +59,6 @@ Checks: >
-hicpp-signed-bitwise,
-hicpp-vararg,
-llvm-header-guard,
- -llvm-include-order,
-llvm-namespace-comment,
-misc-unused-parameters,
-modernize-make-shared,
diff --git a/ingen/Clock.hpp b/ingen/Clock.hpp
index 40204a6b..c3b0f64d 100644
--- a/ingen/Clock.hpp
+++ b/ingen/Clock.hpp
@@ -21,8 +21,8 @@
# include <mach/mach.h>
# include <mach/mach_time.h>
#else
-# include <time.h>
# include <sys/time.h>
+# include <time.h>
#endif
#include <cstdint>
diff --git a/ingen/StreamWriter.hpp b/ingen/StreamWriter.hpp
index 56603b92..620497f8 100644
--- a/ingen/StreamWriter.hpp
+++ b/ingen/StreamWriter.hpp
@@ -17,9 +17,9 @@
#ifndef INGEN_STREAMWRITER_HPP
#define INGEN_STREAMWRITER_HPP
-#include "ingen/ingen.h"
#include "ingen/ColorContext.hpp"
#include "ingen/TurtleWriter.hpp"
+#include "ingen/ingen.h"
#include <cstdio>
diff --git a/ingen/runtime_paths.hpp b/ingen/runtime_paths.hpp
index f23c2882..30e877fb 100644
--- a/ingen/runtime_paths.hpp
+++ b/ingen/runtime_paths.hpp
@@ -17,8 +17,8 @@
#ifndef INGEN_RUNTIME_PATHS_HPP
#define INGEN_RUNTIME_PATHS_HPP
-#include "ingen/ingen.h"
#include "ingen/FilePath.hpp"
+#include "ingen/ingen.h"
#include <string>
#include <vector>
diff --git a/src/client/PluginModel.cpp b/src/client/PluginModel.cpp
index 23015f51..eaa70b9e 100644
--- a/src/client/PluginModel.cpp
+++ b/src/client/PluginModel.cpp
@@ -19,8 +19,8 @@
#include "ingen/Atom.hpp"
#include "ingen/client/GraphModel.hpp"
#include "ingen/client/PluginUI.hpp"
-#include "raul/Path.hpp"
#include "ingen_config.h"
+#include "raul/Path.hpp"
#include <boost/optional/optional.hpp>
diff --git a/src/gui/App.hpp b/src/gui/App.hpp
index 13c46414..e9d83cfd 100644
--- a/src/gui/App.hpp
+++ b/src/gui/App.hpp
@@ -31,8 +31,8 @@
#include <gtkmm/main.h>
#include <gtkmm/window.h>
-#include <unordered_map>
#include <string>
+#include <unordered_map>
namespace ingen {
diff --git a/src/gui/GraphCanvas.hpp b/src/gui/GraphCanvas.hpp
index 7aa4bb98..b2529845 100644
--- a/src/gui/GraphCanvas.hpp
+++ b/src/gui/GraphCanvas.hpp
@@ -27,9 +27,9 @@
#include "lilv/lilv.h"
#include "raul/Path.hpp"
-#include <string>
#include <map>
#include <set>
+#include <string>
namespace ingen {
diff --git a/src/gui/GraphPortModule.cpp b/src/gui/GraphPortModule.cpp
index 336dced7..a80afe57 100644
--- a/src/gui/GraphPortModule.cpp
+++ b/src/gui/GraphPortModule.cpp
@@ -15,13 +15,13 @@
*/
#include "App.hpp"
-#include "Style.hpp"
#include "GraphCanvas.hpp"
#include "GraphPortModule.hpp"
#include "GraphWindow.hpp"
#include "Port.hpp"
#include "PortMenu.hpp"
#include "RenameWindow.hpp"
+#include "Style.hpp"
#include "WidgetFactory.hpp"
#include "WindowFactory.hpp"
diff --git a/src/gui/GraphView.cpp b/src/gui/GraphView.cpp
index ca12e1ef..e25fa1ba 100644
--- a/src/gui/GraphView.cpp
+++ b/src/gui/GraphView.cpp
@@ -15,11 +15,11 @@
*/
#include "App.hpp"
-#include "LoadPluginWindow.hpp"
-#include "NewSubgraphWindow.hpp"
#include "GraphCanvas.hpp"
#include "GraphTreeWindow.hpp"
#include "GraphView.hpp"
+#include "LoadPluginWindow.hpp"
+#include "NewSubgraphWindow.hpp"
#include "WidgetFactory.hpp"
#include "ingen/Interface.hpp"
diff --git a/src/gui/LoadPluginWindow.cpp b/src/gui/LoadPluginWindow.cpp
index bb84f96f..870288ac 100644
--- a/src/gui/LoadPluginWindow.cpp
+++ b/src/gui/LoadPluginWindow.cpp
@@ -25,10 +25,10 @@
#include "ingen/client/ClientStore.hpp"
#include "ingen/client/GraphModel.hpp"
-#include <string>
-#include <cstddef>
-#include <cassert>
#include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <string>
using std::string;
diff --git a/src/gui/SubgraphModule.hpp b/src/gui/SubgraphModule.hpp
index 6f4e1c4c..8ce4f063 100644
--- a/src/gui/SubgraphModule.hpp
+++ b/src/gui/SubgraphModule.hpp
@@ -19,8 +19,8 @@
#include "ingen/types.hpp"
-#include "NodeModule.hpp"
#include "GraphPortModule.hpp"
+#include "NodeModule.hpp"
namespace ingen { namespace client {
class GraphModel;
diff --git a/src/server/BufferFactory.hpp b/src/server/BufferFactory.hpp
index 03a85d1c..78d3fb56 100644
--- a/src/server/BufferFactory.hpp
+++ b/src/server/BufferFactory.hpp
@@ -25,8 +25,8 @@
#include "types.hpp"
#include <atomic>
-#include <mutex>
#include <cstdint>
+#include <mutex>
namespace Raul { class Maid; }
diff --git a/src/server/JackDriver.cpp b/src/server/JackDriver.cpp
index af4dde8f..71ebe308 100644
--- a/src/server/JackDriver.cpp
+++ b/src/server/JackDriver.cpp
@@ -35,13 +35,15 @@
#include "lv2/atom/util.h"
#include <jack/midiport.h>
+
#ifdef INGEN_JACK_SESSION
-#include <jack/session.h>
#include "ingen/Serialiser.hpp"
+#include <jack/session.h>
#endif
+
#ifdef HAVE_JACK_METADATA
-#include <jack/metadata.h>
#include "jackey.h"
+#include <jack/metadata.h>
#endif
#include <cassert>
diff --git a/src/server/LV2Block.hpp b/src/server/LV2Block.hpp
index 5ef8c69a..d42da499 100644
--- a/src/server/LV2Block.hpp
+++ b/src/server/LV2Block.hpp
@@ -17,8 +17,8 @@
#ifndef INGEN_ENGINE_LV2BLOCK_HPP
#define INGEN_ENGINE_LV2BLOCK_HPP
-#include "BufferRef.hpp"
#include "BlockImpl.hpp"
+#include "BufferRef.hpp"
#include "types.hpp"
#include "ingen/LV2Features.hpp"
diff --git a/src/server/ingen_lv2.cpp b/src/server/ingen_lv2.cpp
index e368d8f1..bccae02d 100644
--- a/src/server/ingen_lv2.cpp
+++ b/src/server/ingen_lv2.cpp
@@ -46,7 +46,6 @@
#include "ingen/runtime_paths.hpp"
#include "ingen/types.hpp"
#include "lv2/atom/atom.h"
-#include "lv2/atom/atom.h"
#include "lv2/atom/util.h"
#include "lv2/buf-size/buf-size.h"
#include "lv2/core/lv2.h"
diff --git a/src/server/util.hpp b/src/server/util.hpp
index 34e2ee79..59cceda4 100644
--- a/src/server/util.hpp
+++ b/src/server/util.hpp
@@ -26,8 +26,8 @@
#include <xmmintrin.h>
#endif
-#include <fenv.h>
#include <cstdlib>
+#include <fenv.h>
#ifdef __clang__
# define REALTIME __attribute__((annotate("realtime")))