c0e6e0ed | 2015-06-13 21:00:26 | Slávek Banko |
Fix FTBFS when build without tdehw-lib Signed-off-by: Slávek Banko <slavek.banko@...> |
||
M kmail/kmkernel.cpp M kmail/kmkernel.h |
||
diff --git a/kmail/kmkernel.cpp b/kmail/kmkernel.cpp index aa01c96..6f18a36 100644 --- a/kmail/kmkernel.cpp +++ b/kmail/kmkernel.cpp @@ -170,6 +170,7 @@ connectDCOPSignal( 0, 0, "kmailSelectFolder(TQString)", "selectFolder(TQString)", false ); +#ifdef __TDE_HAVE_TDEHWLIB mNetworkManager = TDEGlobal::networkManager(); if (mNetworkManager) { connect( mNetworkManager, TQT_SIGNAL( networkDeviceStateChanged( TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString ) ), @@ -181,6 +182,7 @@ stopNetworkJobs(); } } +#endif } KMKernel::~KMKernel () @@ -2470,6 +2472,7 @@ bool KMKernel::networkStateConnected() { +#ifdef __TDE_HAVE_TDEHWLIB if (mNetworkManager) { TDENetworkGlobalManagerFlags::TDENetworkGlobalManagerFlags networkStatus = mNetworkManager->backendStatus(); if ((networkStatus & TDENetworkGlobalManagerFlags::Connected) @@ -2488,6 +2491,8 @@ // Assume connected return true; } +#endif + return true; } void KMKernel::slotNetworkStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString) diff --git a/kmail/kmkernel.h b/kmail/kmkernel.h index 0dc4644..610ab47 100644 --- a/kmail/kmkernel.h +++ b/kmail/kmkernel.h @@ -9,12 +9,20 @@ #include <weaver.h> #include <weaverlogger.h> +#include <kdemacros.h> #include <tdeconfig.h> #include <tdeversion.h> #include <tdeimproxy.h> #include <tdepimmacros.h> -#include <tdenetworkconnections.h> +#ifdef __TDE_HAVE_TDEHWLIB +# include <tdenetworkconnections.h> +#else +namespace TDENetworkConnectionStatus { + enum TDENetworkConnectionStatus { + }; +} +#endif #include "kmailIface.h" #include "kmmsgbase.h" @@ -527,7 +535,9 @@ TQString mAddMessageLastFolder; KMFolder *mAddMsgCurrentFolder; +#ifdef __TDE_HAVE_TDEHWLIB TDEGlobalNetworkManager *mNetworkManager; +#endif }; #endif |
||
4554b6c6 | 2015-06-13 21:01:19 | Slávek Banko |
Fix FTBFS with clang Signed-off-by: Slávek Banko <slavek.banko@...> |
||
M certmanager/lib/backends/qgpgme/qgpgmejob.cpp M certmanager/lib/backends/qgpgme/qgpgmesignjob.cpp M kitchensync/src/configguildap.h M kmail/imapaccountbase.h M kmail/networkaccount.h M libkpimidentities/identity.h |
||
diff --git a/certmanager/lib/backends/qgpgme/qgpgmejob.cpp b/certmanager/lib/backends/qgpgme/qgpgmejob.cpp index 6912bb4..7f08aa2 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 032514c..eda519b 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 15741c1..81b8857 100644 --- a/kitchensync/src/configguildap.h +++ b/kitchensync/src/configguildap.h @@ -29,7 +29,9 @@ 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 2d239d9..3a4c4bf 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 503a312..1c5dde6 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 4d6eeed..c1af97e 100644 --- a/libkpimidentities/identity.h +++ b/libkpimidentities/identity.h @@ -26,6 +26,12 @@ 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@...> @@ -319,12 +325,6 @@ bool mIsDefault; 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 |