diff --git a/particles/empty.c b/particles/empty.c index 12151f3..4b7ab37 100644 --- a/particles/empty.c +++ b/particles/empty.c @@ -1,8 +1,7 @@ -#include "empty.h" - #include #include "../config.h" +#include "../particle.h" static int begin_expose(struct exposable *exposable) diff --git a/particles/empty.h b/particles/empty.h deleted file mode 100644 index 5e2f567..0000000 --- a/particles/empty.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../particle.h" - -extern const struct particle_info particle_empty; diff --git a/particles/list.c b/particles/list.c index f0980b7..b190ec6 100644 --- a/particles/list.c +++ b/particles/list.c @@ -1,10 +1,10 @@ -#include "list.h" #include #define LOG_MODULE "list" #define LOG_ENABLE_DBG 1 #include "../log.h" #include "../config.h" +#include "../particle.h" struct private { struct particle **particles; diff --git a/particles/list.h b/particles/list.h deleted file mode 100644 index 3ac9768..0000000 --- a/particles/list.h +++ /dev/null @@ -1,9 +0,0 @@ -#pragma once -#include "../particle.h" - -struct particle *particle_list_new( - struct particle *common, - struct particle *particles[], size_t count, - int left_spacing, int right_spacing); - -extern const struct particle_info particle_list; diff --git a/particles/map.c b/particles/map.c index 0b4c0bf..4aac2fe 100644 --- a/particles/map.c +++ b/particles/map.c @@ -1,5 +1,3 @@ -#include "map.h" - #include #include #include @@ -7,6 +5,7 @@ #define LOG_MODULE "map" #include "../log.h" #include "../config.h" +#include "../particle.h" struct particle_map { const char *tag_value; diff --git a/particles/map.h b/particles/map.h deleted file mode 100644 index c9ccb13..0000000 --- a/particles/map.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../particle.h" - -extern const struct particle_info particle_map; diff --git a/particles/progress-bar.c b/particles/progress-bar.c index e69a1c4..93ae285 100644 --- a/particles/progress-bar.c +++ b/particles/progress-bar.c @@ -1,5 +1,3 @@ -#include "progress-bar.h" - #include #include #include @@ -8,6 +6,7 @@ #define LOG_ENABLE_DBG 0 #include "../log.h" #include "../config.h" +#include "../particle.h" struct private { char *tag; diff --git a/particles/progress-bar.h b/particles/progress-bar.h deleted file mode 100644 index 4095cef..0000000 --- a/particles/progress-bar.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../particle.h" - -extern const struct particle_info particle_progress_bar; diff --git a/particles/ramp.c b/particles/ramp.c index a17f716..30c2e5e 100644 --- a/particles/ramp.c +++ b/particles/ramp.c @@ -1,5 +1,3 @@ -#include "ramp.h" - #include #include #include @@ -7,6 +5,7 @@ #include #include "../config.h" +#include "../particle.h" struct private { char *tag; diff --git a/particles/ramp.h b/particles/ramp.h deleted file mode 100644 index 6605fd3..0000000 --- a/particles/ramp.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../particle.h" - -extern const struct particle_info particle_ramp; diff --git a/particles/string.c b/particles/string.c index 152ca57..ce4b305 100644 --- a/particles/string.c +++ b/particles/string.c @@ -1,5 +1,3 @@ -#include "string.h" - #include #include #include @@ -8,6 +6,7 @@ #define LOG_ENABLE_DBG 1 #include "../log.h" #include "../config.h" +#include "../particle.h" struct private { char *text; diff --git a/particles/string.h b/particles/string.h deleted file mode 100644 index ca09106..0000000 --- a/particles/string.h +++ /dev/null @@ -1,4 +0,0 @@ -#pragma once -#include "../particle.h" - -extern const struct particle_info particle_string;