From 2b7151f46f46ffaf129f99f0bf3e67ddb367674d Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Sat, 29 Aug 2015 01:12:13 -0500 Subject: Fix FTBFS from prior commit due to missing files --- tdecore/tdehw/tdecryptographiccarddevice.cpp | 4 ++++ tdecore/tdehw/tdecryptographiccarddevice_private.h | 4 +++- 2 files changed, 7 insertions(+), 1 deletion(-) (limited to 'tdecore') diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp index 9c827a1f6..7c8e3c7f4 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.cpp +++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp @@ -38,6 +38,7 @@ /* FIXME * This is incomplete */ +#ifdef WITH_PCSC static TQString pcsc_error_code_to_string(long errcode) { if (errcode == SCARD_W_UNPOWERED_CARD) { return i18n("card not powered on"); @@ -49,6 +50,7 @@ static TQString pcsc_error_code_to_string(long errcode) { return TQString::null; } } +#endif CryptoCardDeviceWatcher::CryptoCardDeviceWatcher() { m_readerStates = NULL; @@ -170,6 +172,7 @@ void CryptoCardDeviceWatcher::requestTermination() { } TQString CryptoCardDeviceWatcher::getCardATR(TQString readerName) { +#ifdef WITH_PCSC unsigned int i; long ret; TQString atr_formatted; @@ -205,6 +208,7 @@ TQString CryptoCardDeviceWatcher::getCardATR(TQString readerName) { } return atr_formatted; +#endif } TDECryptographicCardDevice::TDECryptographicCardDevice(TDEGenericDeviceType::TDEGenericDeviceType dt, TQString dn) : TDEGenericDevice(dt, dn), diff --git a/tdecore/tdehw/tdecryptographiccarddevice_private.h b/tdecore/tdehw/tdecryptographiccarddevice_private.h index a82fe1ae5..6ee4cd34a 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice_private.h +++ b/tdecore/tdehw/tdecryptographiccarddevice_private.h @@ -52,8 +52,10 @@ class CryptoCardDeviceWatcher : public TQObject private: bool m_terminationRequested; +#ifdef WITH_PCSC SCARDCONTEXT m_cardContext; SCARD_READERSTATE *m_readerStates; +#endif }; -#endif // _TDECRYPTOGRAPHICCARDDEVICE_PRIVATE_H \ No newline at end of file +#endif // _TDECRYPTOGRAPHICCARDDEVICE_PRIVATE_H -- cgit v1.2.1