generic: misc cleanups

Signed-off-by: Ivailo Monev <xakepa10@gmail.com>

diff --git a/akregator/src/akregator_part.cpp b/akregator/src/akregator_part.cpp
index 26727b6..9e1fd44 100644 (file)
--- 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 4287b21..e690f28 100644 (file)
--- 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 a50d8f9..1e3dbfc 100644 (file)
--- 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 de97445..9711add 100644 (file)
--- 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 6d55179..4fc0f55 100644 (file)
--- 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 a35081d..f6d11a5 100644 (file)
--- 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 78fda2b..a6327f9 100644 (file)
--- 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 5357ba4..2949387 100644 (file)
--- 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 8a1661e..d08b680 100644 (file)
--- 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 484b04a..51bd5ab 100644 (file)
--- 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 4266042..7f64c69 100644 (file)
--- 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 0b4b11b..07518d6 100644 (file)
--- 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;