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-05-15 15:06:07 +0300
committerMikkel Krautz <mikkel@krautz.dk>2016-06-24 01:03:11 +0300
commitb33e1ac7f24b01726831a8b68a9095f45611105c (patch)
treeb8dcc1cfaa78bbc309b9dd0b195124113eabb3f0 /src/murmur/Server.h
parentf66b0d34c8ea1a5b3ffd894b9b5916ceed17e387 (diff)
Rearrange code in Server header.
Diffstat (limited to 'src/murmur/Server.h')
-rw-r--r--src/murmur/Server.h6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/murmur/Server.h b/src/murmur/Server.h
index 6efe89425..bba2dcc64 100644
--- a/src/murmur/Server.h
+++ b/src/murmur/Server.h
@@ -212,13 +212,15 @@ class Server : public QThread {
quint32 uiVersionBlob;
QList<QSocketNotifier *> qlUdpNotifier;
+ QReadWriteLock qrwlVoiceThread;
QHash<unsigned int, ServerUser *> qhUsers;
QHash<QPair<HostAddress, quint16>, ServerUser *> qhPeerUsers;
QHash<HostAddress, QSet<ServerUser *> > qhHostUsers;
QHash<unsigned int, Channel *> qhChannels;
- QReadWriteLock qrwlVoiceThread;
- ChanACL::ACLCache acCache;
+
QMutex qmCache;
+ ChanACL::ACLCache acCache;
+
QHash<int, QString> qhUserNameCache;
QHash<QString, int> qhUserIDCache;