diff options
| author | Slávek Banko <slavek.banko@axis.cz> | 2015-06-14 04:01:19 +0200 | 
|---|---|---|
| committer | Slávek Banko <slavek.banko@axis.cz> | 2015-06-14 04:02:43 +0200 | 
| commit | ae9fde72adecd2ca03f9d4ff55fc30fef5a09afb (patch) | |
| tree | 66c9e8436960898ef128ae852ed031cef84dc054 | |
| parent | 3c3dfdfd7ffbd59bc1f089d6f57b179889f57ac8 (diff) | |
| download | tdepim-ae9fde72adecd2ca03f9d4ff55fc30fef5a09afb.tar.gz tdepim-ae9fde72adecd2ca03f9d4ff55fc30fef5a09afb.zip | |
Fix FTBFS with clang
Signed-off-by: Slávek Banko <slavek.banko@axis.cz>
(cherry picked from commit 4554b6c6fb200addc5fbc833df4f42a65070cdd9)
| -rw-r--r-- | certmanager/lib/backends/qgpgme/qgpgmejob.cpp | 1 | ||||
| -rw-r--r-- | certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp | 1 | ||||
| -rw-r--r-- | kitchensync/src/configguildap.h | 4 | ||||
| -rw-r--r-- | kmail/imapaccountbase.h | 4 | ||||
| -rw-r--r-- | kmail/networkaccount.h | 4 | ||||
| -rw-r--r-- | libkpimidentities/identity.h | 12 | 
6 files changed, 17 insertions, 9 deletions
| diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 6912bb49..7f08aa29 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 032514cd..eda519b1 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 15741c13..81b8857b 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 2d239d96..3a4c4bff 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 503a312d..1c5dde6e 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 4d6eeed0..c1af97e1 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*/ | 
