Rename additional header files to avoid conflicts with KDE4

82 files changed, 123 insertions, 123 deletions

diff --git a/kstars/kstars/addcatdialog.cpp b/kstars/kstars/addcatdialog.cpp
index 07af36ff..2487a6f3 100644
--- a/kstars/kstars/addcatdialog.cpp
+++ b/kstars/kstars/addcatdialog.cpp
@@ -19,9 +19,9 @@
 #include <tqlayout.h>
 #include <kcolorbutton.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <knuminput.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 
 #include "kstars.h"
diff --git a/kstars/kstars/addlinkdialog.cpp b/kstars/kstars/addlinkdialog.cpp
index 346beec9..a52b6fc5 100644
--- a/kstars/kstars/addlinkdialog.cpp
+++ b/kstars/kstars/addlinkdialog.cpp
@@ -17,7 +17,7 @@
 
 #include <tdeapplication.h>
 #include <kurl.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <tqbuttongroup.h>
 #include <tqlayout.h>
diff --git a/kstars/kstars/addlinkdialog.h b/kstars/kstars/addlinkdialog.h
index 5af4dd4f..64722467 100644
--- a/kstars/kstars/addlinkdialog.h
+++ b/kstars/kstars/addlinkdialog.h
@@ -20,7 +20,7 @@
 
 #include <kdialogbase.h>
 #include <klineedit.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqradiobutton.h>
 
 #include "addlinkdialogui.h"
diff --git a/kstars/kstars/ccdpreviewwg.cpp b/kstars/kstars/ccdpreviewwg.cpp
index 77593304..a2b168f3 100644
--- a/kstars/kstars/ccdpreviewwg.cpp
+++ b/kstars/kstars/ccdpreviewwg.cpp
@@ -16,12 +16,12 @@
 #include "indimenu.h"
 #include "Options.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <kcombobox.h>
diff --git a/kstars/kstars/colorscheme.cpp b/kstars/kstars/colorscheme.cpp
index 46aa2de9..f9e01e5e 100644
--- a/kstars/kstars/colorscheme.cpp
+++ b/kstars/kstars/colorscheme.cpp
@@ -18,8 +18,8 @@
 #include <tqfile.h>
 #include <tdeconfig.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "ksutils.h"
diff --git a/kstars/kstars/conbridlg.cpp b/kstars/kstars/conbridlg.cpp
index ec9aa240..2334d6f1 100644
--- a/kstars/kstars/conbridlg.cpp
+++ b/kstars/kstars/conbridlg.cpp
@@ -16,7 +16,7 @@
  *  									   *
  ***************************************************************************/
  
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <kimageeffect.h> 
  #include <kdebug.h>
  
diff --git a/kstars/kstars/conbridlg.h b/kstars/kstars/conbridlg.h
index b1c93d8f..03c704ca 100644
--- a/kstars/kstars/conbridlg.h
+++ b/kstars/kstars/conbridlg.h
@@ -20,7 +20,7 @@
  #define CONTRASTBRIGHTNESSDLG_H
  
  #include <kdialogbase.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  
  class ConBriForm;
  class FITSViewer;
diff --git a/kstars/kstars/deepskyobject.cpp b/kstars/kstars/deepskyobject.cpp
index 5d87d01f..cf314651 100644
--- a/kstars/kstars/deepskyobject.cpp
+++ b/kstars/kstars/deepskyobject.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 
 #include <tqfile.h>
 #include <tqregexp.h>
diff --git a/kstars/kstars/detaildialog.cpp b/kstars/kstars/detaildialog.cpp
index 6f09eafe..fe105d5b 100644
--- a/kstars/kstars/detaildialog.cpp
+++ b/kstars/kstars/detaildialog.cpp
@@ -23,7 +23,7 @@
 
 #include <tdeapplication.h>
 #include <kstandarddirs.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kactivelabel.h>
 #include <kpushbutton.h>
 #include <tdelistview.h>
diff --git a/kstars/kstars/devicemanager.cpp b/kstars/kstars/devicemanager.cpp
index 0f95455c..c88e645d 100644
--- a/kstars/kstars/devicemanager.cpp
+++ b/kstars/kstars/devicemanager.cpp
@@ -24,9 +24,9 @@
 #include <tqsocketnotifier.h>
 #include <tqtextedit.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstatusbar.h>
  
 #include <sys/socket.h>
diff --git a/kstars/kstars/dms.cpp b/kstars/kstars/dms.cpp
index e8a29fc6..9abdd71b 100644
--- a/kstars/kstars/dms.cpp
+++ b/kstars/kstars/dms.cpp
@@ -18,8 +18,8 @@
 #include <stdlib.h>
 
 #include "dms.h"
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 
 void dms::setD( const double &x ) {
diff --git a/kstars/kstars/dmsbox.cpp b/kstars/kstars/dmsbox.cpp
index 1857b1bf..32fd2fd2 100644
--- a/kstars/kstars/dmsbox.cpp
+++ b/kstars/kstars/dmsbox.cpp
@@ -20,7 +20,7 @@
 #include "dmsbox.h"
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqregexp.h>
 #include <tqstring.h>
 #include <tqtooltip.h>
diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp
index f7ea9251..324b0690 100644
--- a/kstars/kstars/draglistbox.cpp
+++ b/kstars/kstars/draglistbox.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <tqdragobject.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "draglistbox.h"
diff --git a/kstars/kstars/finddialog.cpp b/kstars/kstars/finddialog.cpp
index eeeb177c..f73c3b08 100644
--- a/kstars/kstars/finddialog.cpp
+++ b/kstars/kstars/finddialog.cpp
@@ -22,7 +22,7 @@
 #include <tqlistbox.h>
 #include <tqtimer.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "finddialog.h"
 #include "kstars.h"
diff --git a/kstars/kstars/fitshistogram.cpp b/kstars/kstars/fitshistogram.cpp
index 73010cea..55f634a1 100644
--- a/kstars/kstars/fitshistogram.cpp
+++ b/kstars/kstars/fitshistogram.cpp
@@ -33,7 +33,7 @@
  
  #include <kdebug.h>
  #include <klineedit.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  
  
  
diff --git a/kstars/kstars/fitsimage.cpp b/kstars/kstars/fitsimage.cpp
index 1ca5fc14..7751dd3b 100644
--- a/kstars/kstars/fitsimage.cpp
+++ b/kstars/kstars/fitsimage.cpp
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
 #include <tdeaccel.h>
@@ -27,9 +27,9 @@
 #include <tdetoolbar.h> 
 #include <tdeapplication.h>
 #include <kpixmap.h> 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kimageeffect.h> 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kprogress.h>
 #include <kstatusbar.h>
 
diff --git a/kstars/kstars/fitsprocess.cpp b/kstars/kstars/fitsprocess.cpp
index 518db5a1..b785050d 100644
--- a/kstars/kstars/fitsprocess.cpp
+++ b/kstars/kstars/fitsprocess.cpp
@@ -19,7 +19,7 @@
  #include <unistd.h>
  
  #include <kdebug.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <kprogress.h>
  #include <tdeapplication.h>
  
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp
index 56cb6157..a5e6143c 100644
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@@ -18,8 +18,8 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <tdeaction.h>
 #include <tdeaccel.h>
@@ -27,9 +27,9 @@
 #include <tdetoolbar.h>
 #include <tdeapplication.h>
 #include <kpixmap.h> 
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kimageeffect.h> 
-#include <kmenubar.h>
+#include <tdemenubar.h>
 #include <kprogress.h>
 #include <kstatusbar.h>
 #include <kcommand.h>
diff --git a/kstars/kstars/focusdialog.cpp b/kstars/kstars/focusdialog.cpp
index 8da163c2..997550ee 100644
--- a/kstars/kstars/focusdialog.cpp
+++ b/kstars/kstars/focusdialog.cpp
@@ -19,8 +19,8 @@
 #include <tqlayout.h>
 
 #include <kdebug.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 
 #include <tqstring.h>
 #include <knumvalidator.h>
diff --git a/kstars/kstars/fov.cpp b/kstars/kstars/fov.cpp
index 7b01959f..af40388c 100644
--- a/kstars/kstars/fov.cpp
+++ b/kstars/kstars/fov.cpp
@@ -18,7 +18,7 @@
 #include <tqpainter.h>
 #include <tqfile.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "fov.h"
diff --git a/kstars/kstars/fov.h b/kstars/kstars/fov.h
index b04e9099..6b309e9b 100644
--- a/kstars/kstars/fov.h
+++ b/kstars/kstars/fov.h
@@ -19,7 +19,7 @@
 #define FOV_H
 
 #include <tqstring.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**@class FOV A simple class encapulating a Field-of-View symbol
 	*@author Jason Harris
diff --git a/kstars/kstars/fovdialog.cpp b/kstars/kstars/fovdialog.cpp
index 6021c495..2e1722e9 100644
--- a/kstars/kstars/fovdialog.cpp
+++ b/kstars/kstars/fovdialog.cpp
@@ -21,14 +21,14 @@
 #include <tqpainter.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kcolorbutton.h>
 #include <kcombobox.h>
 #include <knuminput.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "fovdialog.h"
diff --git a/kstars/kstars/geolocation.h b/kstars/kstars/geolocation.h
index 79180c65..931d12d8 100644
--- a/kstars/kstars/geolocation.h
+++ b/kstars/kstars/geolocation.h
@@ -20,7 +20,7 @@
 #ifndef GEOLOCATION_H
 #define GEOLOCATION_H
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "dms.h"
 #include "timezonerule.h"
diff --git a/kstars/kstars/imagereductiondlg.cpp b/kstars/kstars/imagereductiondlg.cpp
index 4d5f799e..f5776c8c 100644
--- a/kstars/kstars/imagereductiondlg.cpp
+++ b/kstars/kstars/imagereductiondlg.cpp
@@ -20,7 +20,7 @@
  
  #include <kurl.h>
  #include <tdefiledialog.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  
  #include "imagereductiondlg.h"
  
diff --git a/kstars/kstars/imagesequence.cpp b/kstars/kstars/imagesequence.cpp
index d6f6f9cb..e464f755 100644
--- a/kstars/kstars/imagesequence.cpp
+++ b/kstars/kstars/imagesequence.cpp
@@ -21,8 +21,8 @@
 #include "Options.h"
 
 #include <kdebug.h>
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <kprogress.h>
 #include <knuminput.h>
diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp
index 31a58f79..80b14c4b 100644
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@@ -17,8 +17,8 @@
 
 #include <tqfont.h>
 
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kstatusbar.h>
 #include <tdeio/netaccess.h>
diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h
index 6c10b671..36aacb42 100644
--- a/kstars/kstars/imageviewer.h
+++ b/kstars/kstars/imageviewer.h
@@ -23,7 +23,7 @@
 
 #include <kpixmapio.h>
 #include <tdeio/job.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdemainwindow.h>
 
 /**@class ImageViewer
diff --git a/kstars/kstars/indidevice.cpp b/kstars/kstars/indidevice.cpp
index 4b697237..3d570c69 100644
--- a/kstars/kstars/indidevice.cpp
+++ b/kstars/kstars/indidevice.cpp
@@ -67,8 +67,8 @@
 #include <klineedit.h>
 #include <kpushbutton.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <kcombobox.h>
diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp
index 0baba4e2..c695e69c 100644
--- a/kstars/kstars/indidriver.cpp
+++ b/kstars/kstars/indidriver.cpp
@@ -35,7 +35,7 @@
 #include <tdelistview.h>
 #include <tdepopupmenu.h>
 #include <kprocess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <kstandarddirs.h>
diff --git a/kstars/kstars/indielement.cpp b/kstars/kstars/indielement.cpp
index 162e1120..4308de45 100644
--- a/kstars/kstars/indielement.cpp
+++ b/kstars/kstars/indielement.cpp
@@ -30,7 +30,7 @@
 #include <ksqueezedtextlabel.h> 
 #include <klineedit.h>
 #include <kpushbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kcombobox.h>
 #include <knuminput.h>
diff --git a/kstars/kstars/indigroup.cpp b/kstars/kstars/indigroup.cpp
index b3c9b527..80b38c63 100644
--- a/kstars/kstars/indigroup.cpp
+++ b/kstars/kstars/indigroup.cpp
@@ -16,7 +16,7 @@
  #include "indidevice.h"
  #include "devicemanager.h"
  
- #include <klocale.h>
+ #include <tdelocale.h>
  
  #include <tqlayout.h>
  #include <tqframe.h>
diff --git a/kstars/kstars/indimenu.cpp b/kstars/kstars/indimenu.cpp
index fc257575..8a4df6d2 100644
--- a/kstars/kstars/indimenu.cpp
+++ b/kstars/kstars/indimenu.cpp
@@ -44,8 +44,8 @@
 #include <tdelistbox.h>
 #include <kpushbutton.h>
 #include <tdeapplication.h>
-#include <klocale.h>
-#include <kmessagebox.h>
+#include <tdelocale.h>
+#include <tdemessagebox.h>
 #include <tdelistview.h>
 #include <kdebug.h>
 #include <kcombobox.h>
diff --git a/kstars/kstars/indiproperty.cpp b/kstars/kstars/indiproperty.cpp
index 3d3138f2..9eecf874 100644
--- a/kstars/kstars/indiproperty.cpp
+++ b/kstars/kstars/indiproperty.cpp
@@ -27,12 +27,12 @@
  #include <tdepopupmenu.h>
  #include <klineedit.h>
  #include <kled.h>
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <kcombobox.h>
  #include <kpushbutton.h>
  #include <knuminput.h> 
  #include <kdebug.h>
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
  
  #include <tqbuttongroup.h> 
  #include <tqcheckbox.h>
diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp
index f9cde0eb..274106ec 100644
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@@ -41,12 +41,12 @@
  #include <tqeventloop.h>
  #include <tqsocketnotifier.h>
  
- #include <klocale.h>
+ #include <tdelocale.h>
  #include <kdebug.h>
  #include <kpushbutton.h>
  #include <klineedit.h>
  #include <kstatusbar.h>
- #include <kmessagebox.h>
+ #include <tdemessagebox.h>
  #include <tdeapplication.h>
  #include <kprogress.h>
  #include <kurl.h>
diff --git a/kstars/kstars/infoboxes.cpp b/kstars/kstars/infoboxes.cpp
index 34ba2175..a7297cc1 100644
--- a/kstars/kstars/infoboxes.cpp
+++ b/kstars/kstars/infoboxes.cpp
@@ -15,7 +15,7 @@
  *                                                                         *
  ***************************************************************************/
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kdebug.h>
 //#include <tqpen.h>
 #include <tqpainter.h>
diff --git a/kstars/kstars/ksnewstuff.cpp b/kstars/kstars/ksnewstuff.cpp
index df192c41..d0dc8a24 100644
--- a/kstars/kstars/ksnewstuff.cpp
+++ b/kstars/kstars/ksnewstuff.cpp
@@ -21,7 +21,7 @@
 #include <tdeapplication.h>
 #include <tdeaction.h>
 #include <kdebug.h>
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <kdirwatch.h>
 #include <kprogress.h>
diff --git a/kstars/kstars/ksnewstuff.h b/kstars/kstars/ksnewstuff.h
index 2b08b1b7..c94bb18a 100644
--- a/kstars/kstars/ksnewstuff.h
+++ b/kstars/kstars/ksnewstuff.h
@@ -32,7 +32,7 @@
 
 #include <tdeversion.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <tqobject.h>
 
diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp
index 7b852ac8..680f4ede 100644
--- a/kstars/kstars/kstarsactions.cpp
+++ b/kstars/kstars/kstarsactions.cpp
@@ -25,8 +25,8 @@
 #include <tdeshortcut.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
-#include <ktempfile.h>
+#include <tdemessagebox.h>
+#include <tdetempfile.h>
 #include <ktip.h>
 #include <kstandarddirs.h>
 #include <tdeconfigdialog.h>
diff --git a/kstars/kstars/kstarsdata.cpp b/kstars/kstars/kstarsdata.cpp
index ceb941b6..95ca0d50 100644
--- a/kstars/kstars/kstarsdata.cpp
+++ b/kstars/kstars/kstarsdata.cpp
@@ -20,9 +20,9 @@
 #include <tqfile.h>
 
 #include <tdeapplication.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kstandarddirs.h>
 
 #include "kstarsdata.h"
diff --git a/kstars/kstars/kstarsdcop.cpp b/kstars/kstars/kstarsdcop.cpp
index 1511d920..7a4af85e 100644
--- a/kstars/kstars/kstarsdcop.cpp
+++ b/kstars/kstars/kstarsdcop.cpp
@@ -22,10 +22,10 @@
 #include <tqradiobutton.h>
 
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprinter.h>
 #include <tdeshortcut.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kurl.h>
 #include <tdelistview.h>
 #include <kpushbutton.h>
diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp
index 9b1a4b58..e5493a63 100644
--- a/kstars/kstars/kstarsinit.cpp
+++ b/kstars/kstars/kstarsinit.cpp
@@ -24,7 +24,7 @@
 #include <tdepopupmenu.h>
 #include <kstatusbar.h>
 #include <ktip.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <tdeversion.h>
 
diff --git a/kstars/kstars/kstarssplash.cpp b/kstars/kstars/kstarssplash.cpp
index 60b9eaae..4867c0fd 100644
--- a/kstars/kstars/kstarssplash.cpp
+++ b/kstars/kstars/kstarssplash.cpp
@@ -18,7 +18,7 @@
 #include <tqfile.h>
 #include <tqlabel.h>
 #include <tqlayout.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tdeapplication.h>
 
diff --git a/kstars/kstars/locationdialog.cpp b/kstars/kstars/locationdialog.cpp
index 546694c7..0ac2a751 100644
--- a/kstars/kstars/locationdialog.cpp
+++ b/kstars/kstars/locationdialog.cpp
@@ -18,7 +18,7 @@
 #include <stdlib.h>
 #include <stdio.h>
 
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 #include <klineedit.h>
 
diff --git a/kstars/kstars/main.cpp b/kstars/kstars/main.cpp
index c367c845..8a516860 100644
--- a/kstars/kstars/main.cpp
+++ b/kstars/kstars/main.cpp
@@ -18,7 +18,7 @@
 #include <tdecmdlineargs.h>
 #include <tdeaboutdata.h>
 #include <dcopclient.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 
 #include "kstars.h"
diff --git a/kstars/kstars/opscolors.cpp b/kstars/kstars/opscolors.cpp
index b3699d57..1b7bcbb7 100644
--- a/kstars/kstars/opscolors.cpp
+++ b/kstars/kstars/opscolors.cpp
@@ -17,12 +17,12 @@
 
 #include <tqfile.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <knuminput.h>
 #include <kcombobox.h>
 #include <kpushbutton.h>
 #include <kcolordialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kinputdialog.h>
 #include <kstandarddirs.h>
 
diff --git a/kstars/kstars/simclock.cpp b/kstars/kstars/simclock.cpp
index 54c97b45..25fe72d9 100644
--- a/kstars/kstars/simclock.cpp
+++ b/kstars/kstars/simclock.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "simclock.h"
 #include "kstars.h"
diff --git a/kstars/kstars/skymap.cpp b/kstars/kstars/skymap.cpp
index fcfa3680..19c27001 100644
--- a/kstars/kstars/skymap.cpp
+++ b/kstars/kstars/skymap.cpp
@@ -19,7 +19,7 @@
 #include <tdeconfig.h>
 #include <kiconloader.h>
 #include <kstatusbar.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdeaction.h>
 #include <kstandarddirs.h>
 
diff --git a/kstars/kstars/skyobject.cpp b/kstars/kstars/skyobject.cpp
index 02c2ca86..0f4e4d18 100644
--- a/kstars/kstars/skyobject.cpp
+++ b/kstars/kstars/skyobject.cpp
@@ -17,7 +17,7 @@
 
 #include <iostream>
 
-#include <kglobal.h>
+#include <tdeglobal.h>
 #include <kstandarddirs.h>
 #include <tqpoint.h>
 #include <tqregexp.h>
diff --git a/kstars/kstars/skyobject.h b/kstars/kstars/skyobject.h
index e7de046c..b0742d9f 100644
--- a/kstars/kstars/skyobject.h
+++ b/kstars/kstars/skyobject.h
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <tqstringlist.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "skypoint.h"
 #include "dms.h"
diff --git a/kstars/kstars/skyobjectname.h b/kstars/kstars/skyobjectname.h
index 062b9fc3..467d14d3 100644
--- a/kstars/kstars/skyobjectname.h
+++ b/kstars/kstars/skyobjectname.h
@@ -20,7 +20,7 @@
 
 #include <tqstring.h>
 #include <tdelistbox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 /**@class SkyObjectName
 	*Convenience class which contains a SkyObject's name and a pointer to the SkyObject
diff --git a/kstars/kstars/skypoint.cpp b/kstars/kstars/skypoint.cpp
index 8d795d2b..a04bb0dd 100644
--- a/kstars/kstars/skypoint.cpp
+++ b/kstars/kstars/skypoint.cpp
@@ -18,7 +18,7 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "skypoint.h"
 #include "skyobject.h"
diff --git a/kstars/kstars/streamwg.cpp b/kstars/kstars/streamwg.cpp
index 28e1a85f..7235d02c 100644
--- a/kstars/kstars/streamwg.cpp
+++ b/kstars/kstars/streamwg.cpp
@@ -13,12 +13,12 @@
 #include "indistd.h"
 #include "Options.h"
 
-#include <kmessagebox.h>
-#include <klocale.h>
+#include <tdemessagebox.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kiconloader.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <tdeio/netaccess.h>
 #include <tdefiledialog.h>
 #include <kcombobox.h>
diff --git a/kstars/kstars/telescopeprop.cpp b/kstars/kstars/telescopeprop.cpp
index 12c82a79..93d15861 100644
--- a/kstars/kstars/telescopeprop.cpp
+++ b/kstars/kstars/telescopeprop.cpp
@@ -20,7 +20,7 @@
 #include <tdelistbox.h>
 #include <kcombobox.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include <vector>
 
diff --git a/kstars/kstars/telescopewizardprocess.cpp b/kstars/kstars/telescopewizardprocess.cpp
index 388e4bcf..d7eb6bd5 100644
--- a/kstars/kstars/telescopewizardprocess.cpp
+++ b/kstars/kstars/telescopewizardprocess.cpp
@@ -20,7 +20,7 @@
 
 #include <tdelistview.h>
 #include <klineedit.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 
 #include "telescopewizardprocess.h"
diff --git a/kstars/kstars/thumbnaileditor.cpp b/kstars/kstars/thumbnaileditor.cpp
index 4c56788f..cfef5bf4 100644
--- a/kstars/kstars/thumbnaileditor.cpp
+++ b/kstars/kstars/thumbnaileditor.cpp
@@ -21,7 +21,7 @@
 #include <tqpainter.h>
 #include <tqpoint.h>
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kdebug.h>
 #include <kpushbutton.h>
 
diff --git a/kstars/kstars/thumbnailpicker.cpp b/kstars/kstars/thumbnailpicker.cpp
index b6d1dbdf..08fd3328 100644
--- a/kstars/kstars/thumbnailpicker.cpp
+++ b/kstars/kstars/thumbnailpicker.cpp
@@ -29,12 +29,12 @@
 #include <kpushbutton.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kprogress.h>
 #include <kurl.h>
 #include <kurlrequester.h>
-#include <klocale.h>
-#include <ktempfile.h>
+#include <tdelocale.h>
+#include <tdetempfile.h>
 
 #include "thumbnailpicker.h"
 #include "thumbnailpickerui.h"
diff --git a/kstars/kstars/timebox.cpp b/kstars/kstars/timebox.cpp
index 1ceee2d7..aeacb209 100644
--- a/kstars/kstars/timebox.cpp
+++ b/kstars/kstars/timebox.cpp
@@ -19,8 +19,8 @@
 #include "libtdeedu/extdate/extdatetime.h"
 #include <tqdatetime.h>  //needed for TQTime
 #include <tqregexp.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <kdebug.h>
 
diff --git a/kstars/kstars/timedialog.cpp b/kstars/kstars/timedialog.cpp
index 27846848..fec1d1c1 100644
--- a/kstars/kstars/timedialog.cpp
+++ b/kstars/kstars/timedialog.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include <tqlabel.h>
 #include <tqpushbutton.h>
diff --git a/kstars/kstars/timespinbox.cpp b/kstars/kstars/timespinbox.cpp
index 72549f9b..40e0b94f 100644
--- a/kstars/kstars/timespinbox.cpp
+++ b/kstars/kstars/timespinbox.cpp
@@ -27,7 +27,7 @@
 #include <tqlineedit.h>
 #include <tqfontmetrics.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <stdlib.h>
 #include <math.h>
 
diff --git a/kstars/kstars/timestepbox.cpp b/kstars/kstars/timestepbox.cpp
index 6b661592..4941d56d 100644
--- a/kstars/kstars/timestepbox.cpp
+++ b/kstars/kstars/timestepbox.cpp
@@ -19,7 +19,7 @@
 #include <tqtooltip.h>
 #include <tqwhatsthis.h>
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "timestepbox.h"
 
diff --git a/kstars/kstars/timezonerule.cpp b/kstars/kstars/timezonerule.cpp
index 0a711f57..bde98482 100644
--- a/kstars/kstars/timezonerule.cpp
+++ b/kstars/kstars/timezonerule.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "timezonerule.h"
 #include "kstarsdatetime.h"
diff --git a/kstars/kstars/tools/altvstime.cpp b/kstars/kstars/tools/altvstime.cpp
index 74370a74..9a95e188 100644
--- a/kstars/kstars/tools/altvstime.cpp
+++ b/kstars/kstars/tools/altvstime.cpp
@@ -17,7 +17,7 @@
 
 #include <tqlayout.h>
 #include <tqpainter.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdelistbox.h>
 #include <kpushbutton.h>
diff --git a/kstars/kstars/tools/astrocalc.cpp b/kstars/kstars/tools/astrocalc.cpp
index 3383a1b8..bd9d2037 100644
--- a/kstars/kstars/tools/astrocalc.cpp
+++ b/kstars/kstars/tools/astrocalc.cpp
@@ -33,7 +33,7 @@
 #include "modcalcequinox.h"
 #include "modcalcvlsr.h"
 
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tqlistview.h>
 #include <tqtextview.h>
 
diff --git a/kstars/kstars/tools/jmoontool.cpp b/kstars/kstars/tools/jmoontool.cpp
index 7d7add93..5d45fb27 100644
--- a/kstars/kstars/tools/jmoontool.cpp
+++ b/kstars/kstars/tools/jmoontool.cpp
@@ -18,7 +18,7 @@
 #include <tqlabel.h>
 
 #include <kdebug.h>
-#include <klocale.h>
+#include <tdelocale.h>
 
 #include "jmoontool.h"
 #include "jupitermoons.h"
diff --git a/kstars/kstars/tools/kstarsplotwidget.cpp b/kstars/kstars/tools/kstarsplotwidget.cpp
index 3e2e2ee6..907f72ff 100644
--- a/kstars/kstars/tools/kstarsplotwidget.cpp
+++ b/kstars/kstars/tools/kstarsplotwidget.cpp
@@ -17,8 +17,8 @@
 
 #include <math.h> //for log10(), pow(), modf()
 #include <kdebug.h>
-#include <kglobal.h>
-#include <klocale.h>
+#include <tdeglobal.h>
+#include <tdelocale.h>
 #include <tqcolor.h>
 #include <tqpainter.h>
 #include <tqpixmap.h>
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index 425a9513..ff86b542 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -29,7 +29,7 @@
 #include <tqfile.h>
 
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <kstandarddirs.h>
 
 #include "lcgenerator.h"
diff --git a/kstars/kstars/tools/modcalcangdist.cpp b/kstars/kstars/tools/modcalcangdist.cpp
index cf1c886a..1a13ddf1 100644
--- a/kstars/kstars/tools/modcalcangdist.cpp
+++ b/kstars/kstars/tools/modcalcangdist.cpp
@@ -24,9 +24,9 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //#include <tdeapplication.h> ..already included in modcalcapcoord.h
 
diff --git a/kstars/kstars/tools/modcalcapcoord.cpp b/kstars/kstars/tools/modcalcapcoord.cpp
index 578f3e56..c50b7b9c 100644
--- a/kstars/kstars/tools/modcalcapcoord.cpp
+++ b/kstars/kstars/tools/modcalcapcoord.cpp
@@ -31,9 +31,9 @@
 #include <tqdatetimeedit.h>  //needed for TQTimeEdit
 #include <klineedit.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 //#include <tdeapplication.h> ..already included in modcalcapcoord.h
 
diff --git a/kstars/kstars/tools/modcalcazel.cpp b/kstars/kstars/tools/modcalcazel.cpp
index 8cd37816..04a03904 100644
--- a/kstars/kstars/tools/modcalcazel.cpp
+++ b/kstars/kstars/tools/modcalcazel.cpp
@@ -33,7 +33,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcAzel::modCalcAzel(TQWidget *parentSplit, const char *name) : modCalcAzelDlg (parentSplit,name) {
diff --git a/kstars/kstars/tools/modcalceclipticcoords.cpp b/kstars/kstars/tools/modcalceclipticcoords.cpp
index d2852dd9..33aa83ae 100644
--- a/kstars/kstars/tools/modcalceclipticcoords.cpp
+++ b/kstars/kstars/tools/modcalceclipticcoords.cpp
@@ -28,11 +28,11 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcEclCoords::modCalcEclCoords(TQWidget *parentSplit, const char *name) : modCalcEclCoordsDlg(parentSplit,name) {
diff --git a/kstars/kstars/tools/modcalcequinox.cpp b/kstars/kstars/tools/modcalcequinox.cpp
index 143e3341..50fbd979 100644
--- a/kstars/kstars/tools/modcalcequinox.cpp
+++ b/kstars/kstars/tools/modcalcequinox.cpp
@@ -29,7 +29,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 
diff --git a/kstars/kstars/tools/modcalcgalcoord.cpp b/kstars/kstars/tools/modcalcgalcoord.cpp
index 4d2bee71..8c555b68 100644
--- a/kstars/kstars/tools/modcalcgalcoord.cpp
+++ b/kstars/kstars/tools/modcalcgalcoord.cpp
@@ -27,11 +27,11 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcGalCoord::modCalcGalCoord(TQWidget *parentSplit, const char *name) : modCalcGalCoordDlg(parentSplit,name) {
diff --git a/kstars/kstars/tools/modcalcgeodcoord.cpp b/kstars/kstars/tools/modcalcgeodcoord.cpp
index cf4ce051..fb54a23b 100644
--- a/kstars/kstars/tools/modcalcgeodcoord.cpp
+++ b/kstars/kstars/tools/modcalcgeodcoord.cpp
@@ -31,10 +31,10 @@
 #include <klineedit.h>
 #include <tdeapplication.h>
 #include <knumvalidator.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcGeodCoord::modCalcGeodCoord(TQWidget *parentSplit, const char *name) : modCalcGeodCoordDlg(parentSplit,name) {
diff --git a/kstars/kstars/tools/modcalcjd.cpp b/kstars/kstars/tools/modcalcjd.cpp
index 9b982664..ec25aff6 100644
--- a/kstars/kstars/tools/modcalcjd.cpp
+++ b/kstars/kstars/tools/modcalcjd.cpp
@@ -25,8 +25,8 @@
 #include <tqdatetimeedit.h>  //need for TQTimeEdit
 #include <tqradiobutton.h>
 #include <klineedit.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 
 #include "kstarsdatetime.h"
 
diff --git a/kstars/kstars/tools/modcalcplanets.cpp b/kstars/kstars/tools/modcalcplanets.cpp
index 68731825..e1c8b070 100644
--- a/kstars/kstars/tools/modcalcplanets.cpp
+++ b/kstars/kstars/tools/modcalcplanets.cpp
@@ -33,7 +33,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 
diff --git a/kstars/kstars/tools/modcalcprec.cpp b/kstars/kstars/tools/modcalcprec.cpp
index 4f5c7bb3..d489f1b0 100644
--- a/kstars/kstars/tools/modcalcprec.cpp
+++ b/kstars/kstars/tools/modcalcprec.cpp
@@ -25,11 +25,11 @@
 #include <tqcheckbox.h>
 #include <tqradiobutton.h>
 #include <tqtextstream.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <klineedit.h>
 #include <tdeapplication.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 modCalcPrec::modCalcPrec(TQWidget *parentSplit, const char *name) : modCalcPrecDlg(parentSplit,name) {
 
diff --git a/kstars/kstars/tools/modcalcsidtime.cpp b/kstars/kstars/tools/modcalcsidtime.cpp
index ad3da401..8d38f257 100644
--- a/kstars/kstars/tools/modcalcsidtime.cpp
+++ b/kstars/kstars/tools/modcalcsidtime.cpp
@@ -21,7 +21,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 #include "dmsbox.h"
 #include "modcalcsidtime.h"
diff --git a/kstars/kstars/tools/modcalcvlsr.cpp b/kstars/kstars/tools/modcalcvlsr.cpp
index 885ce1c2..ffe6ed29 100644
--- a/kstars/kstars/tools/modcalcvlsr.cpp
+++ b/kstars/kstars/tools/modcalcvlsr.cpp
@@ -34,7 +34,7 @@
 #include <tqstring.h>
 #include <tqtextstream.h>
 #include <tdefiledialog.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 
 
 modCalcVlsr::modCalcVlsr(TQWidget *parentSplit, const char *name) : modCalcVlsrDlg (parentSplit,name) {
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index e40ccaa0..be2ec6f4 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -30,9 +30,9 @@
 #include <kicontheme.h>
 #include <kiconloader.h>
 #include <tdeio/netaccess.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <klineedit.h>
 
 #include "observinglist.h"
diff --git a/kstars/kstars/tools/planetviewer.cpp b/kstars/kstars/tools/planetviewer.cpp
index b43c0adc..64ed25b9 100644
--- a/kstars/kstars/tools/planetviewer.cpp
+++ b/kstars/kstars/tools/planetviewer.cpp
@@ -19,8 +19,8 @@
 #include <tqfile.h>
 #include <tqlayout.h>
 #include <kdebug.h>
-#include <klocale.h>
-#include <kglobal.h>
+#include <tdelocale.h>
+#include <tdeglobal.h>
 #include <kiconloader.h>
 
 #include "planetviewer.h"
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index 088babd2..e4e02fdf 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -21,7 +21,7 @@
 #include <kdebug.h>
 #include <kpushbutton.h>
 #include <kcolorbutton.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <kcombobox.h>
 #include <kicontheme.h>
 #include <kiconloader.h>
@@ -30,9 +30,9 @@
 #include <tdelistview.h>
 #include <kprocess.h>
 #include <ktextedit.h>
-#include <ktempfile.h>
+#include <tdetempfile.h>
 #include <kdatewidget.h>
-#include <kmessagebox.h>
+#include <tdemessagebox.h>
 #include <tdefiledialog.h>
 #include <kstdguiitem.h>
 #include <kstandarddirs.h>
diff --git a/kstars/kstars/tools/wutdialog.cpp b/kstars/kstars/tools/wutdialog.cpp
index 74ad75e7..632f6254 100644
--- a/kstars/kstars/tools/wutdialog.cpp
+++ b/kstars/kstars/tools/wutdialog.cpp
@@ -32,7 +32,7 @@
 #include "ksmoon.h"
 
 #include <kcombobox.h>
-#include <klocale.h>
+#include <tdelocale.h>
 #include <tdelistbox.h>
 #include <kpushbutton.h>