From c01d1ed7324e782c1a1fab05f9783a0626751c67 Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Thu, 28 Jun 2018 19:57:06 +0200
Subject: [PATCH] step 1: push, step 2: try to compile
---
src/Application.hpp | 1 -
src/common/Channel.cpp | 1 -
src/singletons/helper/LoggingChannel.hpp | 4 +++-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/Application.hpp b/src/Application.hpp
index d1d8cfe46..3d9328a8c 100644
--- a/src/Application.hpp
+++ b/src/Application.hpp
@@ -1,6 +1,5 @@
#pragma once
-"
#include "singletons/Resources.hpp"
#include <QApplication>
diff --git a/src/common/Channel.cpp b/src/common/Channel.cpp
index 74a40de02..3fe8f74d7 100644
--- a/src/common/Channel.cpp
+++ b/src/common/Channel.cpp
@@ -4,7 +4,6 @@
#include "debug/Log.hpp"
#include "messages/Message.hpp"
#include "singletons/Emotes.hpp"
-"
#include "singletons/Logging.hpp"
#include "singletons/WindowManager.hpp"
diff --git a/src/singletons/helper/LoggingChannel.hpp b/src/singletons/helper/LoggingChannel.hpp
index 9acafa417..985ab27b9 100644
--- a/src/singletons/helper/LoggingChannel.hpp
+++ b/src/singletons/helper/LoggingChannel.hpp
@@ -11,6 +11,8 @@
namespace chatterino {
+class Logging;
+
class LoggingChannel : boost::noncopyable
{
explicit LoggingChannel(const QString &_channelName);
@@ -37,7 +39,7 @@ private:
QString dateString;
- friend class LoggingManager;
+ friend class Logging;
};
} // namespace chatterino