diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2022-11-02 13:00:57 +0100 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2022-11-02 13:00:57 +0100 |
| commit | 2aea36ece0881e0ee0885ae1ddc656f2260de57a (patch) | |
| tree | eedb804a9ba70e2f8dcdcfd90f1dfb1de662b46c /src | |
| parent | adf0bb14ca9a76aa88a0fe688764770d0b1fa7d8 (diff) | |
Rename event.h to engineevent.h to avoid nameclash with system include files.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 2 | ||||
| -rw-r--r-- | src/audioinputengine.h | 2 | ||||
| -rw-r--r-- | src/drumgizmo.cc | 1 | ||||
| -rw-r--r-- | src/engineevent.h (renamed from src/event.h) | 2 | ||||
| -rw-r--r-- | src/inputfilter.h | 2 | ||||
| -rw-r--r-- | src/inputprocessor.h | 2 |
6 files changed, 5 insertions, 6 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a5cc5f7..ff02883 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -107,7 +107,7 @@ EXTRA_DIST = \ drumgizmoconf.h \ drumkit.h \ drumkitloader.h \ - event.h \ + engineevent.h \ events.h \ events_ds.h \ grid.h \ diff --git a/src/audioinputengine.h b/src/audioinputengine.h index 71a86c2..55a06ae 100644 --- a/src/audioinputengine.h +++ b/src/audioinputengine.h @@ -29,7 +29,7 @@ #include <string> #include <vector> -#include <event.h> +#include "engineevent.h" #include "instrument.h" diff --git a/src/drumgizmo.cc b/src/drumgizmo.cc index abe57be..9828c6b 100644 --- a/src/drumgizmo.cc +++ b/src/drumgizmo.cc @@ -32,7 +32,6 @@ #include <cstring> #include <mutex> -#include <event.h> #include <audiotypes.h> #include <config.h> diff --git a/src/event.h b/src/engineevent.h index 737fb18..9c60a4a 100644 --- a/src/event.h +++ b/src/engineevent.h @@ -1,6 +1,6 @@ /* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */ /*************************************************************************** - * event.h + * engineevent.h * * Fri Jun 3 12:10:50 CEST 2011 * Copyright 2011 Bent Bisballe Nyeng diff --git a/src/inputfilter.h b/src/inputfilter.h index 45dd01e..128dfb0 100644 --- a/src/inputfilter.h +++ b/src/inputfilter.h @@ -26,7 +26,7 @@ */ #pragma once -#include <event.h> +#include "engineevent.h" //! An abstract filter component for the InputProcessor class filter chain. class InputFilter diff --git a/src/inputprocessor.h b/src/inputprocessor.h index 971cc85..18bb583 100644 --- a/src/inputprocessor.h +++ b/src/inputprocessor.h @@ -30,13 +30,13 @@ #include <list> #include <memory> -#include <event.h> #include "drumkit.h" #include "events.h" #include "events_ds.h" #include "id.h" #include "inputfilter.h" +#include "engineevent.h" struct Settings; class Random; |