From b367d3a77c82d510f1ba2795e4c5b4e58b54809f Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Tue, 2 Sep 2014 09:47:53 +0200 Subject: [PATCH] registrar ClipboardHandler: Style fixes. --- src/servers/registrar/ClipboardHandler.cpp | 116 +++++++++++---------- 1 file changed, 61 insertions(+), 55 deletions(-) diff --git a/src/servers/registrar/ClipboardHandler.cpp b/src/servers/registrar/ClipboardHandler.cpp index f134b4b0625..52f8defc7c6 100644 --- a/src/servers/registrar/ClipboardHandler.cpp +++ b/src/servers/registrar/ClipboardHandler.cpp @@ -17,10 +17,12 @@ #include #include + using std::map; using std::string; using namespace BPrivate; + /*! \class ClipboardHandler \brief Handles all clipboard related requests. @@ -28,6 +30,7 @@ using namespace BPrivate; struct ClipboardHandler::ClipboardMap : map {}; + // constructor /*! \brief Creates and initializes a ClipboardHandler. */ @@ -37,18 +40,19 @@ ClipboardHandler::ClipboardHandler() { } + // destructor /*! \brief Frees all resources associate with this object. */ ClipboardHandler::~ClipboardHandler() { for (ClipboardMap::iterator it = fClipboards->begin(); - it != fClipboards->end(); - ++it) { + it != fClipboards->end(); + ++it) delete it->second; - } } + // MessageReceived /*! \brief Overrides the super class version to handle the clipboard specific messages. @@ -64,32 +68,32 @@ ClipboardHandler::MessageReceived(BMessage *message) { status_t result = B_BAD_VALUE; - if (message->FindString("name", &name) == B_OK) { - if (_GetClipboard(name)) - result = B_OK; - } + if (message->FindString("name", &name) == B_OK) { + if (_GetClipboard(name)) + result = B_OK; + } reply.what = B_REG_RESULT; reply.AddInt32("result", result); message->SendReply(&reply); - break; + break; } case B_REG_GET_CLIPBOARD_COUNT: { status_t result = B_BAD_VALUE; - if (message->FindString("name", &name) == B_OK) { - if (Clipboard *clipboard = _GetClipboard(name)) { + if (message->FindString("name", &name) == B_OK) { + if (Clipboard *clipboard = _GetClipboard(name)) { reply.AddInt32("count", clipboard->Count()); - result = B_OK; - } - } + result = B_OK; + } + } reply.AddInt32("result", result); reply.what = B_REG_RESULT; message->SendReply(&reply); - break; + break; } case B_REG_CLIPBOARD_START_WATCHING: @@ -97,17 +101,17 @@ ClipboardHandler::MessageReceived(BMessage *message) status_t result = B_BAD_VALUE; BMessenger target; - if (message->FindString("name", &name) == B_OK - && message->FindMessenger("target", &target) == B_OK) { - Clipboard *clipboard = _GetClipboard(name); - if (clipboard && clipboard->AddWatcher(target)) - result = B_OK; - } + if (message->FindString("name", &name) == B_OK + && message->FindMessenger("target", &target) == B_OK) { + Clipboard *clipboard = _GetClipboard(name); + if (clipboard && clipboard->AddWatcher(target)) + result = B_OK; + } reply.what = B_REG_RESULT; reply.AddInt32("result", result); message->SendReply(&reply); - break; + break; } case B_REG_CLIPBOARD_STOP_WATCHING: @@ -115,37 +119,37 @@ ClipboardHandler::MessageReceived(BMessage *message) status_t result = B_BAD_VALUE; BMessenger target; - if (message->FindString("name", &name) == B_OK - && message->FindMessenger("target", &target) == B_OK) { - Clipboard *clipboard = _GetClipboard(name); - if (clipboard && clipboard->RemoveWatcher(target)) - result = B_OK; - } + if (message->FindString("name", &name) == B_OK + && message->FindMessenger("target", &target) == B_OK) { + Clipboard *clipboard = _GetClipboard(name); + if (clipboard && clipboard->RemoveWatcher(target)) + result = B_OK; + } reply.what = B_REG_RESULT; reply.AddInt32("result", result); message->SendReply(&reply); - break; + break; } case B_REG_DOWNLOAD_CLIPBOARD: { status_t result = B_BAD_VALUE; - if (message->FindString("name", &name) == B_OK) { - Clipboard *clipboard = _GetClipboard(name); - if (clipboard) { + if (message->FindString("name", &name) == B_OK) { + Clipboard *clipboard = _GetClipboard(name); + if (clipboard) { reply.AddMessage("data", clipboard->Data()); reply.AddMessenger("data source", clipboard->DataSource()); reply.AddInt32("count", clipboard->Count()); - result = B_OK; - } - } + result = B_OK; + } + } reply.what = B_REG_RESULT; reply.AddInt32("result", result); message->SendReply(&reply); - break; + break; } case B_REG_UPLOAD_CLIPBOARD: @@ -154,31 +158,32 @@ ClipboardHandler::MessageReceived(BMessage *message) BMessage data; BMessenger source; - if (message->FindString("name", &name) == B_OK - && message->FindMessenger("data source", &source) == B_OK - && message->FindMessage("data", &data) == B_OK) { - Clipboard *clipboard = _GetClipboard(name); - if (clipboard) { - int32 localCount; - bool failIfChanged; - if (message->FindInt32("count", &localCount) == B_OK - && message->FindBool("fail if changed", &failIfChanged) == B_OK - && failIfChanged - && localCount != clipboard->Count()) { - // atomic support - result = B_ERROR; - } else { - clipboard->SetData(&data, source); + if (message->FindString("name", &name) == B_OK + && message->FindMessenger("data source", &source) == B_OK + && message->FindMessage("data", &data) == B_OK) { + Clipboard *clipboard = _GetClipboard(name); + if (clipboard) { + int32 localCount; + bool failIfChanged; + if (message->FindInt32("count", &localCount) == B_OK + && message->FindBool("fail if changed", &failIfChanged) + == B_OK + && failIfChanged + && localCount != clipboard->Count()) { + // atomic support + result = B_ERROR; + } else { + clipboard->SetData(&data, source); result = reply.AddInt32("count", clipboard->Count()); - result = B_OK; - } - } - } + result = B_OK; + } + } + } reply.what = B_REG_RESULT; reply.AddInt32("result", result); message->SendReply(&reply); - break; + break; } default: @@ -187,6 +192,7 @@ ClipboardHandler::MessageReceived(BMessage *message) } } + /*! \brief Gets the clipboard with the specified name, or adds it, if not yet existent.