X-Git-Url: https://git.netwichtig.de/gitweb/?a=blobdiff_plain;f=include%2Fusers.h;h=12a311980254766fa007651664ef1fedb6b00bbc;hb=8920cb1b9f2c0b50ca326e5fa0646db40acccdbc;hp=ef59646992a7a494c4bf117372f6b9696c412069;hpb=d865b434865907bfad0a187dd403d4ca8144e469;p=user%2Fhenk%2Fcode%2Finspircd.git

diff --git a/include/users.h b/include/users.h
index ef5964699..12a311980 100644
--- a/include/users.h
+++ b/include/users.h
@@ -353,7 +353,7 @@ class CoreExport User : public Extensible
 	unsigned int quitting:1;
 
 	/** What type of user is this? */
-	const unsigned int usertype:2;
+	const UserType usertype:2;
 
 	/** Get client IP string from sockaddr, using static internal buffer
 	 * @return The IP string
@@ -385,7 +385,7 @@ class CoreExport User : public Extensible
 	/** Constructor
 	 * @throw CoreException if the UID allocated to the user already exists
 	 */
-	User(const std::string& uid, Server* srv, int objtype);
+	User(const std::string& uid, Server* srv, UserType objtype);
 
 	/** Returns the full displayed host of the user
 	 * This member function returns the hostname of the user as seen by other users
@@ -727,7 +727,7 @@ class CoreExport User : public Extensible
 	/** Default destructor
 	 */
 	virtual ~User();
-	virtual CullResult cull() CXX11_OVERRIDE;
+	CullResult cull() CXX11_OVERRIDE;
 };
 
 class CoreExport UserIOHandler : public StreamSocket
@@ -735,8 +735,8 @@ class CoreExport UserIOHandler : public StreamSocket
  public:
 	LocalUser* const user;
 	UserIOHandler(LocalUser* me) : user(me) {}
-	void OnDataReady();
-	void OnError(BufferedSocketError error);
+	void OnDataReady() CXX11_OVERRIDE;
+	void OnError(BufferedSocketError error) CXX11_OVERRIDE;
 
 	/** Adds to the user's write buffer.
 	 * You may add any amount of text up to this users sendq value, if you exceed the
@@ -914,9 +914,9 @@ class CoreExport FakeUser : public User
 		nick = sname;
 	}
 
-	virtual CullResult cull() CXX11_OVERRIDE;
-	virtual const std::string& GetFullHost() CXX11_OVERRIDE;
-	virtual const std::string& GetFullRealHost() CXX11_OVERRIDE;
+	CullResult cull() CXX11_OVERRIDE;
+	const std::string& GetFullHost() CXX11_OVERRIDE;
+	const std::string& GetFullRealHost() CXX11_OVERRIDE;
 };
 
 /* Faster than dynamic_cast */