summaryrefslogtreecommitdiffstats
path: root/src/network
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--src/network/packet.h2
-rw-r--r--src/network/room.cpp2
-rw-r--r--src/network/room_member.h16
3 files changed, 10 insertions, 10 deletions
diff --git a/src/network/packet.h b/src/network/packet.h
index e69217488..9aa2a2c9c 100644
--- a/src/network/packet.h
+++ b/src/network/packet.h
@@ -9,7 +9,7 @@
namespace Network {
-/// A class that serializes data for network transfer. It also handles endianess
+/// A class that serializes data for network transfer. It also handles endianness
class Packet {
public:
Packet() = default;
diff --git a/src/network/room.cpp b/src/network/room.cpp
index dc5dbce7f..e456ea09c 100644
--- a/src/network/room.cpp
+++ b/src/network/room.cpp
@@ -27,7 +27,7 @@ public:
std::atomic<State> state{State::Closed}; ///< Current state of the room.
RoomInformation room_information; ///< Information about this room.
- std::string verify_uid; ///< A GUID which may be used for verfication.
+ std::string verify_uid; ///< A GUID which may be used for verification.
mutable std::mutex verify_uid_mutex; ///< Mutex for verify_uid
std::string password; ///< The password required to connect to this room.
diff --git a/src/network/room_member.h b/src/network/room_member.h
index 0d6417294..33ac18e72 100644
--- a/src/network/room_member.h
+++ b/src/network/room_member.h
@@ -71,7 +71,7 @@ public:
Idle, ///< Default state (i.e. not connected)
Joining, ///< The client is attempting to join a room.
Joined, ///< The client is connected to the room and is ready to send/receive packets.
- Moderator, ///< The client is connnected to the room and is granted mod permissions.
+ Moderator, ///< The client is connected to the room and is granted mod permissions.
};
enum class Error : u8 {
@@ -201,7 +201,7 @@ public:
/**
* Binds a function to an event that will be triggered every time the State of the member
- * changed. The function wil be called every time the event is triggered. The callback function
+ * changed. The function will be called every time the event is triggered. The callback function
* must not bind or unbind a function. Doing so will cause a deadlock
* @param callback The function to call
* @return A handle used for removing the function from the registered list
@@ -210,8 +210,8 @@ public:
/**
* Binds a function to an event that will be triggered every time an error happened. The
- * function wil be called every time the event is triggered. The callback function must not bind
- * or unbind a function. Doing so will cause a deadlock
+ * function will be called every time the event is triggered. The callback function must not
+ * bind or unbind a function. Doing so will cause a deadlock
* @param callback The function to call
* @return A handle used for removing the function from the registered list
*/
@@ -219,7 +219,7 @@ public:
/**
* Binds a function to an event that will be triggered every time a ProxyPacket is received.
- * The function wil be called everytime the event is triggered.
+ * The function will be called every time the event is triggered.
* The callback function must not bind or unbind a function. Doing so will cause a deadlock
* @param callback The function to call
* @return A handle used for removing the function from the registered list
@@ -229,7 +229,7 @@ public:
/**
* Binds a function to an event that will be triggered every time an LDNPacket is received.
- * The function wil be called everytime the event is triggered.
+ * The function will be called every time the event is triggered.
* The callback function must not bind or unbind a function. Doing so will cause a deadlock
* @param callback The function to call
* @return A handle used for removing the function from the registered list
@@ -239,7 +239,7 @@ public:
/**
* Binds a function to an event that will be triggered every time the RoomInformation changes.
- * The function wil be called every time the event is triggered.
+ * The function will be called every time the event is triggered.
* The callback function must not bind or unbind a function. Doing so will cause a deadlock
* @param callback The function to call
* @return A handle used for removing the function from the registered list
@@ -249,7 +249,7 @@ public:
/**
* Binds a function to an event that will be triggered every time a ChatMessage is received.
- * The function wil be called every time the event is triggered.
+ * The function will be called every time the event is triggered.
* The callback function must not bind or unbind a function. Doing so will cause a deadlock
* @param callback The function to call
* @return A handle used for removing the function from the registered list