noury/mirror-chatterino2
1
0
Fork 0
mirror of https://github.com/Chatterino/chatterino2.git synced 2024-11-21 22:24:07 +01:00
Code Issues Projects Releases Packages Wiki Activity

make connectionMutex QMutex into a std::mutex

Browse source
This commit is contained in:
Rasmus Karlsson 2017-06-06 16:13:41 +02:00
parent 880fe7e81c
commit 2d2d6dad17
2 changed files with 12 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
src/ircmanager.cpp
View file

@ -159,7 +159,7 @@ void IrcManager::beginConnecting()
Communi::IrcConnection *_writeConnection = this->createConnection(false); Communi::IrcConnection *_writeConnection = this->createConnection(false);
Communi::IrcConnection *_readConnection = this->createConnection(true); Communi::IrcConnection *_readConnection = this->createConnection(true);
QMutexLocker locker(&_connectionMutex); std::lock_guard<std::mutex> locker(this->connectionMutex);
if (generation == this->connectionGeneration) { if (generation == this->connectionGeneration) {
this->writeConnection = std::shared_ptr<Communi::IrcConnection>(_writeConnection); this->writeConnection = std::shared_ptr<Communi::IrcConnection>(_writeConnection);
@ -183,7 +183,7 @@ void IrcManager::beginConnecting()
void IrcManager::disconnect() void IrcManager::disconnect()
{ {
_connectionMutex.lock(); this->connectionMutex.lock();
auto _readConnection = this->readConnection; auto _readConnection = this->readConnection;
auto _writeConnection = this->writeConnection; auto _writeConnection = this->writeConnection;
@ -191,43 +191,43 @@ void IrcManager::disconnect()
this->readConnection.reset(); this->readConnection.reset();
this->writeConnection.reset(); this->writeConnection.reset();
_connectionMutex.unlock(); this->connectionMutex.unlock();
} }
void IrcManager::sendMessage(const QString &channelName, const QString &message) void IrcManager::sendMessage(const QString &channelName, const QString &message)
{ {
_connectionMutex.lock(); this->connectionMutex.lock();
if (this->writeConnection) { if (this->writeConnection) {
this->writeConnection->sendRaw("PRIVMSG #" + channelName + " :" + message); this->writeConnection->sendRaw("PRIVMSG #" + channelName + " :" + message);
} }
_connectionMutex.unlock(); this->connectionMutex.unlock();
} }
void IrcManager::joinChannel(const QString &channelName) void IrcManager::joinChannel(const QString &channelName)
{ {
_connectionMutex.lock(); this->connectionMutex.lock();
if (this->readConnection && this->writeConnection) { if (this->readConnection && this->writeConnection) {
this->readConnection->sendRaw("JOIN #" + channelName); this->readConnection->sendRaw("JOIN #" + channelName);
this->writeConnection->sendRaw("JOIN #" + channelName); this->writeConnection->sendRaw("JOIN #" + channelName);
} }
_connectionMutex.unlock(); this->connectionMutex.unlock();
} }
void IrcManager::partChannel(const QString &channelName) void IrcManager::partChannel(const QString &channelName)
{ {
_connectionMutex.lock(); this->connectionMutex.lock();
if (this->readConnection && this->writeConnection) { if (this->readConnection && this->writeConnection) {
this->readConnection->sendRaw("PART #" + channelName); this->readConnection->sendRaw("PART #" + channelName);
this->writeConnection->sendRaw("PART #" + channelName); this->writeConnection->sendRaw("PART #" + channelName);
} }
_connectionMutex.unlock(); this->connectionMutex.unlock();
} }
void IrcManager::messageReceived(Communi::IrcMessage *message) void IrcManager::messageReceived(Communi::IrcMessage *message)
@ -239,8 +239,8 @@ void IrcManager::messageReceived(Communi::IrcMessage *message)
qDebug() << "Param: " << param; qDebug() << "Param: " << param;
} }
const QString &command = message->command();
/* /*
const QString &command = message->command();
if (command == "CLEARCHAT") { if (command == "CLEARCHAT") {
} else if (command == "ROOMSTATE") { } else if (command == "ROOMSTATE") {

3
src/ircmanager.h
View file

@ -12,6 +12,7 @@
#include <QString> #include <QString>
#include <memory> #include <memory>
#include <mutex>
namespace chatterino { namespace chatterino {
@ -56,7 +57,7 @@ private:
std::shared_ptr<Communi::IrcConnection> writeConnection = nullptr; std::shared_ptr<Communi::IrcConnection> writeConnection = nullptr;
std::shared_ptr<Communi::IrcConnection> readConnection = nullptr; std::shared_ptr<Communi::IrcConnection> readConnection = nullptr;
QMutex _connectionMutex; std::mutex connectionMutex;
uint32_t connectionGeneration = 0; uint32_t connectionGeneration = 0;
QMap<QString, bool> _twitchBlockedUsers; QMap<QString, bool> _twitchBlockedUsers;