From f8cbc1a8a22966b32340b64af7fc1b73d728c9d3 Mon Sep 17 00:00:00 2001 From: Jean Sirmai Date: Sat, 29 Jun 2024 17:15:01 +0200 Subject: [PATCH] src/*.c: moved headers to include/ --- main.c | 26 -------------------------- src/automaton.c | 2 +- src/callback.c | 18 +++++++++--------- src/contain.c | 12 ++++++------ src/dialog.c | 2 +- src/display.c | 6 +++--- src/draw.c | 6 +++--- src/graph_area.c | 6 +++--- src/graph_stack.c | 6 +++--- src/grid.c | 6 +++--- src/init.c | 6 +++--- src/main.c | 2 +- src/parsing.c | 2 +- src/tree.c | 6 +++--- 14 files changed, 40 insertions(+), 66 deletions(-) delete mode 100644 main.c diff --git a/main.c b/main.c deleted file mode 100644 index a5f9b0c..0000000 --- a/main.c +++ /dev/null @@ -1,26 +0,0 @@ -/******************************************************************************/ -/* */ -/* E coli by David S. Goodsell (2009) */ -/* --- */ -/* Let this freeze frame guide us towards the model */ -/* that alone can account for the phenomenon ! */ -/* */ -/******************************************************************************/ - -#include "callback.h" - -int main (int argc, char **argv) -{ - GtkApplication *app; - int status; - - app = gtk_application_new ("org.jean.GTK4_GG_hack", G_APPLICATION_DEFAULT_FLAGS); - g_signal_connect (app, "activate", G_CALLBACK (on_main_window_activation), NULL); - g_signal_connect (app, "activate", G_CALLBACK (on_dialog_window_activation), NULL); - status = g_application_run (G_APPLICATION (app), argc, argv); - g_object_unref (app); - - printf("in contain.get_SPACE_VIEW_box() (line 138) > ui_setup_glarea (0, GTK_WIDGET (middle_box)); < commented 2024/06/27 > TODO\n"); - - return status; -} diff --git a/src/automaton.c b/src/automaton.c index 6e431df..2d35cf8 100644 --- a/src/automaton.c +++ b/src/automaton.c @@ -1,7 +1,7 @@ #include #include #include "../include/callback.h" -#include "automaton.h" +#include "../include/automaton.h" /******************************************************************************/ diff --git a/src/callback.c b/src/callback.c index f42cd4a..6906850 100644 --- a/src/callback.c +++ b/src/callback.c @@ -1,15 +1,15 @@ #include #include -#include "callback.h" -#include "contain.h" -#include "tree.h" -#include "contain.h" -#include "dialog.h" -#include "texts.h" -#include "automaton.h" -#include "parsing.h" -#include "graph_area.h" +#include "../include/callback.h" +#include "../include/contain.h" +#include "../include/tree.h" +#include "../include/contain.h" +#include "../include/dialog.h" +#include "../include/texts.h" +#include "../include/automaton.h" +#include "../include/parsing.h" +#include "../include/graph_area.h" /******************************************************************************/ /* W I N D O W S A C T I V A T I O N */ diff --git a/src/contain.c b/src/contain.c index 3f0a463..e08b1d4 100644 --- a/src/contain.c +++ b/src/contain.c @@ -1,12 +1,12 @@ #include #include -#include "graph_area.h" -#include "callback.h" -#include "automaton.h" -#include "display.h" -#include "tree.h" -#include "texts.h" +#include "../include/graph_area.h" +#include "../include/callback.h" +#include "../include/automaton.h" +#include "../include/display.h" +#include "../include/tree.h" +#include "../include/texts.h" // https://blog.gtk.org/2020/09/08/on-list-models/ < TODO // https://docs.gtk.org/gtk4/visual_index.html < widgets gallery diff --git a/src/dialog.c b/src/dialog.c index a872962..8a4fcd3 100644 --- a/src/dialog.c +++ b/src/dialog.c @@ -1,4 +1,4 @@ -#include "callback.h" +#include "../include/callback.h" void dialog_window_design (GtkWindow *main_window, GtkWindow *dialog_window){ char *title = " Save the current model before modifying it? "; diff --git a/src/display.c b/src/display.c index 439ad62..b3e7f4a 100644 --- a/src/display.c +++ b/src/display.c @@ -1,9 +1,9 @@ #include #include -#include "contain.h" -#include "tree.h" -#include "texts.h" +#include "../include/contain.h" +#include "../include/tree.h" +#include "../include/texts.h" //------------------------------------------------------------------------------ diff --git a/src/draw.c b/src/draw.c index fea1ca7..3dd95a9 100644 --- a/src/draw.c +++ b/src/draw.c @@ -33,9 +33,9 @@ #include #include #include -#include "base.h" -//#include "ui.h" -#include "graph_area.h" +#include "../include/base.h" +//#include "../include/ui.h" +#include "../include/graph_area.h" void graphics_draw_vertex (const int stack_id, GLfloat x, diff --git a/src/graph_area.c b/src/graph_area.c index 2732cf3..6fbc30c 100644 --- a/src/graph_area.c +++ b/src/graph_area.c @@ -25,9 +25,9 @@ #include #include -#include "contain.h" -#include "graph_area.h" -#include "callback.h" +#include "../include/contain.h" +#include "../include/graph_area.h" +#include "../include/callback.h" struct stack_index_t { long stack_id; diff --git a/src/graph_stack.c b/src/graph_stack.c index 6d77b9e..c4d8856 100644 --- a/src/graph_stack.c +++ b/src/graph_stack.c @@ -26,9 +26,9 @@ #include #include -#include "contain.h" -#include "graph_area.h" -#include "parsing.h" +#include "../include/contain.h" +#include "../include/graph_area.h" +#include "../include/parsing.h" #define TEST 0 diff --git a/src/grid.c b/src/grid.c index 0947d80..caad946 100644 --- a/src/grid.c +++ b/src/grid.c @@ -24,9 +24,9 @@ #include #include -#include "base.h" -//#include "ui.h" -#include "graphics.h" +#include "../include/base.h" +//#include "../include/ui.h" +#include "../include/graphics.h" int draw_space_ridges_vertex (const int stack_id, long offset_vertex, diff --git a/src/init.c b/src/init.c index 12756a4..fd5abbe 100644 --- a/src/init.c +++ b/src/init.c @@ -26,9 +26,9 @@ #include #include -#include "base.h" -#include "contain.h" // instead of "ui.h" -#include "graph_area.h" +#include "../include/base.h" +#include "../include/contain.h" // instead of "ui.h" +#include "../include/graph_area.h" /* Initializes the buffer of a gl_area * Calls according to the user preferences diff --git a/src/main.c b/src/main.c index a5f9b0c..2502cbb 100644 --- a/src/main.c +++ b/src/main.c @@ -7,7 +7,7 @@ /* */ /******************************************************************************/ -#include "callback.h" +#include "../include/callback.h" int main (int argc, char **argv) { diff --git a/src/parsing.c b/src/parsing.c index b618d5b..32e7baf 100644 --- a/src/parsing.c +++ b/src/parsing.c @@ -33,7 +33,7 @@ #include // http://xmlsoft.org/examples/#parse1.c // https://gnome.pages.gitlab.gnome.org/libxml2/devhelp/general.html -#include "base.h" +#include "../include/base.h" #define READ_SITE 1 << 0 #define READ_WEIGHT 1 << 1 diff --git a/src/tree.c b/src/tree.c index 99c6fbb..943e6c2 100644 --- a/src/tree.c +++ b/src/tree.c @@ -3,9 +3,9 @@ #include -#include "contain.h" -#include "texts.h" -#include "callback.h" +#include "../include/contain.h" +#include "../include/texts.h" +#include "../include/callback.h" // https://docs.gtk.org/gtk4/visual_index.html < widgets gallery // https://docs.gtk.org/gtk4/section-text-widget.html