chatterino2
Code Issues

removed functions from SettingsManager that shouldn't be there

Browse Source
This commit is contained in:
fourtf
2018-06-28 19:38:57 +02:00
parent b667183ca5
commit 5604ae6a67
75 changed files with 600 additions and 507 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();
}
chatterino::LimitedQueueSnapshot<chatterino::MessagePtr> Channel::getMessageSnapshot()
LimitedQueueSnapshot<MessagePtr> Channel::getMessageSnapshot()
{
return this->messages.getSnapshot();
}
@@ -81,7 +81,7 @@ void Channel::addMessage(MessagePtr message)
this->messageAppended.invoke(message);
}
void Channel::addOrReplaceTimeout(chatterino::MessagePtr message)
void Channel::addOrReplaceTimeout(MessagePtr message)
{
LimitedQueueSnapshot<MessagePtr> snapshot = this->getMessageSnapshot();
int snapshotLength = snapshot.getLength();
@@ -118,7 +118,7 @@ void Channel::addOrReplaceTimeout(chatterino::MessagePtr message)
int count = s->count + 1;
chatterino::MessagePtr replacement(Message::createSystemMessage(
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<chatterino::MessagePtr> &_messages)
void Channel::addMessagesAtStart(std::vector<MessagePtr> &_messages)
{
std::vector<chatterino::MessagePtr> addedMessages = this->messages.pushFront(_messages);
std::vector<MessagePtr> addedMessages = this->messages.pushFront(_messages);
if (addedMessages.size() != 0) {
this->messagesAddedAtStart.invoke(addedMessages);
}
}
void Channel::replaceMessage(chatterino::MessagePtr message, chatterino::MessagePtr replacement)
void Channel::replaceMessage(MessagePtr message, MessagePtr replacement)
{
int index = this->messages.replaceItem(message, replacement);
@@ -180,7 +180,7 @@ void Channel::replaceMessage(chatterino::MessagePtr message, chatterino::Message
}
}
void Channel::addRecentChatter(const std::shared_ptr<chatterino::Message> &message)
void Channel::addRecentChatter(const std::shared_ptr<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<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::Signal<MessagePtr &> messageRemovedFromStart;
pajlada::Signals::Signal<MessagePtr &> messageAppended;
pajlada::Signals::Signal<std::vector<MessagePtr> &> messagesAddedAtStart;
pajlada::Signals::Signal<size_t, MessagePtr &> messageReplaced;
pajlada::Signals::NoArgSignal destroyed;
Type getType() const;
bool isTwitchChannel() const;
virtual bool isEmpty() const;
chatterino::LimitedQueueSnapshot<chatterino::MessagePtr> getMessageSnapshot();
LimitedQueueSnapshot<MessagePtr> getMessageSnapshot();
void addMessage(chatterino::MessagePtr message);
void addMessagesAtStart(std::vector<chatterino::MessagePtr> &messages);
void addOrReplaceTimeout(chatterino::MessagePtr message);
void addMessage(MessagePtr message);
void addMessagesAtStart(std::vector<MessagePtr> &messages);
void addOrReplaceTimeout(MessagePtr message);
void disableAllMessages();
void replaceMessage(chatterino::MessagePtr message, chatterino::MessagePtr replacement);
virtual void addRecentChatter(const std::shared_ptr<chatterino::Message> &message);
void replaceMessage(MessagePtr message, MessagePtr replacement);
virtual void addRecentChatter(const std::shared_ptr<Message> &message);
QString name;
QStringList modList;
@@ -69,7 +69,7 @@ protected:
virtual void onConnected();
private:
chatterino::LimitedQueue<chatterino::MessagePtr> messages;
LimitedQueue<MessagePtr> messages;
Type type;
};
src/common/CompletionModel.cpp
+1 -1
View File
@@ -75,7 +75,7 @@ void CompletionModel::refresh()
// Channel-specific: Usernames
// fourtf: only works with twitch chat
// auto c = chatterino::ChannelManager::getInstance().getTwitchChannel(this->channelName);
// auto c = ChannelManager::getInstance().getTwitchChannel(this->channelName);
// auto usernames = c->getUsernamesForCompletions();
// for (const auto &name : usernames) {
// assert(!name.displayName.isEmpty());
src/common/Emotemap.cpp
+3 -3
View File
@@ -5,7 +5,7 @@
namespace chatterino {
EmoteData::EmoteData(chatterino::Image *_image)
EmoteData::EmoteData(Image *_image)
: image1x(_image)
{
}
@@ -16,7 +16,7 @@ bool EmoteData::isValid() const
return this->image1x != nullptr;
}
chatterino::Image *EmoteData::getImage(float scale) const
Image *EmoteData::getImage(float scale) const
{
int quality = getApp()->settings->preferredEmoteQuality;
@@ -31,7 +31,7 @@ chatterino::Image *EmoteData::getImage(float scale) const
}();
}
chatterino::Image *_image;
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(chatterino::Image *_image);
EmoteData(Image *_image);
// Emotes must have a 1x image to be valid
bool isValid() const;
chatterino::Image *getImage(float scale) const;
Image *getImage(float scale) const;
chatterino::Image *image1x = nullptr;
chatterino::Image *image2x = nullptr;
chatterino::Image *image3x = nullptr;
Image *image1x = nullptr;
Image *image2x = nullptr;
Image *image3x = nullptr;
// Link to the emote page i.e. https://www.frankerfacez.com/emoticon/144722-pajaCringe
QString pageLink;