summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-26 13:06:44 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-06-26 13:30:27 +0200
commit6b20cfb7f0dd4ef7bcdf7b39170bd52c59412316 (patch)
treee1011946646ff88f10c2c5b8a83e4292b700f5f7
parent86e9e2420c147bf64ae64aafd2e75576dc40e7b6 (diff)
downloadtdenetwork-6b20cfb7f0dd4ef7bcdf7b39170bd52c59412316.tar.gz
tdenetwork-6b20cfb7f0dd4ef7bcdf7b39170bd52c59412316.zip
Fix FTBFS with clang
Signed-off-by: Slávek Banko <slavek.banko@axis.cz> (cherry picked from commit ec6378cdd8ea847ecdd81f8976b5adf2551cef56)
-rw-r--r--filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp2
-rw-r--r--kopete/libkopete/kopeteproperties.cpp4
-rw-r--r--kopete/libkopete/ui/metacontactselectorwidget.h4
-rw-r--r--kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp1
-rw-r--r--kopete/protocols/groupwise/libgroupwise/qcatlshandler.h4
5 files changed, 9 insertions, 6 deletions
diff --git a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
index e11a1857..1013677f 100644
--- a/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
+++ b/filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp
@@ -40,7 +40,7 @@
static const int BoxSize = 16;
-QMultiCheckListItem::QMultiCheckListItem( TQListView *parent=0) :
+QMultiCheckListItem::QMultiCheckListItem( TQListView *parent) :
TQListViewItem(parent) {
}
diff --git a/kopete/libkopete/kopeteproperties.cpp b/kopete/libkopete/kopeteproperties.cpp
index 3ed9d044..4565a0e1 100644
--- a/kopete/libkopete/kopeteproperties.cpp
+++ b/kopete/libkopete/kopeteproperties.cpp
@@ -14,14 +14,14 @@
*************************************************************************
*/
-#include "kopeteproperties.h"
-
#include <kdebug.h>
#include <tqdom.h>
#include <tqvariant.h>
#include <typeinfo>
+#include "kopeteproperties.h"
+
namespace Kopete {
namespace Properties {
diff --git a/kopete/libkopete/ui/metacontactselectorwidget.h b/kopete/libkopete/ui/metacontactselectorwidget.h
index fb0f1e17..d084237a 100644
--- a/kopete/libkopete/ui/metacontactselectorwidget.h
+++ b/kopete/libkopete/ui/metacontactselectorwidget.h
@@ -23,10 +23,10 @@
#include "kopetelistviewitem.h"
#include "kopete_export.h"
-class Kopete::MetaContact;
-
namespace Kopete
{
+ class MetaContact;
+
namespace UI
{
diff --git a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
index 75976df5..2902b350 100644
--- a/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
+++ b/kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp
@@ -16,6 +16,7 @@
#include <arpa/inet.h>
#include <netdb.h>
+#include <sys/socket.h>
#include <tqradiobutton.h>
diff --git a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
index 1680a484..f83b01bb 100644
--- a/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
+++ b/kopete/protocols/groupwise/libgroupwise/qcatlshandler.h
@@ -23,7 +23,9 @@
//#include <tqtimer.h>
#include "tlshandler.h"
-class TQCA::TLS;
+namespace TQCA {
+ class TLS;
+}
class TQCATLSHandler : public TLSHandler
{