diff options
author | Alexander Larsson <alexl@redhat.com> | 2010-07-08 18:26:37 +0200 |
---|---|---|
committer | Alexander Larsson <alexl@redhat.com> | 2010-07-08 18:26:37 +0200 |
commit | 1a6e77d6d4da9c73dc706574ea3e3fbaa8142f29 (patch) | |
tree | 4299cdcfbdf378b575948f0870ef6c365a9e8095 /client | |
parent | 925f6387c8b5bd63ecd128c9187d8424607e0fa8 (diff) | |
download | spice-1a6e77d6d4da9c73dc706574ea3e3fbaa8142f29.tar.gz spice-1a6e77d6d4da9c73dc706574ea3e3fbaa8142f29.tar.xz spice-1a6e77d6d4da9c73dc706574ea3e3fbaa8142f29.zip |
Fix various misspellings
letancy -> latency
compund -> compound
SpicedSubMessage -> SpiceSubMessage
modifaiers -> modifiers
massage -> message
outgoiong -> outgoing
AlphaBlnd -> AlphaBlend
remoth -> remote
modifires -> modifiers
secore -> secure
Diffstat (limited to 'client')
-rw-r--r-- | client/gui/resource_provider.cpp | 2 | ||||
-rw-r--r-- | client/inputs_channel.cpp | 8 | ||||
-rw-r--r-- | client/inputs_channel.h | 2 | ||||
-rw-r--r-- | client/red_channel.cpp | 32 | ||||
-rw-r--r-- | client/red_channel.h | 12 | ||||
-rw-r--r-- | client/red_peer.cpp | 8 | ||||
-rw-r--r-- | client/red_peer.h | 12 | ||||
-rw-r--r-- | client/tunnel_channel.cpp | 8 |
8 files changed, 42 insertions, 42 deletions
diff --git a/client/gui/resource_provider.cpp b/client/gui/resource_provider.cpp index 47f86a43..52e3381c 100644 --- a/client/gui/resource_provider.cpp +++ b/client/gui/resource_provider.cpp @@ -108,7 +108,7 @@ struct ResString{ {STR_BUTTON_BACK, "Back"}, {STR_LABEL_HOST, "Host"}, {STR_LABEL_PORT, "Port"}, - {STR_LABEL_SPORT, "Secore port"}, + {STR_LABEL_SPORT, "Secure port"}, {STR_LABEL_PASSWORD, "Password"}, {0, NULL}, }; diff --git a/client/inputs_channel.cpp b/client/inputs_channel.cpp index 09fc9e17..9ff5479f 100644 --- a/client/inputs_channel.cpp +++ b/client/inputs_channel.cpp @@ -23,7 +23,7 @@ #include "application.h" #include "display_channel.h" -#define SYNC_REMOTH_MODIFIRES +#define SYNC_REMOTE_MODIFIERS class SetInputsHandlerEvent: public Event { public: @@ -187,7 +187,7 @@ InputsChannel::InputsChannel(RedClient& client, uint32_t id) handler->set_handler(SPICE_MSG_NOTIFY, &InputsChannel::handle_notify); handler->set_handler(SPICE_MSG_INPUTS_INIT, &InputsChannel::handle_init); - handler->set_handler(SPICE_MSG_INPUTS_KEY_MODIFIERS, &InputsChannel::handle_modifaiers); + handler->set_handler(SPICE_MSG_INPUTS_KEY_MODIFIERS, &InputsChannel::handle_modifiers); handler->set_handler(SPICE_MSG_INPUTS_MOUSE_MOTION_ACK, &InputsChannel::handle_motion_ack); } @@ -217,7 +217,7 @@ void InputsChannel::handle_init(RedPeer::InMessage* message) get_client().push_event(*set_handler_event); } -void InputsChannel::handle_modifaiers(RedPeer::InMessage* message) +void InputsChannel::handle_modifiers(RedPeer::InMessage* message) { SpiceMsgInputsKeyModifiers* init = (SpiceMsgInputsKeyModifiers*)message->data(); _modifiers = init->modifiers; @@ -404,7 +404,7 @@ void InputsChannel::set_local_modifiers() void InputsChannel::on_focus_in() { -#ifdef SYNC_REMOTH_MODIFIRES +#ifdef SYNC_REMOTE_MODIFIERS Message* message = new Message(SPICE_MSGC_INPUTS_KEY_MODIFIERS); SpiceMsgcKeyModifiers modifiers; modifiers.modifiers = Platform::get_keyboard_lock_modifiers(); diff --git a/client/inputs_channel.h b/client/inputs_channel.h index 9a0e8ff3..00e185ce 100644 --- a/client/inputs_channel.h +++ b/client/inputs_channel.h @@ -50,7 +50,7 @@ private: void set_local_modifiers(); void handle_init(RedPeer::InMessage* message); - void handle_modifaiers(RedPeer::InMessage* message); + void handle_modifiers(RedPeer::InMessage* message); void handle_motion_ack(RedPeer::InMessage* message); static uint32_t get_make_scan_code(RedKey key); diff --git a/client/red_channel.cpp b/client/red_channel.cpp index 3fa3f51a..b475927b 100644 --- a/client/red_channel.cpp +++ b/client/red_channel.cpp @@ -336,9 +336,9 @@ void RedChannel::post_message(RedChannel::OutMessage* message) _send_trigger.trigger(); } -RedPeer::CompundInMessage *RedChannel::recive() +RedPeer::CompoundInMessage *RedChannel::recive() { - CompundInMessage *message = RedChannelBase::recive(); + CompoundInMessage *message = RedChannelBase::recive(); on_message_recived(); return message; } @@ -589,12 +589,12 @@ void RedChannel::recive_messages() _incomming_header_pos = n; return; } - AutoRef<CompundInMessage> message(new CompundInMessage(_incomming_header.serial, - _incomming_header.type, - _incomming_header.size, - _incomming_header.sub_list)); - n = RedPeer::recive((*message)->data(), (*message)->compund_size()); - if (n != (*message)->compund_size()) { + AutoRef<CompoundInMessage> message(new CompoundInMessage(_incomming_header.serial, + _incomming_header.type, + _incomming_header.size, + _incomming_header.sub_list)); + n = RedPeer::recive((*message)->data(), (*message)->compound_size()); + if (n != (*message)->compound_size()) { _incomming_message = message.release(); _incomming_message_pos = n; return; @@ -626,22 +626,22 @@ void RedChannel::on_event() return; } _incomming_header_pos = 0; - _incomming_message = new CompundInMessage(_incomming_header.serial, - _incomming_header.type, - _incomming_header.size, - _incomming_header.sub_list); + _incomming_message = new CompoundInMessage(_incomming_header.serial, + _incomming_header.type, + _incomming_header.size, + _incomming_header.sub_list); _incomming_message_pos = 0; } if (_incomming_message) { _incomming_message_pos += RedPeer::recive(_incomming_message->data() + _incomming_message_pos, - _incomming_message->compund_size() - + _incomming_message->compound_size() - _incomming_message_pos); - if (_incomming_message_pos != _incomming_message->compund_size()) { + if (_incomming_message_pos != _incomming_message->compound_size()) { return; } - AutoRef<CompundInMessage> message(_incomming_message); + AutoRef<CompoundInMessage> message(_incomming_message); _incomming_message = NULL; on_message_recived(); _message_handler->handle_message(*(*message)); @@ -680,7 +680,7 @@ void RedChannel::handle_migrate(RedPeer::InMessage* message) if (migrate->flags & SPICE_MIGRATE_NEED_FLUSH) { send_migrate_flush_mark(); } - AutoRef<CompundInMessage> data_message; + AutoRef<CompoundInMessage> data_message; if (migrate->flags & SPICE_MIGRATE_NEED_DATA_TRANSFER) { data_message.reset(recive()); } diff --git a/client/red_channel.h b/client/red_channel.h index fd01f203..a3266809 100644 --- a/client/red_channel.h +++ b/client/red_channel.h @@ -126,7 +126,7 @@ public: virtual void disconnect(); virtual bool abort(); - virtual CompundInMessage *recive(); + virtual CompoundInMessage *recive(); virtual void post_message(RedChannel::OutMessage* message); int get_connection_error() { return _error;} @@ -189,7 +189,7 @@ private: SpiceDataHeader _incomming_header; uint32_t _incomming_header_pos; - RedPeer::CompundInMessage* _incomming_message; + RedPeer::CompoundInMessage* _incomming_message; uint32_t _incomming_message_pos; uint32_t _message_ack_count; @@ -232,7 +232,7 @@ class RedChannel::MessageHandler { public: MessageHandler() {} virtual ~MessageHandler() {} - virtual void handle_message(RedPeer::CompundInMessage& message) = 0; + virtual void handle_message(RedPeer::CompoundInMessage& message) = 0; }; @@ -241,7 +241,7 @@ class MessageHandlerImp: public RedChannel::MessageHandler { public: MessageHandlerImp(HandlerClass& obj); ~MessageHandlerImp() { delete [] _handlers; }; - virtual void handle_message(RedPeer::CompundInMessage& message); + virtual void handle_message(RedPeer::CompoundInMessage& message); typedef void (HandlerClass::*Handler)(RedPeer::InMessage* message); void set_handler(unsigned int id, Handler handler); @@ -264,7 +264,7 @@ MessageHandlerImp<HandlerClass, channel_id>::MessageHandlerImp(HandlerClass& obj } template <class HandlerClass, unsigned int channel_id> -void MessageHandlerImp<HandlerClass, channel_id>::handle_message(RedPeer::CompundInMessage& +void MessageHandlerImp<HandlerClass, channel_id>::handle_message(RedPeer::CompoundInMessage& message) { uint8_t *msg; @@ -288,7 +288,7 @@ void MessageHandlerImp<HandlerClass, channel_id>::handle_message(RedPeer::Compun SpiceSubMessageList *sub_list; sub_list = (SpiceSubMessageList *)(message.data() + message.sub_list()); for (int i = 0; i < sub_list->size; i++) { - SpicedSubMessage *sub = (SpicedSubMessage *)(message.data() + sub_list->sub_messages[i]); + SpiceSubMessage *sub = (SpiceSubMessage *)(message.data() + sub_list->sub_messages[i]); msg = (uint8_t *)(sub + 1); type = sub->type; size = sub->size; diff --git a/client/red_peer.cpp b/client/red_peer.cpp index 2d9f5b97..88fc9ad7 100644 --- a/client/red_peer.cpp +++ b/client/red_peer.cpp @@ -661,14 +661,14 @@ uint32_t RedPeer::recive(uint8_t *buf, uint32_t size) return pos - buf; } -RedPeer::CompundInMessage* RedPeer::recive() +RedPeer::CompoundInMessage* RedPeer::recive() { SpiceDataHeader header; - AutoRef<CompundInMessage> message; + AutoRef<CompoundInMessage> message; recive((uint8_t*)&header, sizeof(SpiceDataHeader)); - message.reset(new CompundInMessage(header.serial, header.type, header.size, header.sub_list)); - recive((*message)->data(), (*message)->compund_size()); + message.reset(new CompoundInMessage(header.serial, header.type, header.size, header.sub_list)); + recive((*message)->data(), (*message)->compound_size()); return message.release(); } diff --git a/client/red_peer.h b/client/red_peer.h index 25a35605..a4310e6f 100644 --- a/client/red_peer.h +++ b/client/red_peer.h @@ -34,7 +34,7 @@ public: virtual ~RedPeer(); class InMessage; - class CompundInMessage; + class CompoundInMessage; class OutMessage; class DisconnectedException {}; @@ -114,7 +114,7 @@ public: void close(); void enable() { _shut = false;} - virtual CompundInMessage* recive(); + virtual CompoundInMessage* recive(); uint32_t do_send(OutMessage& message, uint32_t skip_bytes); uint32_t send(OutMessage& message); @@ -169,9 +169,9 @@ protected: uint8_t* _data; }; -class RedPeer::CompundInMessage: public RedPeer::InMessage { +class RedPeer::CompoundInMessage: public RedPeer::InMessage { public: - CompundInMessage(uint64_t _serial, uint16_t type, uint32_t size, uint32_t sub_list) + CompoundInMessage(uint64_t _serial, uint16_t type, uint32_t size, uint32_t sub_list) : InMessage(type, size, new uint8_t[size]) , _refs (1) , _serial (_serial) @@ -186,10 +186,10 @@ public: uint32_t sub_list() { return _sub_list;} virtual uint32_t size() { return _sub_list ? _sub_list : _size;} - uint32_t compund_size() {return _size;} + uint32_t compound_size() {return _size;} protected: - virtual ~CompundInMessage() { delete[] _data;} + virtual ~CompoundInMessage() { delete[] _data;} private: int _refs; diff --git a/client/tunnel_channel.cpp b/client/tunnel_channel.cpp index 0b55afff..7047d461 100644 --- a/client/tunnel_channel.cpp +++ b/client/tunnel_channel.cpp @@ -33,7 +33,7 @@ class OutSocketMessage; class InSocketMessage: public ClientNetSocket::SendBuffer { public: - InSocketMessage(RedChannel::CompundInMessage& full_msg); + InSocketMessage(RedChannel::CompoundInMessage& full_msg); const uint8_t* data(); uint32_t size(); @@ -45,12 +45,12 @@ protected: private: int _refs; - RedChannel::CompundInMessage& _full_msg; + RedChannel::CompoundInMessage& _full_msg; SpiceMsgTunnelSocketData* _sckt_msg; uint32_t _buf_size; }; -InSocketMessage::InSocketMessage(RedChannel::CompundInMessage& full_msg) +InSocketMessage::InSocketMessage(RedChannel::CompoundInMessage& full_msg) : _refs (1) , _full_msg (full_msg) { @@ -450,7 +450,7 @@ void TunnelChannel::handle_socket_data(RedPeer::InMessage* message) } InSocketMessage* sckt_msg = new InSocketMessage(*( - static_cast<RedChannel::CompundInMessage*>(message))); + static_cast<RedChannel::CompoundInMessage*>(message))); if (sckt_msg->size() > _max_socket_data_size) { THROW("%s: socket data exceeds size limit %d > %d connection_id=%d", __FUNCTION__, sckt_msg->size(), _max_socket_data_size, sckt->id()); |