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

fixed template compilation on mingw

Browse source
This commit is contained in:
fourtf 2018-01-28 15:28:02 +01:00
parent c62a91ac2b
commit 3d479e4c83
6 changed files with 10 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
chatterino.pro
View file

@ -273,14 +273,14 @@ HEADERS += \
src/util/networkrequest.hpp \ src/util/networkrequest.hpp \
src/util/networkworker.hpp \ src/util/networkworker.hpp \
src/util/networkrequester.hpp \ src/util/networkrequester.hpp \
src/util/flagsenum.h \
src/widgets/settingspages/ignoreuserspage.hpp \ src/widgets/settingspages/ignoreuserspage.hpp \
src/widgets/settingspages/ignoremessagespage.hpp \ src/widgets/settingspages/ignoremessagespage.hpp \
src/widgets/settingspages/specialchannelspage.hpp \ src/widgets/settingspages/specialchannelspage.hpp \
src/widgets/settingspages/keyboardsettings.hpp \ src/widgets/settingspages/keyboardsettings.hpp \
src/widgets/settingspages/keyboardsettingspage.hpp \ src/widgets/settingspages/keyboardsettingspage.hpp \
src/widgets/helper/titlebarbutton.hpp \ src/widgets/helper/titlebarbutton.hpp \
src/widgets/helper/label.hpp src/widgets/helper/label.hpp \
src/util/flagsenum.hpp
RESOURCES += \ RESOURCES += \
resources/resources.qrc resources/resources.qrc

2
src/messages/layouts/messagelayout.hpp
View file

@ -4,7 +4,7 @@
#include "messages/layouts/messagelayoutelement.hpp" #include "messages/layouts/messagelayoutelement.hpp"
#include "messages/message.hpp" #include "messages/message.hpp"
#include "messages/selection.hpp" #include "messages/selection.hpp"
#include "util/flagsenum.h" #include "util/flagsenum.hpp"
#include <QPixmap> #include <QPixmap>

2
src/messages/message.hpp
View file

@ -1,7 +1,7 @@
#pragma once #pragma once
#include "messages/messageelement.hpp" #include "messages/messageelement.hpp"
#include "util/flagsenum.h" #include "util/flagsenum.hpp"
#include "widgets/helper/scrollbarhighlight.hpp" #include "widgets/helper/scrollbarhighlight.hpp"
#include <cinttypes> #include <cinttypes>

3
src/messages/messagebuilder.hpp
View file

@ -21,8 +21,7 @@ public:
void appendTimestamp(const QTime &time); void appendTimestamp(const QTime &time);
QString matchLink(const QString &string); QString matchLink(const QString &string);
template <typename T, typename... Args, template <typename T, typename... Args>
typename _ = std::enable_if<std::is_base_of<MessageElement, T>::value>::type>
T *emplace(Args &&... args) T *emplace(Args &&... args)
{ {
static_assert(std::is_base_of<MessageElement, T>::value, "T must extend MessageElement"); static_assert(std::is_base_of<MessageElement, T>::value, "T must extend MessageElement");

3
src/singletons/loggingmanager.cpp
View file

@ -34,7 +34,8 @@ void LoggingManager::addMessage(const QString &channelName, messages::MessagePtr
if (it == this->loggingChannels.end()) { if (it == this->loggingChannels.end()) {
auto channel = new LoggingChannel(channelName, this->getDirectoryForChannel(channelName)); auto channel = new LoggingChannel(channelName, this->getDirectoryForChannel(channelName));
channel->addMessage(message); channel->addMessage(message);
this->loggingChannels.emplace(channelName, std::move(channel)); this->loggingChannels.emplace(channelName,
std::unique_ptr<LoggingChannel>(std::move(channel)));
} else { } else {
it->second->addMessage(message); it->second->addMessage(message);
} }

5
src/util/flagsenum.h → src/util/flagsenum.hpp
View file

@ -5,8 +5,9 @@
namespace chatterino { namespace chatterino {
namespace util { namespace util {
template <typename T, typename _ = std::enable_if<std::is_enum<T>::value>::type, // = std::enable_if<std::is_enum<T>::value>::type
typename Q = std::underlying_type<T>::type>
template <typename T, typename Q = typename std::underlying_type<T>::type>
class FlagsEnum class FlagsEnum
{ {
public: public: