From 741c9771ea6ac6fd5232d083c42090dd53a0aaa4 Mon Sep 17 00:00:00 2001
From: "Tux3 / Mlkj / !Lev.uXFMLA" <barrdetwix@gmail.com>
Date: Sat, 8 Nov 2014 16:30:52 +0100
Subject: [PATCH] Remove dead assignement, useless include

---
 src/core.cpp                        | 1 -
 src/widget/form/genericchatform.cpp | 2 --
 2 files changed, 3 deletions(-)

diff --git a/src/core.cpp b/src/core.cpp
index b3b677f99..48d5c7401 100644
--- a/src/core.cpp
+++ b/src/core.cpp
@@ -1213,7 +1213,6 @@ bool Core::loadConfiguration(QString path)
         if (err)
         {   // maybe we should handle this better
             qWarning() << "Core: history db isn't encrypted, but encryption is set!! No history loaded...";
-            error = false;
         }
         else
         {
diff --git a/src/widget/form/genericchatform.cpp b/src/widget/form/genericchatform.cpp
index 191710025..187f61367 100644
--- a/src/widget/form/genericchatform.cpp
+++ b/src/widget/form/genericchatform.cpp
@@ -34,8 +34,6 @@
 #include "src/friendlist.h"
 #include "src/friend.h"
 
-#include <QDebug>
-
 GenericChatForm::GenericChatForm(QWidget *parent) :
     QWidget(parent),
     earliestMessage(nullptr)