Fix/improve includes/fwd decls
Preparation for clang-format. It will shuffle the includes, and this preparation will prevent errors from that step.
This commit is contained in:
committed by
Johannes Lorenz
parent
7ac627da65
commit
2f17c0da2b
@@ -1,5 +1,7 @@
|
||||
/* algread_internal.h -- interface between allegro.cpp and allegrord.cpp */
|
||||
|
||||
#include "allegro.h"
|
||||
|
||||
Alg_error alg_read(std::istream &file, Alg_seq_ptr new_seq,
|
||||
double *offset_ptr = NULL);
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
/* algsmfrd_internal.h -- interface from allegrosmfrd.cpp to allegro.cpp */
|
||||
|
||||
#include "allegro.h"
|
||||
|
||||
Alg_error alg_smf_read(std::istream &file, Alg_seq_ptr new_seq);
|
||||
|
||||
@@ -49,6 +49,7 @@
|
||||
#ifndef ALLEGRO_H
|
||||
#define ALLEGRO_H
|
||||
#include <assert.h>
|
||||
#include <cstring>
|
||||
#include <istream>
|
||||
#include <ostream>
|
||||
|
||||
|
||||
@@ -1,3 +1,5 @@
|
||||
#include <cstddef>
|
||||
|
||||
#define NOTEOFF 0x80
|
||||
#define NOTEON 0x90
|
||||
#define PRESSURE 0xa0
|
||||
|
||||
@@ -29,6 +29,8 @@
|
||||
#include "Effect.h"
|
||||
#include "peak_controller_effect_controls.h"
|
||||
|
||||
class PeakController;
|
||||
|
||||
class PeakControllerEffect : public Effect
|
||||
{
|
||||
public:
|
||||
|
||||
@@ -29,7 +29,11 @@
|
||||
|
||||
#include <queue>
|
||||
|
||||
#include <FL/x.H>
|
||||
#undef CursorShape // is, by mistake, not undefed in FL
|
||||
|
||||
#define BUILD_REMOTE_PLUGIN_CLIENT
|
||||
|
||||
#include "Note.h"
|
||||
#include "RemotePlugin.h"
|
||||
#include "RemoteZynAddSubFx.h"
|
||||
@@ -38,8 +42,6 @@
|
||||
#include "zynaddsubfx/src/Nio/Nio.h"
|
||||
#include "zynaddsubfx/src/UI/MasterUI.h"
|
||||
|
||||
#include <FL/x.H>
|
||||
|
||||
|
||||
class RemoteZynAddSubFx : public RemotePluginClient, public LocalZynAddSubFx
|
||||
{
|
||||
|
||||
Reference in New Issue
Block a user