juicy compiler error

2017-01-11 18:52:09 +01:00
parent 580a411e9d
commit 854566b57f
63 changed files with 1481 additions and 1067 deletions
@@ -1,48 +1,47 @@
 #include "ircmanager.h"
-#include "ircconnection.h"
-#include "irccommand.h"
-#include "future"
-#include "QNetworkReply"
-#include "asyncexec.h"
-#include "qnetworkrequest.h"
+#include "QJsonArray"
 #include "QJsonDocument"
 #include "QJsonObject"
-#include "QJsonArray"
+#include "QNetworkReply"
+#include "asyncexec.h"
 #include "channel.h"
+#include "future"
+#include "irccommand.h"
+#include "ircconnection.h"
+#include "qnetworkrequest.h"

-Account*                IrcManager::account                 = const_cast<Account*>(Account::anon());
-IrcConnection*          IrcManager::connection              = NULL;
-QMutex*                 IrcManager::connectionMutex         = new QMutex();
-long                    IrcManager::connectionIteration     = 0;
-const                   QString IrcManager::defaultClientId = "7ue61iz46fz11y3cugd0l3tawb4taal";
-QNetworkAccessManager*  IrcManager::accessManager           = new QNetworkAccessManager();
+Account *IrcManager::account = const_cast<Account *>(Account::anon());
+IrcConnection *IrcManager::connection = NULL;
+QMutex *IrcManager::connectionMutex = new QMutex();
+long IrcManager::connectionIteration = 0;
+const QString IrcManager::defaultClientId = "7ue61iz46fz11y3cugd0l3tawb4taal";
+QNetworkAccessManager *IrcManager::m_accessManager =
+    new QNetworkAccessManager();

-QMap<QString, bool>*    IrcManager::twitchBlockedUsers      = new QMap<QString, bool>;
-QMutex*                 IrcManager::twitchBlockedUsersMutex = new QMutex();
+QMap<QString, bool> *IrcManager::twitchBlockedUsers = new QMap<QString, bool>;
+QMutex *IrcManager::twitchBlockedUsersMutex = new QMutex();

 IrcManager::IrcManager()
 {
-
 }

-void IrcManager::connect()
+void
+IrcManager::connect()
 {
    disconnect();

-    async_exec(beginConnecting());
+    async_exec([] { beginConnecting(); });
 }

-void IrcManager::beginConnecting()
+void
+IrcManager::beginConnecting()
 {
    int iteration = ++connectionIteration;

    auto c = new IrcConnection();

-    QObject::connect(c,
-                     &IrcConnection::messageReceived,
-                     &messageReceived);
-    QObject::connect(c,
-                     &IrcConnection::privateMessageReceived,
+    QObject::connect(c, &IrcConnection::messageReceived, &messageReceived);
+    QObject::connect(c, &IrcConnection::privateMessageReceived,
                     &privateMessageReceived);

    if (account->isAnon()) {
@@ -52,58 +51,66 @@ void IrcManager::beginConnecting()
        QString oauthToken = account->oauthToken();

        {
-        QString nextLink = "https://api.twitch.tv/kraken/users/" + username +
-            "/blocks?limit=" + 100 +
-            "&client_id=" + oauthClient;
+            QString nextLink = "https://api.twitch.tv/kraken/users/" +
+                               username + "/blocks?limit=" + 100 +
+                               "&client_id=" + oauthClient;

-        QNetworkRequest req(QUrl(nextLink + "&oauth_token=" + oauthToken));
-        QNetworkReply *reply = accessManager->get(req);
+            QNetworkRequest req(QUrl(nextLink + "&oauth_token=" + oauthToken));
+            QNetworkReply *reply = m_accessManager->get(req);

-        QObject::connect(reply, &QNetworkReply::finished, [=]{
-            twitchBlockedUsersMutex->lock();
-            twitchBlockedUsers->clear();
-            twitchBlockedUsersMutex->unlock();
+            QObject::connect(reply, &QNetworkReply::finished, [=] {
+                twitchBlockedUsersMutex->lock();
+                twitchBlockedUsers->clear();
+                twitchBlockedUsersMutex->unlock();

-            QByteArray data = reply->readAll();
-            QJsonDocument jsonDoc(QJsonDocument::fromJson(data));
-            QJsonObject root = jsonDoc.object();
+                QByteArray data = reply->readAll();
+                QJsonDocument jsonDoc(QJsonDocument::fromJson(data));
+                QJsonObject root = jsonDoc.object();

-            //nextLink = root.value("_links").toObject().value("next").toString();
+                // nextLink =
+                // root.value("_links").toObject().value("next").toString();

-            auto blocks = root.value("blocks").toArray();
+                auto blocks = root.value("blocks").toArray();

-            twitchBlockedUsersMutex->lock();
-            for (QJsonValue block : blocks) {
-                QJsonObject user = block.toObject().value("user").toObject();
-                // display_name
-                twitchBlockedUsers->insert(user.value("name").toString().toLower(), true);
-            }
-            twitchBlockedUsersMutex->unlock();
-        });
+                twitchBlockedUsersMutex->lock();
+                for (QJsonValue block : blocks) {
+                    QJsonObject user =
+                        block.toObject().value("user").toObject();
+                    // display_name
+                    twitchBlockedUsers->insert(
+                        user.value("name").toString().toLower(), true);
+                }
+                twitchBlockedUsersMutex->unlock();
+            });
        }

        // fetch available twitch emtoes
        {
-        QNetworkRequest req(QUrl("https://api.twitch.tv/kraken/users/" + username + "/emotes?oauth_token=" + oauthToken + "&client_id=" + oauthClient));
-        QNetworkReply *reply = accessManager->get(req);
+            QNetworkRequest req(QUrl("https://api.twitch.tv/kraken/users/" +
+                                     username + "/emotes?oauth_token=" +
+                                     oauthToken + "&client_id=" + oauthClient));
+            QNetworkReply *reply = m_accessManager->get(req);

-        QObject::connect(reply, &QNetworkReply::finished, [=]{
-            QByteArray data = reply->readAll();
-            QJsonDocument jsonDoc(QJsonDocument::fromJson(data));
-            QJsonObject root = jsonDoc.object();
+            QObject::connect(reply, &QNetworkReply::finished, [=] {
+                QByteArray data = reply->readAll();
+                QJsonDocument jsonDoc(QJsonDocument::fromJson(data));
+                QJsonObject root = jsonDoc.object();

-            //nextLink = root.value("_links").toObject().value("next").toString();
+                // nextLink =
+                // root.value("_links").toObject().value("next").toString();

-            auto blocks = root.value("blocks").toArray();
+                auto blocks = root.value("blocks").toArray();

-            twitchBlockedUsersMutex->lock();
-            for (QJsonValue block : blocks) {
-                QJsonObject user = block.toObject().value("user").toObject();
-                // display_name
-                twitchBlockedUsers->insert(user.value("name").toString().toLower(), true);
-            }
-            twitchBlockedUsersMutex->unlock();
-        });
+                twitchBlockedUsersMutex->lock();
+                for (QJsonValue block : blocks) {
+                    QJsonObject user =
+                        block.toObject().value("user").toObject();
+                    // display_name
+                    twitchBlockedUsers->insert(
+                        user.value("name").toString().toLower(), true);
+                }
+                twitchBlockedUsersMutex->unlock();
+            });
        }
    }

@@ -126,14 +133,14 @@ void IrcManager::beginConnecting()
        delete connection;
        c->moveToThread(QCoreApplication::instance()->thread());
        connection = c;
-    }
-    else {
+    } else {
        delete c;
    }
    connectionMutex->unlock();
 }

-void IrcManager::disconnect()
+void
+IrcManager::disconnect()
 {
    connectionMutex->lock();

@@ -145,14 +152,16 @@ void IrcManager::disconnect()
    connectionMutex->unlock();
 }

-void IrcManager::messageReceived(IrcMessage *message)
+void
+IrcManager::messageReceived(IrcMessage *message)
 {
    qInfo(message->command().toStdString().c_str());

    //    if (message->command() == "")
 }

-void IrcManager::privateMessageReceived(IrcPrivateMessage *message)
+void
+IrcManager::privateMessageReceived(IrcPrivateMessage *message)
 {
    qInfo(message->content().toStdString().c_str());

@@ -164,7 +173,8 @@ void IrcManager::privateMessageReceived(IrcPrivateMessage *message)
    }
 }

-bool IrcManager::isTwitchBlockedUser(QString const &username)
+bool
+IrcManager::isTwitchBlockedUser(QString const &username)
 {
    twitchBlockedUsersMutex->lock();

@@ -179,19 +189,18 @@ bool IrcManager::isTwitchBlockedUser(QString const &username)
    return true;
 }

-bool IrcManager::tryAddIgnoredUser(QString const &username, QString& errorMessage)
+bool
+IrcManager::tryAddIgnoredUser(QString const &username, QString &errorMessage)
 {
    QUrl url("https://api.twitch.tv/kraken/users/" + account->username() +
-             "/blocks/" + username +
-             "?oauth_token=" + account->oauthToken() +
+             "/blocks/" + username + "?oauth_token=" + account->oauthToken() +
             "&client_id=" + account->oauthClient());

    QNetworkRequest request(url);
-    auto reply = accessManager->put(request, QByteArray());
+    auto reply = m_accessManager->put(request, QByteArray());
    reply->waitForReadyRead(10000);

-    if (reply->error() == QNetworkReply::NoError)
-    {
+    if (reply->error() == QNetworkReply::NoError) {
        twitchBlockedUsersMutex->lock();
        twitchBlockedUsers->insert(username, true);
        twitchBlockedUsersMutex->unlock();
@@ -200,11 +209,13 @@ bool IrcManager::tryAddIgnoredUser(QString const &username, QString& errorMessag
        return true;
    }

-    errorMessage = "Error while ignoring user \"" + username + "\": " + reply->errorString();
+    errorMessage = "Error while ignoring user \"" + username +
+                   "\": " + reply->errorString();
    return false;
 }

-void IrcManager::addIgnoredUser(QString const &username)
+void
+IrcManager::addIgnoredUser(QString const &username)
 {
    QString errorMessage;
    if (!tryAddIgnoredUser(username, errorMessage)) {
@@ -212,19 +223,18 @@ void IrcManager::addIgnoredUser(QString const &username)
    }
 }

-bool IrcManager::tryRemoveIgnoredUser(QString const &username, QString& errorMessage)
+bool
+IrcManager::tryRemoveIgnoredUser(QString const &username, QString &errorMessage)
 {
    QUrl url("https://api.twitch.tv/kraken/users/" + account->username() +
-             "/blocks/" + username +
-             "?oauth_token=" + account->oauthToken() +
+             "/blocks/" + username + "?oauth_token=" + account->oauthToken() +
             "&client_id=" + account->oauthClient());

    QNetworkRequest request(url);
-    auto reply = accessManager->deleteResource(request);
+    auto reply = m_accessManager->deleteResource(request);
    reply->waitForReadyRead(10000);

-    if (reply->error() == QNetworkReply::NoError)
-    {
+    if (reply->error() == QNetworkReply::NoError) {
        twitchBlockedUsersMutex->lock();
        twitchBlockedUsers->remove(username);
        twitchBlockedUsersMutex->unlock();
@@ -233,11 +243,13 @@ bool IrcManager::tryRemoveIgnoredUser(QString const &username, QString& errorMes
        return true;
    }

-    errorMessage = "Error while unignoring user \"" + username + "\": " + reply->errorString();
+    errorMessage = "Error while unignoring user \"" + username +
+                   "\": " + reply->errorString();
    return false;
 }

-void IrcManager::removeIgnoredUser(QString const &username)
+void
+IrcManager::removeIgnoredUser(QString const &username)
 {
    QString errorMessage;
    if (!tryRemoveIgnoredUser(username, errorMessage)) {