GUACAMOLE-1538 Use dashes instead of underscores in filenames for consistency with libguac public API.

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
 

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"
 

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 <guacamole/client.h>

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"
 

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 <guacamole/protocol.h>
 #include <guacamole/socket.h>

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"
 

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"

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"

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"

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"

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 <stdio.h>