From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from [140.186.70.92] (port=34957 helo=eggs.gnu.org) by lists.gnu.org with esmtp (Exim 4.43) id 1OWZof-00086v-Ou for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:58:00 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.69) (envelope-from ) id 1OWZoc-0002fv-3x for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:57:53 -0400 Received: from iksaif.net ([88.191.73.63]:35189) by eggs.gnu.org with esmtp (Exim 4.69) (envelope-from ) id 1OWZob-0002ej-Qv for qemu-devel@nongnu.org; Wed, 07 Jul 2010 14:57:50 -0400 From: Corentin Chary Date: Wed, 7 Jul 2010 20:57:53 +0200 Message-Id: <1278529086-10391-6-git-send-email-corentincj@iksaif.net> In-Reply-To: <1278529086-10391-1-git-send-email-corentincj@iksaif.net> References: <1278529086-10391-1-git-send-email-corentincj@iksaif.net> Subject: [Qemu-devel] [PATCH v2 05/18] vnc: rename vnc-encoding-* vnc-enc-* List-Id: qemu-devel.nongnu.org List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: Corentin Chary , Anthony Liguori , Alexander Graf For the same reason that we don't use vnc-authentication-sasl.c but vnc-auth-sals.c. Because it's tooooo long. Signed-off-by: Corentin Chary --- Makefile.objs | 4 ++-- ui/{vnchextile.h => vnc-enc-hextile-template.h} | 0 ui/{vnc-encoding-hextile.c => vnc-enc-hextile.c} | 12 ++++++------ ui/{vnc-encoding-tight.c => vnc-enc-tight.c} | 2 +- ui/{vnc-encoding-tight.h => vnc-enc-tight.h} | 0 ui/{vnc-encoding-zlib.c => vnc-enc-zlib.c} | 0 6 files changed, 9 insertions(+), 9 deletions(-) rename ui/{vnchextile.h => vnc-enc-hextile-template.h} (100%) rename ui/{vnc-encoding-hextile.c => vnc-enc-hextile.c} (93%) rename ui/{vnc-encoding-tight.c => vnc-enc-tight.c} (99%) rename ui/{vnc-encoding-tight.h => vnc-enc-tight.h} (100%) rename ui/{vnc-encoding-zlib.c => vnc-enc-zlib.c} (100%) diff --git a/Makefile.objs b/Makefile.objs index 43b4e16..a0b8200 100644 --- a/Makefile.objs +++ b/Makefile.objs @@ -106,8 +106,8 @@ ui-obj-y += keymaps.o ui-obj-$(CONFIG_SDL) += sdl.o sdl_zoom.o x_keymap.o ui-obj-$(CONFIG_CURSES) += curses.o ui-obj-y += vnc.o d3des.o -ui-obj-y += vnc-encoding-zlib.o vnc-encoding-hextile.o -ui-obj-y += vnc-encoding-tight.o +ui-obj-y += vnc-enc-zlib.o vnc-enc-hextile.o +ui-obj-y += vnc-enc-tight.o ui-obj-$(CONFIG_VNC_TLS) += vnc-tls.o vnc-auth-vencrypt.o ui-obj-$(CONFIG_VNC_SASL) += vnc-auth-sasl.o ui-obj-$(CONFIG_COCOA) += cocoa.o diff --git a/ui/vnchextile.h b/ui/vnc-enc-hextile-template.h similarity index 100% rename from ui/vnchextile.h rename to ui/vnc-enc-hextile-template.h diff --git a/ui/vnc-encoding-hextile.c b/ui/vnc-enc-hextile.c similarity index 93% rename from ui/vnc-encoding-hextile.c rename to ui/vnc-enc-hextile.c index 728f25e..fa4b264 100644 --- a/ui/vnc-encoding-hextile.c +++ b/ui/vnc-enc-hextile.c @@ -33,32 +33,32 @@ static void hextile_enc_cord(uint8_t *ptr, int x, int y, int w, int h) } #define BPP 8 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #define BPP 16 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #define BPP 32 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #define GENERIC #define BPP 8 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #undef GENERIC #define GENERIC #define BPP 16 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #undef GENERIC #define GENERIC #define BPP 32 -#include "vnchextile.h" +#include "vnc-enc-hextile-template.h" #undef BPP #undef GENERIC diff --git a/ui/vnc-encoding-tight.c b/ui/vnc-enc-tight.c similarity index 99% rename from ui/vnc-encoding-tight.c rename to ui/vnc-enc-tight.c index c1a292b..358221d 100644 --- a/ui/vnc-encoding-tight.c +++ b/ui/vnc-enc-tight.c @@ -37,7 +37,7 @@ #include "qdict.h" #include "qint.h" #include "vnc.h" -#include "vnc-encoding-tight.h" +#include "vnc-enc-tight.h" /* Compression level stuff. The following array contains various encoder parameters for each of 10 compression levels (0..9). diff --git a/ui/vnc-encoding-tight.h b/ui/vnc-enc-tight.h similarity index 100% rename from ui/vnc-encoding-tight.h rename to ui/vnc-enc-tight.h diff --git a/ui/vnc-encoding-zlib.c b/ui/vnc-enc-zlib.c similarity index 100% rename from ui/vnc-encoding-zlib.c rename to ui/vnc-enc-zlib.c -- 1.7.1