projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
common: Add generic stream operators for enum types
[quassel.git]
/
src
/
common
/
protocol.h
diff --git
a/src/common/protocol.h
b/src/common/protocol.h
index
b219e01
..
c7cbcb3
100644
(file)
--- a/
src/common/protocol.h
+++ b/
src/common/protocol.h
@@
-1,5
+1,5
@@
/***************************************************************************
/***************************************************************************
- * Copyright (C) 2005-201
4
by the Quassel Project *
+ * Copyright (C) 2005-201
6
by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
@@
-30,6
+30,7
@@
namespace Protocol {
const quint32 magic = 0x42b33f00;
enum Type {
const quint32 magic = 0x42b33f00;
enum Type {
+ InternalProtocol = 0x00,
LegacyProtocol = 0x01,
DataStreamProtocol = 0x02
};
LegacyProtocol = 0x01,
DataStreamProtocol = 0x02
};
@@
-80,12
+81,11
@@
struct ClientDenied : public HandshakeMessage
struct ClientRegistered : public HandshakeMessage
{
struct ClientRegistered : public HandshakeMessage
{
- inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported
, const QString &coreInfo
)
+ inline ClientRegistered(quint32 coreFeatures, bool coreConfigured, const QVariantList &backendInfo, bool sslSupported)
: coreFeatures(coreFeatures)
, coreConfigured(coreConfigured)
, backendInfo(backendInfo)
, sslSupported(sslSupported)
: coreFeatures(coreFeatures)
, coreConfigured(coreConfigured)
, backendInfo(backendInfo)
, sslSupported(sslSupported)
- , coreInfo(coreInfo)
{}
quint32 coreFeatures;
{}
quint32 coreFeatures;
@@
-94,7
+94,6
@@
struct ClientRegistered : public HandshakeMessage
// this is only used by the LegacyProtocol in compat mode
bool sslSupported;
// this is only used by the LegacyProtocol in compat mode
bool sslSupported;
- QString coreInfo;
};
};