Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mumble-voip/mumble.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMikkel Krautz <mikkel@krautz.dk>2016-02-20 17:33:45 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-05-08 17:45:52 +0300
commit71f90de22ca6e786bc97e45850e3d8fcfe85a7cc (patch)
tree8da854818f95c2c8a927b8b3a1bc35647fe2088a /src/murmur/MurmurGRPCImpl.h
parentd8710c1019af1219c41c11c50128afad8cb85850 (diff)
grpc: rename remaining MurmurRPCImpl member variables to be coding style conformant.
Diffstat (limited to 'src/murmur/MurmurGRPCImpl.h')
-rw-r--r--src/murmur/MurmurGRPCImpl.h14
1 files changed, 8 insertions, 6 deletions
diff --git a/src/murmur/MurmurGRPCImpl.h b/src/murmur/MurmurGRPCImpl.h
index d037065fb..2c7b936a8 100644
--- a/src/murmur/MurmurGRPCImpl.h
+++ b/src/murmur/MurmurGRPCImpl.h
@@ -49,19 +49,21 @@ class MurmurRPCImpl : public QThread {
MurmurRPC::V1::AsyncService m_V1Service;
// Listeners
- QHash<int, QMultiHash<QString, ::MurmurRPC::Wrapper::V1_ContextActionEvents *> > qhContextActionListeners;
+ QHash<int, QMultiHash<QString, ::MurmurRPC::Wrapper::V1_ContextActionEvents *> > m_contextActionListeners;
- QSet<::MurmurRPC::Wrapper::V1_Events *> qsMetaServiceListeners;
+ QSet<::MurmurRPC::Wrapper::V1_Events *> m_metaServiceListeners;
- QMultiHash<int, ::MurmurRPC::Wrapper::V1_ServerEvents *> qmhServerServiceListeners;
+ QMultiHash<int, ::MurmurRPC::Wrapper::V1_ServerEvents *> m_serverServiceListeners;
QMutex qmAuthenticatorsLock;
- QHash<int, ::MurmurRPC::Wrapper::V1_AuthenticatorStream *> qhAuthenticators;
+ QHash<int, ::MurmurRPC::Wrapper::V1_AuthenticatorStream *> m_authenticators;
QMutex qmTextMessageFilterLock;
- QHash<int, ::MurmurRPC::Wrapper::V1_TextMessageFilter *> qhTextMessageFilters;
+ QHash<int, ::MurmurRPC::Wrapper::V1_TextMessageFilter *> m_textMessageFilters;
+
+ // Maps server id -> session -> context action
+ QMap<int, QMap<unsigned int, QSet<QString> > > m_activeContextActions;
- QMap<int, QMap<unsigned int, QSet<QString> > > qmActiveContextActions; // server id -> session -> context action
bool hasActiveContextAction(const ::Server *s, const ::User *u, const QString &action);
void addActiveContextAction(const ::Server *s, const ::User *u, const QString &action);
void removeActiveContextAction(const ::Server *s, const ::User *u, const QString &action);