From 0856e94ece57d63991f0b5828d73c43b10491d5b Mon Sep 17 00:00:00 2001 From: James Muehlner Date: Thu, 24 Feb 2022 11:12:05 -0800 Subject: [PATCH] GUACAMOLE-1538 Use dashes instead of underscores in filenames for consistency with libguac public API. --- src/terminal/Makefile.am | 20 +++++++++---------- .../{char_mappings.c => char-mappings.c} | 0 .../{color_scheme.c => color-scheme.c} | 2 +- .../{named_colors.c => named-colors.c} | 0 src/terminal/select.c | 2 +- ...erminal_handlers.c => terminal-handlers.c} | 6 +++--- ...stdin_stream.c => terminal-stdin-stream.c} | 2 +- src/terminal/terminal.c | 6 +++--- .../{char_mappings.h => char-mappings.h} | 2 +- .../{color_scheme.h => color-scheme.h} | 2 +- .../{named_colors.h => named-colors.h} | 2 +- ...erminal_handlers.h => terminal-handlers.h} | 2 +- .../{terminal_priv.h => terminal-priv.h} | 0 src/terminal/xparsecolor.c | 2 +- 14 files changed, 24 insertions(+), 24 deletions(-) rename src/terminal/{char_mappings.c => char-mappings.c} (100%) rename src/terminal/{color_scheme.c => color-scheme.c} (99%) rename src/terminal/{named_colors.c => named-colors.c} (100%) rename src/terminal/{terminal_handlers.c => terminal-handlers.c} (99%) rename src/terminal/{terminal_stdin_stream.c => terminal-stdin-stream.c} (99%) rename src/terminal/terminal/{char_mappings.h => char-mappings.h} (98%) rename src/terminal/terminal/{color_scheme.h => color-scheme.h} (99%) rename src/terminal/terminal/{named_colors.h => named-colors.h} (98%) rename src/terminal/terminal/{terminal_handlers.h => terminal-handlers.h} (99%) rename src/terminal/terminal/{terminal_priv.h => terminal-priv.h} (100%) diff --git a/src/terminal/Makefile.am b/src/terminal/Makefile.am index 52cc13dd..4d704e7b 100644 --- a/src/terminal/Makefile.am +++ b/src/terminal/Makefile.am @@ -31,37 +31,37 @@ lib_LTLIBRARIES = libguac-terminal.la libguac_terminalincdir = $(includedir)/guacamole/terminal noinst_HEADERS = \ - terminal/terminal_priv.h + terminal/terminal-priv.h libguac_terminalinc_HEADERS = \ terminal/buffer.h \ - terminal/char_mappings.h \ + terminal/char-mappings.h \ terminal/common.h \ - terminal/color_scheme.h \ + terminal/color-scheme.h \ terminal/display.h \ - terminal/named_colors.h \ + terminal/named-colors.h \ terminal/palette.h \ terminal/scrollbar.h \ terminal/select.h \ terminal/terminal.h \ - terminal/terminal_handlers.h \ + terminal/terminal-handlers.h \ terminal/types.h \ terminal/typescript.h \ terminal/xparsecolor.h libguac_terminal_la_SOURCES = \ buffer.c \ - char_mappings.c \ - color_scheme.c \ + char-mappings.c \ + color-scheme.c \ common.c \ display.c \ - named_colors.c \ + named-colors.c \ palette.c \ scrollbar.c \ select.c \ terminal.c \ - terminal_handlers.c \ - terminal_stdin_stream.c \ + terminal-handlers.c \ + terminal-stdin-stream.c \ typescript.c \ xparsecolor.c diff --git a/src/terminal/char_mappings.c b/src/terminal/char-mappings.c similarity index 100% rename from src/terminal/char_mappings.c rename to src/terminal/char-mappings.c diff --git a/src/terminal/color_scheme.c b/src/terminal/color-scheme.c similarity index 99% rename from src/terminal/color_scheme.c rename to src/terminal/color-scheme.c index ec602e12..5df181fa 100644 --- a/src/terminal/color_scheme.c +++ b/src/terminal/color-scheme.c @@ -19,7 +19,7 @@ #include "config.h" -#include "terminal/color_scheme.h" +#include "terminal/color-scheme.h" #include "terminal/palette.h" #include "terminal/xparsecolor.h" diff --git a/src/terminal/named_colors.c b/src/terminal/named-colors.c similarity index 100% rename from src/terminal/named_colors.c rename to src/terminal/named-colors.c diff --git a/src/terminal/select.c b/src/terminal/select.c index a10687c5..e2622e4d 100644 --- a/src/terminal/select.c +++ b/src/terminal/select.c @@ -24,7 +24,7 @@ #include "terminal/display.h" #include "terminal/select.h" #include "terminal/terminal.h" -#include "terminal/terminal_priv.h" +#include "terminal/terminal-priv.h" #include "terminal/types.h" #include diff --git a/src/terminal/terminal_handlers.c b/src/terminal/terminal-handlers.c similarity index 99% rename from src/terminal/terminal_handlers.c rename to src/terminal/terminal-handlers.c index a4079fca..1603d4f5 100644 --- a/src/terminal/terminal_handlers.c +++ b/src/terminal/terminal-handlers.c @@ -19,11 +19,11 @@ #include "config.h" -#include "terminal/char_mappings.h" +#include "terminal/char-mappings.h" #include "terminal/palette.h" #include "terminal/terminal.h" -#include "terminal/terminal_handlers.h" -#include "terminal/terminal_priv.h" +#include "terminal/terminal-handlers.h" +#include "terminal/terminal-priv.h" #include "terminal/types.h" #include "terminal/xparsecolor.h" diff --git a/src/terminal/terminal_stdin_stream.c b/src/terminal/terminal-stdin-stream.c similarity index 99% rename from src/terminal/terminal_stdin_stream.c rename to src/terminal/terminal-stdin-stream.c index f9a2d617..8498a161 100644 --- a/src/terminal/terminal_stdin_stream.c +++ b/src/terminal/terminal-stdin-stream.c @@ -20,7 +20,7 @@ #include "config.h" #include "terminal/common.h" #include "terminal/terminal.h" -#include "terminal/terminal_priv.h" +#include "terminal/terminal-priv.h" #include #include diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c index 4378a304..cd469703 100644 --- a/src/terminal/terminal.c +++ b/src/terminal/terminal.c @@ -22,14 +22,14 @@ #include "common/clipboard.h" #include "common/cursor.h" #include "terminal/buffer.h" -#include "terminal/color_scheme.h" +#include "terminal/color-scheme.h" #include "terminal/common.h" #include "terminal/display.h" #include "terminal/palette.h" #include "terminal/select.h" #include "terminal/terminal.h" -#include "terminal/terminal_handlers.h" -#include "terminal/terminal_priv.h" +#include "terminal/terminal-handlers.h" +#include "terminal/terminal-priv.h" #include "terminal/types.h" #include "terminal/typescript.h" diff --git a/src/terminal/terminal/char_mappings.h b/src/terminal/terminal/char-mappings.h similarity index 98% rename from src/terminal/terminal/char_mappings.h rename to src/terminal/terminal/char-mappings.h index 937c4147..9af99a94 100644 --- a/src/terminal/terminal/char_mappings.h +++ b/src/terminal/terminal/char-mappings.h @@ -24,7 +24,7 @@ /** * Graphics character mapping definitions. * - * @file char_mappings.h + * @file char-mappings.h */ #include "config.h" diff --git a/src/terminal/terminal/color_scheme.h b/src/terminal/terminal/color-scheme.h similarity index 99% rename from src/terminal/terminal/color_scheme.h rename to src/terminal/terminal/color-scheme.h index 446b9eed..51d27be7 100644 --- a/src/terminal/terminal/color_scheme.h +++ b/src/terminal/terminal/color-scheme.h @@ -23,7 +23,7 @@ /** * Definitions and functions related to color scheme handling. * - * @file color_scheme.h + * @file color-scheme.h */ #include "config.h" diff --git a/src/terminal/terminal/named_colors.h b/src/terminal/terminal/named-colors.h similarity index 98% rename from src/terminal/terminal/named_colors.h rename to src/terminal/terminal/named-colors.h index 615d6978..ef51f8c0 100644 --- a/src/terminal/terminal/named_colors.h +++ b/src/terminal/terminal/named-colors.h @@ -23,7 +23,7 @@ /** * Function definitions for operating on individual terminal colors. * - * @file named_colors.h + * @file named-colors.h */ #include "config.h" diff --git a/src/terminal/terminal/terminal_handlers.h b/src/terminal/terminal/terminal-handlers.h similarity index 99% rename from src/terminal/terminal/terminal_handlers.h rename to src/terminal/terminal/terminal-handlers.h index e293c581..7a5551d5 100644 --- a/src/terminal/terminal/terminal_handlers.h +++ b/src/terminal/terminal/terminal-handlers.h @@ -24,7 +24,7 @@ /** * Function definitions for terminal event handlers. * - * @file terminal_handlers.h + * @file terminal-handlers.h */ #include "config.h" diff --git a/src/terminal/terminal/terminal_priv.h b/src/terminal/terminal/terminal-priv.h similarity index 100% rename from src/terminal/terminal/terminal_priv.h rename to src/terminal/terminal/terminal-priv.h diff --git a/src/terminal/xparsecolor.c b/src/terminal/xparsecolor.c index f5432476..779374d8 100644 --- a/src/terminal/xparsecolor.c +++ b/src/terminal/xparsecolor.c @@ -19,7 +19,7 @@ #include "config.h" -#include "terminal/named_colors.h" +#include "terminal/named-colors.h" #include "terminal/palette.h" #include