Skip to content

Commit

Permalink
SpiceAgent: Rename ClipboardServerConnection
Browse files Browse the repository at this point in the history
Rename ClipboardServerConnection=>ConnectionToClipboardServer.

This was done with CLion's automatic rename feature.
  • Loading branch information
itamar8910 authored and awesomekling committed Feb 25, 2022
1 parent 75ee77f commit 493f604
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 13 deletions.
2 changes: 1 addition & 1 deletion Userland/Services/SpiceAgent/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ serenity_component(
set(SOURCES
main.cpp
SpiceAgent.cpp
ClipboardServerConnection.cpp
ConnectionToClipboardServer.cpp
)

serenity_bin(SpiceAgent)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,13 +4,13 @@
* SPDX-License-Identifier: BSD-2-Clause
*/

#include "ClipboardServerConnection.h"
#include "ConnectionToClipboardServer.h"
#include <AK/ByteBuffer.h>
#include <AK/Function.h>
#include <LibGfx/Bitmap.h>

// Copied from LibGUI/Clipboard.cpp
RefPtr<Gfx::Bitmap> ClipboardServerConnection::get_bitmap()
RefPtr<Gfx::Bitmap> ConnectionToClipboardServer::get_bitmap()
{
auto clipping = get_clipboard_data();

Expand Down Expand Up @@ -58,7 +58,7 @@ RefPtr<Gfx::Bitmap> ClipboardServerConnection::get_bitmap()
}

// Copied from LibGUI/Clipboard.cpp
void ClipboardServerConnection::set_bitmap(Gfx::Bitmap const& bitmap)
void ConnectionToClipboardServer::set_bitmap(Gfx::Bitmap const& bitmap)
{
HashMap<String, String> metadata;
metadata.set("width", String::number(bitmap.width()));
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -12,18 +12,18 @@

#pragma once

class ClipboardServerConnection final
class ConnectionToClipboardServer final
: public IPC::ConnectionToServer<ClipboardClientEndpoint, ClipboardServerEndpoint>
, public ClipboardClientEndpoint {
IPC_CLIENT_CONNECTION(ClipboardServerConnection, "/tmp/portal/clipboard")
IPC_CLIENT_CONNECTION(ConnectionToClipboardServer, "/tmp/portal/clipboard")

public:
Function<void()> on_data_changed;
RefPtr<Gfx::Bitmap> get_bitmap();
void set_bitmap(Gfx::Bitmap const& bitmap);

private:
ClipboardServerConnection(NonnullOwnPtr<Core::Stream::LocalSocket> socket)
ConnectionToClipboardServer(NonnullOwnPtr<Core::Stream::LocalSocket> socket)
: IPC::ConnectionToServer<ClipboardClientEndpoint, ClipboardServerEndpoint>(*this, move(socket))
{
}
Expand Down
4 changes: 2 additions & 2 deletions Userland/Services/SpiceAgent/SpiceAgent.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
*/

#include "SpiceAgent.h"
#include "ClipboardServerConnection.h"
#include "ConnectionToClipboardServer.h"
#include <AK/String.h>
#include <LibC/memory.h>
#include <LibC/unistd.h>
Expand All @@ -16,7 +16,7 @@
#include <LibGfx/PNGLoader.h>
#include <LibGfx/PNGWriter.h>

SpiceAgent::SpiceAgent(int fd, ClipboardServerConnection& connection)
SpiceAgent::SpiceAgent(int fd, ConnectionToClipboardServer& connection)
: m_fd(fd)
, m_clipboard_connection(connection)
{
Expand Down
6 changes: 3 additions & 3 deletions Userland/Services/SpiceAgent/SpiceAgent.h
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
* SPDX-License-Identifier: BSD-2-Clause
*/

#include "ClipboardServerConnection.h"
#include "ConnectionToClipboardServer.h"
#include <AK/ByteBuffer.h>
#include <AK/Vector.h>
#include <LibCore/Notifier.h>
Expand All @@ -13,7 +13,7 @@

class SpiceAgent {
public:
SpiceAgent(int fd, ClipboardServerConnection&);
SpiceAgent(int fd, ConnectionToClipboardServer&);

static constexpr u32 AGENT_PROTOCOL = 1;
enum class Port {
Expand Down Expand Up @@ -117,7 +117,7 @@ class SpiceAgent {
private:
int m_fd { -1 };
RefPtr<Core::Notifier> m_notifier;
ClipboardServerConnection& m_clipboard_connection;
ConnectionToClipboardServer& m_clipboard_connection;

void on_message_received();
void send_message(const ByteBuffer& buffer);
Expand Down
2 changes: 1 addition & 1 deletion Userland/Services/SpiceAgent/main.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ ErrorOr<int> serenity_main(Main::Arguments)

int serial_port_fd = TRY(Core::System::open(SPICE_DEVICE, O_RDWR));

auto conn = TRY(ClipboardServerConnection::try_create());
auto conn = TRY(ConnectionToClipboardServer::try_create());
auto agent = SpiceAgent(serial_port_fd, conn);

return loop.exec();
Expand Down

0 comments on commit 493f604

Please sign in to comment.