chatterino2
Code Issues

Remove Unnecessary Includes in Headers (#4275)

Browse Source 
* refactor: remove unnecessary includes in headers

* fix: formatting

* chore: changelog

* fix: scrollbar

* fix: suggestions and old appbase remains

* fix: suggestion

* fix: missing Qt forward declarations

* fix: another qt include

* fix: includes for precompiled-headers=off

* Add missing `<memory>` includes

* Add missing `#pragma once`

* Fix tests

Co-authored-by: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
This commit is contained in:
nerix
2022-12-31 15:41:01 +01:00
committed by GitHub
parent f04c4c7388
commit 1043f9f803
239 changed files with 871 additions and 544 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/messages/Emote.hpp
+2 -5
View File
@@ -1,13 +1,13 @@
#pragma once
#include "common/Atomic.hpp"
#include "messages/Image.hpp"
#include "common/Aliases.hpp"
#include "messages/ImageSet.hpp"
#include <boost/optional.hpp>
#include <functional>
#include <memory>
#include <mutex>
#include <unordered_map>
namespace chatterino {
@@ -55,9 +55,6 @@ public:
EmoteMap::const_iterator findEmote(const QString &emoteNameHint,
const QString &emoteID) const;
};
using EmoteIdMap = std::unordered_map<EmoteId, EmotePtr>;
using WeakEmoteMap = std::unordered_map<EmoteName, std::weak_ptr<const Emote>>;
using WeakEmoteIdMap = std::unordered_map<EmoteId, std::weak_ptr<const Emote>>;
static const std::shared_ptr<const EmoteMap> EMPTY_EMOTE_MAP = std::make_shared<
const EmoteMap>(); // NOLINT(cert-err58-cpp) -- assume this doesn't throw an exception
src/messages/Image.cpp
+7
View File
@@ -3,6 +3,8 @@
#include "Application.hpp"
#include "common/Common.hpp"
#include "common/NetworkRequest.hpp"
#include "common/NetworkResult.hpp"
#include "common/Outcome.hpp"
#include "common/QLogging.hpp"
#include "debug/AssertInGuiThread.hpp"
#include "debug/Benchmark.hpp"
@@ -347,6 +349,11 @@ ImagePtr Image::getEmpty()
return empty;
}
ImagePtr getEmptyImagePtr()
{
return Image::getEmpty();
}
Image::Image()
: empty_(true)
{
src/messages/Image.hpp
+3
View File
@@ -102,6 +102,9 @@ private:
friend class ImageExpirationPool;
};
// forward-declarable function that calls Image::getEmpty() under the hood.
ImagePtr getEmptyImagePtr();
class ImageExpirationPool
{
private:
src/messages/ImageSet.cpp
+1
View File
@@ -1,5 +1,6 @@
#include "messages/ImageSet.hpp"
#include "messages/Image.hpp"
#include "singletons/Settings.hpp"
namespace chatterino {
src/messages/ImageSet.hpp
+10 -3
View File
@@ -1,15 +1,22 @@
#pragma once
#include "messages/Image.hpp"
#include "common/Aliases.hpp"
#include <memory>
namespace chatterino {
class Image;
using ImagePtr = std::shared_ptr<Image>;
ImagePtr getEmptyImagePtr();
class ImageSet
{
public:
ImageSet();
ImageSet(const ImagePtr &image1, const ImagePtr &image2 = Image::getEmpty(),
const ImagePtr &image3 = Image::getEmpty());
ImageSet(const ImagePtr &image1,
const ImagePtr &image2 = getEmptyImagePtr(),
const ImagePtr &image3 = getEmptyImagePtr());
ImageSet(const Url &image1, const Url &image2 = {}, const Url &image3 = {});
void setImage1(const ImagePtr &image);
src/messages/Message.cpp
+4
View File
@@ -2,10 +2,14 @@
#include "Application.hpp"
#include "MessageElement.hpp"
#include "providers/colors/ColorProvider.hpp"
#include "providers/twitch/PubSubActions.hpp"
#include "providers/twitch/TwitchBadge.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
#include "util/DebugCount.hpp"
#include "util/IrcHelpers.hpp"
#include "widgets/helper/ScrollbarHighlight.hpp"
using SBHighlight = chatterino::ScrollbarHighlight;
src/messages/Message.hpp
+3 -2
View File
@@ -1,11 +1,10 @@
#pragma once
#include "common/FlagsEnum.hpp"
#include "providers/twitch/TwitchBadge.hpp"
#include "util/QStringHash.hpp"
#include "widgets/helper/ScrollbarHighlight.hpp"
#include <boost/noncopyable.hpp>
#include <QColor>
#include <QTime>
#include <cinttypes>
@@ -15,6 +14,8 @@
namespace chatterino {
class MessageElement;
class MessageThread;
class Badge;
class ScrollbarHighlight;
enum class MessageFlag : int64_t {
None = 0LL,
src/messages/MessageBuilder.hpp
+8 -1
View File
@@ -1,10 +1,12 @@
#pragma once
#include "messages/MessageElement.hpp"
#include "messages/MessageColor.hpp"
#include <QRegularExpression>
#include <QTime>
#include <ctime>
#include <memory>
#include <utility>
namespace chatterino {
@@ -16,6 +18,11 @@ struct AutomodInfoAction;
struct Message;
using MessagePtr = std::shared_ptr<const Message>;
class MessageElement;
class TextElement;
struct Emote;
using EmotePtr = std::shared_ptr<const Emote>;
struct SystemMessageTag {
};
struct TimeoutMessageTag {
src/messages/MessageElement.cpp
+2
View File
@@ -1,8 +1,10 @@
#include "messages/MessageElement.hpp"
#include "Application.hpp"
#include "controllers/moderationactions/ModerationAction.hpp"
#include "debug/Benchmark.hpp"
#include "messages/Emote.hpp"
#include "messages/Image.hpp"
#include "messages/layouts/MessageLayoutContainer.hpp"
#include "messages/layouts/MessageLayoutElement.hpp"
#include "providers/emoji/Emojis.hpp"
src/messages/MessageParseArgs.hpp
-5
View File
@@ -1,5 +0,0 @@
#pragma once
namespace chatterino {
} // namespace chatterino
src/messages/SharedMessageBuilder.cpp
+3
View File
@@ -5,7 +5,10 @@
#include "controllers/highlights/HighlightController.hpp"
#include "controllers/ignores/IgnoreController.hpp"
#include "controllers/ignores/IgnorePhrase.hpp"
#include "controllers/nicknames/Nickname.hpp"
#include "messages/Message.hpp"
#include "messages/MessageElement.hpp"
#include "providers/twitch/TwitchBadge.hpp"
#include "singletons/Settings.hpp"
#include "singletons/WindowManager.hpp"
#include "util/Helpers.hpp"
src/messages/SharedMessageBuilder.hpp
+5 -2
View File
@@ -1,8 +1,8 @@
#pragma once
#include "common/Aliases.hpp"
#include "common/Outcome.hpp"
#include "messages/MessageBuilder.hpp"
#include "messages/MessageColor.hpp"
#include "providers/twitch/TwitchBadge.hpp"
#include <IrcMessage>
#include <QColor>
@@ -10,6 +10,9 @@
namespace chatterino {
class Badge;
class Channel;
class SharedMessageBuilder : public MessageBuilder
{
public:
src/messages/layouts/MessageLayout.cpp
+3
View File
@@ -3,8 +3,11 @@
#include "Application.hpp"
#include "debug/Benchmark.hpp"
#include "messages/layouts/MessageLayoutContainer.hpp"
#include "messages/layouts/MessageLayoutElement.hpp"
#include "messages/Message.hpp"
#include "messages/MessageElement.hpp"
#include "messages/Selection.hpp"
#include "providers/colors/ColorProvider.hpp"
#include "singletons/Emotes.hpp"
#include "singletons/Settings.hpp"
#include "singletons/Theme.hpp"
src/messages/layouts/MessageLayoutContainer.hpp
+2 -2
View File
@@ -2,8 +2,6 @@
#include "common/Common.hpp"
#include "common/FlagsEnum.hpp"
#include "messages/layouts/MessageLayoutElement.hpp"
#include "messages/Selection.hpp"
#include <QPoint>
#include <QRect>
@@ -18,6 +16,8 @@ namespace chatterino {
enum class MessageFlag : int64_t;
enum class FirstWord { Neutral, RTL, LTR };
using MessageFlags = FlagsEnum<MessageFlag>;
class MessageLayoutElement;
struct Selection;
struct Margin {
int top;
src/messages/layouts/MessageLayoutElement.hpp
+1 -2
View File
@@ -2,8 +2,6 @@
#include "common/FlagsEnum.hpp"
#include "messages/Link.hpp"
#include "messages/MessageColor.hpp"
#include "messages/MessageElement.hpp"
#include <boost/noncopyable.hpp>
#include <pajlada/signals/signalholder.hpp>
@@ -22,6 +20,7 @@ class MessageElement;
class Image;
using ImagePtr = std::shared_ptr<Image>;
enum class FontStyle : uint8_t;
enum class MessageElementFlag : int64_t;
class MessageLayoutElement : boost::noncopyable
{
src/messages/search/AuthorPredicate.cpp
+1
View File
@@ -1,5 +1,6 @@
#include "messages/search/AuthorPredicate.hpp"
#include "messages/Message.hpp"
#include "util/Qt.hpp"
namespace chatterino {
src/messages/search/AuthorPredicate.hpp
+3
View File
@@ -2,6 +2,9 @@
#include "messages/search/MessagePredicate.hpp"
#include <QString>
#include <QStringList>
namespace chatterino {
/**
src/messages/search/BadgePredicate.cpp
+2
View File
@@ -1,5 +1,7 @@
#include "messages/search/BadgePredicate.hpp"
#include "messages/Message.hpp"
#include "providers/twitch/TwitchBadge.hpp"
#include "util/Qt.hpp"
namespace chatterino {
src/messages/search/BadgePredicate.hpp
+3
View File
@@ -2,6 +2,9 @@
#include "messages/search/MessagePredicate.hpp"
#include <QString>
#include <QStringList>
namespace chatterino {
/**
src/messages/search/ChannelPredicate.cpp
+1
View File
@@ -1,5 +1,6 @@
#include "messages/search/ChannelPredicate.hpp"
#include "messages/Message.hpp"
#include "util/Qt.hpp"
namespace chatterino {
src/messages/search/ChannelPredicate.hpp
+3
View File
@@ -2,6 +2,9 @@
#include "messages/search/MessagePredicate.hpp"
#include <QString>
#include <QStringList>
namespace chatterino {
/**
src/messages/search/LinkPredicate.cpp
+1
View File
@@ -1,6 +1,7 @@
#include "messages/search/LinkPredicate.hpp"
#include "common/LinkParser.hpp"
#include "messages/Message.hpp"
#include "util/Qt.hpp"
namespace chatterino {
src/messages/search/LinkPredicate.hpp
+2
View File
@@ -2,6 +2,8 @@
#include "messages/search/MessagePredicate.hpp"
#include <QString>
namespace chatterino {
/**
src/messages/search/MessageFlagsPredicate.hpp
+1
View File
@@ -1,6 +1,7 @@
#pragma once
#include "common/FlagsEnum.hpp"
#include "messages/Message.hpp"
#include "messages/search/MessagePredicate.hpp"
namespace chatterino {
src/messages/search/MessagePredicate.hpp
+2 -2
View File
@@ -1,11 +1,11 @@
#pragma once
#include "messages/Message.hpp"
#include <memory>
namespace chatterino {
struct Message;
/**
* @brief Abstract base class for message predicates.
*
src/messages/search/RegexPredicate.cpp
+2
View File
@@ -1,5 +1,7 @@
#include "RegexPredicate.hpp"
#include "messages/Message.hpp"
namespace chatterino {
RegexPredicate::RegexPredicate(const QString &regex, bool negate)
src/messages/search/RegexPredicate.hpp
+2
View File
@@ -3,6 +3,8 @@
#include "messages/search/MessagePredicate.hpp"
#include "QRegularExpression"
#include <QString>
namespace chatterino {
/**
src/messages/search/SubstringPredicate.cpp
+2
View File
@@ -1,5 +1,7 @@
#include "messages/search/SubstringPredicate.hpp"
#include "messages/Message.hpp"
namespace chatterino {
SubstringPredicate::SubstringPredicate(const QString &search)
src/messages/search/SubstringPredicate.hpp
+2
View File
@@ -2,6 +2,8 @@
#include "messages/search/MessagePredicate.hpp"
#include <QString>
namespace chatterino {
/**
src/messages/search/SubtierPredicate.cpp
+2
View File
@@ -1,5 +1,7 @@
#include "messages/search/SubtierPredicate.hpp"
#include "messages/Message.hpp"
#include "providers/twitch/TwitchBadge.hpp"
#include "util/Qt.hpp"
namespace chatterino {
src/messages/search/SubtierPredicate.hpp
+3
View File
@@ -2,6 +2,9 @@
#include "messages/search/MessagePredicate.hpp"
#include <QString>
#include <QStringList>
namespace chatterino {
/**