diff options
Diffstat (limited to 'arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff')
| -rw-r--r-- | arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff | 121 |
1 files changed, 121 insertions, 0 deletions
diff --git a/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff b/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff new file mode 100644 index 000000000..887c989f1 --- /dev/null +++ b/arch/tde-extra/tde-tdenetworkmanager/bp001-e4e7853030.diff @@ -0,0 +1,121 @@ +commit e4e7853030d8efbf14e5ad6631c4cfb6b3601269 +Author: Michele Calgaro <michele.calgaro@yahoo.it> +Date: Mon Aug 2 23:19:04 2021 +0900 + + Removed unused hardwareEvent code - part 2. + + Signed-off-by: Michele Calgaro <michele.calgaro@yahoo.it> + +diff --git a/tdenetworkmanager/src/devicetraycomponent.cpp b/tdenetworkmanager/src/devicetraycomponent.cpp +index 085435c..2ea4e35 100644 +--- a/tdenetworkmanager/src/devicetraycomponent.cpp ++++ b/tdenetworkmanager/src/devicetraycomponent.cpp +@@ -75,7 +75,11 @@ DeviceTrayComponent::DeviceTrayComponent(TQString device, KSystemTray * parent, + TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices(); + + // Trigger an initial hardware information update +- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null); ++ TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device)); ++ TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); ++ ++ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); ++ connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString))); + + m_pixmaps[TDENetworkConnectionStatus::Invalid] = "nm_no_connection"; + m_pixmaps[TDENetworkConnectionStatus::UnManaged] = "nm_no_connection"; +@@ -110,18 +114,6 @@ TQString DeviceTrayComponent::device() const + return m_device; + } + +-void DeviceTrayComponent::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString) +-{ +- if (event == TDEHardwareEvent::HardwareListModified) { +- TDEHardwareDevices* hwdevices = TDEGlobal::hardwareDevices(); +- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(m_device)); +- TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); +- +- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), TQT_SLOT(deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); +- connect(deviceConnMan, TQT_SIGNAL(networkDeviceEvent(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString)), this, TQT_SLOT(deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType, TQString))); +- } +-} +- + void DeviceTrayComponent::deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message) { + kdDebug() << "DeviceTrayComponent::deviceEventHandler" << endl; + +diff --git a/tdenetworkmanager/src/devicetraycomponent.h b/tdenetworkmanager/src/devicetraycomponent.h +index af0ccea..c3c40e1 100644 +--- a/tdenetworkmanager/src/devicetraycomponent.h ++++ b/tdenetworkmanager/src/devicetraycomponent.h +@@ -59,7 +59,6 @@ class DeviceTrayComponent : public TrayComponent + void deviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString); + + private slots: +- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString); + void deviceEventHandler(TDENetworkDeviceEventType::TDENetworkDeviceEventType event, TQString message); + + protected: +diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp +index 9b855ec..8811650 100644 +--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp ++++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp +@@ -428,25 +428,6 @@ void WirelessDeviceTray::slotAccessPointRemoved(TDEMACAddress) + KNotifyClient::event( tray()->winId(), "tdenm-nm-network-gone", i18n("TDENetworkManager Wireless Network Disappeared") ); + } + +-void WirelessDeviceTray::tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent event, TQString) +-{ +- if (event == TDEHardwareEvent::HardwareListModified) { +- TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); +- TDENetworkConnectionManager* deviceConnMan = (dev)?dev->connectionManager():NULL; +- +- // get notified when the device state changes +- connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); +- +- // get notified of all AP changes +- connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType))); +- +- // force status update to ensure correct icon is shown on startup +- if ((dev) && (deviceConnMan)) { +- slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, dev->deviceNode()); +- } +- } +-} +- + void WirelessDeviceTray::tdeAccessPointStatusChangedHandler(TDEMACAddress BSSID, TDENetworkAPEventType::TDENetworkAPEventType event) { + TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); + TDENetworkConnectionManager* deviceConnMan = dev->connectionManager(); +@@ -487,8 +468,20 @@ WirelessDeviceTray::WirelessDeviceTray (TQString dev, KSystemTray * parent, cons + setPixmapForState(TDENetworkConnectionStatus::Disconnected, "wireless"); + setPixmapForState(TDENetworkConnectionStatus::Connected, "nm_signal_50"); + +- // Trigger an initial hardware information update +- tdeHardwareEventHandler(TDEHardwareEvent::HardwareListModified, TQString::null); ++ // initial hardware information update ++ TDENetworkDevice* netdev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev)); ++ TDENetworkConnectionManager* deviceConnMan = (netdev)?netdev->connectionManager():NULL; ++ ++ // get notified when the device state changes ++ connect(deviceConnMan, TQT_SIGNAL(networkDeviceStateChanged(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString)), this, TQT_SLOT(slotUpdateDeviceState(TDENetworkConnectionStatus::TDENetworkConnectionStatus, TDENetworkConnectionStatus::TDENetworkConnectionStatus, TQString))); ++ ++ // get notified of all AP changes ++ connect(deviceConnMan, TQT_SIGNAL(accessPointStatusChanged(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType)), this, TQT_SLOT(tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType))); ++ ++ // force status update to ensure correct icon is shown on startup ++ if ((netdev) && (deviceConnMan)) { ++ slotUpdateDeviceState(deviceConnMan->deviceInformation().statusFlags, TDENetworkConnectionStatus::Invalid, netdev->deviceNode()); ++ } + } + + WirelessDeviceTray::~WirelessDeviceTray () +diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h +index 59a24a1..eb429b9 100644 +--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h ++++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h +@@ -66,7 +66,6 @@ class WirelessDeviceTray : public DeviceTrayComponent + void slotAccessPointRemoved(TDEMACAddress); + + private slots: +- void tdeHardwareEventHandler(TDEHardwareEvent::TDEHardwareEvent, TQString); + void tdeAccessPointStatusChangedHandler(TDEMACAddress, TDENetworkAPEventType::TDENetworkAPEventType); + void sendUpdateUI(); + |