diff --git a/pages.c b/contain.c similarity index 99% rename from pages.c rename to contain.c index c3b8f97..2d26600 100644 --- a/pages.c +++ b/contain.c @@ -2,8 +2,8 @@ #include #include "cold.h" -#include "widgets.h" -#include "pages.h" +#include "display.h" +#include "contain.h" #include "texts.h" diff --git a/contain.d b/contain.d new file mode 100644 index 0000000..6e9257d --- /dev/null +++ b/contain.d @@ -0,0 +1 @@ +contain.o: contain.c cold.h display.h contain.h texts.h diff --git a/pages.h b/contain.h similarity index 100% rename from pages.h rename to contain.h diff --git a/pages.o b/contain.o similarity index 86% rename from pages.o rename to contain.o index 551fb1d..67676cc 100644 Binary files a/pages.o and b/contain.o differ diff --git a/widgets.c b/display.c similarity index 99% rename from widgets.c rename to display.c index 76dbc11..e5852ae 100644 --- a/widgets.c +++ b/display.c @@ -2,8 +2,8 @@ #include #include "cold.h" -#include "widgets.h" -#include "pages.h" +#include "display.h" +#include "contain.h" #include "texts.h" //------------------------------------------------------------------------------ diff --git a/display.d b/display.d new file mode 100644 index 0000000..7d9c4d8 --- /dev/null +++ b/display.d @@ -0,0 +1 @@ +display.o: display.c cold.h display.h contain.h texts.h diff --git a/widgets.h b/display.h similarity index 100% rename from widgets.h rename to display.h diff --git a/widgets.o b/display.o similarity index 96% rename from widgets.o rename to display.o index 44492cb..be6438d 100644 Binary files a/widgets.o and b/display.o differ diff --git a/hot.c b/hot.c index 3fe80b0..1938b8b 100644 --- a/hot.c +++ b/hot.c @@ -3,8 +3,8 @@ #include "warm.h" #include "cold.h" -#include "widgets.h" -#include "pages.h" +#include "display.h" +#include "contain.h" #include "texts.h" // https://forge.a-lec.org/gem-graph/gem-graph-client/src/branch/devel/Makefile diff --git a/hot.d b/hot.d index 7461b22..0a5b41c 100644 --- a/hot.d +++ b/hot.d @@ -1,3 +1,3 @@ hot.o: hot.c warm.h \ /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib.h \ - cold.h widgets.h pages.h texts.h + cold.h display.h contain.h texts.h diff --git a/hot.h b/hot.h index 3353fb3..6511602 100644 --- a/hot.h +++ b/hot.h @@ -9,6 +9,6 @@ #include "warm.h" #include "cold.h" -#include "widgets.h" -#include "pages.h" +#include "display.h" +#include "contain.h" diff --git a/main.c b/main.c index 03eb2cd..094f0cc 100644 --- a/main.c +++ b/main.c @@ -10,8 +10,8 @@ #include "hot.h" #include "warm.h" #include "cold.h" -#include "widgets.h" -#include "pages.h" +#include "display.h" +#include "contain.h" int main (int argc, char **argv) { diff --git a/main.d b/main.d index 3a2ea19..969681a 100644 --- a/main.d +++ b/main.d @@ -86,4 +86,4 @@ main.o: main.c hot.h warm.h \ /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/deprecated/grel.h \ /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/deprecated/gthread.h \ /gnu/store/fkmpkdav2zmz1k72989bdgpdrfac7rz1-glib-2.78.0/include/glib-2.0/glib/glib-autocleanups.h \ - cold.h widgets.h pages.h + cold.h display.h contain.h diff --git a/main.o b/main.o index 3b05a94..3e74b0f 100644 Binary files a/main.o and b/main.o differ diff --git a/myprogram b/myprogram index 4a8e9bd..1823160 100755 Binary files a/myprogram and b/myprogram differ diff --git a/pages.d b/pages.d deleted file mode 100644 index 1126ba2..0000000 --- a/pages.d +++ /dev/null @@ -1 +0,0 @@ -pages.o: pages.c cold.h widgets.h pages.h texts.h diff --git a/warm.c b/warm.c index 8f16465..2c11386 100644 --- a/warm.c +++ b/warm.c @@ -2,8 +2,8 @@ #include #include "cold.h" -#include "widgets.h" -#include "pages.h" +#include "display.h" +#include "contain.h" #include "texts.h" // https://docs.gtk.org/gtk4/visual_index.html < widgets gallery diff --git a/warm.d b/warm.d index f070fd7..ff34cde 100644 --- a/warm.d +++ b/warm.d @@ -1 +1 @@ -warm.o: warm.c cold.h widgets.h pages.h texts.h +warm.o: warm.c cold.h display.h contain.h texts.h diff --git a/warm.h b/warm.h index 0b406b6..a183d8f 100644 --- a/warm.h +++ b/warm.h @@ -25,8 +25,8 @@ #include #include "cold.h" -#include "widgets.h" -#include "pages.h" +#include "display.h" +#include "contain.h" // https://blog.gtk.org/2020/09/08/on-list-models/ < TODO diff --git a/widgets.d b/widgets.d deleted file mode 100644 index bbdc9b6..0000000 --- a/widgets.d +++ /dev/null @@ -1 +0,0 @@ -widgets.o: widgets.c cold.h widgets.h pages.h texts.h