diff options
Diffstat (limited to 'tdm/cryptocardwatcher')
| -rw-r--r-- | tdm/cryptocardwatcher/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tdm/cryptocardwatcher/main.cpp | 4 | ||||
| -rw-r--r-- | tdm/cryptocardwatcher/watcher.cpp (renamed from tdm/cryptocardwatcher/watcher.cc) | 0 | ||||
| -rw-r--r-- | tdm/cryptocardwatcher/watcher.h | 2 |
4 files changed, 5 insertions, 6 deletions
diff --git a/tdm/cryptocardwatcher/CMakeLists.txt b/tdm/cryptocardwatcher/CMakeLists.txt index 7564ac2cf..c66161263 100644 --- a/tdm/cryptocardwatcher/CMakeLists.txt +++ b/tdm/cryptocardwatcher/CMakeLists.txt @@ -24,9 +24,8 @@ link_directories( ##### tdecryptocardwatcher (executable) ######### tde_add_executable( tdecryptocardwatcher AUTOMOC - SOURCES main.cpp watcher.cc - LINK tdecore-shared tdeio-shared dmctl-static + SOURCES main.cpp watcher.cpp + LINK tdecore-shared tdeio-shared dmctl-static ${TDEHW_LIBRARIES} DESTINATION ${BIN_INSTALL_DIR} SETUID ) - diff --git a/tdm/cryptocardwatcher/main.cpp b/tdm/cryptocardwatcher/main.cpp index 5d27ff19b..34cc96b59 100644 --- a/tdm/cryptocardwatcher/main.cpp +++ b/tdm/cryptocardwatcher/main.cpp @@ -123,8 +123,8 @@ int main(int argc, char *argv[]) { TDEGenericHardwareList cardReaderList = hwdevices->listByDeviceClass(TDEGenericDeviceType::CryptographicCard); for (hwdevice = cardReaderList.first(); hwdevice; hwdevice = cardReaderList.next()) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - TQObject::connect(cdevice, TQT_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); - TQObject::connect(cdevice, TQT_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQT_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); + TQObject::connect(cdevice, TQ_SIGNAL(cardInserted(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardInserted(TDECryptographicCardDevice*))); + TQObject::connect(cdevice, TQ_SIGNAL(cardRemoved(TDECryptographicCardDevice*)), watcher, TQ_SLOT(cryptographicCardRemoved(TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); } diff --git a/tdm/cryptocardwatcher/watcher.cc b/tdm/cryptocardwatcher/watcher.cpp index ecd4e8f3c..ecd4e8f3c 100644 --- a/tdm/cryptocardwatcher/watcher.cc +++ b/tdm/cryptocardwatcher/watcher.cpp diff --git a/tdm/cryptocardwatcher/watcher.h b/tdm/cryptocardwatcher/watcher.h index bfbb010a0..289f16142 100644 --- a/tdm/cryptocardwatcher/watcher.h +++ b/tdm/cryptocardwatcher/watcher.h @@ -26,7 +26,7 @@ class TDECryptographicCardDevice; class CardWatcher : public TQObject { - Q_OBJECT + TQ_OBJECT public: CardWatcher(); |