From cca90781c0ba72bf296c89ce63e7046c9cb33185 Mon Sep 17 00:00:00 2001 From: David Herrmann Date: Tue, 18 Sep 2012 10:54:06 +0200 Subject: [PATCH] tsm: move unicode.[ch] to tsm_unicode.[ch] All TSM related files will get the tsm_* prefix so move unicode headers and sources. Signed-off-by: David Herrmann --- Makefile.am | 2 +- src/console.c | 2 +- src/console.h | 2 +- src/terminal.c | 2 +- src/text.h | 2 +- src/text_bblit.c | 2 +- src/text_bbulk.c | 2 +- src/text_font_8x16.c | 2 +- src/text_font_freetype2.c | 2 +- src/text_font_pango.c | 2 +- src/text_font_unifont.c | 2 +- src/text_gltex.c | 2 +- src/{unicode.c => tsm_unicode.c} | 2 +- src/{unicode.h => tsm_unicode.h} | 0 src/vte.c | 2 +- src/vte.h | 2 +- src/vte_charsets.c | 2 +- 17 files changed, 16 insertions(+), 16 deletions(-) rename src/{unicode.c => tsm_unicode.c} (99%) rename src/{unicode.h => tsm_unicode.h} (100%) diff --git a/Makefile.am b/Makefile.am index c6d0586..a74cc8c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -277,7 +277,7 @@ libkmscon_core_la_SOURCES = \ src/conf.c src/conf.h \ src/ui.c src/ui.h \ src/console.c src/console.h \ - src/unicode.c src/unicode.h \ + src/tsm_unicode.c src/tsm_unicode.h \ src/log.c src/log.h \ src/vte.c src/vte.h \ src/vte_charsets.c \ diff --git a/src/console.c b/src/console.c index 7cb8338..58e3588 100644 --- a/src/console.c +++ b/src/console.c @@ -39,7 +39,7 @@ #include "log.h" #include "main.h" #include "shl_timer.h" -#include "unicode.h" +#include "tsm_unicode.h" #define LOG_SUBSYSTEM "console" diff --git a/src/console.h b/src/console.h index 38ab03d..2bc590c 100644 --- a/src/console.h +++ b/src/console.h @@ -37,7 +37,7 @@ #include #include #include -#include "unicode.h" +#include "tsm_unicode.h" struct kmscon_console; diff --git a/src/terminal.c b/src/terminal.c index d45867f..c08cd17 100644 --- a/src/terminal.c +++ b/src/terminal.c @@ -41,7 +41,7 @@ #include "shl_dlist.h" #include "terminal.h" #include "text.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "uterm.h" #include "vte.h" diff --git a/src/text.h b/src/text.h index 274cf39..bb6f61d 100644 --- a/src/text.h +++ b/src/text.h @@ -41,7 +41,7 @@ #include #include #include "console.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "uterm.h" /* fonts */ diff --git a/src/text_bblit.c b/src/text_bblit.c index 211cf9b..1a7a446 100644 --- a/src/text_bblit.c +++ b/src/text_bblit.c @@ -38,7 +38,7 @@ #include #include "log.h" #include "text.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "uterm.h" #define LOG_SUBSYSTEM "text_bblit" diff --git a/src/text_bbulk.c b/src/text_bbulk.c index 47a4636..abb3d81 100644 --- a/src/text_bbulk.c +++ b/src/text_bbulk.c @@ -38,7 +38,7 @@ #include #include "log.h" #include "text.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "uterm.h" #define LOG_SUBSYSTEM "text_bbulk" diff --git a/src/text_font_8x16.c b/src/text_font_8x16.c index ac17e26..34b8d2a 100644 --- a/src/text_font_8x16.c +++ b/src/text_font_8x16.c @@ -49,7 +49,7 @@ #include #include "log.h" #include "text.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "uterm.h" #define LOG_SUBSYSTEM "text_font_8x16" diff --git a/src/text_font_freetype2.c b/src/text_font_freetype2.c index 0c78e5d..59cd99d 100644 --- a/src/text_font_freetype2.c +++ b/src/text_font_freetype2.c @@ -48,7 +48,7 @@ #include "shl_dlist.h" #include "shl_hashtable.h" #include "text.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "uterm.h" #define LOG_SUBSYSTEM "text_font_freetype2" diff --git a/src/text_font_pango.c b/src/text_font_pango.c index 125db86..4ff396d 100644 --- a/src/text_font_pango.c +++ b/src/text_font_pango.c @@ -55,7 +55,7 @@ #include "shl_dlist.h" #include "shl_hashtable.h" #include "text.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "uterm.h" #define LOG_SUBSYSTEM "text_font_pango" diff --git a/src/text_font_unifont.c b/src/text_font_unifont.c index 0d56677..48fe0c2 100644 --- a/src/text_font_unifont.c +++ b/src/text_font_unifont.c @@ -44,7 +44,7 @@ #include #include "log.h" #include "text.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "uterm.h" #define LOG_SUBSYSTEM "text_font_unifont" diff --git a/src/text_gltex.c b/src/text_gltex.c index 90f1102..e71d923 100644 --- a/src/text_gltex.c +++ b/src/text_gltex.c @@ -50,7 +50,7 @@ #include "shl_hashtable.h" #include "static_gl.h" #include "text.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "uterm.h" #define LOG_SUBSYSTEM "text_gltex" diff --git a/src/unicode.c b/src/tsm_unicode.c similarity index 99% rename from src/unicode.c rename to src/tsm_unicode.c index 464b7a5..4f1fc65 100644 --- a/src/unicode.c +++ b/src/tsm_unicode.c @@ -62,7 +62,7 @@ #include "log.h" #include "shl_array.h" #include "shl_hashtable.h" -#include "unicode.h" +#include "tsm_unicode.h" #define LOG_SUBSYSTEM "unicode" diff --git a/src/unicode.h b/src/tsm_unicode.h similarity index 100% rename from src/unicode.h rename to src/tsm_unicode.h diff --git a/src/vte.c b/src/vte.c index 2ef1fbf..c77ab66 100644 --- a/src/vte.c +++ b/src/vte.c @@ -55,7 +55,7 @@ #include "console.h" #include "log.h" #include "main.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "vte.h" /* TODO: Change this to use "xkbcommon-keysyms.h" and add xkbcommon as diff --git a/src/vte.h b/src/vte.h index 8e58458..59d9e1a 100644 --- a/src/vte.h +++ b/src/vte.h @@ -35,7 +35,7 @@ #include #include "console.h" -#include "unicode.h" +#include "tsm_unicode.h" /* available character sets */ diff --git a/src/vte_charsets.c b/src/vte_charsets.c index 7eedd71..ca83208 100644 --- a/src/vte_charsets.c +++ b/src/vte_charsets.c @@ -68,7 +68,7 @@ #include #include "log.h" -#include "unicode.h" +#include "tsm_unicode.h" #include "vte.h" #define LOG_SUBSYSTEM "vte"