From 2eeef375c73b410a2786c15c64051ef3d913c0f4 Mon Sep 17 00:00:00 2001 From: Hugues Delorme Date: Tue, 15 Jan 2013 17:56:24 +0100 Subject: [PATCH] c-lib: improve file name consistency --- qmake.build/c/libstl/libstl.pro | 4 ++-- src/c/endian.h | 2 +- src/c/{foug_global.h => global.h} | 0 src/c/libstl/stl_global.h | 2 +- src/c/libstl/{triangle.h => stl_triangle.h} | 2 +- src/c/libstl/stlb_read.h | 2 +- src/c/libstl/stlb_write.h | 2 +- src/c/stream.h | 2 +- src/c/task_control.h | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) rename src/c/{foug_global.h => global.h} (100%) rename src/c/libstl/{triangle.h => stl_triangle.h} (92%) diff --git a/qmake.build/c/libstl/libstl.pro b/qmake.build/c/libstl/libstl.pro index 476bbe5..cffc745 100644 --- a/qmake.build/c/libstl/libstl.pro +++ b/qmake.build/c/libstl/libstl.pro @@ -22,14 +22,14 @@ INCLUDEPATH += ../../../src HEADERS += \ ../../../src/c/endian.h \ - ../../../src/c/foug_global.h \ + ../../../src/c/global.h \ ../../../src/c/memory.h \ ../../../src/c/stream.h \ ../../../src/c/task_control.h \ ../../../src/c/libstl/stl_global.h \ ../../../src/c/libstl/stlb_read.h \ ../../../src/c/libstl/stlb_write.h \ - ../../../src/c/libstl/triangle.h + ../../../src/c/libstl/stl_triangle.h SOURCES += \ ../../../src/c/endian.c \ diff --git a/src/c/endian.h b/src/c/endian.h index 5b958b4..8b3382c 100644 --- a/src/c/endian.h +++ b/src/c/endian.h @@ -1,7 +1,7 @@ #ifndef FOUG_ENDIAN_H #define FOUG_ENDIAN_H -#include "foug_global.h" +#include "global.h" typedef enum { diff --git a/src/c/foug_global.h b/src/c/global.h similarity index 100% rename from src/c/foug_global.h rename to src/c/global.h diff --git a/src/c/libstl/stl_global.h b/src/c/libstl/stl_global.h index ce6c06e..0a830e4 100644 --- a/src/c/libstl/stl_global.h +++ b/src/c/libstl/stl_global.h @@ -1,7 +1,7 @@ #ifndef FOUG_C_LIBSTL_STLB_GLOBAL_H #define FOUG_C_LIBSTL_STLB_GLOBAL_H -#include "../foug_global.h" +#include "../global.h" #ifdef FOUG_DATAEX_LIBSTL_DLL # ifdef FOUG_DATAEX_LIBSTL_MAKE_DLL diff --git a/src/c/libstl/triangle.h b/src/c/libstl/stl_triangle.h similarity index 92% rename from src/c/libstl/triangle.h rename to src/c/libstl/stl_triangle.h index 979918e..0b30682 100644 --- a/src/c/libstl/triangle.h +++ b/src/c/libstl/stl_triangle.h @@ -1,7 +1,7 @@ #ifndef FOUG_C_LIBSTL_TRIANGLE_H #define FOUG_C_LIBSTL_TRIANGLE_H -#include "../foug_global.h" +#include "stl_global.h" typedef struct { diff --git a/src/c/libstl/stlb_read.h b/src/c/libstl/stlb_read.h index 91232f8..e831c26 100644 --- a/src/c/libstl/stlb_read.h +++ b/src/c/libstl/stlb_read.h @@ -2,7 +2,7 @@ #define FOUG_C_LIBSTL_STLB_READ_H #include "stl_global.h" -#include "triangle.h" +#include "stl_triangle.h" #include "../stream.h" #include "../task_control.h" diff --git a/src/c/libstl/stlb_write.h b/src/c/libstl/stlb_write.h index 4c5a442..9a41f3e 100644 --- a/src/c/libstl/stlb_write.h +++ b/src/c/libstl/stlb_write.h @@ -2,7 +2,7 @@ #define FOUG_C_LIBSTL_STLB_WRITE_H #include "stl_global.h" -#include "triangle.h" +#include "stl_triangle.h" #include "../stream.h" #include "../task_control.h" diff --git a/src/c/stream.h b/src/c/stream.h index 0aa0a7e..41c2c0b 100644 --- a/src/c/stream.h +++ b/src/c/stream.h @@ -1,7 +1,7 @@ #ifndef FOUG_C_STREAM_H #define FOUG_C_STREAM_H -#include "foug_global.h" +#include "global.h" #include "memory.h" /* foug_stream : opaque structure */ diff --git a/src/c/task_control.h b/src/c/task_control.h index f7479a4..59c9dec 100644 --- a/src/c/task_control.h +++ b/src/c/task_control.h @@ -1,7 +1,7 @@ #ifndef FOUG_C_TASK_CONTROL_H #define FOUG_C_TASK_CONTROL_H -#include "foug_global.h" +#include "global.h" #include "memory.h" /* foug_task_control : opaque structure */