From 641c5822d7f7254e516a1f26a3e7f9a484293fa2 Mon Sep 17 00:00:00 2001
From: Rasmus Karlsson <rasmus.karlsson@pajlada.com>
Date: Thu, 20 Sep 2018 13:09:37 +0200
Subject: [PATCH] fix various warnings

---
 src/messages/Image.cpp                 | 14 +++++++-------
 src/messages/Image.hpp                 |  6 +++---
 src/messages/layouts/MessageLayout.cpp |  1 -
 src/messages/layouts/MessageLayout.hpp |  2 +-
 src/singletons/Theme.cpp               |  2 ++
 5 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/src/messages/Image.cpp b/src/messages/Image.cpp
index 01edc9526..20832c8f7 100644
--- a/src/messages/Image.cpp
+++ b/src/messages/Image.cpp
@@ -21,7 +21,7 @@
 #include <thread>
 
 namespace chatterino {
-namespace {
+namespace detail {
     // Frames
     Frames::Frames()
     {
@@ -179,7 +179,7 @@ namespace {
             }
         };
     }
-}  // namespace
+}  // namespace detail
 
 // IMAGE2
 ImagePtr Image::fromUrl(const Url &url, qreal scale)
@@ -220,14 +220,14 @@ Image::Image(const Url &url, qreal scale)
     : url_(url)
     , scale_(scale)
     , shouldLoad_(true)
-    , frames_(std::make_unique<Frames>())
+    , frames_(std::make_unique<detail::Frames>())
 {
 }
 
 Image::Image(const QPixmap &pixmap, qreal scale)
     : scale_(scale)
-    , frames_(std::make_unique<Frames>(
-          QVector<Frame<QPixmap>>{Frame<QPixmap>{pixmap, 1}}))
+    , frames_(std::make_unique<detail::Frames>(
+          QVector<detail::Frame<QPixmap>>{detail::Frame<QPixmap>{pixmap, 1}}))
 {
 }
 
@@ -301,11 +301,11 @@ void Image::load()
         QBuffer buffer(const_cast<QByteArray *>(&data));
         buffer.open(QIODevice::ReadOnly);
         QImageReader reader(&buffer);
-        auto parsed = readFrames(reader, that->url());
+        auto parsed = detail::readFrames(reader, that->url());
 
         postToThread(makeConvertCallback(parsed, [weak](auto frames) {
             if (auto shared = weak.lock())
-                shared->frames_ = std::make_unique<Frames>(frames);
+                shared->frames_ = std::make_unique<detail::Frames>(frames);
         }));
 
         return Success;
diff --git a/src/messages/Image.hpp b/src/messages/Image.hpp
index 678af25ce..f5840de63 100644
--- a/src/messages/Image.hpp
+++ b/src/messages/Image.hpp
@@ -16,7 +16,7 @@
 #include "common/NullablePtr.hpp"
 
 namespace chatterino {
-namespace {
+namespace detail {
     template <typename Image>
     struct Frame {
         Image image;
@@ -40,7 +40,7 @@ namespace {
         int durationOffset_{0};
         pajlada::Signals::Connection gifTimerConnection_;
     };
-}  // namespace
+}  // namespace detail
 
 class Image;
 using ImagePtr = std::shared_ptr<Image>;
@@ -74,7 +74,7 @@ private:
     qreal scale_{1};
     bool empty_{false};
     bool shouldLoad_{false};
-    std::unique_ptr<Frames> frames_{};
+    std::unique_ptr<detail::Frames> frames_{};
     QObject object_{};
 };
 }  // namespace chatterino
diff --git a/src/messages/layouts/MessageLayout.cpp b/src/messages/layouts/MessageLayout.cpp
index 5fbbe0bfa..357a52f0e 100644
--- a/src/messages/layouts/MessageLayout.cpp
+++ b/src/messages/layouts/MessageLayout.cpp
@@ -27,7 +27,6 @@ namespace chatterino {
 
 MessageLayout::MessageLayout(MessagePtr message)
     : message_(message)
-    , buffer_(nullptr)
     , container_(std::make_shared<MessageLayoutContainer>())
 {
     DebugCount::increase("message layout");
diff --git a/src/messages/layouts/MessageLayout.hpp b/src/messages/layouts/MessageLayout.hpp
index 671d30668..ff0b17d0a 100644
--- a/src/messages/layouts/MessageLayout.hpp
+++ b/src/messages/layouts/MessageLayout.hpp
@@ -65,7 +65,7 @@ private:
     // variables
     MessagePtr message_;
     std::shared_ptr<MessageLayoutContainer> container_;
-    std::shared_ptr<QPixmap> buffer_ = nullptr;
+    std::shared_ptr<QPixmap> buffer_{};
     bool bufferValid_ = false;
 
     int height_ = 0;
diff --git a/src/singletons/Theme.cpp b/src/singletons/Theme.cpp
index 470fd7543..ae0e26d5f 100644
--- a/src/singletons/Theme.cpp
+++ b/src/singletons/Theme.cpp
@@ -63,12 +63,14 @@ void Theme::actuallyUpdate(double hue, double multiplier)
 
     /// WINDOW
     {
+        /*
         QColor bg =
 #ifdef Q_OS_LINUX
             this->window.background = lightWin ? "#fff" : QColor(61, 60, 56);
 #else
             this->window.background = lightWin ? "#fff" : "#111";
 #endif
+        */
 
         QColor fg = this->window.text = lightWin ? "#000" : "#eee";
         this->window.borderFocused = lightWin ? "#ccc" : themeColor;