Rename many classes and header files to avoid conflicts with KDE4

48 files changed, 72 insertions, 72 deletions

diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui
index 6dc67273..8842d6d4 100644
--- a/kstars/kstars/addcatdialogui.ui
+++ b/kstars/kstars/addcatdialogui.ui
@@ -355,7 +355,7 @@
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>draglistbox.h</includehint>
     <includehint>draglistbox.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index e8817ab7..28599439 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -26,7 +26,7 @@
 #include <kmessagebox.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 
 #include "detaildialog.h"
diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui
index 04e4c150..4a1353c7 100644
--- a/kstars/kstars/details_database.ui
+++ b/kstars/kstars/details_database.ui
@@ -50,6 +50,6 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui
index c75c52dc..460f2068 100644
--- a/kstars/kstars/details_links.ui
+++ b/kstars/kstars/details_links.ui
@@ -178,8 +178,8 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui
index 97541c44..6ff0ebb4 100644
--- a/kstars/kstars/devmanager.ui
+++ b/kstars/kstars/devmanager.ui
@@ -428,10 +428,10 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kstars/kstars/draglistbox.h b/kstars/kstars/draglistbox.h
index 1786961e..2327c21c 100644
--- a/kstars/kstars/draglistbox.h
+++ b/kstars/kstars/draglistbox.h
@@ -18,7 +18,7 @@
 #ifndef DRAGLISTBOX_H
 #define DRAGLISTBOX_H
 
-#include <klistbox.h>
+#include <tdelistbox.h>
 
 class TQDragEnterEvent;
 class TQDragDropEvent;
diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp
index 9aa0c372..560cf82f 100644
--- a/kstars/kstars/fitsimage.cpp
+++ b/kstars/kstars/fitsimage.cpp
@@ -21,10 +21,10 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <kdebug.h>
-#include <ktoolbar.h> 
+#include <tdetoolbar.h> 
 #include <kapplication.h>
 #include <kpixmap.h> 
 #include <ktempfile.h>
diff --git a/kstars/kstars/fitsimage.h b/kstars/kstars/fitsimage.h
index 4ee482b3..514fc5dc 100644
--- a/kstars/kstars/fitsimage.h
+++ b/kstars/kstars/fitsimage.h
@@ -32,7 +32,7 @@
 #include <kpixmapio.h>
 #include <kpixmap.h>
 #include <kdialog.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 
 #include "indi/fitsrw.h"
diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp
index 6a4d7fcd..c68a54aa 100644
--- a/kstars/kstars/fitsprocess.cpp
+++ b/kstars/kstars/fitsprocess.cpp
@@ -149,7 +149,7 @@ float * FITSProcess::combine(TQPtrList<float> & frames, int mode)
 }
  
  /*
- *  This Quickselect routine is based on the algorithm described in
+ *  This Quictdeselect routine is based on the algorithm described in
  *  "Numerical recipies in C", Second Edition,
  *  Cambridge University Press, 1992, Section 8.5, ISBN 0-521-43108-5
  */
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp
index b9c8c03f..19056236 100644
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@@ -21,10 +21,10 @@
 #include <klocale.h>
 #include <kmessagebox.h>
 #include <tdefiledialog.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <kdebug.h>
-#include <ktoolbar.h>
+#include <tdetoolbar.h>
 #include <kapplication.h>
 #include <kpixmap.h> 
 #include <ktempfile.h>
@@ -34,7 +34,7 @@
 #include <kstatusbar.h>
 #include <kcommand.h>
 #include <klineedit.h>
-#include <klistview.h>
+#include <tdelistview.h>
 
 #include <tqfile.h>
 #include <tqvbox.h>
diff --git a/kstars/kstars/fitsviewer.h b/kstars/kstars/fitsviewer.h
index ee3c7a7c..a951d01c 100644
--- a/kstars/kstars/fitsviewer.h
+++ b/kstars/kstars/fitsviewer.h
@@ -33,7 +33,7 @@
 #include <kpixmapio.h>
 #include <kpixmap.h>
 #include <kdialog.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <kurl.h>
 #include <kcommand.h>
 
diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui
index f114266d..f5f78de2 100644
--- a/kstars/kstars/fovdialogui.ui
+++ b/kstars/kstars/fovdialogui.ui
@@ -184,7 +184,7 @@
 </customwidgets>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp
index 8fdbacbc..b14a00a9 100644
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@@ -22,8 +22,8 @@
 #include <tdefiledialog.h>
 #include <kstatusbar.h>
 #include <tdeio/netaccess.h>
-#include <kaction.h>
-#include <kaccel.h>
+#include <tdeaction.h>
+#include <tdeaccel.h>
 #include <kdebug.h>
 #include "imageviewer.h"
 
diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h
index e0b085e9..6c10b671 100644
--- a/kstars/kstars/imageviewer.h
+++ b/kstars/kstars/imageviewer.h
@@ -24,7 +24,7 @@
 #include <kpixmapio.h>
 #include <tdeio/job.h>
 #include <ktempfile.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 
 /**@class ImageViewer
 	*@short Image viewer widget for KStars
diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp
index 56e8407f..e3388984 100644
--- a/kstars/kstars/indidevice.cpp
+++ b/kstars/kstars/indidevice.cpp
@@ -69,13 +69,13 @@
 #include <kapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 #include <kdialogbase.h>
 #include <kstatusbar.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 #define NINDI_STD	26
 /* INDI standard property used across all clients to enable interoperability. */
diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp
index 1de1b3ea..6210db85 100644
--- a/kstars/kstars/indidriver.cpp
+++ b/kstars/kstars/indidriver.cpp
@@ -32,14 +32,14 @@
 #include <tqtextedit.h>
 
 #include <kiconloader.h>
-#include <klistview.h>
-#include <kpopupmenu.h>
+#include <tdelistview.h>
+#include <tdepopupmenu.h>
 #include <kprocess.h>
 #include <kmessagebox.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 #include <kextsock.h>
 #include <unistd.h>
diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp
index 3c63b835..9408f57e 100644
--- a/kstars/kstars/indimenu.cpp
+++ b/kstars/kstars/indimenu.cpp
@@ -41,12 +41,12 @@
 
 #include <kled.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <kapplication.h>
 #include <klocale.h>
 #include <kmessagebox.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <knuminput.h>
diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp
index 112a69b4..3d3138f2 100644
--- a/kstars/kstars/indiproperty.cpp
+++ b/kstars/kstars/indiproperty.cpp
@@ -24,7 +24,7 @@
  #include "indi/base64.h"
  #include "indi/indicom.h"
  
- #include <kpopupmenu.h>
+ #include <tdepopupmenu.h>
  #include <klineedit.h>
  #include <kled.h>
  #include <klocale.h>
diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp
index debf946c..b5fe7085 100644
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@@ -51,7 +51,7 @@
  #include <kprogress.h>
  #include <kurl.h>
  #include <kdirlister.h>
- #include <kaction.h>
+ #include <tdeaction.h>
  
   
  #define STD_BUFFER_SIZ		1024000
diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp
index 695ce191..22bc486f 100644
--- a/kstars/kstars/ksnewstuff.cpp
+++ b/kstars/kstars/ksnewstuff.cpp
@@ -19,7 +19,7 @@
 #if KDE_IS_VERSION( 3, 2, 90 )
 
 #include <kapplication.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kdebug.h>
 #include <kglobal.h>
 #include <kstandarddirs.h>
diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h
index 6dd9b143..a96b4118 100644
--- a/kstars/kstars/kspopupmenu.h
+++ b/kstars/kstars/kspopupmenu.h
@@ -19,7 +19,7 @@
 #ifndef KSPOPUPMENU_H
 #define KSPOPUPMENU_H
 
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 
 /**@class KSPopupMenu
 	*The KStars Popup Menu.  The menu is sensitive to the 
diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp
index c57eec64..e75199d4 100644
--- a/kstars/kstars/kstars.cpp
+++ b/kstars/kstars/kstars.cpp
@@ -24,7 +24,7 @@
 #include <stdlib.h>
 //#include <iostream.h>
 #include <kdebug.h>
-#include <kactioncollection.h>
+#include <tdeactioncollection.h>
 #include <kiconloader.h>
 #include <tqpalette.h>
 #include <kstatusbar.h>
diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h
index 3e719742..fffc4eba 100644
--- a/kstars/kstars/kstars.h
+++ b/kstars/kstars/kstars.h
@@ -23,7 +23,7 @@
 
 #include <dcopclient.h>
 #include <kapplication.h>
-#include <kmainwindow.h>
+#include <tdemainwindow.h>
 #include <tqwidget.h>
 
 #include "kstarsinterface.h"
diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp
index 133d5fab..7b852ac8 100644
--- a/kstars/kstars/kstarsactions.cpp
+++ b/kstars/kstars/kstarsactions.cpp
@@ -19,10 +19,10 @@
 #include <sys/stat.h>
 
 #include <kdebug.h>
-#include <kaction.h>
-#include <kactionclasses.h>
+#include <tdeaction.h>
+#include <tdeactionclasses.h>
 #include <klineedit.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
 #include <kmessagebox.h>
@@ -32,7 +32,7 @@
 #include <tdeconfigdialog.h>
 #include <tdefiledialog.h>
 #include <kinputdialog.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <kprocess.h>
 #include <tqcheckbox.h>
diff --git a/kstars/kstars/kstarsdata.h b/kstars/kstars/kstarsdata.h
index 652113bf..3007ed58 100644
--- a/kstars/kstars/kstarsdata.h
+++ b/kstars/kstars/kstarsdata.h
@@ -22,7 +22,7 @@
 #include <tqptrlist.h>
 #include <tqstring.h>
 
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 
 #include <iostream>
 
diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp
index a4cc5835..1511d920 100644
--- a/kstars/kstars/kstarsdcop.cpp
+++ b/kstars/kstars/kstarsdcop.cpp
@@ -24,10 +24,10 @@
 #include <tdeio/netaccess.h>
 #include <kmessagebox.h>
 #include <kprinter.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <ktempfile.h>
 #include <kurl.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <knuminput.h> 
diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp
index 4db3b995..9b1a4b58 100644
--- a/kstars/kstars/kstarsinit.cpp
+++ b/kstars/kstars/kstarsinit.cpp
@@ -19,9 +19,9 @@
 #include <tqfile.h>
 #include <tqdir.h>
 #include <dcopclient.h>
-#include <kshortcut.h>
+#include <tdeshortcut.h>
 #include <kiconloader.h>
-#include <kpopupmenu.h>
+#include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <ktip.h>
 #include <kmessagebox.h>
diff --git a/kstars/kstars/kswizard.cpp b/kstars/kstars/kswizard.cpp
index 85258362..1c4ed73d 100644
--- a/kstars/kstars/kswizard.cpp
+++ b/kstars/kstars/kswizard.cpp
@@ -19,7 +19,7 @@
 #include <tqpixmap.h>
 #include <tqlabel.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 
 #include "kstars.h"
diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp
index 10b290db..72af66e6 100644
--- a/kstars/kstars/skymap.cpp
+++ b/kstars/kstars/skymap.cpp
@@ -20,7 +20,7 @@
 #include <kiconloader.h>
 #include <kstatusbar.h>
 #include <kmessagebox.h>
-#include <kaction.h>
+#include <tdeaction.h>
 #include <kstandarddirs.h>
 
 #include <tqmemarray.h>
diff --git a/kstars/kstars/skymapevents.cpp b/kstars/kstars/skymapevents.cpp
index 12da4367..d14f97a5 100644
--- a/kstars/kstars/skymapevents.cpp
+++ b/kstars/kstars/skymapevents.cpp
@@ -26,7 +26,7 @@
 
 #include <kiconloader.h>
 #include <kstatusbar.h>
-#include <kshortcut.h> //KKey class
+#include <tdeshortcut.h> //KKey class
 
 #include "skymap.h"
 #include "Options.h"
diff --git a/kstars/kstars/skyobjectname.h b/kstars/kstars/skyobjectname.h
index 15d0bc32..062b9fc3 100644
--- a/kstars/kstars/skyobjectname.h
+++ b/kstars/kstars/skyobjectname.h
@@ -19,7 +19,7 @@
 #define SKYOBJECTNAME_H
 
 #include <tqstring.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <klocale.h>
 
 /**@class SkyObjectName
diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp
index b2f17009..12c82a79 100644
--- a/kstars/kstars/telescopeprop.cpp
+++ b/kstars/kstars/telescopeprop.cpp
@@ -17,7 +17,7 @@
 
 
 #include <kpushbutton.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kcombobox.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui
index 53f8c8f2..bf823651 100644
--- a/kstars/kstars/telescopepropui.ui
+++ b/kstars/kstars/telescopepropui.ui
@@ -257,7 +257,7 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kcombobox.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>klineedit.h</includehint>
diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp
index 9afd62e4..388e4bcf 100644
--- a/kstars/kstars/telescopewizardprocess.cpp
+++ b/kstars/kstars/telescopewizardprocess.cpp
@@ -18,7 +18,7 @@
 #include <tqtextedit.h>
 #include <tqradiobutton.h>
 
-#include <klistview.h>
+#include <tdelistview.h>
 #include <klineedit.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp
index f568dbec..6241b3c3 100644
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@@ -28,7 +28,7 @@
 #include <tdeversion.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kmessagebox.h>
 #include <kprogress.h>
 #include <kurl.h>
diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui
index 7bd41bbd..d7a16f57 100644
--- a/kstars/kstars/thumbnailpickerui.ui
+++ b/kstars/kstars/thumbnailpickerui.ui
@@ -305,7 +305,7 @@
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
     <includehint>kprogress.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kurlrequester.h</includehint>
     <includehint>klineedit.h</includehint>
     <includehint>kpushbutton.h</includehint>
diff --git a/kstars/kstars/toggleaction.h b/kstars/kstars/toggleaction.h
index ca8550dd..5c62909d 100644
--- a/kstars/kstars/toggleaction.h
+++ b/kstars/kstars/toggleaction.h
@@ -27,7 +27,7 @@
 	*/
 
 #include <tqiconset.h>
-#include <kaction.h>
+#include <tdeaction.h>
 
 class ToggleAction : public TDEAction {
 	Q_OBJECT
diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp
index c1b7b298..74370a74 100644
--- a/kstars/kstars/tools/altvstime.cpp
+++ b/kstars/kstars/tools/altvstime.cpp
@@ -19,7 +19,7 @@
 #include <tqpainter.h>
 #include <klocale.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <kdialogbase.h>
 
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index bcb593d8..ad6942bf 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -17,7 +17,7 @@
 
 #include <tqvariant.h>
 #include <klineedit.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tqcheckbox.h>
 #include <tqgroupbox.h>
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index 963d3cdd..d3184aea 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -22,7 +22,7 @@
 #include <tqlayout.h>
 #include <tqstringlist.h>
 #include <tqwidgetstack.h>
-#include <klistview.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 #include <kstatusbar.h>
 #include <ktextedit.h>
diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui
index 33a2dbbc..c53fe812 100644
--- a/kstars/kstars/tools/observinglistui.ui
+++ b/kstars/kstars/tools/observinglistui.ui
@@ -566,8 +566,8 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>ktextedit.h</includehint>
 </includehints>
 </UI>
diff --git a/kstars/kstars/tools/obslistwizard.cpp b/kstars/kstars/tools/obslistwizard.cpp
index 2b63509e..cf6c64d1 100644
--- a/kstars/kstars/tools/obslistwizard.cpp
+++ b/kstars/kstars/tools/obslistwizard.cpp
@@ -19,8 +19,8 @@
 #include <tqlayout.h>
 #include <tqwidgetstack.h>
 #include <knuminput.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kpushbutton.h>
 
 #include "dmsbox.h"
diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui
index 5fd3f6d2..1f258a7b 100644
--- a/kstars/kstars/tools/obslistwizardui.ui
+++ b/kstars/kstars/tools/obslistwizardui.ui
@@ -1014,10 +1014,10 @@ select from a region on the sky.</string>
 </images>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistview.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>dmsbox.h</includehint>
     <includehint>knuminput.h</includehint>
     <includehint>magnitudespinbox.h</includehint>
diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui
index c5adc126..1f9394d4 100644
--- a/kstars/kstars/tools/optionstreeview.ui
+++ b/kstars/kstars/tools/optionstreeview.ui
@@ -132,6 +132,6 @@
 </connections>
 <layoutdefaults spacing="6" margin="11"/>
 <includehints>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
 </includehints>
 </UI>
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 3f6afe34..93d95955 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -26,8 +26,8 @@
 #include <kicontheme.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <klistbox.h>
-#include <klistview.h>
+#include <tdelistbox.h>
+#include <tdelistview.h>
 #include <kprocess.h>
 #include <ktextedit.h>
 #include <ktempfile.h>
diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui
index bf17b669..0c917ea0 100644
--- a/kstars/kstars/tools/scriptbuilderui.ui
+++ b/kstars/kstars/tools/scriptbuilderui.ui
@@ -634,13 +634,13 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistview.h</includehint>
+    <includehint>tdelistview.h</includehint>
     <includehint>ktextedit.h</includehint>
 </includehints>
 </UI>
diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp
index 2aa3590e..74ad75e7 100644
--- a/kstars/kstars/tools/wutdialog.cpp
+++ b/kstars/kstars/tools/wutdialog.cpp
@@ -33,7 +33,7 @@
 
 #include <kcombobox.h>
 #include <klocale.h>
-#include <klistbox.h>
+#include <tdelistbox.h>
 #include <kpushbutton.h>
 
 #include <tqgroupbox.h>
diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui
index 7117eb8a..b3086f64 100644
--- a/kstars/kstars/tools/wutdialogui.ui
+++ b/kstars/kstars/tools/wutdialogui.ui
@@ -557,9 +557,9 @@
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kcombobox.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
     <includehint>kpushbutton.h</includehint>
     <includehint>kpushbutton.h</includehint>
-    <includehint>klistbox.h</includehint>
+    <includehint>tdelistbox.h</includehint>
 </includehints>
 </UI>