chatterino2
Code Issues

removed namespaces

Browse Source
This commit is contained in:
fourtf
2018-06-26 17:06:17 +02:00
parent 2df0566492
commit 54eb07e116
132 changed files with 805 additions and 823 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/common/Channel.cpp
+7 -7
View File
@@ -53,7 +53,7 @@ bool Channel::isEmpty() const
return this->name.isEmpty();
}
messages::LimitedQueueSnapshot<messages::MessagePtr> Channel::getMessageSnapshot()
chatterino::LimitedQueueSnapshot<chatterino::MessagePtr> Channel::getMessageSnapshot()
{
return this->messages.getSnapshot();
}
@@ -81,7 +81,7 @@ void Channel::addMessage(MessagePtr message)
this->messageAppended.invoke(message);
}
void Channel::addOrReplaceTimeout(messages::MessagePtr message)
void Channel::addOrReplaceTimeout(chatterino::MessagePtr message)
{
LimitedQueueSnapshot<MessagePtr> snapshot = this->getMessageSnapshot();
int snapshotLength = snapshot.getLength();
@@ -118,7 +118,7 @@ void Channel::addOrReplaceTimeout(messages::MessagePtr message)
int count = s->count + 1;
messages::MessagePtr replacement(Message::createSystemMessage(
chatterino::MessagePtr replacement(Message::createSystemMessage(
message->searchText + QString(" (") + QString::number(count) + " times)"));
replacement->timeoutUser = message->timeoutUser;
@@ -162,16 +162,16 @@ void Channel::disableAllMessages()
}
}
void Channel::addMessagesAtStart(std::vector<messages::MessagePtr> &_messages)
void Channel::addMessagesAtStart(std::vector<chatterino::MessagePtr> &_messages)
{
std::vector<messages::MessagePtr> addedMessages = this->messages.pushFront(_messages);
std::vector<chatterino::MessagePtr> addedMessages = this->messages.pushFront(_messages);
if (addedMessages.size() != 0) {
this->messagesAddedAtStart.invoke(addedMessages);
}
}
void Channel::replaceMessage(messages::MessagePtr message, messages::MessagePtr replacement)
void Channel::replaceMessage(chatterino::MessagePtr message, chatterino::MessagePtr replacement)
{
int index = this->messages.replaceItem(message, replacement);
@@ -180,7 +180,7 @@ void Channel::replaceMessage(messages::MessagePtr message, messages::MessagePtr
}
}
void Channel::addRecentChatter(const std::shared_ptr<messages::Message> &message)
void Channel::addRecentChatter(const std::shared_ptr<chatterino::Message> &message)
{
// Do nothing by default
}
src/common/Channel.hpp
+11 -11
View File
@@ -35,23 +35,23 @@ public:
pajlada::Signals::Signal<const QString &, const QString &, bool &> sendMessageSignal;
pajlada::Signals::Signal<messages::MessagePtr &> messageRemovedFromStart;
pajlada::Signals::Signal<messages::MessagePtr &> messageAppended;
pajlada::Signals::Signal<std::vector<messages::MessagePtr> &> messagesAddedAtStart;
pajlada::Signals::Signal<size_t, messages::MessagePtr &> messageReplaced;
pajlada::Signals::Signal<chatterino::MessagePtr &> messageRemovedFromStart;
pajlada::Signals::Signal<chatterino::MessagePtr &> messageAppended;
pajlada::Signals::Signal<std::vector<chatterino::MessagePtr> &> messagesAddedAtStart;
pajlada::Signals::Signal<size_t, chatterino::MessagePtr &> messageReplaced;
pajlada::Signals::NoArgSignal destroyed;
Type getType() const;
bool isTwitchChannel() const;
virtual bool isEmpty() const;
messages::LimitedQueueSnapshot<messages::MessagePtr> getMessageSnapshot();
chatterino::LimitedQueueSnapshot<chatterino::MessagePtr> getMessageSnapshot();
void addMessage(messages::MessagePtr message);
void addMessagesAtStart(std::vector<messages::MessagePtr> &messages);
void addOrReplaceTimeout(messages::MessagePtr message);
void addMessage(chatterino::MessagePtr message);
void addMessagesAtStart(std::vector<chatterino::MessagePtr> &messages);
void addOrReplaceTimeout(chatterino::MessagePtr message);
void disableAllMessages();
void replaceMessage(messages::MessagePtr message, messages::MessagePtr replacement);
virtual void addRecentChatter(const std::shared_ptr<messages::Message> &message);
void replaceMessage(chatterino::MessagePtr message, chatterino::MessagePtr replacement);
virtual void addRecentChatter(const std::shared_ptr<chatterino::Message> &message);
QString name;
QStringList modList;
@@ -69,7 +69,7 @@ protected:
virtual void onConnected();
private:
messages::LimitedQueue<messages::MessagePtr> messages;
chatterino::LimitedQueue<chatterino::MessagePtr> messages;
Type type;
};
src/common/CompletionModel.cpp
+3 -3
View File
@@ -19,7 +19,7 @@ CompletionModel::CompletionModel(const QString &_channelName)
void CompletionModel::refresh()
{
debug::Log("[CompletionModel:{}] Refreshing...]", this->channelName);
Log("[CompletionModel:{}] Refreshing...]", this->channelName);
auto app = getApp();
@@ -75,7 +75,7 @@ void CompletionModel::refresh()
// Channel-specific: Usernames
// fourtf: only works with twitch chat
// auto c = singletons::ChannelManager::getInstance().getTwitchChannel(this->channelName);
// auto c = chatterino::ChannelManager::getInstance().getTwitchChannel(this->channelName);
// auto usernames = c->getUsernamesForCompletions();
// for (const auto &name : usernames) {
// assert(!name.displayName.isEmpty());
@@ -131,7 +131,7 @@ void CompletionModel::ClearExpiredStrings()
const auto &taggedString = *it;
if (taggedString.HasExpired(now)) {
// debug::Log("String {} expired", taggedString.str);
// Log("String {} expired", taggedString.str);
it = this->emotes.erase(it);
} else {
++it;
src/common/Emotemap.cpp
+3 -3
View File
@@ -5,7 +5,7 @@
namespace chatterino {
EmoteData::EmoteData(messages::Image *_image)
EmoteData::EmoteData(chatterino::Image *_image)
: image1x(_image)
{
}
@@ -16,7 +16,7 @@ bool EmoteData::isValid() const
return this->image1x != nullptr;
}
messages::Image *EmoteData::getImage(float scale) const
chatterino::Image *EmoteData::getImage(float scale) const
{
int quality = getApp()->settings->preferredEmoteQuality;
@@ -31,7 +31,7 @@ messages::Image *EmoteData::getImage(float scale) const
}();
}
messages::Image *_image;
chatterino::Image *_image;
if (quality == 3 && this->image3x != nullptr) {
_image = this->image3x;
} else if (quality >= 2 && this->image2x != nullptr) {
src/common/Emotemap.hpp
+5 -5
View File
@@ -8,15 +8,15 @@ namespace chatterino {
struct EmoteData {
EmoteData() = default;
EmoteData(messages::Image *_image);
EmoteData(chatterino::Image *_image);
// Emotes must have a 1x image to be valid
bool isValid() const;
messages::Image *getImage(float scale) const;
chatterino::Image *getImage(float scale) const;
messages::Image *image1x = nullptr;
messages::Image *image2x = nullptr;
messages::Image *image3x = nullptr;
chatterino::Image *image1x = nullptr;
chatterino::Image *image2x = nullptr;
chatterino::Image *image3x = nullptr;
// Link to the emote page i.e. https://www.frankerfacez.com/emoticon/144722-pajaCringe
QString pageLink;
src/common/NetworkRequest.hpp
+6 -6
View File
@@ -31,7 +31,7 @@ static rapidjson::Document parseJSONFromData2(const QByteArray &data)
rapidjson::ParseResult result = ret.Parse(data.data(), data.length());
if (result.Code() != rapidjson::kParseErrorNone) {
debug::Log("JSON parse error: {} ({})", rapidjson::GetParseError_En(result.Code()),
Log("JSON parse error: {} ({})", rapidjson::GetParseError_En(result.Code()),
result.Offset());
return ret;
}
@@ -51,7 +51,7 @@ static rapidjson::Document parseJSONFromReply2(QNetworkReply *reply)
rapidjson::ParseResult result = ret.Parse(data.data(), data.length());
if (result.Code() != rapidjson::kParseErrorNone) {
debug::Log("JSON parse error: {} ({})", rapidjson::GetParseError_En(result.Code()),
Log("JSON parse error: {} ({})", rapidjson::GetParseError_En(result.Code()),
result.Offset());
return ret;
}
@@ -242,7 +242,7 @@ public:
if (timer != nullptr) {
QObject::connect(timer, &QTimer::timeout, worker, [reply, timer]() {
debug::Log("Aborted!");
Log("Aborted!");
reply->abort();
timer->deleteLater();
});
@@ -314,7 +314,7 @@ public:
} break;
default: {
debug::Log("[Execute] Unhandled request type {}", (int)this->data.requestType);
Log("[Execute] Unhandled request type {}", (int)this->data.requestType);
} break;
}
}
@@ -407,14 +407,14 @@ private:
}
if (reply == nullptr) {
debug::Log("Unhandled request type {}", (int)data.requestType);
Log("Unhandled request type {}", (int)data.requestType);
return;
}
if (timer != nullptr) {
QObject::connect(timer, &QTimer::timeout, worker,
[reply, timer, data]() {
debug::Log("Aborted!");
Log("Aborted!");
reply->abort();
timer->deleteLater();
data.onError(-2);
src/common/SignalVector2.hpp
+5 -5
View File
@@ -36,14 +36,14 @@ public:
const std::vector<TVectorItem> &getVector() const
{
util::assertInGuiThread();
assertInGuiThread();
return this->vector;
}
void invokeDelayedItemsChanged()
{
util::assertInGuiThread();
assertInGuiThread();
if (!this->itemsChangedTimer.isActive()) {
itemsChangedTimer.start();
@@ -64,7 +64,7 @@ public:
void removeItem(int index, void *caller = 0)
{
util::assertInGuiThread();
assertInGuiThread();
assert(index >= 0 && index < this->vector.size());
TVectorItem item = this->vector[index];
@@ -87,7 +87,7 @@ class UnsortedSignalVector : public BaseSignalVector<TVectorItem>
public:
virtual int insertItem(const TVectorItem &item, int index = -1, void *caller = 0) override
{
util::assertInGuiThread();
assertInGuiThread();
if (index == -1) {
index = this->vector.size();
} else {
@@ -109,7 +109,7 @@ class SortedSignalVector : public BaseSignalVector<TVectorItem>
public:
virtual int insertItem(const TVectorItem &item, int = -1, void *caller = nullptr) override
{
util::assertInGuiThread();
assertInGuiThread();
auto it = std::lower_bound(this->vector.begin(), this->vector.end(), item, Compare{});
int index = it - this->vector.begin();
src/common/SignalVectorModel.hpp
+1 -1
View File
@@ -23,7 +23,7 @@ public:
}
}
void init(util::BaseSignalVector<TVectorItem> *vec)
void init(BaseSignalVector<TVectorItem> *vec)
{
this->vector = vec;
src/common/UrlFetch.hpp
+11 -11
View File
@@ -1,10 +1,10 @@
#pragma once
#include "controllers/accounts/AccountController.hpp"
#include "providers/twitch/Credentials.hpp"
#include "debug/Log.hpp"
#include "common/NetworkManager.hpp"
#include "common/NetworkRequest.hpp"
#include "controllers/accounts/AccountController.hpp"
#include "debug/Log.hpp"
#include "providers/twitch/Credentials.hpp"
#include <rapidjson/document.h>
#include <rapidjson/error/en.h>
@@ -26,7 +26,7 @@ namespace chatterino {
static void get(QString url, const QObject *caller,
std::function<void(const QJsonObject &)> successCallback)
{
util::NetworkRequest req(url);
NetworkRequest req(url);
req.setCaller(caller);
req.setRawHeader("Client-ID", getDefaultClientID());
req.setRawHeader("Accept", "application/vnd.twitchtv.v5+json");
@@ -39,7 +39,7 @@ static void get(QString url, const QObject *caller,
static void get2(QString url, const QObject *caller, bool useQuickLoadCache,
std::function<void(const rapidjson::Document &)> successCallback)
{
util::NetworkRequest req(url);
NetworkRequest req(url);
req.setCaller(caller);
req.setRawHeader("Client-ID", getDefaultClientID());
req.setRawHeader("Accept", "application/vnd.twitchtv.v5+json");
@@ -54,7 +54,7 @@ static void getAuthorized(QString url, const QString &clientID, const QString &o
const QObject *caller,
std::function<void(const QJsonObject &)> successCallback)
{
util::NetworkRequest req(url);
NetworkRequest req(url);
req.setCaller(caller);
req.setRawHeader("Client-ID", clientID.toUtf8());
req.setRawHeader("Authorization", "OAuth " + oauthToken.toUtf8());
@@ -71,24 +71,24 @@ static void getUserID(QString username, const QObject *caller,
get("https://api.twitch.tv/kraken/users?login=" + username, caller,
[=](const QJsonObject &root) {
if (!root.value("users").isArray()) {
debug::Log("API Error while getting user id, users is not an array");
Log("API Error while getting user id, users is not an array");
return;
}
auto users = root.value("users").toArray();
if (users.size() != 1) {
debug::Log("API Error while getting user id, users array size is not 1");
Log("API Error while getting user id, users array size is not 1");
return;
}
if (!users[0].isObject()) {
debug::Log("API Error while getting user id, first user is not an object");
Log("API Error while getting user id, first user is not an object");
return;
}
auto firstUser = users[0].toObject();
auto id = firstUser.value("_id");
if (!id.isString()) {
debug::Log("API Error: while getting user id, first user object `_id` key is not a "
"string");
Log("API Error: while getting user id, first user object `_id` key is not a "
"string");
return;
}
successCallback(id.toString());