Rename a number of classes to enhance compatibility with KDE4

17 files changed, 53 insertions, 53 deletions

diff --git a/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui b/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui
index 9415ce4..277f6ae 100644
--- a/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui
+++ b/tdenetworkmanager/src/configwidgets/connection_setting_wireless.ui
@@ -57,7 +57,7 @@
                 </size>
             </property>
         </spacer>
-        <widget class="KListView" row="1" column="0" rowspan="1" colspan="4">
+        <widget class="TDEListView" row="1" column="0" rowspan="1" colspan="4">
             <column>
                 <property name="text">
                     <string>Essid</string>
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
index e44ad09..492e367 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.cpp
@@ -44,12 +44,12 @@
 
 using namespace ConnectionSettings;
 
-class NetworkListViewItem : public KListViewItem
+class NetworkListViewItem : public TDEListViewItem
 {
 	public:
 
 	NetworkListViewItem(TQListView* parent, WirelessNetwork& net)
-		: KListViewItem(parent, TQString::fromUtf8(net.getDisplaySsid()), TQString("%1\%").arg(net.getStrength()))
+		: TDEListViewItem(parent, TQString::fromUtf8(net.getDisplaySsid()), TQString("%1\%").arg(net.getStrength()))
 		, _net(net)
 	{
 		TQ_UINT8 strength = net.getStrength();
@@ -97,7 +97,7 @@ void
 WirelessWidgetImpl::Init()
 {
 	TQVBoxLayout* layout = new TQVBoxLayout(_mainWid->framePlaceholder, 1, 1);
-	_searchLine = new KListViewSearchLineWidget(_mainWid->lvEssids, _mainWid->framePlaceholder);
+	_searchLine = new TDEListViewSearchLineWidget(_mainWid->lvEssids, _mainWid->framePlaceholder);
 	layout->addWidget(_searchLine);
 
 	connect(_mainWid->txtEssid, TQT_SIGNAL(textChanged(const TQString&)), this, TQT_SLOT(slotEssidChanged(const TQString&)));
@@ -123,7 +123,7 @@ WirelessWidgetImpl::Activate()
 
 	for (TQValueList<WirelessNetwork>::Iterator it = nets.begin(); it != nets.end(); ++it)
 	{
-		KListViewItem* item = new NetworkListViewItem(_mainWid->lvEssids, (*it));
+		TDEListViewItem* item = new NetworkListViewItem(_mainWid->lvEssids, (*it));
 
 		_mainWid->lvEssids->insertItem(item);
 	}
diff --git a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h
index b0b8ff0..6063402 100644
--- a/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h
+++ b/tdenetworkmanager/src/configwidgets/tdenetman-connection_setting_wireless_widget.h
@@ -34,7 +34,7 @@
 #include "tdenetman-connection_settings_dialog.h"
 #include "connection_setting_wireless.h"
 
-class KListViewSearchLineWidget;
+class TDEListViewSearchLineWidget;
 
 namespace ConnectionSettings
 {
@@ -68,7 +68,7 @@ namespace ConnectionSettings
 			TDEWiFiConnection*     _info_setting;
 			TDEWiFiConnection* _security_setting;
 			ConnectionSettingWirelessWidget* _mainWid;
-			KListViewSearchLineWidget* _searchLine;
+			TDEListViewSearchLineWidget* _searchLine;
 			bool _new_conn;
 			TQByteArray _preselect_ssid;
 
diff --git a/tdenetworkmanager/src/connection_editor.ui b/tdenetworkmanager/src/connection_editor.ui
index 27a69ba..291829a 100644
--- a/tdenetworkmanager/src/connection_editor.ui
+++ b/tdenetworkmanager/src/connection_editor.ui
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListView" row="1" column="0" rowspan="5" colspan="1">
+        <widget class="TDEListView" row="1" column="0" rowspan="5" colspan="1">
             <column>
                 <property name="text">
                     <string>Connection</string>
diff --git a/tdenetworkmanager/src/devicetraycomponent.h b/tdenetworkmanager/src/devicetraycomponent.h
index 701ea25..af0ccea 100644
--- a/tdenetworkmanager/src/devicetraycomponent.h
+++ b/tdenetworkmanager/src/devicetraycomponent.h
@@ -34,7 +34,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include "traycomponent.h"
 
 class TDENetworkDevice;
-class KPopupMenu;
+class TDEPopupMenu;
 class KSystemTray;
 
 class DeviceTrayComponent : public TrayComponent
diff --git a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
index 5861250..29cf61f 100644
--- a/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.cpp
@@ -72,7 +72,7 @@ void CellularDeviceTray::newConnection()
 }
 
 
-void CellularDeviceTray::addMenuItems(KPopupMenu* menu)
+void CellularDeviceTray::addMenuItems(TDEPopupMenu* menu)
 {
 	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
 
@@ -111,7 +111,7 @@ void CellularDeviceTray::addMenuItems(KPopupMenu* menu)
 	}
 
 	// bring the device down
-	KAction* deactivate = tray()->actionCollection()->action("deactivate_device");
+	TDEAction* deactivate = tray()->actionCollection()->action("deactivate_device");
 	if (deactivate) {
 		deactivate->plug(menu);
 	}
diff --git a/tdenetworkmanager/src/tdenetman-cellular_device_tray.h b/tdenetworkmanager/src/tdenetman-cellular_device_tray.h
index e5aa4cf..c718940 100644
--- a/tdenetworkmanager/src/tdenetman-cellular_device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-cellular_device_tray.h
@@ -43,7 +43,7 @@ class CellularDeviceTray : public DeviceTrayComponent
 		CellularDeviceTray (TQString, KSystemTray * parent = 0, const char * name = 0);
 		~CellularDeviceTray ();
 
-		void addMenuItems(KPopupMenu* menu);
+		void addMenuItems(TDEPopupMenu* menu);
 
 	public slots:
 		void newConnection();
diff --git a/tdenetworkmanager/src/tdenetman-connection_editor.cpp b/tdenetworkmanager/src/tdenetman-connection_editor.cpp
index d8964f8..36e795d 100644
--- a/tdenetworkmanager/src/tdenetman-connection_editor.cpp
+++ b/tdenetworkmanager/src/tdenetman-connection_editor.cpp
@@ -53,12 +53,12 @@ using namespace ConnectionSettings;
 /*
  * ConnectionListViewItem
  */
-class ConnectionListViewItem : public KListViewItem
+class ConnectionListViewItem : public TDEListViewItem
 {
 	public:
 
 	ConnectionListViewItem(TQListView* parent, TQString connection)
-		: KListViewItem(parent)
+		: TDEListViewItem(parent)
 		, _conn(connection)
 	{
 		TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
diff --git a/tdenetworkmanager/src/tdenetman-tray.cpp b/tdenetworkmanager/src/tdenetman-tray.cpp
index d87fb19..61ad120 100644
--- a/tdenetworkmanager/src/tdenetman-tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-tray.cpp
@@ -215,7 +215,7 @@ void Tray::slotVPNBannerShow(const TQString& vpnbanner)
 	KNotifyClient::event(winId(), "knm-nm-vpn-banner", vpnbanner);
 }
 
-void Tray::contextMenuAboutToShow (KPopupMenu* menu)
+void Tray::contextMenuAboutToShow (TDEPopupMenu* menu)
 {
 	TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
 
@@ -235,16 +235,16 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 		menu->insertItem (subhead, -1, -1);
 
 		// New connection
-		KAction * newConnAction = 0;
+		TDEAction * newConnAction = 0;
 		int devices =  d->trayComponents.count();
 		if ( devices > 1 ) {
 			newConnAction = actionCollection ()->action ("new_connection_menu");
-			KActionMenu* newConnActionMenu = static_cast<KActionMenu*>(newConnAction);
+			TDEActionMenu* newConnActionMenu = static_cast<TDEActionMenu*>(newConnAction);
 			newConnActionMenu->popupMenu()->clear();
 			TQValueList<TrayComponent*>::Iterator it;
 			for (it = d->trayComponents.begin(); it != d->trayComponents.end(); ++it) {
 				DeviceTrayComponent* dev_comp = dynamic_cast<DeviceTrayComponent*> (*it);
-				KAction * deviceNewConnAction = 0;
+				TDEAction * deviceNewConnAction = 0;
 				if (dev_comp) {
 					TDENetworkDevice* dev_comp_dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(dev_comp->device()));
 					TQString actionName = TQString("new_connection_%1").arg(dev_comp_dev->deviceNode());
@@ -264,17 +264,17 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 					menuCaption = menuCaption.append(")");
 					deviceNewConnAction = actionCollection ()->action (actionName);
 					if (!deviceNewConnAction) {
-						deviceNewConnAction = new KAction (menuCaption, 0, (*it), TQT_SLOT(newConnection()), actionCollection(), actionName);
+						deviceNewConnAction = new TDEAction (menuCaption, 0, (*it), TQT_SLOT(newConnection()), actionCollection(), actionName);
 					}
 					newConnActionMenu->insert(deviceNewConnAction);
 				}
 			}
 			// New VPN connection option
 			++it;
-			KAction * deviceNewConnAction = 0;
+			TDEAction * deviceNewConnAction = 0;
 			TQString menuCaption = "VPN Connection";
 			TQString actionName = TQString("new_connection_%1").arg("vpn");
-			deviceNewConnAction = new KAction (menuCaption, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVPNConnection()), actionCollection(), actionName);
+			deviceNewConnAction = new TDEAction (menuCaption, 0, TQT_TQOBJECT(this), TQT_SLOT(slotNewVPNConnection()), actionCollection(), actionName);
 			newConnActionMenu->insert(deviceNewConnAction);
  		}
  		else if ( devices == 1 ) {
@@ -288,7 +288,7 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 	
 		// turn things off
 		if (nm) {
-			KActionMenu* disableStuffActionMenu = static_cast<KActionMenu*>(actionCollection ()->action ("deactivate_menu") );
+			TDEActionMenu* disableStuffActionMenu = static_cast<TDEActionMenu*>(actionCollection ()->action ("deactivate_menu") );
 			disableStuffActionMenu->popupMenu()->clear();
 			TDENetworkConnectionList* map = nm->connections();
 			d->act_conn_map.clear();
@@ -308,11 +308,11 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 				}
 
 				TQString actionName = TQString("disable_connection_%1").arg(conn->UUID);
-				KAction * deviceNewConnAction = actionCollection ()->action (actionName);
+				TDEAction * deviceNewConnAction = actionCollection ()->action (actionName);
 				TQString actionText = conn->friendlyName;
 
 				if (!deviceNewConnAction) {
-					deviceNewConnAction = new KAction (actionText, 0, &d->signalMapper, TQT_SLOT(map()), actionCollection(), actionName);
+					deviceNewConnAction = new TDEAction (actionText, 0, &d->signalMapper, TQT_SLOT(map()), actionCollection(), actionName);
 				}
 				d->signalMapper.setMapping(deviceNewConnAction, d->current_idx);
 				d->act_conn_map.insert(d->current_idx, conn->UUID);
@@ -322,7 +322,7 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 
 			// disable wireless
 			if (nm->wiFiHardwareEnabled()) {
-				KAction* wireless = NULL;
+				TDEAction* wireless = NULL;
 				if (nm->wiFiEnabled()) {
 					wireless = actionCollection ()->action ("disable_wireless");
 				} else {
@@ -332,7 +332,7 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 			}
 
 			// offline vs. online mode
-			KAction* switch_mode = NULL;
+			TDEAction* switch_mode = NULL;
 			if (nm->backendStatus() & TDENetworkGlobalManagerFlags::Sleeping) {
 				switch_mode = actionCollection ()->action ("online_mode");
 			}
@@ -350,16 +350,16 @@ void Tray::contextMenuAboutToShow (KPopupMenu* menu)
 	}
 
 	// Notifications
-	KAction* notif = actionCollection()->action("configure_notifications");
+	TDEAction* notif = actionCollection()->action("configure_notifications");
 	notif->plug(menu);
 
 	// Connection Editor
-	KAction* edit = actionCollection ()->action ("edit_connections");
+	TDEAction* edit = actionCollection ()->action ("edit_connections");
 	edit->plug(menu);
 
 	// quit
 	menu->insertSeparator ();
-	KAction* quitAction = actionCollection ()->action (KStdAction::name (KStdAction::Quit));
+	TDEAction* quitAction = actionCollection ()->action (KStdAction::name (KStdAction::Quit));
 	if (quitAction) {
 		quitAction->plug (menu);
 	}
@@ -446,7 +446,7 @@ void Tray::slotRemoveDeviceTrayComponent(TQString dev)
 			// remove the appropriate action
 			TDENetworkDevice* dev_comp_dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(dev_comp->device()));
 			TQString actionName = TQString("new_connection_%1").arg(dev_comp_dev->deviceNode());
-			KAction * deviceNewConnAction = actionCollection ()->action (actionName);
+			TDEAction * deviceNewConnAction = actionCollection ()->action (actionName);
 			
 			if (!deviceNewConnAction)
 			{
@@ -1040,40 +1040,40 @@ Tray::Tray() : KSystemTray()
 	setMouseTracking (true);
 
 	// Actions used for plugging into the menu
-	new KAction (i18n ("Switch to offline mode"),
+	new TDEAction (i18n ("Switch to offline mode"),
 					SmallIcon ("no",  TQIconSet::Automatic), 0,
 					TQT_TQOBJECT(this), TQT_SLOT (slotOfflineMode()), actionCollection (), "offline_mode");
 
-	new KAction (i18n ("Switch to online mode"),
+	new TDEAction (i18n ("Switch to online mode"),
 					SmallIcon ("ok",  TQIconSet::Automatic), 0,
 					TQT_TQOBJECT(this), TQT_SLOT (slotOnlineMode()), actionCollection (), "online_mode");
 
-	new KAction (i18n ("Disable Wireless"),
+	new TDEAction (i18n ("Disable Wireless"),
 					SmallIcon ("wireless_off",  TQIconSet::Automatic), 0,
 					TQT_TQOBJECT(this), TQT_SLOT (slotDisableWireless()), actionCollection (), "disable_wireless");
 
-	new KAction (i18n ("Enable Wireless"),
+	new TDEAction (i18n ("Enable Wireless"),
 					SmallIcon ("wireless",  TQIconSet::Automatic), 0,
 					TQT_TQOBJECT(this), TQT_SLOT (slotEnableWireless()), actionCollection (), "enable_wireless");
 
-	new KAction (i18n ("Edit Connections"),
+	new TDEAction (i18n ("Edit Connections"),
 					SmallIcon ("edit",  TQIconSet::Automatic), 0,
 					TQT_TQOBJECT(this), TQT_SLOT (slotEditConnections()), actionCollection (), "edit_connections");
 
-	new KAction (i18n ("Configure Notifications"),
+	new TDEAction (i18n ("Configure Notifications"),
 					SmallIcon ("knotify",  TQIconSet::Automatic), 0,
 					TQT_TQOBJECT(this), TQT_SLOT (slotEditNotifications()), actionCollection (), "configure_notifications");
 
 	// this action is only connected when the menu is shown, hence the 0 receiver
-	new KAction (i18n ("New connection ..."),
+	new TDEAction (i18n ("New connection ..."),
 					SmallIcon ("filenew",  TQIconSet::Automatic), 0,
 					TQT_TQOBJECT(this), 0, actionCollection (), "new_connection");
 
-	new KActionMenu (i18n ("New connection ..."),
+	new TDEActionMenu (i18n ("New connection ..."),
 					SmallIcon ("filenew",  TQIconSet::Automatic),
 					actionCollection(), "new_connection_menu");
 
-	new KActionMenu (i18n ("Deactivate connection..."),
+	new TDEActionMenu (i18n ("Deactivate connection..."),
 					SmallIcon ("no",  TQIconSet::Automatic),
 					actionCollection (), "deactivate_menu");
 
diff --git a/tdenetworkmanager/src/tdenetman-tray.h b/tdenetworkmanager/src/tdenetman-tray.h
index 438b36f..f75564a 100644
--- a/tdenetworkmanager/src/tdenetman-tray.h
+++ b/tdenetworkmanager/src/tdenetman-tray.h
@@ -76,7 +76,7 @@ class Tray : public KSystemTray
 	  Tray ();
 	  ~Tray ();
 		static Tray* getInstance();
-		void contextMenuAboutToShow (KPopupMenu* menu);
+		void contextMenuAboutToShow (TDEPopupMenu* menu);
 	
 	signals:
 
diff --git a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
index 7e92825..095f19e 100644
--- a/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.cpp
@@ -72,7 +72,7 @@ void WiredDeviceTray::newConnection()
 }
 
 
-void WiredDeviceTray::addMenuItems(KPopupMenu* menu)
+void WiredDeviceTray::addMenuItems(TDEPopupMenu* menu)
 {
 	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
 
@@ -127,7 +127,7 @@ void WiredDeviceTray::addMenuItems(KPopupMenu* menu)
 		}
 
 		// bring the device down
-		KAction* deactivate = tray()->actionCollection()->action("deactivate_device");
+		TDEAction* deactivate = tray()->actionCollection()->action("deactivate_device");
 		if (deactivate) {
 			deactivate->plug(menu);
 		}
diff --git a/tdenetworkmanager/src/tdenetman-wired_device_tray.h b/tdenetworkmanager/src/tdenetman-wired_device_tray.h
index 53d8ad1..2c1b0ba 100644
--- a/tdenetworkmanager/src/tdenetman-wired_device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-wired_device_tray.h
@@ -45,7 +45,7 @@ class WiredDeviceTray : public DeviceTrayComponent
 	  WiredDeviceTray (TQString, KSystemTray * parent = 0, const char * name = 0);
 	  ~WiredDeviceTray ();
 
-		void addMenuItems(KPopupMenu* menu);
+		void addMenuItems(TDEPopupMenu* menu);
 
 	public slots:
 		void newConnection();
diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
index f68b701..c60ffd2 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.cpp
@@ -138,7 +138,7 @@ TDEWiFiConnection* WirelessDeviceTray::findMatchingConnection(const WirelessNetw
 	return NULL;
 }
 
-void WirelessDeviceTray::addWirelessNetworks(KPopupMenu* menu)
+void WirelessDeviceTray::addWirelessNetworks(TDEPopupMenu* menu)
 {
 	TDEGlobalNetworkManager* nm = TDEGlobal::networkManager();
 	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
@@ -253,7 +253,7 @@ void WirelessDeviceTray::addWirelessNetworks(KPopupMenu* menu)
 	//menu->insertSeparator();
 }
 
-void WirelessDeviceTray::addMenuItems(KPopupMenu* menu)
+void WirelessDeviceTray::addMenuItems(TDEPopupMenu* menu)
 {
 	TDENetworkDevice* dev = dynamic_cast<TDENetworkDevice*>(hwdevices->findByUniqueID(d->dev));
 
@@ -285,7 +285,7 @@ void WirelessDeviceTray::addMenuItems(KPopupMenu* menu)
 		addWirelessNetworks(menu);
 
 		// bring the device down
-		KAction* deactivate = tray()->actionCollection()->action("deactivate_device");
+		TDEAction* deactivate = tray()->actionCollection()->action("deactivate_device");
 		if (deactivate) {
 			deactivate->plug(menu);
 		}
diff --git a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
index 0fa1c17..a34da1c 100644
--- a/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
+++ b/tdenetworkmanager/src/tdenetman-wireless_device_tray.h
@@ -46,7 +46,7 @@ class WirelessDeviceTray : public DeviceTrayComponent
 		WirelessDeviceTray (TQString, KSystemTray * parent = 0, const char * name = 0);
 		~WirelessDeviceTray ();
 
-		void addMenuItems(KPopupMenu* menu);
+		void addMenuItems(TDEPopupMenu* menu);
 
 	protected:
 		/**
@@ -71,7 +71,7 @@ class WirelessDeviceTray : public DeviceTrayComponent
 		void sendUpdateUI();
 
 	private:
-		void addWirelessNetworks(KPopupMenu* menu);
+		void addWirelessNetworks(TDEPopupMenu* menu);
 		TQValueList<WirelessNetwork> getWirelessNetworks();
 		TQValueList<TDEWiFiConnection*> getWirelessConnections();
 		TDEWiFiConnection* findMatchingConnection(const WirelessNetwork& net, const TQValueList<TDEWiFiConnection*>& connection);
diff --git a/tdenetworkmanager/src/traycomponent.h b/tdenetworkmanager/src/traycomponent.h
index df8483b..aa64762 100644
--- a/tdenetworkmanager/src/traycomponent.h
+++ b/tdenetworkmanager/src/traycomponent.h
@@ -26,7 +26,7 @@ along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #include <tqobject.h>
 #include <tqpixmap.h>
 
-class KPopupMenu;
+class TDEPopupMenu;
 class KSystemTray;
 
 class TrayComponent : public TQObject
@@ -36,7 +36,7 @@ Q_OBJECT
 public:
     TrayComponent(KSystemTray * parent, const char * name );
     virtual ~TrayComponent();
-    virtual void addMenuItems(KPopupMenu* menu) = 0;
+    virtual void addMenuItems(TDEPopupMenu* menu) = 0;
     KSystemTray * tray() const;;
     virtual TQStringList getToolTipText();
 signals:
diff --git a/tdenetworkmanager/src/vpn_tray_component.cpp b/tdenetworkmanager/src/vpn_tray_component.cpp
index ce852c5..7edaba6 100644
--- a/tdenetworkmanager/src/vpn_tray_component.cpp
+++ b/tdenetworkmanager/src/vpn_tray_component.cpp
@@ -55,7 +55,7 @@ void VPNTrayComponent::slotShowNewConnectionDialog()
 }
 
 
-void VPNTrayComponent::addMenuItems(KPopupMenu* menu)
+void VPNTrayComponent::addMenuItems(TDEPopupMenu* menu)
 {
 	int inactive_vpn_connections = 0;
 	char vpn_found = 0;
@@ -180,7 +180,7 @@ VPNTrayComponent::VPNTrayComponent (KSystemTray * parent, const char * name )
 	connect(nm, SIGNAL(vpnEvent(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)), this, SLOT(vpnEventHandler(TDENetworkVPNEventType::TDENetworkVPNEventType, TQString)));
 
 	//Actions used for plugging into the menu
-	new KAction (i18n ("New connection ..."),
+	new TDEAction (i18n ("New connection ..."),
 					     SmallIcon ("encrypted",  TQIconSet::Automatic), 0,
 					     this, TQT_SLOT (slotShowNewConnectionDialog()), parent->actionCollection (), "create_new_vpn_connection");
 }
diff --git a/tdenetworkmanager/src/vpn_tray_component.h b/tdenetworkmanager/src/vpn_tray_component.h
index 56b6e93..40ee25c 100644
--- a/tdenetworkmanager/src/vpn_tray_component.h
+++ b/tdenetworkmanager/src/vpn_tray_component.h
@@ -43,7 +43,7 @@ class VPNTrayComponent : public TrayComponent
 		VPNTrayComponent (KSystemTray * parent = 0, const char * name = 0);
 		~VPNTrayComponent ();
 
-		void addMenuItems(KPopupMenu* menu);
+		void addMenuItems(TDEPopupMenu* menu);
 
 	public slots:
 		void slotShowNewConnectionDialog();