From eee928548d6859cc4bbc4f632084e6b4ea841e9c Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Sun, 11 Sep 2016 17:28:50 -0700 Subject: [PATCH] GUACAMOLE-169: Use proper namespace for internal common headers. --- src/common-ssh/guac_sftp.h | 2 +- src/common/Makefile.am | 62 +++++++++---------- .../{guac_blank_cursor.c => blank_cursor.c} | 0 src/common/{guac_clipboard.c => clipboard.c} | 2 +- .../blank_cursor.h} | 0 .../{guac_clipboard.h => common/clipboard.h} | 0 src/common/{guac_cursor.h => common/cursor.h} | 2 +- .../{guac_display.h => common/display.h} | 4 +- .../dot_cursor.h} | 0 .../ibar_cursor.h} | 0 src/common/{guac_iconv.h => common/iconv.h} | 0 src/common/{guac_io.h => common/io.h} | 0 src/common/{guac_json.h => common/json.h} | 0 src/common/{guac_list.h => common/list.h} | 0 .../pointer_cursor.h} | 0 .../{guac_recording.h => common/recording.h} | 0 src/common/{guac_rect.h => common/rect.h} | 0 src/common/{guac_string.h => common/string.h} | 0 .../{guac_surface.h => common/surface.h} | 2 +- src/common/{guac_cursor.c => cursor.c} | 12 ++-- src/common/{guac_display.c => display.c} | 6 +- .../{guac_dot_cursor.c => dot_cursor.c} | 0 .../{guac_ibar_cursor.c => ibar_cursor.c} | 0 src/common/{guac_iconv.c => iconv.c} | 2 +- src/common/{guac_io.c => io.c} | 2 +- src/common/{guac_json.c => json.c} | 2 +- src/common/{guac_list.c => list.c} | 2 +- ...guac_pointer_cursor.c => pointer_cursor.c} | 0 src/common/{guac_recording.c => recording.c} | 2 +- src/common/{guac_rect.c => rect.c} | 2 +- src/common/{guac_string.c => string.c} | 2 +- src/common/{guac_surface.c => surface.c} | 4 +- src/guacd/proc-map.c | 2 +- src/guacd/proc-map.h | 2 +- src/protocols/rdp/dvc.c | 2 +- src/protocols/rdp/dvc.h | 2 +- src/protocols/rdp/rdp.c | 6 +- src/protocols/rdp/rdp.h | 8 +-- src/protocols/rdp/rdp_bitmap.c | 4 +- src/protocols/rdp/rdp_bitmap.h | 2 +- src/protocols/rdp/rdp_cliprdr.c | 4 +- src/protocols/rdp/rdp_gdi.c | 2 +- src/protocols/rdp/rdp_glyph.c | 2 +- src/protocols/rdp/rdp_pointer.c | 4 +- src/protocols/rdp/rdp_pointer.h | 2 +- src/protocols/rdp/rdp_settings.c | 2 +- src/protocols/rdp/rdp_stream.c | 2 +- src/protocols/rdp/rdp_stream.h | 2 +- src/protocols/rdp/rdp_svc.c | 2 +- src/protocols/rdp/user.c | 2 +- src/protocols/ssh/input.c | 4 +- src/protocols/ssh/ssh.c | 2 +- src/protocols/ssh/user.c | 2 +- src/protocols/telnet/telnet.c | 2 +- src/protocols/vnc/clipboard.c | 4 +- src/protocols/vnc/cursor.c | 6 +- src/protocols/vnc/display.c | 4 +- src/protocols/vnc/input.c | 4 +- src/protocols/vnc/log.c | 4 +- src/protocols/vnc/log.h | 4 +- src/protocols/vnc/user.c | 6 +- src/protocols/vnc/vnc.c | 8 +-- src/protocols/vnc/vnc.h | 8 +-- src/terminal/display.c | 2 +- src/terminal/display.h | 2 +- src/terminal/terminal.c | 5 +- src/terminal/terminal.h | 4 +- src/terminal/typescript.c | 2 +- tests/common/guac_iconv.c | 2 +- tests/common/guac_rect.c | 2 +- tests/common/guac_string.c | 2 +- 71 files changed, 120 insertions(+), 121 deletions(-) rename src/common/{guac_blank_cursor.c => blank_cursor.c} (100%) rename src/common/{guac_clipboard.c => clipboard.c} (99%) rename src/common/{guac_blank_cursor.h => common/blank_cursor.h} (100%) rename src/common/{guac_clipboard.h => common/clipboard.h} (100%) rename src/common/{guac_cursor.h => common/cursor.h} (99%) rename src/common/{guac_display.h => common/display.h} (99%) rename src/common/{guac_dot_cursor.h => common/dot_cursor.h} (100%) rename src/common/{guac_ibar_cursor.h => common/ibar_cursor.h} (100%) rename src/common/{guac_iconv.h => common/iconv.h} (100%) rename src/common/{guac_io.h => common/io.h} (100%) rename src/common/{guac_json.h => common/json.h} (100%) rename src/common/{guac_list.h => common/list.h} (100%) rename src/common/{guac_pointer_cursor.h => common/pointer_cursor.h} (100%) rename src/common/{guac_recording.h => common/recording.h} (100%) rename src/common/{guac_rect.h => common/rect.h} (100%) rename src/common/{guac_string.h => common/string.h} (100%) rename src/common/{guac_surface.h => common/surface.h} (99%) rename src/common/{guac_cursor.c => cursor.c} (98%) rename src/common/{guac_display.c => display.c} (99%) rename src/common/{guac_dot_cursor.c => dot_cursor.c} (100%) rename src/common/{guac_ibar_cursor.c => ibar_cursor.c} (100%) rename src/common/{guac_iconv.c => iconv.c} (99%) rename src/common/{guac_io.c => io.c} (98%) rename src/common/{guac_json.c => json.c} (99%) rename src/common/{guac_list.c => list.c} (98%) rename src/common/{guac_pointer_cursor.c => pointer_cursor.c} (100%) rename src/common/{guac_recording.c => recording.c} (99%) rename src/common/{guac_rect.c => rect.c} (99%) rename src/common/{guac_string.c => string.c} (98%) rename src/common/{guac_surface.c => surface.c} (99%) diff --git a/src/common-ssh/guac_sftp.h b/src/common-ssh/guac_sftp.h index c43c00c6..fdc1e72e 100644 --- a/src/common-ssh/guac_sftp.h +++ b/src/common-ssh/guac_sftp.h @@ -20,7 +20,7 @@ #ifndef GUAC_COMMON_SSH_SFTP_H #define GUAC_COMMON_SSH_SFTP_H -#include "guac_json.h" +#include "common/json.h" #include "guac_ssh.h" #include diff --git a/src/common/Makefile.am b/src/common/Makefile.am index f36d9037..32d12836 100644 --- a/src/common/Makefile.am +++ b/src/common/Makefile.am @@ -22,39 +22,39 @@ ACLOCAL_AMFLAGS = -I m4 noinst_LTLIBRARIES = libguac_common.la -noinst_HEADERS = \ - guac_io.h \ - guac_blank_cursor.h \ - guac_clipboard.h \ - guac_cursor.h \ - guac_display.h \ - guac_dot_cursor.h \ - guac_ibar_cursor.h \ - guac_iconv.h \ - guac_json.h \ - guac_list.h \ - guac_pointer_cursor.h \ - guac_recording.h \ - guac_rect.h \ - guac_string.h \ - guac_surface.h +noinst_HEADERS = \ + common/io.h \ + common/blank_cursor.h \ + common/clipboard.h \ + common/cursor.h \ + common/display.h \ + common/dot_cursor.h \ + common/ibar_cursor.h \ + common/iconv.h \ + common/json.h \ + common/list.h \ + common/pointer_cursor.h \ + common/recording.h \ + common/rect.h \ + common/string.h \ + common/surface.h libguac_common_la_SOURCES = \ - guac_io.c \ - guac_blank_cursor.c \ - guac_clipboard.c \ - guac_cursor.c \ - guac_display.c \ - guac_dot_cursor.c \ - guac_ibar_cursor.c \ - guac_iconv.c \ - guac_json.c \ - guac_list.c \ - guac_pointer_cursor.c \ - guac_recording.c \ - guac_rect.c \ - guac_string.c \ - guac_surface.c + io.c \ + blank_cursor.c \ + clipboard.c \ + cursor.c \ + display.c \ + dot_cursor.c \ + ibar_cursor.c \ + iconv.c \ + json.c \ + list.c \ + pointer_cursor.c \ + recording.c \ + rect.c \ + string.c \ + surface.c libguac_common_la_CFLAGS = \ -Werror -Wall -pedantic \ diff --git a/src/common/guac_blank_cursor.c b/src/common/blank_cursor.c similarity index 100% rename from src/common/guac_blank_cursor.c rename to src/common/blank_cursor.c diff --git a/src/common/guac_clipboard.c b/src/common/clipboard.c similarity index 99% rename from src/common/guac_clipboard.c rename to src/common/clipboard.c index 15cdd840..4452bee7 100644 --- a/src/common/guac_clipboard.c +++ b/src/common/clipboard.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "guac_clipboard.h" +#include "common/clipboard.h" #include #include diff --git a/src/common/guac_blank_cursor.h b/src/common/common/blank_cursor.h similarity index 100% rename from src/common/guac_blank_cursor.h rename to src/common/common/blank_cursor.h diff --git a/src/common/guac_clipboard.h b/src/common/common/clipboard.h similarity index 100% rename from src/common/guac_clipboard.h rename to src/common/common/clipboard.h diff --git a/src/common/guac_cursor.h b/src/common/common/cursor.h similarity index 99% rename from src/common/guac_cursor.h rename to src/common/common/cursor.h index a6d9681e..86a7f14a 100644 --- a/src/common/guac_cursor.h +++ b/src/common/common/cursor.h @@ -21,7 +21,7 @@ #ifndef GUAC_COMMON_CURSOR_H #define GUAC_COMMON_CURSOR_H -#include "guac_surface.h" +#include "surface.h" #include #include diff --git a/src/common/guac_display.h b/src/common/common/display.h similarity index 99% rename from src/common/guac_display.h rename to src/common/common/display.h index 4bac8ea6..0b54338c 100644 --- a/src/common/guac_display.h +++ b/src/common/common/display.h @@ -20,8 +20,8 @@ #ifndef GUAC_COMMON_DISPLAY_H #define GUAC_COMMON_DISPLAY_H -#include "guac_cursor.h" -#include "guac_surface.h" +#include "cursor.h" +#include "surface.h" #include #include diff --git a/src/common/guac_dot_cursor.h b/src/common/common/dot_cursor.h similarity index 100% rename from src/common/guac_dot_cursor.h rename to src/common/common/dot_cursor.h diff --git a/src/common/guac_ibar_cursor.h b/src/common/common/ibar_cursor.h similarity index 100% rename from src/common/guac_ibar_cursor.h rename to src/common/common/ibar_cursor.h diff --git a/src/common/guac_iconv.h b/src/common/common/iconv.h similarity index 100% rename from src/common/guac_iconv.h rename to src/common/common/iconv.h diff --git a/src/common/guac_io.h b/src/common/common/io.h similarity index 100% rename from src/common/guac_io.h rename to src/common/common/io.h diff --git a/src/common/guac_json.h b/src/common/common/json.h similarity index 100% rename from src/common/guac_json.h rename to src/common/common/json.h diff --git a/src/common/guac_list.h b/src/common/common/list.h similarity index 100% rename from src/common/guac_list.h rename to src/common/common/list.h diff --git a/src/common/guac_pointer_cursor.h b/src/common/common/pointer_cursor.h similarity index 100% rename from src/common/guac_pointer_cursor.h rename to src/common/common/pointer_cursor.h diff --git a/src/common/guac_recording.h b/src/common/common/recording.h similarity index 100% rename from src/common/guac_recording.h rename to src/common/common/recording.h diff --git a/src/common/guac_rect.h b/src/common/common/rect.h similarity index 100% rename from src/common/guac_rect.h rename to src/common/common/rect.h diff --git a/src/common/guac_string.h b/src/common/common/string.h similarity index 100% rename from src/common/guac_string.h rename to src/common/common/string.h diff --git a/src/common/guac_surface.h b/src/common/common/surface.h similarity index 99% rename from src/common/guac_surface.h rename to src/common/common/surface.h index 144d45ab..3da3f175 100644 --- a/src/common/guac_surface.h +++ b/src/common/common/surface.h @@ -21,7 +21,7 @@ #define __GUAC_COMMON_SURFACE_H #include "config.h" -#include "guac_rect.h" +#include "rect.h" #include #include diff --git a/src/common/guac_cursor.c b/src/common/cursor.c similarity index 98% rename from src/common/guac_cursor.c rename to src/common/cursor.c index 4ed66b1d..6dd000f5 100644 --- a/src/common/guac_cursor.c +++ b/src/common/cursor.c @@ -17,12 +17,12 @@ * under the License. */ -#include "guac_blank_cursor.h" -#include "guac_dot_cursor.h" -#include "guac_cursor.h" -#include "guac_ibar_cursor.h" -#include "guac_pointer_cursor.h" -#include "guac_surface.h" +#include "common/blank_cursor.h" +#include "common/dot_cursor.h" +#include "common/cursor.h" +#include "common/ibar_cursor.h" +#include "common/pointer_cursor.h" +#include "common/surface.h" #include #include diff --git a/src/common/guac_display.c b/src/common/display.c similarity index 99% rename from src/common/guac_display.c rename to src/common/display.c index a81ff241..38a2ad42 100644 --- a/src/common/guac_display.c +++ b/src/common/display.c @@ -17,9 +17,9 @@ * under the License. */ -#include "guac_cursor.h" -#include "guac_display.h" -#include "guac_surface.h" +#include "common/cursor.h" +#include "common/display.h" +#include "common/surface.h" #include #include diff --git a/src/common/guac_dot_cursor.c b/src/common/dot_cursor.c similarity index 100% rename from src/common/guac_dot_cursor.c rename to src/common/dot_cursor.c diff --git a/src/common/guac_ibar_cursor.c b/src/common/ibar_cursor.c similarity index 100% rename from src/common/guac_ibar_cursor.c rename to src/common/ibar_cursor.c diff --git a/src/common/guac_iconv.c b/src/common/iconv.c similarity index 99% rename from src/common/guac_iconv.c rename to src/common/iconv.c index f9182263..f4cc6c50 100644 --- a/src/common/guac_iconv.c +++ b/src/common/iconv.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "guac_iconv.h" +#include "common/iconv.h" #include #include diff --git a/src/common/guac_io.c b/src/common/io.c similarity index 98% rename from src/common/guac_io.c rename to src/common/io.c index 0cefd7a7..2e2a5ad7 100644 --- a/src/common/guac_io.c +++ b/src/common/io.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "guac_io.h" +#include "common/io.h" #include diff --git a/src/common/guac_json.c b/src/common/json.c similarity index 99% rename from src/common/guac_json.c rename to src/common/json.c index 4bd1140e..6dad60be 100644 --- a/src/common/guac_json.c +++ b/src/common/json.c @@ -19,7 +19,7 @@ #include "config.h" -#include "guac_json.h" +#include "common/json.h" #include #include diff --git a/src/common/guac_list.c b/src/common/list.c similarity index 98% rename from src/common/guac_list.c rename to src/common/list.c index 869d59c5..072ef89f 100644 --- a/src/common/guac_list.c +++ b/src/common/list.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "guac_list.h" +#include "common/list.h" #include #include diff --git a/src/common/guac_pointer_cursor.c b/src/common/pointer_cursor.c similarity index 100% rename from src/common/guac_pointer_cursor.c rename to src/common/pointer_cursor.c diff --git a/src/common/guac_recording.c b/src/common/recording.c similarity index 99% rename from src/common/guac_recording.c rename to src/common/recording.c index 5d30fa98..2c953b5a 100644 --- a/src/common/guac_recording.c +++ b/src/common/recording.c @@ -17,7 +17,7 @@ * under the License. */ -#include "guac_recording.h" +#include "common/recording.h" #include #include diff --git a/src/common/guac_rect.c b/src/common/rect.c similarity index 99% rename from src/common/guac_rect.c rename to src/common/rect.c index 2d7fca68..a7ca7da5 100644 --- a/src/common/guac_rect.c +++ b/src/common/rect.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "guac_rect.h" +#include "common/rect.h" void guac_common_rect_init(guac_common_rect* rect, int x, int y, int width, int height) { rect->x = x; diff --git a/src/common/guac_string.c b/src/common/string.c similarity index 98% rename from src/common/guac_string.c rename to src/common/string.c index 437cd77a..b2479998 100644 --- a/src/common/guac_string.c +++ b/src/common/string.c @@ -19,7 +19,7 @@ #include "config.h" -#include "guac_string.h" +#include "common/string.h" #include #include diff --git a/src/common/guac_surface.c b/src/common/surface.c similarity index 99% rename from src/common/guac_surface.c rename to src/common/surface.c index 64726a9a..5a680937 100644 --- a/src/common/guac_surface.c +++ b/src/common/surface.c @@ -18,8 +18,8 @@ */ #include "config.h" -#include "guac_rect.h" -#include "guac_surface.h" +#include "common/rect.h" +#include "common/surface.h" #include #include diff --git a/src/guacd/proc-map.c b/src/guacd/proc-map.c index 410ac459..c09c06a3 100644 --- a/src/guacd/proc-map.c +++ b/src/guacd/proc-map.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "guac_list.h" +#include "common/list.h" #include "proc.h" #include "proc-map.h" #include "user.h" diff --git a/src/guacd/proc-map.h b/src/guacd/proc-map.h index 2078f5a5..123449dd 100644 --- a/src/guacd/proc-map.h +++ b/src/guacd/proc-map.h @@ -22,7 +22,7 @@ #define _GUACD_PROC_MAP_H #include "config.h" -#include "guac_list.h" +#include "common/list.h" #include "proc.h" #include "user.h" diff --git a/src/protocols/rdp/dvc.c b/src/protocols/rdp/dvc.c index 10c65d7f..34406c9b 100644 --- a/src/protocols/rdp/dvc.c +++ b/src/protocols/rdp/dvc.c @@ -18,8 +18,8 @@ */ #include "config.h" +#include "common/list.h" #include "dvc.h" -#include "guac_list.h" #include "rdp.h" #include diff --git a/src/protocols/rdp/dvc.h b/src/protocols/rdp/dvc.h index 02ca6437..63694f53 100644 --- a/src/protocols/rdp/dvc.h +++ b/src/protocols/rdp/dvc.h @@ -21,7 +21,7 @@ #define GUAC_RDP_DVC_H #include "config.h" -#include "guac_list.h" +#include "common/list.h" #include diff --git a/src/protocols/rdp/rdp.c b/src/protocols/rdp/rdp.c index e759888a..893fde5e 100644 --- a/src/protocols/rdp/rdp.c +++ b/src/protocols/rdp/rdp.c @@ -21,10 +21,10 @@ #include "audio_input.h" #include "client.h" +#include "common/cursor.h" +#include "common/display.h" +#include "common/recording.h" #include "dvc.h" -#include "guac_cursor.h" -#include "guac_display.h" -#include "guac_recording.h" #include "keyboard.h" #include "rdp.h" #include "rdp_bitmap.h" diff --git a/src/protocols/rdp/rdp.h b/src/protocols/rdp/rdp.h index 247ec131..af26408f 100644 --- a/src/protocols/rdp/rdp.h +++ b/src/protocols/rdp/rdp.h @@ -23,10 +23,10 @@ #include "config.h" #include "audio_input.h" -#include "guac_clipboard.h" -#include "guac_display.h" -#include "guac_surface.h" -#include "guac_list.h" +#include "common/clipboard.h" +#include "common/display.h" +#include "common/list.h" +#include "common/surface.h" #include "keyboard.h" #include "rdp_disp.h" #include "rdp_fs.h" diff --git a/src/protocols/rdp/rdp_bitmap.c b/src/protocols/rdp/rdp_bitmap.c index 351d5a32..f77bbaea 100644 --- a/src/protocols/rdp/rdp_bitmap.c +++ b/src/protocols/rdp/rdp_bitmap.c @@ -20,8 +20,8 @@ #include "config.h" #include "client.h" -#include "guac_display.h" -#include "guac_surface.h" +#include "common/display.h" +#include "common/surface.h" #include "rdp.h" #include "rdp_bitmap.h" #include "rdp_settings.h" diff --git a/src/protocols/rdp/rdp_bitmap.h b/src/protocols/rdp/rdp_bitmap.h index dbf452ae..dda3f763 100644 --- a/src/protocols/rdp/rdp_bitmap.h +++ b/src/protocols/rdp/rdp_bitmap.h @@ -22,7 +22,7 @@ #define _GUAC_RDP_RDP_BITMAP_H #include "config.h" -#include "guac_display.h" +#include "common/display.h" #include #include diff --git a/src/protocols/rdp/rdp_cliprdr.c b/src/protocols/rdp/rdp_cliprdr.c index 6f45387f..647dddab 100644 --- a/src/protocols/rdp/rdp_cliprdr.c +++ b/src/protocols/rdp/rdp_cliprdr.c @@ -20,10 +20,10 @@ #include "config.h" #include "client.h" +#include "common/clipboard.h" +#include "common/iconv.h" #include "rdp.h" #include "rdp_cliprdr.h" -#include "guac_clipboard.h" -#include "guac_iconv.h" #include #include diff --git a/src/protocols/rdp/rdp_gdi.c b/src/protocols/rdp/rdp_gdi.c index 7bf495b2..1805319e 100644 --- a/src/protocols/rdp/rdp_gdi.c +++ b/src/protocols/rdp/rdp_gdi.c @@ -20,7 +20,7 @@ #include "config.h" #include "client.h" -#include "guac_surface.h" +#include "common/surface.h" #include "rdp.h" #include "rdp_bitmap.h" #include "rdp_color.h" diff --git a/src/protocols/rdp/rdp_glyph.c b/src/protocols/rdp/rdp_glyph.c index ddbf2d03..68ce7a26 100644 --- a/src/protocols/rdp/rdp_glyph.c +++ b/src/protocols/rdp/rdp_glyph.c @@ -20,7 +20,7 @@ #include "config.h" #include "client.h" -#include "guac_surface.h" +#include "common/surface.h" #include "rdp.h" #include "rdp_color.h" #include "rdp_glyph.h" diff --git a/src/protocols/rdp/rdp_pointer.c b/src/protocols/rdp/rdp_pointer.c index 1f497a3e..f510b578 100644 --- a/src/protocols/rdp/rdp_pointer.c +++ b/src/protocols/rdp/rdp_pointer.c @@ -20,8 +20,8 @@ #include "config.h" #include "client.h" -#include "guac_cursor.h" -#include "guac_display.h" +#include "common/cursor.h" +#include "common/display.h" #include "rdp.h" #include "rdp_pointer.h" diff --git a/src/protocols/rdp/rdp_pointer.h b/src/protocols/rdp/rdp_pointer.h index 8818f52e..995c8d6f 100644 --- a/src/protocols/rdp/rdp_pointer.h +++ b/src/protocols/rdp/rdp_pointer.h @@ -22,7 +22,7 @@ #define _GUAC_RDP_RDP_POINTER_H #include "config.h" -#include "guac_display.h" +#include "common/display.h" #include diff --git a/src/protocols/rdp/rdp_settings.c b/src/protocols/rdp/rdp_settings.c index fd77e92a..e8161b13 100644 --- a/src/protocols/rdp/rdp_settings.c +++ b/src/protocols/rdp/rdp_settings.c @@ -20,7 +20,7 @@ #include "config.h" #include "client.h" -#include "guac_string.h" +#include "common/string.h" #include "rdp.h" #include "rdp_settings.h" #include "resolution.h" diff --git a/src/protocols/rdp/rdp_stream.c b/src/protocols/rdp/rdp_stream.c index eb5b9f3a..5dae3667 100644 --- a/src/protocols/rdp/rdp_stream.c +++ b/src/protocols/rdp/rdp_stream.c @@ -20,7 +20,7 @@ #include "config.h" #include "client.h" -#include "guac_clipboard.h" +#include "common/clipboard.h" #include "rdp.h" #include "rdp_fs.h" #include "rdp_svc.h" diff --git a/src/protocols/rdp/rdp_stream.h b/src/protocols/rdp/rdp_stream.h index 1bd490e0..c9c3838e 100644 --- a/src/protocols/rdp/rdp_stream.h +++ b/src/protocols/rdp/rdp_stream.h @@ -22,7 +22,7 @@ #define _GUAC_RDP_STREAM_H #include "config.h" -#include "guac_json.h" +#include "common/json.h" #include "rdp_svc.h" #include diff --git a/src/protocols/rdp/rdp_svc.c b/src/protocols/rdp/rdp_svc.c index 0d20746b..83537a86 100644 --- a/src/protocols/rdp/rdp_svc.c +++ b/src/protocols/rdp/rdp_svc.c @@ -19,7 +19,7 @@ #include "config.h" #include "client.h" -#include "guac_list.h" +#include "common/list.h" #include "rdp.h" #include "rdp_svc.h" diff --git a/src/protocols/rdp/user.c b/src/protocols/rdp/user.c index ae02a106..6aa71ae9 100644 --- a/src/protocols/rdp/user.c +++ b/src/protocols/rdp/user.c @@ -20,8 +20,8 @@ #include "config.h" #include "audio_input.h" +#include "common/display.h" #include "input.h" -#include "guac_display.h" #include "user.h" #include "rdp.h" #include "rdp_settings.h" diff --git a/src/protocols/ssh/input.c b/src/protocols/ssh/input.c index 240f729a..e0267e20 100644 --- a/src/protocols/ssh/input.c +++ b/src/protocols/ssh/input.c @@ -19,8 +19,8 @@ #include "config.h" -#include "guac_cursor.h" -#include "guac_display.h" +#include "common/cursor.h" +#include "common/display.h" #include "ssh.h" #include "terminal.h" diff --git a/src/protocols/ssh/ssh.c b/src/protocols/ssh/ssh.c index 4bdf76f7..53835c85 100644 --- a/src/protocols/ssh/ssh.c +++ b/src/protocols/ssh/ssh.c @@ -19,7 +19,7 @@ #include "config.h" -#include "guac_recording.h" +#include "common/recording.h" #include "guac_sftp.h" #include "guac_ssh.h" #include "settings.h" diff --git a/src/protocols/ssh/user.c b/src/protocols/ssh/user.c index 4ebbab2f..24d0fbb1 100644 --- a/src/protocols/ssh/user.c +++ b/src/protocols/ssh/user.c @@ -20,8 +20,8 @@ #include "config.h" #include "clipboard.h" +#include "common/display.h" #include "input.h" -#include "guac_display.h" #include "user.h" #include "sftp.h" #include "ssh.h" diff --git a/src/protocols/telnet/telnet.c b/src/protocols/telnet/telnet.c index 531819f2..b80c959e 100644 --- a/src/protocols/telnet/telnet.c +++ b/src/protocols/telnet/telnet.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "guac_recording.h" +#include "common/recording.h" #include "telnet.h" #include "terminal.h" diff --git a/src/protocols/vnc/clipboard.c b/src/protocols/vnc/clipboard.c index eab708da..8a802234 100644 --- a/src/protocols/vnc/clipboard.c +++ b/src/protocols/vnc/clipboard.c @@ -20,8 +20,8 @@ #include "config.h" #include "client.h" #include "clipboard.h" -#include "guac_clipboard.h" -#include "guac_iconv.h" +#include "common/clipboard.h" +#include "common/iconv.h" #include "user.h" #include "vnc.h" diff --git a/src/protocols/vnc/cursor.c b/src/protocols/vnc/cursor.c index fd075bc1..22d45ebe 100644 --- a/src/protocols/vnc/cursor.c +++ b/src/protocols/vnc/cursor.c @@ -20,9 +20,9 @@ #include "config.h" #include "client.h" -#include "guac_cursor.h" -#include "guac_display.h" -#include "guac_surface.h" +#include "common/cursor.h" +#include "common/display.h" +#include "common/surface.h" #include "vnc.h" #include diff --git a/src/protocols/vnc/display.c b/src/protocols/vnc/display.c index 99edb77a..22de084a 100644 --- a/src/protocols/vnc/display.c +++ b/src/protocols/vnc/display.c @@ -20,8 +20,8 @@ #include "config.h" #include "client.h" -#include "guac_iconv.h" -#include "guac_surface.h" +#include "common/iconv.h" +#include "common/surface.h" #include "vnc.h" #include diff --git a/src/protocols/vnc/input.c b/src/protocols/vnc/input.c index 08f3ec30..d8fcda58 100644 --- a/src/protocols/vnc/input.c +++ b/src/protocols/vnc/input.c @@ -19,8 +19,8 @@ #include "config.h" -#include "guac_cursor.h" -#include "guac_display.h" +#include "common/cursor.h" +#include "common/display.h" #include "vnc.h" #include diff --git a/src/protocols/vnc/log.c b/src/protocols/vnc/log.c index 84e28ad0..ba593e81 100644 --- a/src/protocols/vnc/log.c +++ b/src/protocols/vnc/log.c @@ -20,8 +20,8 @@ #include "config.h" #include "client.h" -#include "guac_iconv.h" -#include "guac_surface.h" +#include "common/iconv.h" +#include "common/surface.h" #include #include diff --git a/src/protocols/vnc/log.h b/src/protocols/vnc/log.h index 829d60f9..65f3dc2d 100644 --- a/src/protocols/vnc/log.h +++ b/src/protocols/vnc/log.h @@ -23,8 +23,8 @@ #include "config.h" #include "client.h" -#include "guac_iconv.h" -#include "guac_surface.h" +#include "common/iconv.h" +#include "common/surface.h" #include #include diff --git a/src/protocols/vnc/user.c b/src/protocols/vnc/user.c index e01ee758..aecf4e90 100644 --- a/src/protocols/vnc/user.c +++ b/src/protocols/vnc/user.c @@ -21,9 +21,9 @@ #include "clipboard.h" #include "input.h" -#include "guac_display.h" -#include "guac_dot_cursor.h" -#include "guac_pointer_cursor.h" +#include "common/display.h" +#include "common/dot_cursor.h" +#include "common/pointer_cursor.h" #include "user.h" #include "sftp.h" #include "vnc.h" diff --git a/src/protocols/vnc/vnc.c b/src/protocols/vnc/vnc.c index f9ab6873..9238ef13 100644 --- a/src/protocols/vnc/vnc.c +++ b/src/protocols/vnc/vnc.c @@ -22,12 +22,12 @@ #include "auth.h" #include "client.h" #include "clipboard.h" +#include "common/clipboard.h" +#include "common/cursor.h" +#include "common/display.h" +#include "common/recording.h" #include "cursor.h" #include "display.h" -#include "guac_clipboard.h" -#include "guac_cursor.h" -#include "guac_display.h" -#include "guac_recording.h" #include "log.h" #include "settings.h" #include "vnc.h" diff --git a/src/protocols/vnc/vnc.h b/src/protocols/vnc/vnc.h index cf9895b7..7938d846 100644 --- a/src/protocols/vnc/vnc.h +++ b/src/protocols/vnc/vnc.h @@ -22,10 +22,10 @@ #include "config.h" -#include "guac_clipboard.h" -#include "guac_display.h" -#include "guac_iconv.h" -#include "guac_surface.h" +#include "common/clipboard.h" +#include "common/display.h" +#include "common/iconv.h" +#include "common/surface.h" #include "settings.h" #include diff --git a/src/terminal/display.c b/src/terminal/display.c index fdb19431..da1a8d98 100644 --- a/src/terminal/display.c +++ b/src/terminal/display.c @@ -20,8 +20,8 @@ #include "config.h" #include "common.h" +#include "common/surface.h" #include "display.h" -#include "guac_surface.h" #include "types.h" #include diff --git a/src/terminal/display.h b/src/terminal/display.h index 440d809a..655d1aa0 100644 --- a/src/terminal/display.h +++ b/src/terminal/display.h @@ -23,7 +23,7 @@ #include "config.h" -#include "guac_surface.h" +#include "common/surface.h" #include "types.h" #include diff --git a/src/terminal/terminal.c b/src/terminal/terminal.c index 7488a310..50571234 100644 --- a/src/terminal/terminal.c +++ b/src/terminal/terminal.c @@ -21,10 +21,9 @@ #include "buffer.h" #include "common.h" +#include "common/clipboard.h" +#include "common/cursor.h" #include "display.h" -#include "guac_clipboard.h" -#include "guac_cursor.h" -#include "scrollbar.h" #include "terminal.h" #include "terminal_handlers.h" #include "types.h" diff --git a/src/terminal/terminal.h b/src/terminal/terminal.h index 62312b04..965d7eac 100644 --- a/src/terminal/terminal.h +++ b/src/terminal/terminal.h @@ -24,9 +24,9 @@ #include "config.h" #include "buffer.h" +#include "common/clipboard.h" +#include "common/cursor.h" #include "display.h" -#include "guac_clipboard.h" -#include "guac_cursor.h" #include "scrollbar.h" #include "types.h" #include "typescript.h" diff --git a/src/terminal/typescript.c b/src/terminal/typescript.c index 0cf5edf0..aa922f0a 100644 --- a/src/terminal/typescript.c +++ b/src/terminal/typescript.c @@ -18,7 +18,7 @@ */ #include "config.h" -#include "guac_io.h" +#include "common/io.h" #include "typescript.h" #include diff --git a/tests/common/guac_iconv.c b/tests/common/guac_iconv.c index 6f7726af..6af706f9 100644 --- a/tests/common/guac_iconv.c +++ b/tests/common/guac_iconv.c @@ -20,7 +20,7 @@ #include "config.h" #include "common_suite.h" -#include "guac_iconv.h" +#include "common/iconv.h" #include #include diff --git a/tests/common/guac_rect.c b/tests/common/guac_rect.c index 97a71962..a45ee385 100644 --- a/tests/common/guac_rect.c +++ b/tests/common/guac_rect.c @@ -20,7 +20,7 @@ #include "config.h" #include "common_suite.h" -#include "guac_rect.h" +#include "common/rect.h" #include #include diff --git a/tests/common/guac_string.c b/tests/common/guac_string.c index 2ba7f04b..543a41b8 100644 --- a/tests/common/guac_string.c +++ b/tests/common/guac_string.c @@ -20,7 +20,7 @@ #include "config.h" #include "common_suite.h" -#include "guac_string.h" +#include "common/string.h" #include #include