From 201cffba36bc03e09775e7a243cdd4aa8433db56 Mon Sep 17 00:00:00 2001 From: Timothy Pearson Date: Fri, 17 Feb 2012 16:00:01 -0600 Subject: [PATCH] Remove spurious TQ_OBJECT instances --- knetworkmanager-0.9/src/devicetraycomponent.h | 2 +- .../src/knetworkmanager-accesspoint.h | 2 +- .../src/knetworkmanager-cdma_connection.h | 2 +- .../src/knetworkmanager-cdma_device.h | 2 +- .../src/knetworkmanager-cellular_device.h | 2 +- .../src/knetworkmanager-cellular_device_tray.h | 2 +- .../src/knetworkmanager-connection.h | 2 +- .../src/knetworkmanager-connection_dbus.h | 2 +- .../src/knetworkmanager-connection_editor.h | 2 +- .../knetworkmanager-connection_secrets_dbus.h | 2 +- .../src/knetworkmanager-connection_setting.h | 2 +- ...tworkmanager-connection_setting_cdma_widget.h | 2 +- ...etworkmanager-connection_setting_gsm_widget.h | 2 +- ...tworkmanager-connection_setting_info_widget.h | 2 +- ...tworkmanager-connection_setting_ipv4_widget.h | 2 +- ...etworkmanager-connection_setting_ppp_widget.h | 2 +- ...orkmanager-connection_setting_serial_widget.h | 2 +- ...etworkmanager-connection_setting_vpn_widget.h | 2 +- ...manager-connection_setting_widget_interface.h | 2 +- ...connection_setting_wireless_security_widget.h | 16 ++++++++-------- ...kmanager-connection_setting_wireless_widget.h | 2 +- .../knetworkmanager-connection_settings_dialog.h | 2 +- .../src/knetworkmanager-connection_store.h | 2 +- knetworkmanager-0.9/src/knetworkmanager-device.h | 2 +- .../src/knetworkmanager-device_tray.h | 2 +- .../src/knetworkmanager-devicestore.h | 2 +- .../src/knetworkmanager-generic_connection.h | 2 +- .../src/knetworkmanager-gsm_connection.h | 2 +- .../src/knetworkmanager-gsm_device.h | 2 +- .../src/knetworkmanager-hal_device_proxy.h | 2 +- .../src/knetworkmanager-menuitem.h | 2 +- .../src/knetworkmanager-nm_proxy.h | 2 +- .../src/knetworkmanager-nm_vpn_proxy.h | 2 +- .../src/knetworkmanager-nmsettings.h | 2 +- knetworkmanager-0.9/src/knetworkmanager-plugin.h | 2 +- .../src/knetworkmanager-pluginmanager.h | 2 +- .../src/knetworkmanager-ppp_connection.h | 2 +- .../src/knetworkmanager-storage.h | 2 +- knetworkmanager-0.9/src/knetworkmanager-tray.h | 4 ++-- .../src/knetworkmanager-vpn_connection.h | 2 +- .../src/knetworkmanager-vpn_device.h | 2 +- .../src/knetworkmanager-vpn_plugin.h | 2 +- .../knetworkmanager-vpnauthenticationdialog.h | 2 +- .../src/knetworkmanager-vpnmanager.h | 2 +- .../src/knetworkmanager-vpnplugin.h | 6 +++--- .../src/knetworkmanager-vpnservice.h | 2 +- .../src/knetworkmanager-wired_connection.h | 2 +- .../src/knetworkmanager-wired_device.h | 2 +- .../src/knetworkmanager-wired_device_tray.h | 2 +- .../src/knetworkmanager-wireless_connection.h | 2 +- .../src/knetworkmanager-wireless_device.h | 2 +- .../src/knetworkmanager-wireless_device_tray.h | 2 +- .../src/knetworkmanager-wireless_menuitem.h | 2 +- knetworkmanager-0.9/src/knetworkmanager.h | 2 +- knetworkmanager-0.9/src/secret_storage_plugin.h | 2 +- knetworkmanager-0.9/src/traycomponent.h | 2 +- knetworkmanager-0.9/src/vpn_tray_component.h | 2 +- .../openvpn/src/knetworkmanager-openvpn.h | 6 +++--- .../vpn-plugins/pptp/src/knetworkmanager-pptp.h | 6 +++--- .../strongswan/src/knetworkmanager-strongswan.h | 6 +++--- .../vpn-plugins/vpnc/src/knetworkmanager-vpnc.h | 6 +++--- 61 files changed, 79 insertions(+), 79 deletions(-) diff --git a/knetworkmanager-0.9/src/devicetraycomponent.h b/knetworkmanager-0.9/src/devicetraycomponent.h index fb1d4c2..729076f 100644 --- a/knetworkmanager-0.9/src/devicetraycomponent.h +++ b/knetworkmanager-0.9/src/devicetraycomponent.h @@ -37,7 +37,7 @@ class KSystemTray; class DeviceTrayComponent : public TrayComponent { Q_OBJECT - TQ_OBJECT + public: DeviceTrayComponent(Device * device, KSystemTray * parent, const char * name ); virtual ~DeviceTrayComponent(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-accesspoint.h b/knetworkmanager-0.9/src/knetworkmanager-accesspoint.h index be929aa..d9e7a60 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-accesspoint.h +++ b/knetworkmanager-0.9/src/knetworkmanager-accesspoint.h @@ -38,7 +38,7 @@ namespace DBus class AccessPoint : public TQObject { Q_OBJECT - TQ_OBJECT + public: AccessPoint (const AccessPoint&); AccessPoint (TQString objpath = TQString(), TQObject * parent = 0, const char * name = 0); diff --git a/knetworkmanager-0.9/src/knetworkmanager-cdma_connection.h b/knetworkmanager-0.9/src/knetworkmanager-cdma_connection.h index 903e278..0d52d22 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-cdma_connection.h +++ b/knetworkmanager-0.9/src/knetworkmanager-cdma_connection.h @@ -36,7 +36,7 @@ namespace ConnectionSettings class CDMAConnection : public PPPConnection { Q_OBJECT - TQ_OBJECT + public: CDMAConnection(); ~CDMAConnection(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-cdma_device.h b/knetworkmanager-0.9/src/knetworkmanager-cdma_device.h index 3546f59..2de56d7 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-cdma_device.h +++ b/knetworkmanager-0.9/src/knetworkmanager-cdma_device.h @@ -39,7 +39,7 @@ class CDMADevicePrivate; class CDMADevice : public CellularDevice { Q_OBJECT - TQ_OBJECT + public: CDMADevice (const TQString & obj_path ); ~CDMADevice (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-cellular_device.h b/knetworkmanager-0.9/src/knetworkmanager-cellular_device.h index b6e8d78..d680490 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-cellular_device.h +++ b/knetworkmanager-0.9/src/knetworkmanager-cellular_device.h @@ -31,7 +31,7 @@ class CellularDevice : public Device { Q_OBJECT - TQ_OBJECT + public: CellularDevice (const TQString & obj_path ); ~CellularDevice (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-cellular_device_tray.h b/knetworkmanager-0.9/src/knetworkmanager-cellular_device_tray.h index 455b9f7..282cc3e 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-cellular_device_tray.h +++ b/knetworkmanager-0.9/src/knetworkmanager-cellular_device_tray.h @@ -38,7 +38,7 @@ class CellularDeviceTrayPrivate; class CellularDeviceTray : public DeviceTrayComponent { Q_OBJECT - TQ_OBJECT + public: CellularDeviceTray (CellularDevice*, KSystemTray * parent = 0, const char * name = 0); ~CellularDeviceTray (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection.h b/knetworkmanager-0.9/src/knetworkmanager-connection.h index 8d024e1..a370700 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection.h @@ -54,7 +54,7 @@ namespace ConnectionSettings class Connection : public TQObject, DBus::ConnectionNode { Q_OBJECT - TQ_OBJECT + public: Connection(); virtual ~Connection(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_dbus.h b/knetworkmanager-0.9/src/knetworkmanager-connection_dbus.h index 3d12d49..f7bdc00 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_dbus.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_dbus.h @@ -49,7 +49,7 @@ namespace ConnectionSettings class ConnectionDBus : public TQObject, public DBus::Connection { Q_OBJECT - TQ_OBJECT + public: ConnectionDBus(ConnectionSettings::Connection* parent); ~ConnectionDBus(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_editor.h b/knetworkmanager-0.9/src/knetworkmanager-connection_editor.h index fc5f4e5..a0a7567 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_editor.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_editor.h @@ -46,7 +46,7 @@ namespace ConnectionSettings class ConnectionEditorImpl : public ConnectionEditor { Q_OBJECT - TQ_OBJECT + public: ConnectionEditorImpl(TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~ConnectionEditorImpl(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_secrets_dbus.h b/knetworkmanager-0.9/src/knetworkmanager-connection_secrets_dbus.h index 36136f1..78a6303 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_secrets_dbus.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_secrets_dbus.h @@ -50,7 +50,7 @@ namespace ConnectionSettings class ConnectionSecretsDBus : public TQObject, public DBus::Secrets { Q_OBJECT - TQ_OBJECT + public: ConnectionSecretsDBus(ConnectionSettings::Connection* parent); virtual ~ConnectionSecretsDBus(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting.h index daf6acf..f189117 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting.h @@ -44,7 +44,7 @@ class Connection; class ConnectionSetting : public TQObject { Q_OBJECT - TQ_OBJECT + public: ConnectionSetting(Connection* conn, TQString type, const char* name = 0, bool enabled = true); ConnectionSetting(const ConnectionSetting&); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma_widget.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma_widget.h index 4685b78..6ee8a37 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma_widget.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_cdma_widget.h @@ -46,7 +46,7 @@ class Connection; class CDMAWidgetImpl : public WidgetInterface { Q_OBJECT - TQ_OBJECT + public: CDMAWidgetImpl(Connection* conn, TQWidget* parent = NULL, const char* name = NULL, WFlags fl = 0); void Activate(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm_widget.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm_widget.h index b4b5501..df77606 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm_widget.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_gsm_widget.h @@ -46,7 +46,7 @@ class Connection; class GSMWidgetImpl : public WidgetInterface { Q_OBJECT - TQ_OBJECT + public: GSMWidgetImpl(Connection* conn, TQWidget* parent = NULL, const char* name = NULL, WFlags fl = 0); void Activate(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info_widget.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info_widget.h index b09d61c..16a7ace 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info_widget.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_info_widget.h @@ -45,7 +45,7 @@ class Connection; class InfoWidgetImpl : public WidgetInterface { Q_OBJECT - TQ_OBJECT + public: InfoWidgetImpl(Connection* conn, TQWidget* parent = NULL, const char* name = NULL, WFlags fl = 0); void Activate(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4_widget.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4_widget.h index e65e4da..4fabdce 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4_widget.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ipv4_widget.h @@ -40,7 +40,7 @@ namespace ConnectionSettings class IPv4WidgetImpl : public WidgetInterface { Q_OBJECT - TQ_OBJECT + public: IPv4WidgetImpl(Connection* conn, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp_widget.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp_widget.h index 0d92587..acdc2a2 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp_widget.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_ppp_widget.h @@ -46,7 +46,7 @@ class Connection; class PPPWidgetImpl : public WidgetInterface { Q_OBJECT - TQ_OBJECT + public: PPPWidgetImpl(Connection* conn, TQWidget* parent = NULL, const char* name = NULL, WFlags fl = 0); void Activate(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial_widget.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial_widget.h index 81dbb16..5b3bf28 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial_widget.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_serial_widget.h @@ -46,7 +46,7 @@ class Connection; class SerialWidgetImpl : public WidgetInterface { Q_OBJECT - TQ_OBJECT + public: SerialWidgetImpl(Connection* conn, TQWidget* parent = NULL, const char* name = NULL, WFlags fl = 0); void Activate(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn_widget.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn_widget.h index ef0b7bd..f7c16cd 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn_widget.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_vpn_widget.h @@ -46,7 +46,7 @@ class Connection; class VPNWidgetImpl : public WidgetInterface { Q_OBJECT - TQ_OBJECT + public: VPNWidgetImpl(Connection* conn, bool new_conn, TQWidget* parent = NULL, const char* name = NULL, WFlags fl = 0); void Activate(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_widget_interface.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_widget_interface.h index 25f5e5f..13ea65e 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_widget_interface.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_widget_interface.h @@ -34,7 +34,7 @@ namespace ConnectionSettings class WidgetInterface : public TQWidget { Q_OBJECT - TQ_OBJECT + public: WidgetInterface(TQWidget* parent = NULL, const char* name = 0, WFlags fl = 0); virtual void Activate() = 0; diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h index 9e1dd20..7e90694 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_security_widget.h @@ -51,7 +51,7 @@ namespace ConnectionSettings class WirelessSecurityWEPImpl : public ConnectionSettingWirelessSecurityWEP { Q_OBJECT - TQ_OBJECT + public: enum WEPKEY_TYPE { @@ -84,7 +84,7 @@ namespace ConnectionSettings class WirelessSecurityWEPEncryptionImpl : public ConnectionSettingWirelessSecurityWEPEncryption { Q_OBJECT - TQ_OBJECT + public: WirelessSecurityWEPEncryptionImpl(WirelessSecurity* security_setting, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); private: @@ -94,7 +94,7 @@ namespace ConnectionSettings class WirelessSecurityWPAVersionImpl : public ConnectionSettingWirelessSecurityWPAVersion { Q_OBJECT - TQ_OBJECT + public: WirelessSecurityWPAVersionImpl(WirelessSecurity* security_setting, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); @@ -111,7 +111,7 @@ namespace ConnectionSettings class WirelessSecurityWPACipherImpl : public ConnectionSettingWirelessSecurityWPACipher { Q_OBJECT - TQ_OBJECT + private: enum WPA_CIPHERS { @@ -139,7 +139,7 @@ namespace ConnectionSettings class WirelessSecurityWPAPSKImpl : public ConnectionSettingWirelessSecurityWPAPSK { Q_OBJECT - TQ_OBJECT + public: WirelessSecurityWPAPSKImpl(WirelessSecurity* security_setting, Wireless* wireless_setting, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); TQCString String2Hex(TQByteArray bytes, int final_len) const; @@ -155,7 +155,7 @@ namespace ConnectionSettings class WirelessSecurityEAPImpl : public ConnectionSettingWirelessSecurityEAP { Q_OBJECT - TQ_OBJECT + public: WirelessSecurityEAPImpl(IEEE8021x* security_setting, WirelessSecurityPhase2Impl* phase2_widget, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); @@ -175,7 +175,7 @@ namespace ConnectionSettings class WirelessSecurityPhase2Impl : public ConnectionSettingWirelessSecurityPhase2 { Q_OBJECT - TQ_OBJECT + public: WirelessSecurityPhase2Impl(IEEE8021x* security_setting, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); public slots: @@ -192,7 +192,7 @@ namespace ConnectionSettings class WirelessSecurityWidgetImpl : public WidgetInterface { Q_OBJECT - TQ_OBJECT + private: enum SecurityMethods { diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_widget.h b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_widget.h index ffed2ea..0baba65 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_widget.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_setting_wireless_widget.h @@ -42,7 +42,7 @@ namespace ConnectionSettings class WirelessWidgetImpl : public WidgetInterface { Q_OBJECT - TQ_OBJECT + public: WirelessWidgetImpl(Connection* conn, bool new_conn, TQWidget* parent = 0, const char* name = 0, WFlags fl = 0); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_settings_dialog.h b/knetworkmanager-0.9/src/knetworkmanager-connection_settings_dialog.h index 0d54fdc..9cedc69 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_settings_dialog.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_settings_dialog.h @@ -46,7 +46,7 @@ namespace ConnectionSettings class ConnectionSettingsDialogImpl : public ConnectionSettingsDialog { Q_OBJECT - TQ_OBJECT + public: ConnectionSettingsDialogImpl(ConnectionSettings::Connection* conn, bool new_conn, ConnectionSettings::ConnectionSetting* setting = NULL, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~ConnectionSettingsDialogImpl(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-connection_store.h b/knetworkmanager-0.9/src/knetworkmanager-connection_store.h index c65deab..a399270 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-connection_store.h +++ b/knetworkmanager-0.9/src/knetworkmanager-connection_store.h @@ -39,7 +39,7 @@ using namespace ConnectionSettings; class ConnectionStore : public TQObject { Q_OBJECT - TQ_OBJECT + public: static ConnectionStore* getInstance(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-device.h b/knetworkmanager-0.9/src/knetworkmanager-device.h index 56fcdab..2a12ec8 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-device.h +++ b/knetworkmanager-0.9/src/knetworkmanager-device.h @@ -41,7 +41,7 @@ class DevicePrivate; class Device : public TQObject { Q_OBJECT - TQ_OBJECT + public: Device (const TQString & obj_path ); ~Device (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-device_tray.h b/knetworkmanager-0.9/src/knetworkmanager-device_tray.h index c172b7b..5b390ad 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-device_tray.h +++ b/knetworkmanager-0.9/src/knetworkmanager-device_tray.h @@ -54,7 +54,7 @@ class DeviceTrayPrivate; class DeviceTray : public KSystemTray { Q_OBJECT - TQ_OBJECT + public: DeviceTray (Device*); diff --git a/knetworkmanager-0.9/src/knetworkmanager-devicestore.h b/knetworkmanager-0.9/src/knetworkmanager-devicestore.h index 2c03c84..caf8428 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-devicestore.h +++ b/knetworkmanager-0.9/src/knetworkmanager-devicestore.h @@ -35,7 +35,7 @@ class Device; class DeviceStore : public TQObject { Q_OBJECT - TQ_OBJECT + public: static DeviceStore* getInstance(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-generic_connection.h b/knetworkmanager-0.9/src/knetworkmanager-generic_connection.h index 7eb7d62..6acbd32 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-generic_connection.h +++ b/knetworkmanager-0.9/src/knetworkmanager-generic_connection.h @@ -44,7 +44,7 @@ namespace ConnectionSettings class GenericConnection : public Connection { Q_OBJECT - TQ_OBJECT + public: GenericConnection(const TQString&); TQString getType(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-gsm_connection.h b/knetworkmanager-0.9/src/knetworkmanager-gsm_connection.h index 004840f..0e4dc0e 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-gsm_connection.h +++ b/knetworkmanager-0.9/src/knetworkmanager-gsm_connection.h @@ -36,7 +36,7 @@ namespace ConnectionSettings class GSMConnection : public PPPConnection { Q_OBJECT - TQ_OBJECT + public: GSMConnection(); ~GSMConnection(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-gsm_device.h b/knetworkmanager-0.9/src/knetworkmanager-gsm_device.h index 3d14288..6149890 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-gsm_device.h +++ b/knetworkmanager-0.9/src/knetworkmanager-gsm_device.h @@ -39,7 +39,7 @@ class GSMDevicePrivate; class GSMDevice : public CellularDevice { Q_OBJECT - TQ_OBJECT + public: GSMDevice (const TQString & obj_path ); ~GSMDevice (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-hal_device_proxy.h b/knetworkmanager-0.9/src/knetworkmanager-hal_device_proxy.h index f39e9f8..663301e 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-hal_device_proxy.h +++ b/knetworkmanager-0.9/src/knetworkmanager-hal_device_proxy.h @@ -49,7 +49,7 @@ class HalDeviceProxyPrivate; class HalDeviceProxy : public TQObject { Q_OBJECT - TQ_OBJECT + public: HalDeviceProxy (const TQString & udi); ~HalDeviceProxy (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-menuitem.h b/knetworkmanager-0.9/src/knetworkmanager-menuitem.h index 6f875d0..5f9f6eb 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-menuitem.h +++ b/knetworkmanager-0.9/src/knetworkmanager-menuitem.h @@ -39,7 +39,7 @@ namespace ConnectionSettings class NetworkMenuItem : public TQObject { Q_OBJECT - TQ_OBJECT + public: NetworkMenuItem (Device* dev, ConnectionSettings::Connection* conn, TQObject* parent = 0, const char* name = 0); ~NetworkMenuItem (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-nm_proxy.h b/knetworkmanager-0.9/src/knetworkmanager-nm_proxy.h index c8af913..05ade99 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-nm_proxy.h +++ b/knetworkmanager-0.9/src/knetworkmanager-nm_proxy.h @@ -37,7 +37,7 @@ class NMProxyPrivate; class NMProxy : public DBus::NetworkManagerProxy { Q_OBJECT - TQ_OBJECT + public: static NMProxy* getInstance(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-nm_vpn_proxy.h b/knetworkmanager-0.9/src/knetworkmanager-nm_vpn_proxy.h index a86dfbf..af5f8ec 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-nm_vpn_proxy.h +++ b/knetworkmanager-0.9/src/knetworkmanager-nm_vpn_proxy.h @@ -37,7 +37,7 @@ class NMVPNProxyPrivate; class NMVPNProxy : public DBus::NetworkManagerVPNProxy { Q_OBJECT - TQ_OBJECT + public: static NMVPNProxy* getInstance(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-nmsettings.h b/knetworkmanager-0.9/src/knetworkmanager-nmsettings.h index d1786dc..c9769c1 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-nmsettings.h +++ b/knetworkmanager-0.9/src/knetworkmanager-nmsettings.h @@ -37,7 +37,7 @@ class NMSettingsPrivate; class NMSettings : public TQObject, DBus::SettingsInterface { Q_OBJECT - TQ_OBJECT + public: /* get singleton */ static NMSettings* getInstance(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-plugin.h b/knetworkmanager-0.9/src/knetworkmanager-plugin.h index d220989..3a500ac 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-plugin.h +++ b/knetworkmanager-0.9/src/knetworkmanager-plugin.h @@ -30,7 +30,7 @@ class Plugin : public TQObject { Q_OBJECT - TQ_OBJECT + public: Plugin(TQObject*, const char*, const TQStringList&); ~Plugin(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.h b/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.h index 29fd703..efe6c63 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.h +++ b/knetworkmanager-0.9/src/knetworkmanager-pluginmanager.h @@ -39,7 +39,7 @@ typedef TQMap PluginMap; class PluginManager : public TQObject { Q_OBJECT - TQ_OBJECT + public: PluginManager(TQObject*, const char*); ~PluginManager(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-ppp_connection.h b/knetworkmanager-0.9/src/knetworkmanager-ppp_connection.h index 0f37ba7..e58e553 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-ppp_connection.h +++ b/knetworkmanager-0.9/src/knetworkmanager-ppp_connection.h @@ -38,7 +38,7 @@ namespace ConnectionSettings class PPPConnection : public GenericConnection { Q_OBJECT - TQ_OBJECT + public: PPPConnection(const TQString& infoName); ~PPPConnection(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-storage.h b/knetworkmanager-0.9/src/knetworkmanager-storage.h index 23b48c8..33682ea 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-storage.h +++ b/knetworkmanager-0.9/src/knetworkmanager-storage.h @@ -42,7 +42,7 @@ class StoragePrivate; class Storage : public TQObject { Q_OBJECT - TQ_OBJECT + public: // Singleton diff --git a/knetworkmanager-0.9/src/knetworkmanager-tray.h b/knetworkmanager-0.9/src/knetworkmanager-tray.h index d301386..cbce02b 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-tray.h +++ b/knetworkmanager-0.9/src/knetworkmanager-tray.h @@ -67,7 +67,7 @@ class TQLabel; class Tray : public KSystemTray { Q_OBJECT - TQ_OBJECT + public: Tray (); @@ -122,7 +122,7 @@ class Tray : public KSystemTray class NewSecretsDialog : public TQDialog { Q_OBJECT - TQ_OBJECT + public: NewSecretsDialog(ConnectionSettings::Connection* connection, TQWidget * parent, const char * name, bool modal = false, TQt::WFlags f = 0); diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpn_connection.h b/knetworkmanager-0.9/src/knetworkmanager-vpn_connection.h index af41b8f..6d504f5 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-vpn_connection.h +++ b/knetworkmanager-0.9/src/knetworkmanager-vpn_connection.h @@ -42,7 +42,7 @@ namespace ConnectionSettings class VPNConnection : public GenericConnection { Q_OBJECT - TQ_OBJECT + public: VPNConnection(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpn_device.h b/knetworkmanager-0.9/src/knetworkmanager-vpn_device.h index cf92d99..f3c3db7 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-vpn_device.h +++ b/knetworkmanager-0.9/src/knetworkmanager-vpn_device.h @@ -39,7 +39,7 @@ class VPNDevicePrivate; class VPNDevice : public Device { Q_OBJECT - TQ_OBJECT + public: VPNDevice (const TQString & obj_path ); ~VPNDevice (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpn_plugin.h b/knetworkmanager-0.9/src/knetworkmanager-vpn_plugin.h index 0b03d74..88c63e0 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-vpn_plugin.h +++ b/knetworkmanager-0.9/src/knetworkmanager-vpn_plugin.h @@ -39,7 +39,7 @@ class VPNDBUSPluginPrivate; class VPNDBUSPlugin : public TQObject { Q_OBJECT - TQ_OBJECT + public: VPNDBUSPlugin (); ~VPNDBUSPlugin (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.h b/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.h index 59caf55..8c43e7d 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.h +++ b/knetworkmanager-0.9/src/knetworkmanager-vpnauthenticationdialog.h @@ -47,7 +47,7 @@ namespace ConnectionSettings class VPNAuthenticationDialog : public AuthenticationDialog { Q_OBJECT - TQ_OBJECT + public: VPNAuthenticationDialog(ConnectionSettings::VPNConnection* conn = NULL, TQWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0); ~VPNAuthenticationDialog(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnmanager.h b/knetworkmanager-0.9/src/knetworkmanager-vpnmanager.h index 2dfdb1b..769d2c3 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-vpnmanager.h +++ b/knetworkmanager-0.9/src/knetworkmanager-vpnmanager.h @@ -43,7 +43,7 @@ typedef TQValueList VPNServiceList; class VPNManager : public TQObject { Q_OBJECT - TQ_OBJECT + public: static VPNService* getVPNService(TQString); diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnplugin.h b/knetworkmanager-0.9/src/knetworkmanager-vpnplugin.h index b8d91eb..3b8b625 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-vpnplugin.h +++ b/knetworkmanager-0.9/src/knetworkmanager-vpnplugin.h @@ -36,7 +36,7 @@ class VPNConfigWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: virtual ~VPNConfigWidget(); VPNConfigWidget(TQWidget* parent = NULL, const char* name = NULL); @@ -51,7 +51,7 @@ class VPNConfigWidget : public TQWidget class VPNAuthenticationWidget : public TQWidget { Q_OBJECT - TQ_OBJECT + public: virtual ~VPNAuthenticationWidget(); VPNAuthenticationWidget(TQWidget* parent = NULL, const char* name = NULL); @@ -65,7 +65,7 @@ class VPNAuthenticationWidget : public TQWidget class VPNPlugin : public Plugin { Q_OBJECT - TQ_OBJECT + public: VPNPlugin(TQObject*, const char*, const TQStringList&); virtual ~VPNPlugin(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-vpnservice.h b/knetworkmanager-0.9/src/knetworkmanager-vpnservice.h index 5c6eeb3..51a03f6 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-vpnservice.h +++ b/knetworkmanager-0.9/src/knetworkmanager-vpnservice.h @@ -42,7 +42,7 @@ class KConfigGroup; class VPNService : public TQObject { Q_OBJECT - TQ_OBJECT + public: VPNService(const TQString& serviceName, const TQString& service, TQObject* parent, const char* name = 0); diff --git a/knetworkmanager-0.9/src/knetworkmanager-wired_connection.h b/knetworkmanager-0.9/src/knetworkmanager-wired_connection.h index bf31212..e641bfa 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-wired_connection.h +++ b/knetworkmanager-0.9/src/knetworkmanager-wired_connection.h @@ -43,7 +43,7 @@ namespace ConnectionSettings class WiredConnection : public GenericConnection { Q_OBJECT - TQ_OBJECT + public: WiredConnection(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-wired_device.h b/knetworkmanager-0.9/src/knetworkmanager-wired_device.h index 98d3d3f..0a52a44 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-wired_device.h +++ b/knetworkmanager-0.9/src/knetworkmanager-wired_device.h @@ -39,7 +39,7 @@ class WiredDevicePrivate; class WiredDevice : public Device { Q_OBJECT - TQ_OBJECT + public: WiredDevice (const TQString & obj_path ); ~WiredDevice (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-wired_device_tray.h b/knetworkmanager-0.9/src/knetworkmanager-wired_device_tray.h index 113f684..7fcab3b 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-wired_device_tray.h +++ b/knetworkmanager-0.9/src/knetworkmanager-wired_device_tray.h @@ -39,7 +39,7 @@ class WiredDeviceTrayPrivate; class WiredDeviceTray : public DeviceTrayComponent { Q_OBJECT - TQ_OBJECT + public: WiredDeviceTray (WiredDevice*, KSystemTray * parent = 0, const char * name = 0); diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_connection.h b/knetworkmanager-0.9/src/knetworkmanager-wireless_connection.h index b57815f..b559ab1 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-wireless_connection.h +++ b/knetworkmanager-0.9/src/knetworkmanager-wireless_connection.h @@ -46,7 +46,7 @@ namespace ConnectionSettings class WirelessConnection : public GenericConnection { Q_OBJECT - TQ_OBJECT + public: WirelessConnection(); diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_device.h b/knetworkmanager-0.9/src/knetworkmanager-wireless_device.h index 4cfe9ce..dd94ef7 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-wireless_device.h +++ b/knetworkmanager-0.9/src/knetworkmanager-wireless_device.h @@ -40,7 +40,7 @@ class WirelessDevicePrivate; class WirelessDevice : public Device { Q_OBJECT - TQ_OBJECT + public: WirelessDevice (const TQString & obj_path ); ~WirelessDevice (); diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_device_tray.h b/knetworkmanager-0.9/src/knetworkmanager-wireless_device_tray.h index e0c93dd..46b25f1 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-wireless_device_tray.h +++ b/knetworkmanager-0.9/src/knetworkmanager-wireless_device_tray.h @@ -45,7 +45,7 @@ namespace ConnectionSettings class WirelessDeviceTray : public DeviceTrayComponent { Q_OBJECT - TQ_OBJECT + public: WirelessDeviceTray (WirelessDevice*, KSystemTray * parent = 0, const char * name = 0); diff --git a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h b/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h index 11edbde..98b6321 100644 --- a/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h +++ b/knetworkmanager-0.9/src/knetworkmanager-wireless_menuitem.h @@ -50,7 +50,7 @@ class WirelessNetworkItem : public NetworkMenuItem, public TQCustomMenuItem { Q_OBJECT - TQ_OBJECT + public: WirelessNetworkItem (TQWidget*, Device* dev, WirelessNetwork& net, ConnectionSettings::WirelessConnection* conn, bool adhoc); WirelessNetworkItem (TQWidget*, Device* dev, WirelessNetwork& net, bool adhoc); diff --git a/knetworkmanager-0.9/src/knetworkmanager.h b/knetworkmanager-0.9/src/knetworkmanager.h index 3a2bf50..cb48772 100644 --- a/knetworkmanager-0.9/src/knetworkmanager.h +++ b/knetworkmanager-0.9/src/knetworkmanager.h @@ -37,7 +37,7 @@ class Device; class KNetworkManager : public KUniqueApplication { Q_OBJECT - TQ_OBJECT + public: KNetworkManager (); diff --git a/knetworkmanager-0.9/src/secret_storage_plugin.h b/knetworkmanager-0.9/src/secret_storage_plugin.h index ab4e54c..c2713e8 100644 --- a/knetworkmanager-0.9/src/secret_storage_plugin.h +++ b/knetworkmanager-0.9/src/secret_storage_plugin.h @@ -36,7 +36,7 @@ class SecretStoragePlugin : public Plugin { Q_OBJECT - TQ_OBJECT + public: SecretStoragePlugin(TQObject*, const char*, const TQStringList&); virtual ~SecretStoragePlugin(); diff --git a/knetworkmanager-0.9/src/traycomponent.h b/knetworkmanager-0.9/src/traycomponent.h index d6607e8..4128f11 100644 --- a/knetworkmanager-0.9/src/traycomponent.h +++ b/knetworkmanager-0.9/src/traycomponent.h @@ -34,7 +34,7 @@ class KSystemTray; class TrayComponent : public TQObject { Q_OBJECT - TQ_OBJECT + public: TrayComponent(KSystemTray * parent, const char * name ); virtual ~TrayComponent(); diff --git a/knetworkmanager-0.9/src/vpn_tray_component.h b/knetworkmanager-0.9/src/vpn_tray_component.h index ad78081..2af5b55 100644 --- a/knetworkmanager-0.9/src/vpn_tray_component.h +++ b/knetworkmanager-0.9/src/vpn_tray_component.h @@ -33,7 +33,7 @@ class VPNTrayComponent : public TrayComponent { Q_OBJECT - TQ_OBJECT + public: VPNTrayComponent (KSystemTray * parent = 0, const char * name = 0); diff --git a/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h b/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h index c78f524..4b43b18 100644 --- a/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h +++ b/knetworkmanager-0.9/vpn-plugins/openvpn/src/knetworkmanager-openvpn.h @@ -38,7 +38,7 @@ class OpenVPNPlugin : public VPNPlugin { Q_OBJECT - TQ_OBJECT + public: OpenVPNPlugin(TQObject*, const char*, const TQStringList&); ~OpenVPNPlugin(); @@ -66,7 +66,7 @@ class OpenVPNConnectionType class OpenVPNConfig : public VPNConfigWidget { Q_OBJECT - TQ_OBJECT + public: void setVPNData(const TQStringList& routes, const TQMap& properties); TQMap getVPNProperties(); @@ -93,7 +93,7 @@ class OpenVPNConfig : public VPNConfigWidget class OpenVPNAuthentication : public VPNAuthenticationWidget { Q_OBJECT - TQ_OBJECT + public: OpenVPNAuthentication(TQWidget* parent = NULL, char* name = NULL); ~OpenVPNAuthentication(); diff --git a/knetworkmanager-0.9/vpn-plugins/pptp/src/knetworkmanager-pptp.h b/knetworkmanager-0.9/vpn-plugins/pptp/src/knetworkmanager-pptp.h index d703743..ca7b3b0 100644 --- a/knetworkmanager-0.9/vpn-plugins/pptp/src/knetworkmanager-pptp.h +++ b/knetworkmanager-0.9/vpn-plugins/pptp/src/knetworkmanager-pptp.h @@ -37,7 +37,7 @@ class PPTPPlugin : public VPNPlugin { Q_OBJECT - TQ_OBJECT + public: PPTPPlugin(TQObject*, const char*, const TQStringList&); ~PPTPPlugin(); @@ -49,7 +49,7 @@ class PPTPPlugin : public VPNPlugin class PPTPConfig : public VPNConfigWidget { Q_OBJECT - TQ_OBJECT + public: void setVPNData(const TQStringList& routes, const TQMap& properties); TQMap getVPNProperties(); @@ -70,7 +70,7 @@ class PPTPConfig : public VPNConfigWidget class PPTPAuthentication : public VPNAuthenticationWidget { Q_OBJECT - TQ_OBJECT + public: PPTPAuthentication(TQWidget* parent = NULL, char* name = NULL); ~PPTPAuthentication(); diff --git a/knetworkmanager-0.9/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h b/knetworkmanager-0.9/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h index 74f82a5..ce2f739 100644 --- a/knetworkmanager-0.9/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h +++ b/knetworkmanager-0.9/vpn-plugins/strongswan/src/knetworkmanager-strongswan.h @@ -37,7 +37,7 @@ class StrongswanPlugin : public VPNPlugin { Q_OBJECT - TQ_OBJECT + public: StrongswanPlugin(TQObject*, const char*, const TQStringList&); ~StrongswanPlugin(); @@ -64,7 +64,7 @@ class StrongswanConnectionType class StrongswanConfig : public VPNConfigWidget { Q_OBJECT - TQ_OBJECT + public: void setVPNData(const TQStringList& routes, const TQMap& properties); TQMap getVPNProperties(); @@ -85,7 +85,7 @@ class StrongswanConfig : public VPNConfigWidget class StrongswanAuthentication : public VPNAuthenticationWidget { Q_OBJECT - TQ_OBJECT + public: StrongswanAuthentication(TQWidget* parent = NULL, char* name = NULL); ~StrongswanAuthentication(); diff --git a/knetworkmanager-0.9/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h b/knetworkmanager-0.9/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h index 429bc55..35e2ee6 100644 --- a/knetworkmanager-0.9/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h +++ b/knetworkmanager-0.9/vpn-plugins/vpnc/src/knetworkmanager-vpnc.h @@ -38,7 +38,7 @@ class VPNCPlugin : public VPNPlugin { Q_OBJECT - TQ_OBJECT + public: VPNCPlugin(TQObject*, const char*, const TQStringList&); ~VPNCPlugin(); @@ -50,7 +50,7 @@ class VPNCPlugin : public VPNPlugin class VPNCConfig : public VPNConfigWidget { Q_OBJECT - TQ_OBJECT + public: void setVPNData(const TQStringList& routes, const TQMap& properties); TQMap getVPNProperties(); @@ -75,7 +75,7 @@ class VPNCConfig : public VPNConfigWidget class VPNCAuthentication : public VPNAuthenticationWidget { Q_OBJECT - TQ_OBJECT + public: VPNCAuthentication(TQWidget* parent = NULL, char* name = NULL); ~VPNCAuthentication();