diff options
| author | Alexander Larsson <alexl@redhat.com> | 2010-02-04 18:04:26 +0100 |
|---|---|---|
| committer | Alexander Larsson <alexl@redhat.com> | 2010-02-04 18:49:00 +0100 |
| commit | 1f516978527b223882c02d8c23834a0f30279dec (patch) | |
| tree | 7472bb21b145c2c586a3ad7aebb7bd136cef9e70 /client/cursor.cpp | |
| parent | c1694fb51bb29d3cbd03f679372339f9e8f29803 (diff) | |
| download | spice-1f516978527b223882c02d8c23834a0f30279dec.tar.gz spice-1f516978527b223882c02d8c23834a0f30279dec.tar.xz spice-1f516978527b223882c02d8c23834a0f30279dec.zip | |
Rename symbols that were changed in spice-protocol
This is an automatic change using:
$ find -name "*.[ch]" | xargs ../spice-protocol/rename-identifiers.sh ../spice-protocol/renames
$ find -name "*.cpp" | xargs ../spice-protocol/rename-identifiers.sh ../spice-protocol/renames
Diffstat (limited to 'client/cursor.cpp')
| -rw-r--r-- | client/cursor.cpp | 32 |
1 files changed, 16 insertions, 16 deletions
diff --git a/client/cursor.cpp b/client/cursor.cpp index 9bf8e9a6..7babdb90 100644 --- a/client/cursor.cpp +++ b/client/cursor.cpp @@ -20,7 +20,7 @@ #include "utils.h" #include "debug.h" -CursorData::CursorData(RedCursor& cursor, int data_size) +CursorData::CursorData(SpiceCursor& cursor, int data_size) : _atomic (1) , _header (cursor.header) , _data (NULL) @@ -30,31 +30,31 @@ CursorData::CursorData(RedCursor& cursor, int data_size) int expected_size = 0; switch (cursor.header.type) { - case CURSOR_TYPE_ALPHA: + case SPICE_CURSOR_TYPE_ALPHA: expected_size = (_header.width << 2) * _header.height; break; - case CURSOR_TYPE_MONO: + case SPICE_CURSOR_TYPE_MONO: expected_size = (ALIGN(_header.width, 8) >> 2) * _header.height; break; - case CURSOR_TYPE_COLOR4: + case SPICE_CURSOR_TYPE_COLOR4: expected_size = (ALIGN(_header.width, 2) >> 1) * _header.height; expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; expected_size += 16 * sizeof(uint32_t); break; - case CURSOR_TYPE_COLOR8: + case SPICE_CURSOR_TYPE_COLOR8: expected_size = _header.width * _header.height; expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; expected_size += 256 * sizeof(uint32_t); break; - case CURSOR_TYPE_COLOR16: + case SPICE_CURSOR_TYPE_COLOR16: expected_size = (_header.width << 1) * _header.height; expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; break; - case CURSOR_TYPE_COLOR24: + case SPICE_CURSOR_TYPE_COLOR24: expected_size = (_header.width * 3) * _header.height; expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; break; - case CURSOR_TYPE_COLOR32: + case SPICE_CURSOR_TYPE_COLOR32: expected_size = (_header.width << 2) * _header.height; expected_size += (ALIGN(_header.width, 8) >> 3) * _header.height; break; @@ -84,26 +84,26 @@ CursorData::~CursorData() delete[] _data; } -int LocalCursor::get_size_bits(const CursorHeader& header, int& size) +int LocalCursor::get_size_bits(const SpiceCursorHeader& header, int& size) { switch (header.type) { - case CURSOR_TYPE_ALPHA: - case CURSOR_TYPE_COLOR32: + case SPICE_CURSOR_TYPE_ALPHA: + case SPICE_CURSOR_TYPE_COLOR32: size = (header.width << 2) * header.height; return 32; - case CURSOR_TYPE_MONO: + case SPICE_CURSOR_TYPE_MONO: size = (ALIGN(header.width, 8) >> 3) * header.height; return 1; - case CURSOR_TYPE_COLOR4: + case SPICE_CURSOR_TYPE_COLOR4: size = (ALIGN(header.width, 2) >> 1) * header.height; return 4; - case CURSOR_TYPE_COLOR8: + case SPICE_CURSOR_TYPE_COLOR8: size = header.width * header.height; return 8; - case CURSOR_TYPE_COLOR16: + case SPICE_CURSOR_TYPE_COLOR16: size = (header.width << 1) * header.height; return 16; - case CURSOR_TYPE_COLOR24: + case SPICE_CURSOR_TYPE_COLOR24: size = (header.width * 3) * header.height; return 24; default: |