From c5441c6d4ac2920d5f41ee4bc8b216db254a689f Mon Sep 17 00:00:00 2001
From: fourtf <tf.four@gmail.com>
Date: Tue, 26 Jun 2018 17:51:31 +0200
Subject: [PATCH] fixed minor issues

---
 chatterino.pro                                | 2 +-
 src/controllers/accounts/AccountModel.hpp     | 2 +-
 src/util/CombinePath.hpp                      | 2 +-
 src/util/DistanceBetweenPoints.hpp            | 2 +-
 src/util/{QstringHash.hpp => QStringHash.hpp} | 0
 5 files changed, 4 insertions(+), 4 deletions(-)
 rename src/util/{QstringHash.hpp => QStringHash.hpp} (100%)

diff --git a/chatterino.pro b/chatterino.pro
index f67d44b14..5c9dc4f70 100644
--- a/chatterino.pro
+++ b/chatterino.pro
@@ -317,7 +317,7 @@ HEADERS  += \
     src/util/IrcHelpers.hpp \
     src/util/LayoutCreator.hpp \
     src/util/PostToThread.hpp \
-    src/util/QstringHash.hpp \
+    src/util/QStringHash.hpp \
     src/util/RapidjsonHelpers.hpp \
     src/util/RemoveScrollAreaBackground.hpp \
     src/util/SharedPtrElementLess.hpp \
diff --git a/src/controllers/accounts/AccountModel.hpp b/src/controllers/accounts/AccountModel.hpp
index ea9c11170..714bf51ce 100644
--- a/src/controllers/accounts/AccountModel.hpp
+++ b/src/controllers/accounts/AccountModel.hpp
@@ -2,7 +2,7 @@
 
 #include "common/SignalVectorModel.hpp"
 #include "controllers/accounts/Account.hpp"
-#include "util/QstringHash.hpp"
+#include "util/QStringHash.hpp"
 
 #include <unordered_map>
 
diff --git a/src/util/CombinePath.hpp b/src/util/CombinePath.hpp
index c7ed22b1a..d0ed8e7ad 100644
--- a/src/util/CombinePath.hpp
+++ b/src/util/CombinePath.hpp
@@ -6,7 +6,7 @@
 namespace chatterino {
 
 // https://stackoverflow.com/a/13014491
-static QString combinePath(const QString &a, const QString &b)
+inline QString combinePath(const QString &a, const QString &b)
 {
     return QDir::cleanPath(a + QDir::separator() + b);
 }
diff --git a/src/util/DistanceBetweenPoints.hpp b/src/util/DistanceBetweenPoints.hpp
index 591706381..7a2a834cc 100644
--- a/src/util/DistanceBetweenPoints.hpp
+++ b/src/util/DistanceBetweenPoints.hpp
@@ -6,7 +6,7 @@
 
 namespace chatterino {
 
-static float distanceBetweenPoints(const QPointF &p1, const QPointF &p2)
+inline float distanceBetweenPoints(const QPointF &p1, const QPointF &p2)
 {
     QPointF tmp = p1 - p2;
 
diff --git a/src/util/QstringHash.hpp b/src/util/QStringHash.hpp
similarity index 100%
rename from src/util/QstringHash.hpp
rename to src/util/QStringHash.hpp