diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-05-03 12:08:00 +0200 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-05-03 12:38:02 +0200 |
| commit | ae40f270cfbe4629c041074e2b0c28dfd3f554b8 (patch) | |
| tree | 5bfcd3f0e129f3c098eb26334b71af54762356d2 /client/x11 | |
| parent | 295c8ed8bc508d69c88ec83b82afc4573500ff12 (diff) | |
| download | spice-ae40f270cfbe4629c041074e2b0c28dfd3f554b8.tar.gz spice-ae40f270cfbe4629c041074e2b0c28dfd3f554b8.tar.xz spice-ae40f270cfbe4629c041074e2b0c28dfd3f554b8.zip | |
Remove all mentions of "cairo" from the code
The command line option is renamed from "cairo" to "sw", and
similarly all filenames and types from Cairo to Sw (and similar).
Diffstat (limited to 'client/x11')
| -rw-r--r-- | client/x11/Makefile.am | 16 | ||||
| -rw-r--r-- | client/x11/red_pixmap_sw.cpp (renamed from client/x11/red_pixmap_cairo.cpp) | 12 |
2 files changed, 14 insertions, 14 deletions
diff --git a/client/x11/Makefile.am b/client/x11/Makefile.am index e5a3b773..904fb42b 100644 --- a/client/x11/Makefile.am +++ b/client/x11/Makefile.am @@ -6,9 +6,9 @@ CLIENT_DIR=$(top_srcdir)/client SUBDIRS = images INCLUDES = \ - -DCAIRO_CANVAS_ACCESS_TEST \ - -DCAIRO_CANVAS_CACHE \ - -DCAIRO_CANVAS_NO_CHUNKS \ + -DSW_CANVAS_ACCESS_TEST \ + -DSW_CANVAS_CACHE \ + -DSW_CANVAS_NO_CHUNKS \ -DUSE_GLZ \ -DUSE_OGL \ -D__STDC_LIMIT_MACROS \ @@ -38,12 +38,12 @@ RED_COMMON_SRCS = \ $(CLIENT_DIR)/audio_channels.h \ $(CLIENT_DIR)/audio_devices.h \ $(CLIENT_DIR)/cache.hpp \ - $(CLIENT_DIR)/cairo_canvas.cpp \ + $(CLIENT_DIR)/sw_canvas.cpp \ $(CLIENT_DIR)/canvas.cpp \ $(CLIENT_DIR)/canvas.h \ $(CLIENT_DIR)/canvas_utils.cpp \ - $(CLIENT_DIR)/red_cairo_canvas.cpp \ - $(CLIENT_DIR)/red_cairo_canvas.h \ + $(CLIENT_DIR)/red_sw_canvas.cpp \ + $(CLIENT_DIR)/red_sw_canvas.h \ $(CLIENT_DIR)/cmd_line_parser.cpp \ $(CLIENT_DIR)/cmd_line_parser.h \ $(CLIENT_DIR)/client_net_socket.cpp \ @@ -93,7 +93,7 @@ RED_COMMON_SRCS = \ $(CLIENT_DIR)/red_key.h \ $(CLIENT_DIR)/red_peer.cpp \ $(CLIENT_DIR)/red_peer.h \ - $(CLIENT_DIR)/red_pixmap_cairo.h \ + $(CLIENT_DIR)/red_pixmap_sw.h \ $(CLIENT_DIR)/red_pixmap_gl.h \ $(CLIENT_DIR)/red_pixmap.h \ $(CLIENT_DIR)/red_types.h \ @@ -142,7 +142,7 @@ spicec_SOURCES = \ record.h \ red_drawable.cpp \ red_pixmap.cpp \ - red_pixmap_cairo.cpp \ + red_pixmap_sw.cpp \ red_pixmap_gl.cpp \ red_window.cpp \ red_window_p.h \ diff --git a/client/x11/red_pixmap_cairo.cpp b/client/x11/red_pixmap_sw.cpp index 863ed392..2b514b7f 100644 --- a/client/x11/red_pixmap_cairo.cpp +++ b/client/x11/red_pixmap_sw.cpp @@ -17,19 +17,19 @@ */ #include "common.h" -#include "red_pixmap_cairo.h" +#include "red_pixmap_sw.h" #include "debug.h" #include "utils.h" #include "pixels_source_p.h" #include "x_platform.h" -RedPixmapCairo::RedPixmapCairo(int width, int height, RedDrawable::Format format, - bool top_bottom, RedWindow *win) +RedPixmapSw::RedPixmapSw(int width, int height, RedDrawable::Format format, + bool top_bottom, RedWindow *win) : RedPixmap(width, height, format, top_bottom) { ASSERT(format == RedDrawable::ARGB32 || format == RedDrawable::RGB32 || - format == RedDrawable::RGB16_555 || format == RedDrawable::RGB16_565 || - format == RedDrawable::A1); + format == RedDrawable::RGB16_555 || format == RedDrawable::RGB16_565 || + format == RedDrawable::A1); ASSERT(sizeof(RedDrawable_p) <= PIXELES_SOURCE_OPAQUE_SIZE); pixman_image_t *pixman_image; XImage *image; @@ -73,7 +73,7 @@ RedPixmapCairo::RedPixmapCairo(int width, int height, RedDrawable::Format format ((PixelsSource_p*)get_opaque())->pixmap.format = format; } -RedPixmapCairo::~RedPixmapCairo() +RedPixmapSw::~RedPixmapSw() { ASSERT(((PixelsSource_p*)get_opaque())->type == PIXELS_SOURCE_TYPE_PIXMAP); |