summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp2
-rw-r--r--tdenetworkmanager/src/tdenetman-pluginmanager.cpp2
-rw-r--r--tdenetworkmanager/src/tdenetman-tray.cpp18
-rw-r--r--tdenetworkmanager/src/tdenetman-vpnmanager.cpp4
-rw-r--r--tdenetworkmanager/src/tdenetman-wired_device_tray.cpp2
-rw-r--r--tdenetworkmanager/src/vpn_tray_component.cpp2
6 files changed, 15 insertions, 15 deletions
diff --git a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
index 52cc3c4..50a8284 100644
--- a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
@@ -127,7 +127,7 @@ void CellularDeviceTray::addMenuItems(TDEPopupMenu* menu)
title += TQString(" (%1)").arg((conn->ipConfig.connectionFlags & TDENetworkIPConfigurationFlags::IPV4DHCPIP) ? i18n("DHCP") : i18n("Manual IP config"));
}
- NetworkMenuItem* item = new NetworkMenuItem(d->dev, conn->UUID, TQT_TQOBJECT(menu));
+ NetworkMenuItem* item = new NetworkMenuItem(d->dev, conn->UUID, menu);
int id = menu->insertItem(title, item, TQT_SLOT(slotActivate()));
menu->setItemChecked(id, ((*it) == active_conn));
diff --git a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
index d388440..5ee5fad 100644
--- a/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman-pluginmanager.cpp
@@ -36,7 +36,7 @@ PluginManager* PluginManager::getInstance()
if (_instance) {
return _instance;
}
- return new PluginManager(TQT_TQOBJECT(TDENetworkManager::getInstance()), "pluginmanager");
+ return new PluginManager(TDENetworkManager::getInstance(), "pluginmanager");
}
PluginManager::PluginManager(TQObject* parent, const char* name)
diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
index b922b7f..4512b8a 100644
--- a/tdenetworkmanager/src/tdenetman-tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
@@ -287,7 +287,7 @@ void Tray::contextMenuAboutToShow (TDEPopupMenu* menu)
TDEAction * deviceNewConnAction = 0;
TQString menuCaption = "VPN Connection";
TQString actionName = TQString("new_connection_%1").arg("vpn");
- deviceNewConnAction = new TDEAction (menuCaption, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVPNConnection()), actionCollection(), actionName.utf8());
+ deviceNewConnAction = new TDEAction (menuCaption, 0, this, TQT_SLOT(slotNewVPNConnection()), actionCollection(), actionName.utf8());
newConnActionMenu->insert(deviceNewConnAction);
}
else if ( devices == 1 )
@@ -1073,7 +1073,7 @@ Tray::Tray() : KSystemTray()
updateGraphicsCache();
- d = new TrayPrivate(TQT_TQOBJECT(this));
+ d = new TrayPrivate(this);
d->helpMenu = new KHelpMenu(0, TDEGlobal::instance()->aboutData(), false);
connect(&d->signalMapper, TQT_SIGNAL(mapped(int)), this, TQT_SLOT(slotDeactivateConnection(int)));
@@ -1084,32 +1084,32 @@ Tray::Tray() : KSystemTray()
// Actions used for plugging into the menu
new TDEAction (i18n ("Switch to offline mode"),
SmallIcon ("no", TQIconSet::Automatic), 0,
- TQT_TQOBJECT(this), TQT_SLOT (slotOfflineMode()), actionCollection (), "offline_mode");
+ this, TQT_SLOT (slotOfflineMode()), actionCollection (), "offline_mode");
new TDEAction (i18n ("Switch to online mode"),
SmallIcon ("ok", TQIconSet::Automatic), 0,
- TQT_TQOBJECT(this), TQT_SLOT (slotOnlineMode()), actionCollection (), "online_mode");
+ this, TQT_SLOT (slotOnlineMode()), actionCollection (), "online_mode");
new TDEAction (i18n ("Disable Wireless"),
SmallIcon ("wireless_off", TQIconSet::Automatic), 0,
- TQT_TQOBJECT(this), TQT_SLOT (slotDisableWireless()), actionCollection (), "disable_wireless");
+ this, TQT_SLOT (slotDisableWireless()), actionCollection (), "disable_wireless");
new TDEAction (i18n ("Enable Wireless"),
SmallIcon ("wireless", TQIconSet::Automatic), 0,
- TQT_TQOBJECT(this), TQT_SLOT (slotEnableWireless()), actionCollection (), "enable_wireless");
+ this, TQT_SLOT (slotEnableWireless()), actionCollection (), "enable_wireless");
new TDEAction (i18n ("Edit Connections"),
SmallIcon ("edit", TQIconSet::Automatic), 0,
- TQT_TQOBJECT(this), TQT_SLOT (slotEditConnections()), actionCollection (), "edit_connections");
+ this, TQT_SLOT (slotEditConnections()), actionCollection (), "edit_connections");
new TDEAction (i18n ("Configure Notifications"),
SmallIcon ("knotify", TQIconSet::Automatic), 0,
- TQT_TQOBJECT(this), TQT_SLOT (slotEditNotifications()), actionCollection (), "configure_notifications");
+ this, TQT_SLOT (slotEditNotifications()), actionCollection (), "configure_notifications");
// this action is only connected when the menu is shown, hence the 0 receiver
new TDEAction (i18n ("New connection ..."),
SmallIcon ("document-new", TQIconSet::Automatic), 0,
- TQT_TQOBJECT(this), 0, actionCollection (), "new_connection");
+ this, 0, actionCollection (), "new_connection");
new TDEActionMenu (i18n ("New connection ..."),
SmallIcon ("document-new", TQIconSet::Automatic),
diff --git a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
index 756451e..3684d22 100644
--- a/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
+++ b/tdenetworkmanager/src/tdenetman-vpnmanager.cpp
@@ -77,7 +77,7 @@ VPNManager::getVPNServices ()
kdDebug() << "VPN Service " << serviceString.ascii() << endl;
// create new VPNService Object
- VPNService* vpnservice = new VPNService(serviceString, serviceString, TQT_TQOBJECT(TDENetworkManager::getInstance()));
+ VPNService* vpnservice = new VPNService(serviceString, serviceString, TDENetworkManager::getInstance());
if (!vpnservice->getVPNPlugin())
{
delete vpnservice;
@@ -132,7 +132,7 @@ VPNManager::getVPNService(TQString service_type)
if (serviceString == service_type)
{
// create new VPNService Object
- VPNService* vpnservice = new VPNService(service_type, service_type, TQT_TQOBJECT(TDENetworkManager::getInstance()));
+ VPNService* vpnservice = new VPNService(service_type, service_type, TDENetworkManager::getInstance());
if (!vpnservice->getVPNPlugin())
{
delete vpnservice;
diff --git a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
index 3744b9a..506317d 100644
--- a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
@@ -124,7 +124,7 @@ void WiredDeviceTray::addMenuItems(TDEPopupMenu* menu)
title += TQString(" (%1)").arg((conn->ipConfig.connectionFlags & TDENetworkIPConfigurationFlags::IPV4DHCPIP) ? i18n("DHCP") : i18n("Manual IP config"));
}
- NetworkMenuItem* item = new NetworkMenuItem(d->dev, conn->UUID, TQT_TQOBJECT(menu));
+ NetworkMenuItem* item = new NetworkMenuItem(d->dev, conn->UUID, menu);
connectionItems += 1;
int id = menu->insertItem(title, item, TQT_SLOT(slotActivate()));
diff --git a/tdenetworkmanager/src/vpn_tray_component.cpp b/tdenetworkmanager/src/vpn_tray_component.cpp
index bfaf26d..9830d3c 100644
--- a/tdenetworkmanager/src/vpn_tray_component.cpp
+++ b/tdenetworkmanager/src/vpn_tray_component.cpp
@@ -89,7 +89,7 @@ void VPNTrayComponent::addMenuItems(TDEPopupMenu* menu)
TQString title = conn->friendlyName;
- NetworkMenuItem* item = new NetworkMenuItem(NULL, conn->UUID, TQT_TQOBJECT(menu));
+ NetworkMenuItem* item = new NetworkMenuItem(NULL, conn->UUID, menu);
vpn_found = 0;
TDENetworkConnectionStatus::TDENetworkConnectionStatus connStatus = nm->checkConnectionStatus(conn->UUID);
generated by cgit v1.2.1 (git 2.18.0) at 2024-12-25 19:15:41 +0000