summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSlávek Banko <slavek.banko@axis.cz>2015-06-14 04:01:19 +0200
committerSlávek Banko <slavek.banko@axis.cz>2015-06-14 04:01:19 +0200
commit4554b6c6fb200addc5fbc833df4f42a65070cdd9 (patch)
treee5e5e7abc3b677831ba5f63cf0ddddfe21e8ded0
parentc0e6e0eddc721f28a273c15688db0c6f46ed78e1 (diff)
downloadtdepim-4554b6c6fb200addc5fbc833df4f42a65070cdd9.tar.gz
tdepim-4554b6c6fb200addc5fbc833df4f42a65070cdd9.zip
Fix FTBFS with clang
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmejob.cpp1
-rw-r--r--certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp1
-rw-r--r--kitchensync/src/configguildap.h4
-rw-r--r--kmail/imapaccountbase.h4
-rw-r--r--kmail/networkaccount.h4
-rw-r--r--libkpimidentities/identity.h12
6 files changed, 17 insertions, 9 deletions
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
index 6912bb49b..7f08aa29b 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp
@@ -55,6 +55,7 @@
#include <algorithm>
#include <assert.h>
+#include <stdlib.h>
#include <string.h>
namespace {
diff --git a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
index 032514cd3..eda519b12 100644
--- a/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
+++ b/certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp
@@ -49,6 +49,7 @@
#include <tdelocale.h>
#include <assert.h>
+#include <stdlib.h>
Kleo::QGpgMESignJob::QGpgMESignJob( GpgME::Context * context )
: SignJob( QGpgME::EventLoopInteractor::instance(), "Kleo::QGpgMESignJob" ),
diff --git a/kitchensync/src/configguildap.h b/kitchensync/src/configguildap.h
index 15741c134..81b8857b7 100644
--- a/kitchensync/src/configguildap.h
+++ b/kitchensync/src/configguildap.h
@@ -29,7 +29,9 @@ class TQCheckBox;
class TQLabel;
class TQSpinBox;
-class TDEABC::LdapConfigWidget;
+namespace TDEABC {
+ class LdapConfigWidget;
+}
class KComboBox;
class KLineEdit;
diff --git a/kmail/imapaccountbase.h b/kmail/imapaccountbase.h
index 2d239d967..3a4c4bff9 100644
--- a/kmail/imapaccountbase.h
+++ b/kmail/imapaccountbase.h
@@ -32,7 +32,9 @@
#include <tqguardedptr.h>
#include <tdeio/global.h>
-class AccountManager;
+namespace KMail {
+ class AccountManager;
+}
class KMFolder;
class TDEConfig/*Base*/;
class KMMessagePart;
diff --git a/kmail/networkaccount.h b/kmail/networkaccount.h
index 503a312da..1c5dde6e8 100644
--- a/kmail/networkaccount.h
+++ b/kmail/networkaccount.h
@@ -33,7 +33,9 @@
#include <tqstring.h>
-class AccountManager;
+namespace KMail {
+ class AccountManager;
+}
class TDEConfig/*Base*/;
class KURL;
namespace TDEIO {
diff --git a/libkpimidentities/identity.h b/libkpimidentities/identity.h
index 4d6eeed09..c1af97e15 100644
--- a/libkpimidentities/identity.h
+++ b/libkpimidentities/identity.h
@@ -26,6 +26,12 @@ class TQDataStream;
namespace KPIM {
+KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig );
+KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig );
+
+KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident );
+KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident );
+
/**
* @short abstraction of a signature (aka "footer").
* @author Marc Mutz <mutz@kde.org>
@@ -320,12 +326,6 @@ protected:
Kleo::CryptoMessageFormat mPreferredCryptoMessageFormat;
};
-KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Signature & sig );
-KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Signature & sig );
-
-KDE_EXPORT TQDataStream & operator<<( TQDataStream & stream, const KPIM::Identity & ident );
-KDE_EXPORT TQDataStream & operator>>( TQDataStream & stream, KPIM::Identity & ident );
-
} // namespace KPIM
#endif /*kpim_identity_h*/