diff --git a/src/netlistviewitem.cpp b/src/netlistviewitem.cpp
index 2635e06..96d03a8 100644
--- a/src/netlistviewitem.cpp
+++ b/src/netlistviewitem.cpp
@@ -44,10 +44,10 @@ void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
                         bgColor = cg.color( TQColorGroup::Background);
                 else {
 #if KDE_IS_VERSION(3,4,0)
-                        bgColor = ((KListViewItem*)this)->backgroundColor(column);
+                        bgColor = ((TDEListViewItem*)this)->backgroundColor(column);
 #else
 
-                        bgColor = ((KListViewItem*)this)->backgroundColor();
+                        bgColor = ((TDEListViewItem*)this)->backgroundColor();
 #endif
 
                 }
@@ -165,7 +165,7 @@ void NetListViewItem::paintCell(TQPainter *p, const TQColorGroup &cg, int column
                 }
 
         default:
-                KListViewItem::paintCell(p, cg, column, width, alignment);
+                TDEListViewItem::paintCell(p, cg, column, width, alignment);
 
         } //switch
 }
diff --git a/src/netlistviewitem.h b/src/netlistviewitem.h
index b3ca41c..7bd0c87 100644
--- a/src/netlistviewitem.h
+++ b/src/netlistviewitem.h
@@ -28,14 +28,14 @@
 #include <klistview.h>
 #include <kmessagebox.h>
 
-class NetListViewItem : public KListViewItem
+class NetListViewItem : public TDEListViewItem
 {
 public:
-        //NetListViewItem(KListView *parent) : KListViewItem(parent) {}
-        //NetListViewItem(KListView *parent, KListViewItem *after) : KListViewItem(parent, after) {}
-        //NetListViewItem(KListView *parent, KListViewItem *after, TQString essid, TQString mode) : KListViewItem(parent, after, essid, mode) {}
-        NetListViewItem(KListView *parent, TQString essid, TQString chan, int quality, bool enc, TQString ap, bool hidden, bool connected = 0 )
-                        : KListViewItem(parent, TQString(), TQString(), TQString(), TQString(), TQString())
+        //NetListViewItem(TDEListView *parent) : TDEListViewItem(parent) {}
+        //NetListViewItem(TDEListView *parent, TDEListViewItem *after) : TDEListViewItem(parent, after) {}
+        //NetListViewItem(TDEListView *parent, TDEListViewItem *after, TQString essid, TQString mode) : TDEListViewItem(parent, after, essid, mode) {}
+        NetListViewItem(TDEListView *parent, TQString essid, TQString chan, int quality, bool enc, TQString ap, bool hidden, bool connected = 0 )
+                        : TDEListViewItem(parent, TQString(), TQString(), TQString(), TQString(), TQString())
         {
                 mEssid = essid;
                 mChannel = chan;
diff --git a/src/ui_main.ui b/src/ui_main.ui
index 0c0083a..94af120 100644
--- a/src/ui_main.ui
+++ b/src/ui_main.ui
@@ -264,7 +264,7 @@
 <property name="spacing">
 <number>0</number>
 </property>
-<widget class="KListView" row="0" column="0">
+<widget class="TDEListView" row="0" column="0">
 <column>
 <property name="text">
 <string>ESSID</string>
diff --git a/src/wlassistant.cpp b/src/wlassistant.cpp
index 6fd4077..78ae1e3 100644
--- a/src/wlassistant.cpp
+++ b/src/wlassistant.cpp
@@ -1030,7 +1030,7 @@ void WirelessAssistant::showItemContextMenu( TQListViewItem* i, const TQPoint& p
 	if (search == "any") search = nvi->essid();
         bool isConfigured = setNetParamsFromConfig(search);
 
-        KPopupMenu *icm = new KPopupMenu();
+        TDEPopupMenu *icm = new TDEPopupMenu();
         icm->insertTitle(nvi->essid());
         if (isConfigured) {
                 if (nvi->isConnected()) {