mirror of
https://github.com/Chatterino/chatterino2.git
synced 2024-11-21 22:24:07 +01:00
removed SplitColumn
This commit is contained in:
parent
c74bc00106
commit
6ee1fc303e
5 changed files with 31 additions and 63 deletions
|
@ -210,7 +210,6 @@ SOURCES += \
|
||||||
src/widgets/settingspages/SettingsPage.cpp \
|
src/widgets/settingspages/SettingsPage.cpp \
|
||||||
src/widgets/settingspages/SpecialChannelsPage.cpp \
|
src/widgets/settingspages/SpecialChannelsPage.cpp \
|
||||||
src/widgets/splits/Split.cpp \
|
src/widgets/splits/Split.cpp \
|
||||||
src/widgets/splits/SplitColumn.cpp \
|
|
||||||
src/widgets/splits/SplitContainer.cpp \
|
src/widgets/splits/SplitContainer.cpp \
|
||||||
src/widgets/splits/SplitHeader.cpp \
|
src/widgets/splits/SplitHeader.cpp \
|
||||||
src/widgets/splits/SplitInput.cpp \
|
src/widgets/splits/SplitInput.cpp \
|
||||||
|
@ -380,7 +379,6 @@ HEADERS += \
|
||||||
src/widgets/settingspages/SettingsPage.hpp \
|
src/widgets/settingspages/SettingsPage.hpp \
|
||||||
src/widgets/settingspages/SpecialChannelsPage.hpp \
|
src/widgets/settingspages/SpecialChannelsPage.hpp \
|
||||||
src/widgets/splits/Split.hpp \
|
src/widgets/splits/Split.hpp \
|
||||||
src/widgets/splits/SplitColumn.hpp \
|
|
||||||
src/widgets/splits/SplitContainer.hpp \
|
src/widgets/splits/SplitContainer.hpp \
|
||||||
src/widgets/splits/SplitHeader.hpp \
|
src/widgets/splits/SplitHeader.hpp \
|
||||||
src/widgets/splits/SplitInput.hpp \
|
src/widgets/splits/SplitInput.hpp \
|
||||||
|
|
|
@ -193,7 +193,7 @@ void TwitchEmotes::refresh(const std::shared_ptr<TwitchAccount> &user)
|
||||||
emoteData.filled = true;
|
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)
|
void TwitchEmotes::loadSetData(std::shared_ptr<TwitchEmotes::EmoteSet> emoteSet)
|
||||||
|
|
|
@ -352,8 +352,8 @@ void ResourceManager::loadChannelData(const QString &roomID, bool bypassCache)
|
||||||
|
|
||||||
QString cheermoteURL = "https://api.twitch.tv/kraken/bits/actions?channel_id=" + roomID;
|
QString cheermoteURL = "https://api.twitch.tv/kraken/bits/actions?channel_id=" + roomID;
|
||||||
|
|
||||||
get2(cheermoteURL, QThread::currentThread(), true,
|
twitchApiGet2(
|
||||||
[this, roomID](const rapidjson::Document &d) {
|
cheermoteURL, QThread::currentThread(), true, [this, roomID](const rapidjson::Document &d) {
|
||||||
ResourceManager::Channel &ch = this->channels[roomID];
|
ResourceManager::Channel &ch = this->channels[roomID];
|
||||||
|
|
||||||
ParseCheermoteSets(ch.jsonCheermoteSets, d);
|
ParseCheermoteSets(ch.jsonCheermoteSets, d);
|
||||||
|
|
|
@ -1,7 +0,0 @@
|
||||||
#include "SplitColumn.hpp"
|
|
||||||
|
|
||||||
namespace chatterino {
|
|
||||||
namespace helper {
|
|
||||||
|
|
||||||
} // namespace helper
|
|
||||||
} // namespace chatterino
|
|
|
@ -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
|
|
Loading…
Reference in a new issue