From 6b20cfb7f0dd4ef7bcdf7b39170bd52c59412316 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sl=C3=A1vek=20Banko?= Date: Fri, 26 Jun 2015 13:06:44 +0200 Subject: [PATCH] Fix FTBFS with clang MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Slávek Banko (cherry picked from commit ec6378cdd8ea847ecdd81f8976b5adf2551cef56) --- filesharing/advanced/kcm_sambaconf/qmultichecklistitem.cpp | 2 +- kopete/libkopete/kopeteproperties.cpp | 4 ++-- kopete/libkopete/ui/metacontactselectorwidget.h | 4 ++-- kopete/plugins/smpppdcs/smpppdcsprefsimpl.cpp | 1 + kopete/protocols/groupwise/libgroupwise/qcatlshandler.h | 4 +++- 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 #include #include #include +#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 #include +#include #include 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 #include "tlshandler.h" -class TQCA::TLS; +namespace TQCA { + class TLS; +} class TQCATLSHandler : public TLSHandler {