Remove superflous access specifiers

Author: Flamefire

libs/common/include/s25util/BinaryFile.h

@@ -51,8 +51,8 @@ class BinaryFile
     void WriteUnsignedChar(unsigned char i) const;
     void WriteRawData(const void* data, unsigned length) const;
 
-    void WriteShortString(const std::string& str); /// Länge max 254
-    void WriteLongString(const std::string& str);  /// Länge max 2^32-2
+    void WriteShortString(const std::string& str) const; /// Länge max 254
+    void WriteLongString(const std::string& str) const;  /// Länge max 2^32-2
 
     /// Lesemethoden
     int ReadSignedInt();

libs/common/include/s25util/Serializer.h

@@ -64,7 +64,7 @@ class Serializer
     }
 
     /// Schreibt den Buffer in eine Datei
-    void WriteToFile(BinaryFile& file);
+    void WriteToFile(BinaryFile& file) const;
     /// Liest den Buffer aus einer Datei
     virtual void ReadFromFile(BinaryFile& file);
 

libs/common/src/BinaryFile.cpp

@@ -87,7 +87,7 @@ void BinaryFile::WriteRawData(const void* const data, const unsigned length) con
     CHECKED_WRITE(libendian::write((const char*)data, length, file));
 }
 
-void BinaryFile::WriteShortString(const std::string& str)
+void BinaryFile::WriteShortString(const std::string& str) const
 {
     if(str.length() + 1 > std::numeric_limits<unsigned char>::max())
         throw std::out_of_range("String '" + str + "' is to long for a short string");
@@ -96,7 +96,7 @@ void BinaryFile::WriteShortString(const std::string& str)
     WriteRawData(str.c_str(), length);
 }
 
-void BinaryFile::WriteLongString(const std::string& str)
+void BinaryFile::WriteLongString(const std::string& str) const
 {
     auto length = unsigned(str.length() + 1);
     WriteUnsignedInt(length);

libs/common/src/Serializer.cpp

@@ -39,7 +39,7 @@ void Serializer::SetLength(const unsigned length)
         pos_ = length_;
 }
 
-void Serializer::WriteToFile(BinaryFile& file)
+void Serializer::WriteToFile(BinaryFile& file) const
 {
     file.WriteUnsignedInt(GetLength());
     file.WriteRawData(GetData(), GetLength());

libs/network/include/s25util/Socket.h

@@ -119,7 +119,7 @@ class Socket
     void Close();
 
     /// Binds the socket to a specific port
-    bool Bind(unsigned short port, bool useIPv6);
+    bool Bind(unsigned short port, bool useIPv6) const;
 
     /// setzt das Socket auf Listen.
     bool Listen(unsigned short port, bool use_ipv6 = false, bool use_upnp = true);
@@ -132,42 +132,42 @@ class Socket
                  const ProxySettings& proxy = ProxySettings());
 
     /// liest Daten vom Socket in einen Puffer.
-    int Recv(void* buffer, int length, bool block = true);
+    int Recv(void* buffer, int length, bool block = true) const;
     /// Reads data from socket and returns peer address. Can be used for unbound sockets
-    int Recv(void* buffer, int length, PeerAddr& addr);
+    int Recv(void* buffer, int length, PeerAddr& addr) const;
     template<typename T, size_t T_size>
     int Recv(std::array<T, T_size>& buffer, const int length = T_size * sizeof(T), bool block = true)
     {
         return Recv(buffer.data(), length, block);
     }
 
     /// schreibt Daten von einem Puffer auf das Socket.
-    int Send(const void* buffer, int length);
+    int Send(const void* buffer, int length) const;
     /// Sends data to the specified address (only for connectionless sockets!)
-    int Send(const void* buffer, int length, const PeerAddr& addr);
+    int Send(const void* buffer, int length, const PeerAddr& addr) const;
     template<typename T, size_t T_size>
     int Send(const std::array<T, T_size>& buffer)
     {
         return Send(buffer.data(), buffer.size() * sizeof(T));
     }
 
     /// setzt eine Socketoption.
-    bool SetSockOpt(int nOptionName, const void* lpOptionValue, int nOptionLen, int nLevel = IPPROTO_TCP);
+    bool SetSockOpt(int nOptionName, const void* lpOptionValue, int nOptionLen, int nLevel = IPPROTO_TCP) const;
 
     /// Größer-Vergleichsoperator.
-    bool operator>(const Socket& sock);
+    bool operator>(const Socket& sock) const;
 
     /// prüft auf wartende Bytes.
     int BytesWaiting();
 
     /// prüft auf wartende Bytes.
-    int BytesWaiting(unsigned* received);
+    int BytesWaiting(unsigned* received) const;
 
     /// liefert die IP des Remote-Hosts.
-    std::string GetPeerIP();
+    std::string GetPeerIP() const;
 
     /// liefert die IP des Lokalen-Hosts.
-    std::string GetSockIP();
+    std::string GetSockIP() const;
 
     /// Gets a reference to the Socket.
     SOCKET GetSocket() const;

libs/network/src/Socket.cpp

@@ -298,7 +298,7 @@ void Socket::Close()
     refCount_ = nullptr;
 }
 
-bool Socket::Bind(unsigned short port, bool useIPv6)
+bool Socket::Bind(unsigned short port, bool useIPv6) const
 {
     union
     {
@@ -678,7 +678,7 @@ bool Socket::Connect(const std::string& hostname, const unsigned short port, boo
  *
  *  @return -1 bei Fehler, Anzahl der empfangenen Bytes (max. @p length )
  */
-int Socket::Recv(void* buffer, const int length, bool block)
+int Socket::Recv(void* buffer, const int length, bool block) const
 {
     if(!isValid())
         return -1;
@@ -687,7 +687,7 @@ int Socket::Recv(void* buffer, const int length, bool block)
     return recv(socket_, reinterpret_cast<char*>(buffer), length, (block ? 0 : MSG_PEEK));
 }
 
-int Socket::Recv(void* const buffer, const int length, PeerAddr& addr)
+int Socket::Recv(void* const buffer, const int length, PeerAddr& addr) const
 {
     if(!isValid())
         return -1;
@@ -704,7 +704,7 @@ int Socket::Recv(void* const buffer, const int length, PeerAddr& addr)
  *
  *  @return -1 bei Fehler, Anzahl der gesendeten Bytes (max. @p length )
  */
-int Socket::Send(const void* const buffer, const int length)
+int Socket::Send(const void* const buffer, const int length) const
 {
     if(!isValid())
         return -1;
@@ -713,7 +713,7 @@ int Socket::Send(const void* const buffer, const int length)
     return send(socket_, reinterpret_cast<const char*>(buffer), length, 0);
 }
 
-int Socket::Send(const void* const buffer, const int length, const PeerAddr& addr)
+int Socket::Send(const void* const buffer, const int length, const PeerAddr& addr) const
 {
     if(!isValid())
         return -1;
@@ -729,7 +729,7 @@ int Socket::Send(const void* const buffer, const int length, const PeerAddr& add
  *
  *  @return @p true bei Erfolg, @p false bei Fehler
  */
-bool Socket::SetSockOpt(int nOptionName, const void* lpOptionValue, int nOptionLen, int nLevel)
+bool Socket::SetSockOpt(int nOptionName, const void* lpOptionValue, int nOptionLen, int nLevel) const
 {
     return (SOCKET_ERROR != setsockopt(socket_, nLevel, nOptionName, (const char*)lpOptionValue, nOptionLen));
 }
@@ -741,7 +741,7 @@ bool Socket::SetSockOpt(int nOptionName, const void* lpOptionValue, int nOptionL
  *
  *  @return liefert true falls @p this größer ist als @p sock
  */
-bool Socket::operator>(const Socket& sock)
+bool Socket::operator>(const Socket& sock) const
 {
     return this->socket_ > sock.socket_;
 }
@@ -767,7 +767,7 @@ int Socket::BytesWaiting()
  *
  *  @return liefert Null bei Erfolg, SOCKET_ERROR bei Fehler
  */
-int Socket::BytesWaiting(unsigned* received)
+int Socket::BytesWaiting(unsigned* received) const
 {
 #ifdef _WIN32
     DWORD dwReceived;
@@ -784,7 +784,7 @@ int Socket::BytesWaiting(unsigned* received)
  *
  *  @return liefert @p buffer zurück oder @p "" bei Fehler
  */
-std::string Socket::GetPeerIP()
+std::string Socket::GetPeerIP() const
 {
     sockaddr_storage peer;
     socklen_t length = sizeof(sockaddr_storage);
@@ -802,7 +802,7 @@ std::string Socket::GetPeerIP()
  *
  *  @return liefert @p buffer zurück oder @p "" bei Fehler
  */
-std::string Socket::GetSockIP()
+std::string Socket::GetSockIP() const
 {
     sockaddr_storage peer;
     socklen_t length = sizeof(sockaddr_storage);