a611eec8 | 2015-09-15 19:20:55 | Timothy Pearson |
Update cryptographic card API to send card device with insert/remove signals |
||
M tdecore/tdehw/tdecryptographiccarddevice.cpp M tdecore/tdehw/tdecryptographiccarddevice.h |
||
diff --git a/tdecore/tdehw/tdecryptographiccarddevice.cpp b/tdecore/tdehw/tdecryptographiccarddevice.cpp index 37aa6ca..111cbce 100644 --- a/tdecore/tdehw/tdecryptographiccarddevice.cpp +++ b/tdecore/tdehw/tdecryptographiccarddevice.cpp @@ -539,12 +539,12 @@ 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 db0f082..e917c9a 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 @@ void workerRequestedPin(TQString prompt); signals: - void cardInserted(); - void cardRemoved(); + void cardInserted(TDECryptographicCardDevice*); + void cardRemoved(TDECryptographicCardDevice*); void pinRequested(TQString prompt, TDECryptographicCardDevice* cdevice); private: |