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

removed SplitColumn

Browse source
This commit is contained in:
fourtf 2018-06-26 17:16:58 +02:00
parent c74bc00106
commit 6ee1fc303e
5 changed files with 31 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
chatterino.pro
View file

@ -210,7 +210,6 @@ SOURCES += \
src/widgets/settingspages/SettingsPage.cpp \
src/widgets/settingspages/SpecialChannelsPage.cpp \
src/widgets/splits/Split.cpp \
src/widgets/splits/SplitColumn.cpp \
src/widgets/splits/SplitContainer.cpp \
src/widgets/splits/SplitHeader.cpp \
src/widgets/splits/SplitInput.cpp \
@ -380,7 +379,6 @@ HEADERS += \
src/widgets/settingspages/SettingsPage.hpp \
src/widgets/settingspages/SpecialChannelsPage.hpp \
src/widgets/splits/Split.hpp \
src/widgets/splits/SplitColumn.hpp \
src/widgets/splits/SplitContainer.hpp \
src/widgets/splits/SplitHeader.hpp \
src/widgets/splits/SplitInput.hpp \

2
src/providers/twitch/TwitchEmotes.cpp
View file

@ -193,7 +193,7 @@ void TwitchEmotes::refresh(const std::shared_ptr<TwitchAccount> &user)
emoteData.filled = true;
};
getAuthorized(url, clientID, oauthToken, QThread::currentThread(), loadEmotes);
twitchApiGetAuthorized(url, clientID, oauthToken, QThread::currentThread(), loadEmotes);
}
void TwitchEmotes::loadSetData(std::shared_ptr<TwitchEmotes::EmoteSet> emoteSet)

4
src/singletons/ResourceManager.cpp
View file

@ -352,8 +352,8 @@ void ResourceManager::loadChannelData(const QString &roomID, bool bypassCache)
QString cheermoteURL = "https://api.twitch.tv/kraken/bits/actions?channel_id=" + roomID;
get2(cheermoteURL, QThread::currentThread(), true,
[this, roomID](const rapidjson::Document &d) {
twitchApiGet2(
cheermoteURL, QThread::currentThread(), true, [this, roomID](const rapidjson::Document &d) {
ResourceManager::Channel &ch = this->channels[roomID];
ParseCheermoteSets(ch.jsonCheermoteSets, d);

7
src/widgets/splits/SplitColumn.cpp
View file

@ -1,7 +0,0 @@
#include "SplitColumn.hpp"
namespace chatterino {
namespace helper {
} // namespace helper
} // namespace chatterino

23
src/widgets/splits/SplitColumn.hpp
View file

@ -1,23 +0,0 @@
#pragma once
#include "widgets/splits/Split.hpp"
#include <vector>
namespace chatterino {
class SplitColumn
{
public:
SplitColumn() = default;
void insert(Split *split, int index = -1);
void remove(int index);
double getFlex();
void setFlex(double flex);
private:
std::vector<Split> items;
};
} // namespace chatterino