From 71ef284c086df62de1cda152a67e2687a14df54e Mon Sep 17 00:00:00 2001
From: Ivailo Monev <xakepa10@gmail.com>
Date: Mon, 2 May 2016 16:45:19 +0000
Subject: [PATCH] generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>
---
 akregator/src/akregator_part.cpp                                     | 1 -
 bluedevil/src/kio/bluetooth/kiobluetooth.cpp                         | 1 -
 kget/conf/kget.kcfg                                                  | 1 +
 kget/core/scheduler.cpp                                              | 2 +-
 kget/core/urlchecker.cpp                                             | 2 +-
 kget/transfer-plugins/bittorrent/kget_bittorrentfactory.kcfg         | 1 +
 kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.kcfg | 1 +
 kget/transfer-plugins/metalink/kget_metalinkfactory.kcfg             | 1 +
 kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.kcfg     | 1 +
 kget/transfer-plugins/mmsthreads/kget_mmsfactory.kcfg                | 1 +
 kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.kcfg   | 1 +
 libktorrent/src/peer/utmetadata.cpp                                  | 2 +-
 12 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 26727b64..9e1fd442 100644
--- a/akregator/src/akregator_part.cpp
+++ b/akregator/src/akregator_part.cpp
@@ -216,7 +216,6 @@ Part::Part( QWidget *parentWidget, QObject *parent, const QVariantList& )
     m_extension = new BrowserExtension(this, "ak_extension");
 
     connect(Kernel::self()->frameManager(), SIGNAL(signalCaptionChanged(QString)), this, SIGNAL(setWindowCaption(QString)));
-    connect(Kernel::self()->frameManager(), SIGNAL(signalStatusText(QString)), this, SLOT(slotSetStatusText(QString)));
     connect(Kernel::self()->frameManager(), SIGNAL(signalLoadingProgress(int)), m_extension, SIGNAL(loadingProgress(int)));
     connect(Kernel::self()->frameManager(), SIGNAL(signalCanceled(QString)), this, SIGNAL(canceled(QString)));
     connect(Kernel::self()->frameManager(), SIGNAL(signalStarted()), this, SLOT(slotStarted()));
diff --git a/bluedevil/src/kio/bluetooth/kiobluetooth.cpp b/bluedevil/src/kio/bluetooth/kiobluetooth.cpp
index 4287b216..e690f28a 100644
--- a/bluedevil/src/kio/bluetooth/kiobluetooth.cpp
+++ b/bluedevil/src/kio/bluetooth/kiobluetooth.cpp
@@ -30,7 +30,6 @@
 #include <KComponentData>
 #include <KCmdLineArgs>
 #include <KAboutData>
-#include <KProcess>
 #include <KApplication>
 #include <KLocale>
 #include <kdemacros.h>
diff --git a/kget/conf/kget.kcfg b/kget/conf/kget.kcfg
index a50d8f9e..1e3dbfc5 100644
--- a/kget/conf/kget.kcfg
+++ b/kget/conf/kget.kcfg
@@ -4,6 +4,7 @@
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
 
+  <include>kdemacros.h</include>
   <include>KGlobalSettings</include>
 
   <kcfgfile name="kgetrc"/>
diff --git a/kget/core/scheduler.cpp b/kget/core/scheduler.cpp
index de97445b..9711add2 100644
--- a/kget/core/scheduler.cpp
+++ b/kget/core/scheduler.cpp
@@ -15,7 +15,7 @@
 #include "settings.h"
 
 #include <algorithm>
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 
 #include <KDebug>
 
diff --git a/kget/core/urlchecker.cpp b/kget/core/urlchecker.cpp
index 6d55179b..4fc0f550 100644
--- a/kget/core/urlchecker.cpp
+++ b/kget/core/urlchecker.cpp
@@ -29,7 +29,7 @@
 #include "settings.h"
 
 #include <algorithm>
-#include <boost/bind/bind.hpp>
+#include <boost/bind.hpp>
 
 #include <QtCore/QFileInfo>
 #include <QtGui/QCheckBox>
diff --git a/kget/transfer-plugins/bittorrent/kget_bittorrentfactory.kcfg b/kget/transfer-plugins/bittorrent/kget_bittorrentfactory.kcfg
index a35081d6..f6d11a50 100644
--- a/kget/transfer-plugins/bittorrent/kget_bittorrentfactory.kcfg
+++ b/kget/transfer-plugins/bittorrent/kget_bittorrentfactory.kcfg
@@ -3,6 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <include>kdemacros.h</include>
   <kcfgfile name="kget_bittorrentfactory.rc"/>
   <group name="General">
     <entry name="UploadLimit" type="Int">
diff --git a/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.kcfg b/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.kcfg
index 78fda2be..a6327f90 100644
--- a/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.kcfg
+++ b/kget/transfer-plugins/checksumsearch/kget_checksumsearchfactory.kcfg
@@ -3,6 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <include>kdemacros.h</include>
   <kcfgfile name="kget_checksumsearchfactory.rc"/>
    <group name="ChecksumSearch">
     <entry name="SearchStrings" type="StringList">
diff --git a/kget/transfer-plugins/metalink/kget_metalinkfactory.kcfg b/kget/transfer-plugins/metalink/kget_metalinkfactory.kcfg
index 5357ba48..29493875 100644
--- a/kget/transfer-plugins/metalink/kget_metalinkfactory.kcfg
+++ b/kget/transfer-plugins/metalink/kget_metalinkfactory.kcfg
@@ -3,6 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <include>kdemacros.h</include>
   <kcfgfile name="kget_metalinkfactory.rc"/>
   <group name="Files">
     <entry name="SimultanousFiles" type="Int">
diff --git a/kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.kcfg b/kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.kcfg
index 8a1661e9..d08b6803 100644
--- a/kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.kcfg
+++ b/kget/transfer-plugins/mirrorsearch/kget_mirrorsearchfactory.kcfg
@@ -3,6 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <include>kdemacros.h</include>
   <kcfgfile name="kget_mirrorsearchfactory.rc"/>
    <group name="SearchEngines">
     <entry name="UseSearchEngines" type="Bool">
diff --git a/kget/transfer-plugins/mmsthreads/kget_mmsfactory.kcfg b/kget/transfer-plugins/mmsthreads/kget_mmsfactory.kcfg
index 484b04aa..51bd5abb 100644
--- a/kget/transfer-plugins/mmsthreads/kget_mmsfactory.kcfg
+++ b/kget/transfer-plugins/mmsthreads/kget_mmsfactory.kcfg
@@ -3,6 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <include>kdemacros.h</include>
   <kcfgfile name="kget_mmsfactory.rc"/>
   <group name="Threads">
     <entry name="Threads" type="Int">
diff --git a/kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.kcfg b/kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.kcfg
index 42660429..7f64c699 100644
--- a/kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.kcfg
+++ b/kget/transfer-plugins/multisegmentkio/kget_multisegkiofactory.kcfg
@@ -3,6 +3,7 @@
       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
       xsi:schemaLocation="http://www.kde.org/standards/kcfg/1.0
                           http://www.kde.org/standards/kcfg/1.0/kcfg.xsd" >
+  <include>kdemacros.h</include>
   <kcfgfile name="kget_multisegkiofactory.rc"/>
   <group name="Segments">
     <entry name="Segments" type="Int">
diff --git a/libktorrent/src/peer/utmetadata.cpp b/libktorrent/src/peer/utmetadata.cpp
index 0b4b11b7..07518d62 100644
--- a/libktorrent/src/peer/utmetadata.cpp
+++ b/libktorrent/src/peer/utmetadata.cpp
@@ -50,7 +50,7 @@ namespace bt
 		{
 			BDecoder dec(tmp,false,2);
 			node = dec.decode();
-			if (!node || !node->getType() == BNode::DICT)
+			if (!node || node->getType() != BNode::DICT)
 			{
 				delete node;
 				return;
-- 
2.11.0