projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Replace Protocol::Handler enum with enum class
[quassel.git]
/
src
/
common
/
protocol.h
diff --git
a/src/common/protocol.h
b/src/common/protocol.h
index
d9d1049
..
bf6c401
100644
(file)
--- a/
src/common/protocol.h
+++ b/
src/common/protocol.h
@@
-42,7
+42,7
@@
enum Feature {
};
};
-enum Handler {
+enum
class
Handler {
SignalProxy,
AuthHandler
};
SignalProxy,
AuthHandler
};
@@
-51,7
+51,7
@@
enum Handler {
/*** Handshake, handled by AuthHandler ***/
struct HandshakeMessage {
/*** Handshake, handled by AuthHandler ***/
struct HandshakeMessage {
- inline Handler handler() const { return AuthHandler; }
+ inline Handler handler() const { return
Handler::
AuthHandler; }
};
};
@@
-81,20
+81,20
@@
struct ClientDenied : public HandshakeMessage
struct ClientRegistered : public HandshakeMessage
{
struct ClientRegistered : public HandshakeMessage
{
- inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported, const QVariantList &auth
Backend
Info)
+ inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported, const QVariantList &auth
enticator
Info)
: coreFeatures(coreFeatures)
, coreConfigured(coreConfigured)
, backendInfo(backendInfo)
: coreFeatures(coreFeatures)
, coreConfigured(coreConfigured)
, backendInfo(backendInfo)
- , auth
BackendInfo(authBackend
Info)
+ , auth
enticatorInfo(authenticator
Info)
, sslSupported(sslSupported)
{}
quint32 coreFeatures;
bool coreConfigured;
, sslSupported(sslSupported)
{}
quint32 coreFeatures;
bool coreConfigured;
- // The auth
Backend
Info should be optional!
+ // The auth
enticator
Info should be optional!
QVariantList backendInfo; // TODO: abstract this better
QVariantList backendInfo; // TODO: abstract this better
- QVariantList auth
Backend
Info;
+ QVariantList auth
enticator
Info;
// this is only used by the LegacyProtocol in compat mode
bool sslSupported;
// this is only used by the LegacyProtocol in compat mode
bool sslSupported;
@@
-179,7
+179,7
@@
struct SessionState : public HandshakeMessage
struct SignalProxyMessage
{
struct SignalProxyMessage
{
- inline Handler handler() const { return SignalProxy; }
+ inline Handler handler() const { return
Handler::
SignalProxy; }
};
};