diff options
| author | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-03-16 17:18:20 +0900 |
|---|---|---|
| committer | Michele Calgaro <michele.calgaro@yahoo.it> | 2022-03-16 17:18:20 +0900 |
| commit | 3aa097d05d83712329ab265a007036ba88772dc6 (patch) | |
| tree | cfad17bb0a040f49eef3fb8847d1cd23e3ff59d0 | |
| parent | 02549ecc727385b7499fcef49fe210ff71822c16 (diff) | |
| download | tdebase-3aa097d05d83712329ab265a007036ba88772dc6.tar.gz tdebase-3aa097d05d83712329ab265a007036ba88772dc6.zip | |
hwmanager: simplify code after tdelibs commit 5f795c0b.
Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it>
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.cpp | 9 | ||||
| -rw-r--r-- | kcontrol/hwmanager/hwmanager.h | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/kcontrol/hwmanager/hwmanager.cpp b/kcontrol/hwmanager/hwmanager.cpp index 783f703fb..265901003 100644 --- a/kcontrol/hwmanager/hwmanager.cpp +++ b/kcontrol/hwmanager/hwmanager.cpp @@ -97,7 +97,7 @@ TDEHWManager::TDEHWManager(TQWidget *parent, const char *name, const TQStringLis connect(base->showByConnection, TQT_SIGNAL(clicked()), TQT_SLOT(populateTreeView())); connect(hwdevices, TQT_SIGNAL(hardwareAdded(TDEGenericDevice*)), this, TQT_SLOT(populateTreeView())); - connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(delayedPopulateTreeView())); + connect(hwdevices, TQT_SIGNAL(hardwareRemoved(TDEGenericDevice*)), this, TQT_SLOT(populateTreeView())); connect(hwdevices, TQT_SIGNAL(hardwareUpdated(TDEGenericDevice*)), this, TQT_SLOT(deviceChanged(TDEGenericDevice*))); load(); @@ -191,13 +191,6 @@ void TDEHWManager::populateTreeView() } } -void TDEHWManager::delayedPopulateTreeView() { - // When hardwareRemoved() is triggered, the list of devices still contains the device which - // is about to be removed. Therefore we need to delay repopulating the device tree after the - // removal of the device. - TQTimer::singleShot(0, this, TQT_SLOT(populateTreeView())); -} - void TDEHWManager::populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath) { if (show_by_connection) { TDEHardwareDevices *hwdevices = TDEGlobal::hardwareDevices(); diff --git a/kcontrol/hwmanager/hwmanager.h b/kcontrol/hwmanager/hwmanager.h index 033ed6252..abc05fa54 100644 --- a/kcontrol/hwmanager/hwmanager.h +++ b/kcontrol/hwmanager/hwmanager.h @@ -59,7 +59,6 @@ k_dcop: private slots: void populateTreeView(); - void delayedPopulateTreeView(); void populateTreeViewLeaf(DeviceIconItem *parent, bool show_by_connection, TQString selected_syspath); void deviceChanged(TDEGenericDevice*); void cryptographicCardPinRequested(TQString prompt, TDECryptographicCardDevice* cdevice); |