From a611eec8a079786dbfc6b6b803e5fee9b111b8eb Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Tue, 15 Sep 2015 19:20:55 -0500 Subject: [PATCH] Update cryptographic card API to send card device with insert/remove signals --- tdecore/tdehw/tdecryptographiccarddevice.cpp | 4 ++-- tdecore/tdehw/tdecryptographiccarddevice.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp index 37aa6cac5..111cbce17 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.cpp +++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp @@ -539,12 +539,12 @@ void TDECryptographicCardDevice::cardStatusChanged(TQString status, TQString atr if (status == "INSERTED") { m_cardPresent = true; m_cardATR = atr; - emit(cardInserted()); + emit(cardInserted(this)); } else if (status == "REMOVED") { m_cardPresent = false; m_cardATR = atr; - emit(cardRemoved()); + emit(cardRemoved(this)); } else if (status == "PRESENT") { m_cardATR = atr; diff --git a/tdecore/tdehw/tdecryptographiccarddevice.h b/tdecore/tdehw/tdecryptographiccarddevice.h index db0f08289..e917c9ae3 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.h +++ b/tdecore/tdehw/tdecryptographiccarddevice.h @@ -25,7 +25,7 @@ #ifdef KSSL_HAVE_SSL typedef struct x509_st X509; #else - class X509; + struct X509; #endif #endif @@ -147,8 +147,8 @@ class TDECORE_EXPORT TDECryptographicCardDevice : public TDEGenericDevice void workerRequestedPin(TQString prompt); signals: - void cardInserted(); - void cardRemoved(); + void cardInserted(TDECryptographicCardDevice*); + void cardRemoved(TDECryptographicCardDevice*); void pinRequested(TQString prompt, TDECryptographicCardDevice* cdevice); private: