diff options
Diffstat (limited to 'kcontrol/hwmanager/hwmanager.cpp')
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.cpp | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index f5b0206c3..662844ec3 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -44,7 +44,7 @@ #include <unistd.h> #include <kpassdlg.h> -#include <ksimpleconfig.h> +#include <tdesimpleconfig.h> #include <string> #include <stdio.h> #include <tqstring.h> @@ -59,8 +59,8 @@ using namespace std; typedef KGenericFactory<TDEHWManager, TQWidget> TDEHWManagerFactory; K_EXPORT_COMPONENT_FACTORY( kcm_hwmanager, TDEHWManagerFactory("kcmhwmanager") ) -KSimpleConfig *config; -KSimpleConfig *systemconfig; +TDESimpleConfig *config; +TDESimpleConfig *systemconfig; /**** TDEHWManager ****/ @@ -68,8 +68,8 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis : TDECModule(TDEHWManagerFactory::instance(), parent, name) { TQVBoxLayout *layout = new TQVBoxLayout(this, KDialog::marginHint(), KDialog::spacingHint()); - config = new KSimpleConfig( TQString::fromLatin1( "hwmanagerrc" )); - systemconfig = new KSimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" )); + config = new TDESimpleConfig( TQString::fromLatin1( "hwmanagerrc" )); + systemconfig = new TDESimpleConfig( TQString::fromLatin1( KDE_CONFDIR "/tdehw/hwmanagerrc" )); TDEAboutData *about = new TDEAboutData(I18N_NOOP("kcmhwmanager"), I18N_NOOP("TDE Device Manager"), 0, @@ -95,11 +95,11 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); hwdevices->setTriggerlessHardwareUpdatesEnabled(true); - connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(changed())); - connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView())); + connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(changed())); + connect(base->showByConnection, TQ_SIGNAL(clicked()), TQ_SLOT(populateTreeView())); - connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(scheduleDeviceUpdate())); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(scheduleDeviceUpdate())); + connect(hwdevices, TQ_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate())); + connect(hwdevices, TQ_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQ_SLOT(scheduleDeviceUpdate())); load(); @@ -138,7 +138,7 @@ void TDEHWManager::scheduleDeviceUpdate() if (!deviceUpdateScheduled) { deviceUpdateScheduled = true; - TQTimer::singleShot(1000, this, TQT_SLOT(populateTreeView())); + TQTimer::singleShot(1000, this, TQ_SLOT(populateTreeView())); } } @@ -166,7 +166,7 @@ void TDEHWManager::populateTreeView() for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -188,7 +188,7 @@ void TDEHWManager::populateTreeView() for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } @@ -211,7 +211,7 @@ void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_con for ( hwdevice = hwlist.first(); hwdevice; hwdevice = hwlist.next() ) { if (hwdevice->type() == TDEGenericDeviceType::CryptographicCard) { TDECryptographicCardDevice* cdevice = static_cast<TDECryptographicCardDevice*>(hwdevice); - connect(cdevice, SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); + connect(cdevice, TQ_SIGNAL(pinRequested(TQString,TDECryptographicCardDevice*)), this, TQ_SLOT(cryptographicCardPinRequested(TQString,TDECryptographicCardDevice*))); cdevice->enableCardMonitoring(true); cdevice->enablePINEntryCallbacks(true); } |