From kde-commits Tue Dec 14 15:46:08 2010 From: =?utf-8?q?Andr=C3=A9=20W=C3=B6bbeking?= Date: Tue, 14 Dec 2010 15:46:08 +0000 To: kde-commits Subject: KDE/kdebase/workspace Message-Id: <20101214154608.E8D90AC8A7 () svn ! kde ! org> X-MARC-Message: https://marc.info/?l=kde-commits&m=129234161123206 SVN commit 1206483 by woebbe: Forwardport of rev. 1146755: remove signals already defined in the interface M +0 -7 libs/solid/control/backends/fakenet/fakeaccesspoint.h M +0 -7 solid/networkmanager-0.7/accesspoint.h M +0 -5 solid/networkmanager-0.7/manager.h M +0 -13 solid/wicd/networkmanager.h M +0 -12 solid/wicd/wirelessaccesspoint.h --- trunk/KDE/kdebase/workspace/libs/solid/control/backends/fakenet/fakeaccesspoint.h #1206482:1206483 @@ -47,13 +47,6 @@ uint maxBitRate() const; Solid::Control::WirelessNetworkInterface::OperationMode mode() const; int signalStrength() const; -signals: - void ssidChanged(const QString &); - void frequencyChanged(uint); - void signalStrengthChanged(int strength); - void bitRateChanged(int bitrate); - void wpaFlagsChanged(Solid::Control::AccessPoint::WpaFlags flags); - void rsnFlagsChanged(Solid::Control::AccessPoint::WpaFlags flags); private: Solid::Control::AccessPoint::WpaFlags wpaPropsToFlags( const QString & property ) const; QMap mPropertyMap; --- trunk/KDE/kdebase/workspace/solid/networkmanager-0.7/accesspoint.h #1206482:1206483 @@ -50,13 +50,6 @@ int signalStrength() const; public Q_SLOTS: void propertiesChanged(const QVariantMap &properties); -Q_SIGNALS: - void signalStrengthChanged(int strength); - void wpaFlagsChanged(Solid::Control::AccessPoint::WpaFlags flags); - void rsnFlagsChanged(Solid::Control::AccessPoint::WpaFlags flags); - void ssidChanged(const QString &ssid); - void frequencyChanged(uint frequency); - void bitRateChanged(int); private: static Solid::Control::AccessPoint::Capabilities convertCapabilities(int); static Solid::Control::AccessPoint::WpaFlags convertWpaFlags(uint); --- trunk/KDE/kdebase/workspace/solid/networkmanager-0.7/manager.h #1206482:1206483 @@ -57,12 +57,7 @@ void setWirelessEnabled(bool enabled); Q_SIGNALS: - void statusChanged(Solid::Networking::Status status); - void networkInterfaceAdded(const QString & uni); - void networkInterfaceRemoved(const QString & uni); - void wirelessEnabledChanged(bool); void networkingEnabledChanged(bool); - void activeConnectionsChanged(); protected Q_SLOTS: void deviceAdded(const QDBusObjectPath &state); --- trunk/KDE/kdebase/workspace/solid/wicd/networkmanager.h #1206482:1206483 @@ -52,19 +52,6 @@ private Q_SLOTS: void refreshStatus(); -Q_SIGNALS: - void statusChanged(Solid::Networking::Status status); - - void networkInterfaceAdded(const QString & uni); - - void networkInterfaceRemoved(const QString & uni); - - void wirelessEnabledChanged(bool enabled); - - void wirelessHardwareEnabledChanged(bool enabled); - - void activeConnectionsChanged(); - private: WicdNetworkManagerPrivate * d; }; --- trunk/KDE/kdebase/workspace/solid/wicd/wirelessaccesspoint.h #1206482:1206483 @@ -46,18 +46,6 @@ private Q_SLOTS: void refreshStatus(); -Q_SIGNALS: - void signalStrengthChanged(int strength); - - void bitRateChanged(int bitrate); - - void wpaFlagsChanged(Solid::Control::AccessPoint::WpaFlags flags); - - void rsnFlagsChanged(Solid::Control::AccessPoint::WpaFlags flags); - - void ssidChanged(const QString &ssid); - - void frequencyChanged(uint frequency); private: class Private; Private *d;