Rename a number of classes to enhance compatibility with KDE4

40 files changed, 160 insertions, 160 deletions

diff --git a/kstars/kstars/addcatdialogui.ui b/kstars/kstars/addcatdialogui.ui
index 266cbefb..6dc67273 100644
--- a/kstars/kstars/addcatdialogui.ui
+++ b/kstars/kstars/addcatdialogui.ui
@@ -41,7 +41,7 @@
                         <string>To import an existing data file, enter its filename here.  You will then describe the contents of the file below.  You can leave the filename blank to construct a catalog file with a valid header, but no data.</string>
                     </property>
                 </widget>
-                <widget class="KListBox">
+                <widget class="TDEListBox">
                     <property name="name">
                         <cstring>DataFileBox</cstring>
                     </property>
diff --git a/kstars/kstars/details_database.ui b/kstars/kstars/details_database.ui
index 51dd7e3c..04e4c150 100644
--- a/kstars/kstars/details_database.ui
+++ b/kstars/kstars/details_database.ui
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string>Choose Online Database</string>
diff --git a/kstars/kstars/details_links.ui b/kstars/kstars/details_links.ui
index 3b2a7bb2..c75c52dc 100644
--- a/kstars/kstars/details_links.ui
+++ b/kstars/kstars/details_links.ui
@@ -43,7 +43,7 @@
                         <string>&lt;p align="center"&gt;Information Links&lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="KListBox">
+                <widget class="TDEListBox">
                     <property name="name">
                         <cstring>InfoList</cstring>
                     </property>
@@ -97,7 +97,7 @@
                         <string>&lt;p align="center"&gt;Image Links&lt;/p&gt;</string>
                     </property>
                 </widget>
-                <widget class="KListBox">
+                <widget class="TDEListBox">
                     <property name="name">
                         <cstring>ImagesList</cstring>
                     </property>
diff --git a/kstars/kstars/devmanager.ui b/kstars/kstars/devmanager.ui
index 3755d1da..97541c44 100644
--- a/kstars/kstars/devmanager.ui
+++ b/kstars/kstars/devmanager.ui
@@ -37,7 +37,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="KListView">
+                    <widget class="TDEListView">
                         <column>
                             <property name="text">
                                 <string>Device</string>
@@ -238,7 +238,7 @@
                     <property name="name">
                         <cstring>unnamed</cstring>
                     </property>
-                    <widget class="KListView">
+                    <widget class="TDEListView">
                         <column>
                             <property name="text">
                                 <string>Status</string>
diff --git a/kstars/kstars/draglistbox.cpp b/kstars/kstars/draglistbox.cpp
index 74cd169f..f7ea9251 100644
--- a/kstars/kstars/draglistbox.cpp
+++ b/kstars/kstars/draglistbox.cpp
@@ -22,7 +22,7 @@
 #include "draglistbox.h"
 
 DragListBox::DragListBox( TQWidget *parent, const char *name, WFlags f ) 
-		: KListBox( parent, name, f ) {
+		: TDEListBox( parent, name, f ) {
 
 	setAcceptDrops( TRUE );
 	dragging = FALSE;
diff --git a/kstars/kstars/draglistbox.h b/kstars/kstars/draglistbox.h
index 880c63db..1786961e 100644
--- a/kstars/kstars/draglistbox.h
+++ b/kstars/kstars/draglistbox.h
@@ -24,13 +24,13 @@ class TQDragEnterEvent;
 class TQDragDropEvent;
 
 /**@class DragListBox
-	*@short Extension of KListBox that allows Drag-and-Drop 
+	*@short Extension of TDEListBox that allows Drag-and-Drop 
 	*with other DragListBoxes
 	*@author Jason Harris
 	*@version 1.0
 	*/
 
-class DragListBox : public KListBox {
+class DragListBox : public TDEListBox {
 	Q_OBJECT
   
 public:
diff --git a/kstars/kstars/fitsheaderdialog.ui b/kstars/kstars/fitsheaderdialog.ui
index 7903b000..18c6e723 100644
--- a/kstars/kstars/fitsheaderdialog.ui
+++ b/kstars/kstars/fitsheaderdialog.ui
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListView" row="0" column="0" rowspan="1" colspan="5">
+        <widget class="TDEListView" row="0" column="0" rowspan="1" colspan="5">
             <column>
                 <property name="text">
                     <string>Card</string>
diff --git a/kstars/kstars/fitsviewer.cpp b/kstars/kstars/fitsviewer.cpp
index e5e510bd..b9c8c03f 100644
--- a/kstars/kstars/fitsviewer.cpp
+++ b/kstars/kstars/fitsviewer.cpp
@@ -92,7 +92,7 @@ extern int fits_ieee64_motorola;
    val = *(FITS_BITPIXM64 *)uc; } else val = *(FITS_BITPIXM64 *)p; }	  
 
 FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name)
-	: KMainWindow (parent, name)
+	: TDEMainWindow (parent, name)
 {
     image      = NULL;
     currentURL = *url;
@@ -131,27 +131,27 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name)
     
     if (KSUtils::openDataFile( tempFile, "imgreduction.png" ) )
     {
-    	new KAction( i18n("Image Reduction"), tempFile.name(), KShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
+    	new TDEAction( i18n("Image Reduction"), tempFile.name(), TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
 	tempFile.close();
     }
     else
-    	new KAction( i18n("Image Reduction"), "blend", KShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
+    	new TDEAction( i18n("Image Reduction"), "blend", TDEShortcut( "Ctrl+R" ), TQT_TQOBJECT(this), TQT_SLOT( imageReduction()), actionCollection(), "image_reduce");
 	
     /*if (KSUtils::openDataFile( tempFile, "bricon.png" ) )
     {
-    	new KAction( i18n("Brightness/Contrast"), tempFile.name(), KShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
+    	new TDEAction( i18n("Brightness/Contrast"), tempFile.name(), TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
 	tempFile.close();
     }
     else*/
-       	new KAction( i18n("Brightness/Contrast"), "contrast+", KShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
+       	new TDEAction( i18n("Brightness/Contrast"), "contrast+", TDEShortcut( "Ctrl+T" ), TQT_TQOBJECT(this), TQT_SLOT( BrightContrastDlg()), actionCollection(), "image_brightness_contrast");
 	
     if (KSUtils::openDataFile( tempFile, "histogram.png" ) )
     {
-    	new KAction ( i18n("Histogram"), tempFile.name(), KShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
+    	new TDEAction ( i18n("Histogram"), tempFile.name(), TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
 	tempFile.close();
     }
     else
-        new KAction ( i18n("Histogram"), "wizard", KShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
+        new TDEAction ( i18n("Histogram"), "wizard", TDEShortcut("Ctrl+H"), TQT_TQOBJECT(this), TQT_SLOT (imageHistogram()), actionCollection(), "image_histogram");
     
     KStdAction::open(TQT_TQOBJECT(this), TQT_SLOT(fileOpen()), actionCollection());   
     KStdAction::save(TQT_TQOBJECT(this), TQT_SLOT(fileSave()), actionCollection());
@@ -160,10 +160,10 @@ FITSViewer::FITSViewer (const KURL *url, TQWidget *parent, const char *name)
     KStdAction::copy(TQT_TQOBJECT(this), TQT_SLOT(fitsCOPY()), actionCollection());
     KStdAction::zoomIn(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomIn()), actionCollection());
     KStdAction::zoomOut(TQT_TQOBJECT(image), TQT_SLOT(fitsZoomOut()), actionCollection());
-    new KAction( i18n( "&Default Zoom" ), "viewmagfit.png", KShortcut( "Ctrl+D" ),
+    new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+D" ),
 		TQT_TQOBJECT(image), TQT_SLOT(fitsZoomDefault()), actionCollection(), "zoom_default" );
-    new KAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats");
-    new KAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor");
+    new TDEAction( i18n( "Statistics"), "sum", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsStatistics()), actionCollection(), "image_stats");
+    new TDEAction( i18n( "FITS Header"), "frame_spreadsheet.png", 0, TQT_TQOBJECT(this), TQT_SLOT(fitsHeader()), actionCollection(), "fits_editor");
     
    /* Create GUI */
    createGUI("fitsviewer.rc");
diff --git a/kstars/kstars/fitsviewer.h b/kstars/kstars/fitsviewer.h
index 3790ebf1..ee3c7a7c 100644
--- a/kstars/kstars/fitsviewer.h
+++ b/kstars/kstars/fitsviewer.h
@@ -45,7 +45,7 @@ class TQScrollView;
 class FITSImage;
 class FITSHistogram;
 
-class FITSViewer : public KMainWindow  {
+class FITSViewer : public TDEMainWindow  {
 	Q_OBJECT
   
 
diff --git a/kstars/kstars/fovdialogui.ui b/kstars/kstars/fovdialogui.ui
index 77f10219..f114266d 100644
--- a/kstars/kstars/fovdialogui.ui
+++ b/kstars/kstars/fovdialogui.ui
@@ -19,7 +19,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListBox">
+        <widget class="TDEListBox">
             <property name="name">
                 <cstring>FOVListBox</cstring>
             </property>
diff --git a/kstars/kstars/imageviewer.cpp b/kstars/kstars/imageviewer.cpp
index d3b92722..8fdbacbc 100644
--- a/kstars/kstars/imageviewer.cpp
+++ b/kstars/kstars/imageviewer.cpp
@@ -30,16 +30,16 @@
 #include <kapplication.h>
 
 ImageViewer::ImageViewer (const KURL *url, const TQString &capText, TQWidget *parent, const char *name)
-	: KMainWindow (parent, name), imageURL (*url), fileIsImage (false),
+	: TDEMainWindow (parent, name), imageURL (*url), fileIsImage (false),
 	  ctrl (false), key_s (false), key_q (false), downloadJob(0)
 {
 // toolbar can dock only on top-position and can't be minimized
 // JH: easier to just disable its mobility
 	toolBar()->setMovingEnabled( false );
 
-	KAction *action = new KAction (i18n ("Close Window"), "fileclose", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection());
+	TDEAction *action = new TDEAction (i18n ("Close Window"), "fileclose", CTRL+Key_Q, TQT_TQOBJECT(this), TQT_SLOT (close()), actionCollection());
 	action->plug (toolBar());
-	action = new KAction (i18n ("Save Image"), "filesave", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection());
+	action = new TDEAction (i18n ("Save Image"), "filesave", CTRL+Key_S, TQT_TQOBJECT(this), TQT_SLOT (saveFileToDisc()), actionCollection());
 	action->plug (toolBar());
 
 	statusBar()->insertItem( capText, 0, 1, true );
diff --git a/kstars/kstars/imageviewer.h b/kstars/kstars/imageviewer.h
index cec0d85f..e0b085e9 100644
--- a/kstars/kstars/imageviewer.h
+++ b/kstars/kstars/imageviewer.h
@@ -45,7 +45,7 @@
 class KURL;
 class TQFile;
 
-class ImageViewer : public KMainWindow  {
+class ImageViewer : public TDEMainWindow  {
 	Q_OBJECT
   
 
@@ -70,7 +70,7 @@ class ImageViewer : public KMainWindow  {
 		void closeEvent (TQCloseEvent *ev);
 
 	/**Keyboard shortcuts for saving files and closing the window
-		*@note (this should be deprecated; instead just assign KAccel 
+		*@note (this should be deprecated; instead just assign TDEAccel 
 		*to the close/save buttons)
 		*/
 		void keyPressEvent (TQKeyEvent *ev);
diff --git a/kstars/kstars/indidevice.h b/kstars/kstars/indidevice.h
index 11ed7cf3..366e7b3a 100644
--- a/kstars/kstars/indidevice.h
+++ b/kstars/kstars/indidevice.h
@@ -31,7 +31,7 @@ class KLineEdit;
 class KComboBox;
 class KDoubleSpinBox;
 class KPushButton;
-class KPopupMenu;
+class TDEPopupMenu;
 
 class TQTable;
 class TQLabel;
diff --git a/kstars/kstars/indidriver.cpp b/kstars/kstars/indidriver.cpp
index e34b83f6..1de1b3ea 100644
--- a/kstars/kstars/indidriver.cpp
+++ b/kstars/kstars/indidriver.cpp
@@ -69,7 +69,7 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent )
     localMode  = icons->loadIcon( "network_local", KIcon::Small);
     serverMode = icons->loadIcon( "network", KIcon::Small);
 
-    LocalpopMenu = new KPopupMenu(localListView);
+    LocalpopMenu = new TDEPopupMenu(localListView);
     LocalpopMenu->insertItem( runningPix, i18n("Run Service") , 0);
     LocalpopMenu->insertItem( stopPix, i18n("Stop Service"), 1);
 
@@ -79,7 +79,7 @@ INDIDriver::INDIDriver(TQWidget *parent) : devManager( parent )
   disconnected        = icons->loadIcon( "connect_no", KIcon::Small);
   establishConnection = icons->loadIcon( "connect_creating", KIcon::Small);
 
-  ClientpopMenu = new KPopupMenu(clientListView);
+  ClientpopMenu = new TDEPopupMenu(clientListView);
   ClientpopMenu->insertItem( establishConnection, i18n("Connect") , 0);
   ClientpopMenu->insertItem( disconnected, i18n("Disconnect"), 1);
 
@@ -353,7 +353,7 @@ void INDIDriver::updateMenuActions()
   // We iterate over devices, we enable INDI Control Panel if we have any active device
   // We enable capture image sequence if we have any imaging device
   
-  KAction *tmpAction;
+  TDEAction *tmpAction;
   INDIMenu *devMenu = ksw->getINDIMenu();
   bool activeDevice = false;
   bool activeImaging = false;
@@ -656,7 +656,7 @@ bool INDIDriver::buildDeviceGroup(XMLEle *root, char errmsg[])
     groupType = KSTARS_GPS;
 
 
-  //KListViewItem *group = new KListViewItem(topItem, lastGroup);
+  //TDEListViewItem *group = new TDEListViewItem(topItem, lastGroup);
   TQListViewItem *group = new TQListViewItem(localListView, lastGroup);
   group->setText(0, groupName);
   lastGroup = group;
diff --git a/kstars/kstars/indidriver.h b/kstars/kstars/indidriver.h
index 8ecf6e2e..617d89de 100644
--- a/kstars/kstars/indidriver.h
+++ b/kstars/kstars/indidriver.h
@@ -27,8 +27,8 @@
 
 class KStars;
 
-class KListView;
-class KPopupMenu;
+class TDEListView;
+class TDEPopupMenu;
 class TDEProcess;
 
 struct INDIHostsInfo
@@ -87,7 +87,7 @@ class INDIDriver : public devManager
    INDIDriver(TQWidget * parent = 0);
    ~INDIDriver();
 
-    KListView* deviceContainer;
+    TDEListView* deviceContainer;
 
     bool readXMLDriver();
 
@@ -108,8 +108,8 @@ class INDIDriver : public devManager
     TQPixmap localMode;
     TQPixmap serverMode;
 
-    KPopupMenu *ClientpopMenu;
-    KPopupMenu *LocalpopMenu;
+    TDEPopupMenu *ClientpopMenu;
+    TDEPopupMenu *LocalpopMenu;
 
     int lastPort;
 
diff --git a/kstars/kstars/indiproperty.h b/kstars/kstars/indiproperty.h
index 836f02f7..c655903a 100644
--- a/kstars/kstars/indiproperty.h
+++ b/kstars/kstars/indiproperty.h
@@ -18,7 +18,7 @@
 class INDI_G;
 class INDIStdProperty;
 
-class KPopupMenu;
+class TDEPopupMenu;
 class KComboBox;
 class KLed;
 
@@ -43,7 +43,7 @@ class INDI_P : public TQObject
     TQString     label;			/* property label */
     
     INDI_G	*pg;			/* parent group */
-    KPopupMenu  *assosiatedPopup;	/* assosiated popup menu, if any */
+    TDEPopupMenu  *assosiatedPopup;	/* assosiated popup menu, if any */
     INDIStdProperty *indistd;		/* Assosciated std routines class */
     double	timeout;		/* timeout, seconds */
     PState	state;			/* state light code */
diff --git a/kstars/kstars/indistd.cpp b/kstars/kstars/indistd.cpp
index c79b90eb..debf946c 100644
--- a/kstars/kstars/indistd.cpp
+++ b/kstars/kstars/indistd.cpp
@@ -345,7 +345,7 @@ void INDIStdDevice::handleBLOB(unsigned char *buffer, int bufferSize, TQString d
  {
     INDI_E *lp;
     INDI_P *imgProp;
-    KAction *tmpAction;
+    TDEAction *tmpAction;
     INDIDriver *drivers = ksw->getINDIDriver();
     TQFont buttonFont;
     
diff --git a/kstars/kstars/kspopupmenu.cpp b/kstars/kstars/kspopupmenu.cpp
index 94e25708..80125fbe 100644
--- a/kstars/kstars/kspopupmenu.cpp
+++ b/kstars/kstars/kspopupmenu.cpp
@@ -33,7 +33,7 @@
 #include "indiproperty.h"
 
 KSPopupMenu::KSPopupMenu( TQWidget *parent, const char *name )
- : KPopupMenu( parent, name )
+ : TDEPopupMenu( parent, name )
 {
 	ksw = ( KStars* )parent;
 }
@@ -154,7 +154,7 @@ bool KSPopupMenu::addINDI(void)
         if (!dev->INDIStdSupport)
 	 continue;
 
-	KPopupMenu *menuDevice = new KPopupMenu();
+	TDEPopupMenu *menuDevice = new TDEPopupMenu();
 	
 	insertItem(dev->label, menuDevice);
 
diff --git a/kstars/kstars/kspopupmenu.h b/kstars/kstars/kspopupmenu.h
index 3262a2aa..6dd9b143 100644
--- a/kstars/kstars/kspopupmenu.h
+++ b/kstars/kstars/kspopupmenu.h
@@ -36,7 +36,7 @@ class StarObject;
 class SkyObject;
 class TQLabel;
 
-class KSPopupMenu : public KPopupMenu
+class KSPopupMenu : public TDEPopupMenu
 {
 Q_OBJECT
   
diff --git a/kstars/kstars/kstars.cpp b/kstars/kstars/kstars.cpp
index 93c01717..c57eec64 100644
--- a/kstars/kstars/kstars.cpp
+++ b/kstars/kstars/kstars.cpp
@@ -16,7 +16,7 @@
  ***************************************************************************/
 //JH 11.06.2002: replaced infoPanel with infoBoxes
 //JH 24.08.2001: reorganized infoPanel
-//JH 25.08.2001: added toolbar, converted menu items to KAction objects
+//JH 25.08.2001: added toolbar, converted menu items to TDEAction objects
 //JH 25.08.2001: main window now resizable, window size saved in config file
 
 
@@ -47,7 +47,7 @@
 #include "indidriver.h"
 
 KStars::KStars( bool doSplash, bool clockrun, const TQString &startdate ) :
-	DCOPObject("KStarsInterface"), KMainWindow(),
+	DCOPObject("KStarsInterface"), TDEMainWindow(),
 	skymap(0), centralWidget(0), topLayout(0), viewToolBar(0), TimeStep(0),
 	actCoordSys(0), colorActionMenu(0), fovActionMenu(0),
 	AAVSODialog(0), findDialog(0), kns(0), 
@@ -163,23 +163,23 @@ void KStars::applyConfig() {
 
 	//Toggle actions
 	if ( Options::useAltAz() ) ((ToggleAction*)actionCollection()->action("coordsys"))->turnOff();
-	((KToggleAction*)actionCollection()->action("show_time_box"))->setChecked( Options::showTimeBox() );
-	((KToggleAction*)actionCollection()->action("show_location_box"))->setChecked( Options::showGeoBox() );
-	((KToggleAction*)actionCollection()->action("show_focus_box"))->setChecked( Options::showFocusBox() );
-	((KToggleAction*)actionCollection()->action("show_mainToolBar"))->setChecked( Options::showMainToolBar() );
-	((KToggleAction*)actionCollection()->action("show_viewToolBar"))->setChecked( Options::showViewToolBar() );
-	((KToggleAction*)actionCollection()->action("show_statusBar"))->setChecked( Options::showStatusBar() );
-	((KToggleAction*)actionCollection()->action("show_sbAzAlt"))->setChecked( Options::showAltAzField() );
-	((KToggleAction*)actionCollection()->action("show_sbRADec"))->setChecked( Options::showRADecField() );
-	((KToggleAction*)actionCollection()->action("show_stars"))->setChecked( Options::showStars() );
-	((KToggleAction*)actionCollection()->action("show_deepsky"))->setChecked( Options::showDeepSky() );
-	((KToggleAction*)actionCollection()->action("show_planets"))->setChecked( Options::showPlanets() );
-	((KToggleAction*)actionCollection()->action("show_clines"))->setChecked( Options::showCLines() );
-	((KToggleAction*)actionCollection()->action("show_cnames"))->setChecked( Options::showCNames() );
-	((KToggleAction*)actionCollection()->action("show_cbounds"))->setChecked( Options::showCBounds() );
-	((KToggleAction*)actionCollection()->action("show_mw"))->setChecked( Options::showMilkyWay() );
-	((KToggleAction*)actionCollection()->action("show_grid"))->setChecked( Options::showGrid() );
-	((KToggleAction*)actionCollection()->action("show_horizon"))->setChecked( Options::showGround() );
+	((TDEToggleAction*)actionCollection()->action("show_time_box"))->setChecked( Options::showTimeBox() );
+	((TDEToggleAction*)actionCollection()->action("show_location_box"))->setChecked( Options::showGeoBox() );
+	((TDEToggleAction*)actionCollection()->action("show_focus_box"))->setChecked( Options::showFocusBox() );
+	((TDEToggleAction*)actionCollection()->action("show_mainToolBar"))->setChecked( Options::showMainToolBar() );
+	((TDEToggleAction*)actionCollection()->action("show_viewToolBar"))->setChecked( Options::showViewToolBar() );
+	((TDEToggleAction*)actionCollection()->action("show_statusBar"))->setChecked( Options::showStatusBar() );
+	((TDEToggleAction*)actionCollection()->action("show_sbAzAlt"))->setChecked( Options::showAltAzField() );
+	((TDEToggleAction*)actionCollection()->action("show_sbRADec"))->setChecked( Options::showRADecField() );
+	((TDEToggleAction*)actionCollection()->action("show_stars"))->setChecked( Options::showStars() );
+	((TDEToggleAction*)actionCollection()->action("show_deepsky"))->setChecked( Options::showDeepSky() );
+	((TDEToggleAction*)actionCollection()->action("show_planets"))->setChecked( Options::showPlanets() );
+	((TDEToggleAction*)actionCollection()->action("show_clines"))->setChecked( Options::showCLines() );
+	((TDEToggleAction*)actionCollection()->action("show_cnames"))->setChecked( Options::showCNames() );
+	((TDEToggleAction*)actionCollection()->action("show_cbounds"))->setChecked( Options::showCBounds() );
+	((TDEToggleAction*)actionCollection()->action("show_mw"))->setChecked( Options::showMilkyWay() );
+	((TDEToggleAction*)actionCollection()->action("show_grid"))->setChecked( Options::showGrid() );
+	((TDEToggleAction*)actionCollection()->action("show_horizon"))->setChecked( Options::showGround() );
 	
 	//color scheme
 	pd->kstarsData->colorScheme()->loadFromConfig( kapp->config() );
diff --git a/kstars/kstars/kstars.h b/kstars/kstars/kstars.h
index 0a5c3dee..3e719742 100644
--- a/kstars/kstars/kstars.h
+++ b/kstars/kstars/kstars.h
@@ -32,10 +32,10 @@
 // forward declaration is enough. We only need pointers
 class TQPalette;
 class TQVBoxLayout;
-class KActionMenu;
+class TDEActionMenu;
 class KDialogBase;
 class KKey;
-class KToolBar;
+class TDEToolBar;
 
 class dms;
 class KSNewStuff;
@@ -64,7 +64,7 @@ class imagesequence;
 	*@version 1.0
 	*/
 
-class KStars : public KMainWindow, virtual public KStarsInterface
+class KStars : public TDEMainWindow, virtual public KStarsInterface
 {
 
   Q_OBJECT
@@ -634,12 +634,12 @@ class KStars : public KMainWindow, virtual public KStarsInterface
 		TQWidget *centralWidget;
 		TQVBoxLayout *topLayout;
 
-		KToolBar *viewToolBar;
+		TDEToolBar *viewToolBar;
 		TimeStepBox *TimeStep;
 
 		ToggleAction *actCoordSys;
 		ToggleAction *actObsList;
-		KActionMenu *colorActionMenu, *fovActionMenu;
+		TDEActionMenu *colorActionMenu, *fovActionMenu;
 		
 		KDialogBase *AAVSODialog;
 		FindDialog *findDialog;
diff --git a/kstars/kstars/kstarsactions.cpp b/kstars/kstars/kstarsactions.cpp
index aa403e9b..133d5fab 100644
--- a/kstars/kstars/kstarsactions.cpp
+++ b/kstars/kstars/kstarsactions.cpp
@@ -873,7 +873,7 @@ void KStars::slotFOVEdit() {
 
 				if ( fields.count() == 4 ) {
 					TQString nm = fields[0].stripWhiteSpace();
-					KToggleAction *kta = new KToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ),
+					TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ),
 							actionCollection(), nm.utf8() );
 					kta->setExclusiveGroup( "fovsymbol" );
 					fovActionMenu->insert( kta );
@@ -884,7 +884,7 @@ void KStars::slotFOVEdit() {
 		}
 
 		fovActionMenu->popupMenu()->insertSeparator();
-		fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this),
+		fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this),
 				TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) );
 
 		//set FOV to whatever was highlighted in FOV dialog
@@ -1019,7 +1019,7 @@ void KStars::slotShowGUIItem( bool show ) {
 }
 
 void KStars::addColorMenuItem( TQString name, TQString actionName ) {
-	colorActionMenu->insert( new KAction( name, 0,
+	colorActionMenu->insert( new TDEAction( name, 0,
 			TQT_TQOBJECT(this), TQT_SLOT( slotColorScheme() ), actionCollection(), actionName.local8Bit() ) );
 }
 
diff --git a/kstars/kstars/kstarsinit.cpp b/kstars/kstars/kstarsinit.cpp
index c0248238..4db3b995 100644
--- a/kstars/kstars/kstarsinit.cpp
+++ b/kstars/kstars/kstarsinit.cpp
@@ -48,24 +48,24 @@
 
 void KStars::initActions() {
 //File Menu:
-	new KAction(i18n("&New Window"), "window_new", KShortcut( "Ctrl+N"  ),
+	new TDEAction(i18n("&New Window"), "window_new", TDEShortcut( "Ctrl+N"  ),
 			TQT_TQOBJECT(this), TQT_SLOT( newWindow() ), actionCollection(), "new_window");
-	new KAction(i18n("&Close Window"), "fileclose", KShortcut( "Ctrl+W"  ),
+	new TDEAction(i18n("&Close Window"), "fileclose", TDEShortcut( "Ctrl+W"  ),
 			TQT_TQOBJECT(this), TQT_SLOT( closeWindow() ), actionCollection(), "close_window");
-	new KAction( i18n( "&Download Data..." ), "knewstuff", KShortcut( "Ctrl+D" ),
+	new TDEAction( i18n( "&Download Data..." ), "knewstuff", TDEShortcut( "Ctrl+D" ),
 			TQT_TQOBJECT(this), TQT_SLOT( slotDownload() ), actionCollection(), "get_data" );
-	new KAction( i18n( "Open FITS..."), "fileopen", KShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file");
-	new KAction( i18n( "&Save Sky Image..." ), "fileexport", KShortcut( "Ctrl+I" ),
+	new TDEAction( i18n( "Open FITS..."), "fileopen", TDEShortcut( "Ctrl+O"), TQT_TQOBJECT(this), TQT_SLOT( slotOpenFITS()), actionCollection(), "open_file");
+	new TDEAction( i18n( "&Save Sky Image..." ), "fileexport", TDEShortcut( "Ctrl+I" ),
 			TQT_TQOBJECT(this), TQT_SLOT( slotExportImage() ), actionCollection(), "export_image" );
-	new KAction( i18n( "&Run Script..." ), "launch", KShortcut( "Ctrl+R" ),
+	new TDEAction( i18n( "&Run Script..." ), "launch", TDEShortcut( "Ctrl+R" ),
 			TQT_TQOBJECT(this), TQT_SLOT( slotRunScript() ), actionCollection(), "run_script" );
 	KStdAction::print(TQT_TQOBJECT(this), TQT_SLOT( slotPrint() ), actionCollection(), "print" );
 	KStdAction::quit(TQT_TQOBJECT(this), TQT_SLOT( close() ), actionCollection(), "quit" );
 
 //Time Menu:
-	new KAction( i18n( "Set Time to &Now" ), KShortcut( "Ctrl+E"  ),
+	new TDEAction( i18n( "Set Time to &Now" ), TDEShortcut( "Ctrl+E"  ),
 		TQT_TQOBJECT(this), TQT_SLOT( slotSetTimeToNow() ), actionCollection(), "time_to_now" );
-	new KAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", KShortcut( "Ctrl+S"  ),
+	new TDEAction( i18n( "set Clock to New Time", "&Set Time..." ), "clock", TDEShortcut( "Ctrl+S"  ),
 		TQT_TQOBJECT(this), TQT_SLOT( slotSetTime() ), actionCollection(), "time_dialog" );
 	ToggleAction *actTimeRun = new ToggleAction( i18n( "Stop &Clock" ), BarIcon("player_pause"),
 				i18n("Start &Clock"), BarIcon("1rightarrow"),
@@ -78,33 +78,33 @@ void KStars::initActions() {
 	TQObject::connect(data()->clock(), TQT_SIGNAL(clockStopped()), this, TQT_SLOT(updateTime()) );
 
 //Focus Menu:
-	new KAction(i18n( "&Zenith" ), KShortcut( "Z" ),
+	new TDEAction(i18n( "&Zenith" ), TDEShortcut( "Z" ),
 			TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ),  actionCollection(), "zenith");
-	new KAction(i18n( "&North" ), KShortcut( "N" ),
+	new TDEAction(i18n( "&North" ), TDEShortcut( "N" ),
 			TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ),  actionCollection(), "north");
-	new KAction(i18n( "&East" ), KShortcut( "E" ),
+	new TDEAction(i18n( "&East" ), TDEShortcut( "E" ),
 			TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ),  actionCollection(), "east");
-	new KAction(i18n( "&South" ), KShortcut( "S" ),
+	new TDEAction(i18n( "&South" ), TDEShortcut( "S" ),
 			TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ),  actionCollection(), "south");
-	new KAction(i18n( "&West" ), KShortcut( "W" ),
+	new TDEAction(i18n( "&West" ), TDEShortcut( "W" ),
 			TQT_TQOBJECT(this), TQT_SLOT( slotPointFocus() ),  actionCollection(), "west");
-	KAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ),
+	TDEAction *tmpAction = KStdAction::find( TQT_TQOBJECT(this), TQT_SLOT( slotFind() ),
 												actionCollection(), "find_object" );
 	tmpAction->setText( i18n( "&Find Object..." ) );
 	tmpAction->setToolTip( i18n( "Find object" ) );
 
-	new KAction( i18n( "Engage &Tracking" ), "decrypted", KShortcut( "Ctrl+T"  ),
+	new TDEAction( i18n( "Engage &Tracking" ), "decrypted", TDEShortcut( "Ctrl+T"  ),
 		TQT_TQOBJECT(this), TQT_SLOT( slotTrack() ), actionCollection(), "track_object" );
 
-	new KAction( i18n( "Set Focus &Manually..." ), KShortcut( "Ctrl+M" ),
+	new TDEAction( i18n( "Set Focus &Manually..." ), TDEShortcut( "Ctrl+M" ),
 			TQT_TQOBJECT(this), TQT_SLOT( slotManualFocus() ),  actionCollection(), "manual_focus" );
 
 //View Menu:
 	KStdAction::zoomIn(TQT_TQOBJECT(this), TQT_SLOT( slotZoomIn() ), actionCollection(), "zoom_in" );
 	KStdAction::zoomOut(TQT_TQOBJECT(this), TQT_SLOT( slotZoomOut() ), actionCollection(), "zoom_out" );
-	new KAction( i18n( "&Default Zoom" ), "viewmagfit.png", KShortcut( "Ctrl+Z" ),
+	new TDEAction( i18n( "&Default Zoom" ), "viewmagfit.png", TDEShortcut( "Ctrl+Z" ),
 		TQT_TQOBJECT(this), TQT_SLOT( slotDefaultZoom() ), actionCollection(), "zoom_default" );
-	new KAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", KShortcut( "Ctrl+Shift+Z" ),
+	new TDEAction( i18n( "&Zoom to Angular Size..." ), "viewmag.png", TDEShortcut( "Ctrl+Shift+Z" ),
 		TQT_TQOBJECT(this), TQT_SLOT( slotSetZoom() ), actionCollection(), "zoom_set" );
 	actCoordSys = new ToggleAction( i18n("Horizontal &Coordinates"), i18n( "Equatorial &Coordinates" ),
 			Key_Space, TQT_TQOBJECT(this), TQT_SLOT( slotCoordSys() ), actionCollection(), "coordsys" );
@@ -114,56 +114,56 @@ void KStars::initActions() {
 //Settings Menu:
 	//
 	// MHH - 2002-01-13
-	// Setting the slot in the KToggleAction constructor, connects the slot to
+	// Setting the slot in the TDEToggleAction constructor, connects the slot to
 	// the activated signal instead of the toggled signal. This seems like a bug
 	// to me, but ...
 	//
 	//Info Boxes option actions
-	KToggleAction *a = new KToggleAction(i18n( "Show the information boxes", "Show &Info Boxes"),
+	TDEToggleAction *a = new TDEToggleAction(i18n( "Show the information boxes", "Show &Info Boxes"),
 			0, 0, 0, actionCollection(), "show_boxes");
 	a->setChecked( Options::showInfoBoxes() );
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(setVisible(bool)));
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
 
-	a = new KToggleAction(i18n( "Show time-related info box", "Show &Time Box"),
+	a = new TDEToggleAction(i18n( "Show time-related info box", "Show &Time Box"),
 			0, 0, 0, actionCollection(), "show_time_box");
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showTimeBox(bool)));
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
 
-	a = new KToggleAction(i18n( "Show focus-related info box", "Show &Focus Box"),
+	a = new TDEToggleAction(i18n( "Show focus-related info box", "Show &Focus Box"),
 			0, 0, 0, actionCollection(), "show_focus_box");
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showFocusBox(bool)));
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
 
-	a = new KToggleAction(i18n( "Show location-related info box", "Show &Location Box"),
+	a = new TDEToggleAction(i18n( "Show location-related info box", "Show &Location Box"),
 			0, 0, 0, actionCollection(), "show_location_box");
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), infoBoxes(), TQT_SLOT(showGeoBox(bool)));
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
 
 //Toolbar view options
-	a = new KToggleAction(i18n( "Show Main Toolbar" ),
+	a = new TDEToggleAction(i18n( "Show Main Toolbar" ),
 			0, 0, 0, actionCollection(), "show_mainToolBar");
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
 
-	a = new KToggleAction(i18n( "Show View Toolbar" ),
+	a = new TDEToggleAction(i18n( "Show View Toolbar" ),
 			0, 0, 0, actionCollection(), "show_viewToolBar");
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
 
 //Statusbar view options
-	a = new KToggleAction(i18n( "Show Statusbar" ),
+	a = new TDEToggleAction(i18n( "Show Statusbar" ),
 			0, 0, 0, actionCollection(), "show_statusBar");
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
 
-	a = new KToggleAction(i18n( "Show Az/Alt Field" ),
+	a = new TDEToggleAction(i18n( "Show Az/Alt Field" ),
 			0, 0, 0, actionCollection(), "show_sbAzAlt");
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
 
-	a = new KToggleAction(i18n( "Show RA/Dec Field" ),
+	a = new TDEToggleAction(i18n( "Show RA/Dec Field" ),
 			0, 0, 0, actionCollection(), "show_sbRADec");
 	TQObject::connect(a, TQT_SIGNAL( toggled(bool) ), this, TQT_SLOT(slotShowGUIItem(bool)));
 
-//Color scheme actions.  These are added to the "colorschemes" KActionMenu.
-	colorActionMenu = new KActionMenu( i18n( "C&olor Schemes" ), actionCollection(), "colorschemes" );
+//Color scheme actions.  These are added to the "colorschemes" TDEActionMenu.
+	colorActionMenu = new TDEActionMenu( i18n( "C&olor Schemes" ), actionCollection(), "colorschemes" );
 	addColorMenuItem( i18n( "&Default" ), "cs_default" );
 	addColorMenuItem( i18n( "&Star Chart" ), "cs_chart" );
 	addColorMenuItem( i18n( "&Night Vision" ), "cs_night" );
@@ -187,65 +187,65 @@ void KStars::initActions() {
 	}
 
 	//Add FOV Symbol actions
-	fovActionMenu = new KActionMenu( i18n( "&FOV Symbols" ), actionCollection(), "fovsymbols" );
+	fovActionMenu = new TDEActionMenu( i18n( "&FOV Symbols" ), actionCollection(), "fovsymbols" );
 	initFOV();
 
-	new KAction( i18n( "Location on Earth", "&Geographic..." ), 
-			"kstars_geo", KShortcut( "Ctrl+G"  ), TQT_TQOBJECT(this), 
+	new TDEAction( i18n( "Location on Earth", "&Geographic..." ), 
+			"kstars_geo", TDEShortcut( "Ctrl+G"  ), TQT_TQOBJECT(this), 
 			TQT_SLOT( slotGeoLocator() ), actionCollection(), "geolocation" );
 
 	KStdAction::preferences( TQT_TQOBJECT(this), TQT_SLOT( slotViewOps() ), actionCollection(), "configure" );
 
-	new KAction(i18n( "Startup Wizard..." ), "wizard", KShortcut(), 
+	new TDEAction(i18n( "Startup Wizard..." ), "wizard", TDEShortcut(), 
 			TQT_TQOBJECT(this), TQT_SLOT( slotWizard() ), actionCollection(), "startwizard" );
 
 //Tools Menu:
-	new KAction(i18n( "Calculator..."), KShortcut( "Ctrl+C"),
+	new TDEAction(i18n( "Calculator..."), TDEShortcut( "Ctrl+C"),
 			TQT_TQOBJECT(this), TQT_SLOT( slotCalculator() ), actionCollection(), "astrocalculator");
 
-	new KAction(i18n( "Observing List..."), KShortcut( "Ctrl+L"),
+	new TDEAction(i18n( "Observing List..."), TDEShortcut( "Ctrl+L"),
 			TQT_TQOBJECT(this), TQT_SLOT( slotObsList() ), actionCollection(), "obslist");
 
 	// enable action only if file was loaded and processed successfully.
 	if (!data()->VariableStarsList.isEmpty())
-		new KAction(i18n( "AAVSO Light Curves..."), KShortcut( "Ctrl+V"),
+		new TDEAction(i18n( "AAVSO Light Curves..."), TDEShortcut( "Ctrl+V"),
 						TQT_TQOBJECT(this), TQT_SLOT( slotLCGenerator() ), actionCollection(), "lightcurvegenerator");
 
-	new KAction(i18n( "Altitude vs. Time..."), KShortcut( "Ctrl+A"),
+	new TDEAction(i18n( "Altitude vs. Time..."), TDEShortcut( "Ctrl+A"),
 						TQT_TQOBJECT(this), TQT_SLOT( slotAVT() ), actionCollection(), "altitude_vs_time");
-	new KAction(i18n( "What's up Tonight..."), KShortcut("Ctrl+U"),
+	new TDEAction(i18n( "What's up Tonight..."), TDEShortcut("Ctrl+U"),
 						TQT_TQOBJECT(this), TQT_SLOT(slotWUT()), actionCollection(), "whats_up_tonight");
 //FIXME GLOSSARY
-//	new KAction(i18n( "Glossary..."), KShortcut("Ctrl+K"),
+//	new TDEAction(i18n( "Glossary..."), TDEShortcut("Ctrl+K"),
 //						this, TQT_SLOT(slotGlossary()), actionCollection(), "glossary");
-	new KAction(i18n( "Script Builder..."), KShortcut("Ctrl+B"),
+	new TDEAction(i18n( "Script Builder..."), TDEShortcut("Ctrl+B"),
 						TQT_TQOBJECT(this), TQT_SLOT(slotScriptBuilder()), actionCollection(), "scriptbuilder");
-	new KAction(i18n( "Solar System..."), KShortcut("Ctrl+Y"),
+	new TDEAction(i18n( "Solar System..."), TDEShortcut("Ctrl+Y"),
 						TQT_TQOBJECT(this), TQT_SLOT(slotSolarSystem()), actionCollection(), "solarsystem");
-	new KAction(i18n( "Jupiter's Moons..."), KShortcut("Ctrl+J"),
+	new TDEAction(i18n( "Jupiter's Moons..."), TDEShortcut("Ctrl+J"),
 						TQT_TQOBJECT(this), TQT_SLOT(slotJMoonTool()), actionCollection(), "jmoontool");
 
 // devices Menu
-	new KAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard");
-	new KAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties");
-	new KAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager");
+	new TDEAction(i18n("Telescope Wizard..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeWizard()), actionCollection(), "telescope_wizard");
+	new TDEAction(i18n("Telescope Properties..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotTelescopeProperties()), actionCollection(), "telescope_properties");
+	new TDEAction(i18n("Device Manager..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIDriver()), actionCollection(), "device_manager");
 	
-	tmpAction = new KAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence");
+	tmpAction = new TDEAction(i18n("Capture Image Sequence..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotImageSequence()), actionCollection(), "capture_sequence");
 	tmpAction->setEnabled(false);
 	
-	tmpAction = new KAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel");
+	tmpAction = new TDEAction(i18n("INDI Control Panel..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIPanel()), actionCollection(), "indi_control_panel");
 	tmpAction->setEnabled(false);
 	
-	new KAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi");
+	new TDEAction(i18n("Configure INDI..."), 0, TQT_TQOBJECT(this), TQT_SLOT(slotINDIConf()), actionCollection(), "configure_indi");
 
 
 
 //Help Menu:
-	new KAction( i18n( "Tip of the Day" ), "idea", 0,
+	new TDEAction( i18n( "Tip of the Day" ), "idea", 0,
 			TQT_TQOBJECT(this), TQT_SLOT( slotTipOfDay() ), actionCollection(), "help_tipofday" );
 
 //Handbook toolBar item:
-	new KAction( i18n( "&Handbook" ), "contents", KShortcut( "F1"  ),
+	new TDEAction( i18n( "&Handbook" ), "contents", TDEShortcut( "F1"  ),
 			TQT_TQOBJECT(this), TQT_SLOT( appHelpActivated() ), actionCollection(), "handbook" );
 
 //
@@ -253,39 +253,39 @@ void KStars::initActions() {
 //
 
 //show_stars:
-	a = new KToggleAction( i18n( "Toggle Stars" ), "kstars_stars", 
+	a = new TDEToggleAction( i18n( "Toggle Stars" ), "kstars_stars", 
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_stars" );
 
 //show_deepsky:
-	a = new KToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky", 
+	a = new TDEToggleAction( i18n( "Toggle Deep Sky Objects" ), "kstars_deepsky", 
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_deepsky" );
 
 //show_planets:
-	a = new KToggleAction( i18n( "Toggle Solar System" ), "kstars_planets", 
+	a = new TDEToggleAction( i18n( "Toggle Solar System" ), "kstars_planets", 
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_planets" );
 
 //show_clines:
-	a = new KToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines", 
+	a = new TDEToggleAction( i18n( "Toggle Constellation Lines" ), "kstars_clines", 
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_clines" );
 
 //show_cnames:
-	a = new KToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames", 
+	a = new TDEToggleAction( i18n( "Toggle Constellation Names" ), "kstars_cnames", 
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cnames" );
 
 //show_cbound:
-	a = new KToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound", 
+	a = new TDEToggleAction( i18n( "Toggle Constellation Boundaries" ), "kstars_cbound", 
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_cbounds" );
 
 //show_mw:
-	a = new KToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw", 
+	a = new TDEToggleAction( i18n( "Toggle Milky Way" ), "kstars_mw", 
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_mw" );
 
 //show_grid:
-	a = new KToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid", 
+	a = new TDEToggleAction( i18n( "Toggle Coordinate Grid" ), "kstars_grid", 
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_grid" );
 
 //show_horizon:
-	a = new KToggleAction( i18n( "Toggle Ground" ), "kstars_horizon", 
+	a = new TDEToggleAction( i18n( "Toggle Ground" ), "kstars_horizon", 
 		0, TQT_TQOBJECT(this), TQT_SLOT( slotViewToolBar() ), actionCollection(), "show_horizon" );
 	
 	if (Options::fitsSaveDirectory().isEmpty())
@@ -327,7 +327,7 @@ void KStars::initFOV() {
 
 			if ( fields.count() == 4 ) {
 				nm = fields[0].stripWhiteSpace();
-				KToggleAction *kta = new KToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), 
+				TDEToggleAction *kta = new TDEToggleAction( nm, 0, TQT_TQOBJECT(this), TQT_SLOT( slotTargetSymbol() ), 
 						actionCollection(), nm.utf8() );
 				kta->setExclusiveGroup( "fovsymbol" );
 				if ( nm == Options::fOVName() ) kta->setChecked( true );
@@ -339,7 +339,7 @@ void KStars::initFOV() {
 	}
 
 	fovActionMenu->popupMenu()->insertSeparator();
-	fovActionMenu->insert( new KAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) );
+	fovActionMenu->insert( new TDEAction( i18n( "Edit FOV Symbols..." ), 0, TQT_TQOBJECT(this), TQT_SLOT( slotFOVEdit() ), actionCollection(), "edit_fov" ) );
 }
 
 void KStars::initStatusBar() {
@@ -477,7 +477,7 @@ void KStars::privatedata::buildGUI() {
 	//Do not show text on the view toolbar buttons
 	//FIXME: after strings freeze, remove this and make the
 	//text of each button shorter
-	ks->toolBar( "viewToolBar" )->setIconText( KToolBar::IconOnly );
+	ks->toolBar( "viewToolBar" )->setIconText( TDEToolBar::IconOnly );
 
 	ks->TimeStep = new TimeStepBox( ks->toolBar() );
 	ks->toolBar()->insertWidget( 0, 6, ks->TimeStep, 15 );
diff --git a/kstars/kstars/kswizardui.ui b/kstars/kstars/kswizardui.ui
index 2a612e2e..3d81e6e3 100644
--- a/kstars/kstars/kswizardui.ui
+++ b/kstars/kstars/kswizardui.ui
@@ -382,7 +382,7 @@ country.&lt;/p&gt;
                                     </widget>
                                 </hbox>
                             </widget>
-                            <widget class="KListBox">
+                            <widget class="TDEListBox">
                                 <property name="name">
                                     <cstring>CityListBox</cstring>
                                 </property>
diff --git a/kstars/kstars/opscolorsui.ui b/kstars/kstars/opscolorsui.ui
index fc70d791..aff25ac1 100644
--- a/kstars/kstars/opscolorsui.ui
+++ b/kstars/kstars/opscolorsui.ui
@@ -30,7 +30,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListBox">
+                <widget class="TDEListBox">
                     <property name="name">
                         <cstring>ColorPalette</cstring>
                     </property>
@@ -156,7 +156,7 @@
                 <property name="name">
                     <cstring>unnamed</cstring>
                 </property>
-                <widget class="KListBox">
+                <widget class="TDEListBox">
                     <property name="name">
                         <cstring>PresetBox</cstring>
                     </property>
diff --git a/kstars/kstars/telescopepropui.ui b/kstars/kstars/telescopepropui.ui
index 91b3aefc..53f8c8f2 100644
--- a/kstars/kstars/telescopepropui.ui
+++ b/kstars/kstars/telescopepropui.ui
@@ -89,7 +89,7 @@
                 </widget>
             </hbox>
         </widget>
-        <widget class="KListBox" row="1" column="0" rowspan="2" colspan="1">
+        <widget class="TDEListBox" row="1" column="0" rowspan="2" colspan="1">
             <property name="name">
                 <cstring>telescopeListBox</cstring>
             </property>
diff --git a/kstars/kstars/thumbnailpickerui.ui b/kstars/kstars/thumbnailpickerui.ui
index c3232750..7bd41bbd 100644
--- a/kstars/kstars/thumbnailpickerui.ui
+++ b/kstars/kstars/thumbnailpickerui.ui
@@ -76,7 +76,7 @@
                         </widget>
                     </hbox>
                 </widget>
-                <widget class="KListBox">
+                <widget class="TDEListBox">
                     <property name="name">
                         <cstring>ImageList</cstring>
                     </property>
diff --git a/kstars/kstars/toggleaction.cpp b/kstars/kstars/toggleaction.cpp
index a0b59a64..d95fb2dc 100644
--- a/kstars/kstars/toggleaction.cpp
+++ b/kstars/kstars/toggleaction.cpp
@@ -20,7 +20,7 @@
 ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix,
 	const TQString& offtext, const TQIconSet& offpix,
 	int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) :
-		KAction(ontext, onpix, accel, receiver, slot, parent, name),
+		TDEAction(ontext, onpix, accel, receiver, slot, parent, name),
 		officon(offpix),
 		onicon(onpix),
 		offcap(offtext),
@@ -30,7 +30,7 @@ ToggleAction::ToggleAction(const TQString& ontext, const TQIconSet& onpix,
 
 ToggleAction::ToggleAction(const TQString& ontext, const TQString& offtext,
 	int accel, const TQObject* receiver, const char* slot, TQObject* parent, const char* name ) :
-		KAction(ontext, accel, receiver, slot, parent, name),
+		TDEAction(ontext, accel, receiver, slot, parent, name),
 		officon(),
 		onicon(),
 		offcap(offtext),
diff --git a/kstars/kstars/toggleaction.h b/kstars/kstars/toggleaction.h
index 9f1b2365..ca8550dd 100644
--- a/kstars/kstars/toggleaction.h
+++ b/kstars/kstars/toggleaction.h
@@ -29,7 +29,7 @@
 #include <tqiconset.h>
 #include <kaction.h>
 
-class ToggleAction : public KAction {
+class ToggleAction : public TDEAction {
 	Q_OBJECT
   
 		
diff --git a/kstars/kstars/tools/altvstimeui.ui b/kstars/kstars/tools/altvstimeui.ui
index 629dc8d9..92f5030c 100644
--- a/kstars/kstars/tools/altvstimeui.ui
+++ b/kstars/kstars/tools/altvstimeui.ui
@@ -256,7 +256,7 @@
                             </widget>
                         </vbox>
                     </widget>
-                    <widget class="KListBox">
+                    <widget class="TDEListBox">
                         <property name="name">
                             <cstring>PlotList</cstring>
                         </property>
diff --git a/kstars/kstars/tools/argloadcolorscheme.ui b/kstars/kstars/tools/argloadcolorscheme.ui
index 1e7d1732..45c9ecd7 100644
--- a/kstars/kstars/tools/argloadcolorscheme.ui
+++ b/kstars/kstars/tools/argloadcolorscheme.ui
@@ -16,7 +16,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListBox">
+        <widget class="TDEListBox">
             <property name="name">
                 <cstring>SchemeList</cstring>
             </property>
diff --git a/kstars/kstars/tools/lcgenerator.cpp b/kstars/kstars/tools/lcgenerator.cpp
index 2fef2a5a..bcb593d8 100644
--- a/kstars/kstars/tools/lcgenerator.cpp
+++ b/kstars/kstars/tools/lcgenerator.cpp
@@ -80,7 +80,7 @@ void LCGenerator::createGUI()
     desigLabel->setMinimumSize( TQSize( 70, 0 ) );
     DesignHLayout->addWidget( desigLabel );
 
-    DesignationIn = new KListBox( StarInfoBox, "DesignationIn" );
+    DesignationIn = new TDEListBox( StarInfoBox, "DesignationIn" );
     DesignHLayout->addWidget( DesignationIn );
     StarInfoBoxLayout->addLayout( DesignHLayout );
     
@@ -94,7 +94,7 @@ void LCGenerator::createGUI()
     nameLabel->setMinimumSize( TQSize( 70, 0 ) );
     NameHLayout->addWidget( nameLabel );
 
-    NameIn = new KListBox( StarInfoBox, "NameIn" );
+    NameIn = new TDEListBox( StarInfoBox, "NameIn" );
     NameHLayout->addWidget( NameIn );
     StarInfoBoxLayout->addLayout( NameHLayout );
     
diff --git a/kstars/kstars/tools/lcgenerator.h b/kstars/kstars/tools/lcgenerator.h
index 569d1e7f..c0faacbe 100644
--- a/kstars/kstars/tools/lcgenerator.h
+++ b/kstars/kstars/tools/lcgenerator.h
@@ -36,7 +36,7 @@ class TQHBoxLayout;
 class TQGridLayout;
 class TQFile;
 class KLineEdit;
-class KListBox;
+class TDEListBox;
 class KPushButton;
 class TQCheckBox;
 class TQGroupBox;
@@ -92,9 +92,9 @@ private:
 	
 	TQGroupBox* StarInfoBox;
 	TQLabel* desigLabel;
-	KListBox* DesignationIn;
+	TDEListBox* DesignationIn;
 	TQLabel* nameLabel;
-	KListBox* NameIn;
+	TDEListBox* NameIn;
 	TQLabel* startLabel;
 	KLineEdit* StartDateIn;
 	TQLabel* endLabel;
diff --git a/kstars/kstars/tools/observinglist.cpp b/kstars/kstars/tools/observinglist.cpp
index c8bd8709..963d3cdd 100644
--- a/kstars/kstars/tools/observinglist.cpp
+++ b/kstars/kstars/tools/observinglist.cpp
@@ -156,7 +156,7 @@ void ObservingList::slotAddObject( SkyObject *obj ) {
 	//Insert object entry in FullTable and TinyTable
 	TQString smag("--");
 	if ( obj->mag() < 90.0 ) smag = TQString::number( obj->mag(), 'g', 2 );
-	new KListViewItem( ui->FullTable, obj->translatedName(), 
+	new TDEListViewItem( ui->FullTable, obj->translatedName(), 
 			obj->ra()->toHMSString(),
 			obj->dec()->toDMSString(),
 			smag,
diff --git a/kstars/kstars/tools/observinglistui.ui b/kstars/kstars/tools/observinglistui.ui
index 4a664c0c..33a2dbbc 100644
--- a/kstars/kstars/tools/observinglistui.ui
+++ b/kstars/kstars/tools/observinglistui.ui
@@ -385,7 +385,7 @@
                     <property name="margin">
                         <number>0</number>
                     </property>
-                    <widget class="KListView">
+                    <widget class="TDEListView">
                         <column>
                             <property name="text">
                                 <string>Name</string>
@@ -476,7 +476,7 @@
                     <property name="margin">
                         <number>0</number>
                     </property>
-                    <widget class="KListBox">
+                    <widget class="TDEListBox">
                         <property name="name">
                             <cstring>TinyTable</cstring>
                         </property>
diff --git a/kstars/kstars/tools/obslistwizardui.ui b/kstars/kstars/tools/obslistwizardui.ui
index e7891bed..5fd3f6d2 100644
--- a/kstars/kstars/tools/obslistwizardui.ui
+++ b/kstars/kstars/tools/obslistwizardui.ui
@@ -43,7 +43,7 @@
                                 <string>Selection filters:</string>
                             </property>
                         </widget>
-                        <widget class="KListView">
+                        <widget class="TDEListView">
                             <column>
                                 <property name="text">
                                     <string>Filter</string>
@@ -170,7 +170,7 @@
                                             <property name="name">
                                                 <cstring>unnamed</cstring>
                                             </property>
-                                            <widget class="KListBox">
+                                            <widget class="TDEListBox">
                                                 <item>
                                                     <property name="text">
                                                         <string>Stars</string>
@@ -305,7 +305,7 @@
                                             <string>Select objects in constell&amp;ation(s):</string>
                                         </property>
                                     </widget>
-                                    <widget class="KListBox">
+                                    <widget class="TDEListBox">
                                         <property name="name">
                                             <cstring>ConstellationList</cstring>
                                         </property>
diff --git a/kstars/kstars/tools/optionstreeview.ui b/kstars/kstars/tools/optionstreeview.ui
index 775b2270..c5adc126 100644
--- a/kstars/kstars/tools/optionstreeview.ui
+++ b/kstars/kstars/tools/optionstreeview.ui
@@ -22,7 +22,7 @@
         <property name="name">
             <cstring>unnamed</cstring>
         </property>
-        <widget class="KListView">
+        <widget class="TDEListView">
             <column>
                 <property name="text">
                     <string>Option Name</string>
diff --git a/kstars/kstars/tools/scriptbuilder.cpp b/kstars/kstars/tools/scriptbuilder.cpp
index a66d7bca..3f6afe34 100644
--- a/kstars/kstars/tools/scriptbuilder.cpp
+++ b/kstars/kstars/tools/scriptbuilder.cpp
@@ -217,7 +217,7 @@ ScriptBuilder::ScriptBuilder( TQWidget *parent, const char *name )
 	
 	
 	// Modified by JM
-	// We're using KListView instead of listbox to arrange the functions in two
+	// We're using TDEListView instead of listbox to arrange the functions in two
 	// main categories: KStars and INDI. INDI is further subdivided.
 	
 	sb->FunctionListView->addColumn(i18n("Functions"));
diff --git a/kstars/kstars/tools/scriptbuilderui.ui b/kstars/kstars/tools/scriptbuilderui.ui
index e34e6dcb..bf17b669 100644
--- a/kstars/kstars/tools/scriptbuilderui.ui
+++ b/kstars/kstars/tools/scriptbuilderui.ui
@@ -246,7 +246,7 @@
                             <property name="name">
                                 <cstring>unnamed</cstring>
                             </property>
-                            <widget class="KListBox">
+                            <widget class="TDEListBox">
                                 <property name="name">
                                     <cstring>ScriptListBox</cstring>
                                 </property>
@@ -507,7 +507,7 @@
                         <property name="orientation">
                             <enum>Vertical</enum>
                         </property>
-                        <widget class="KListView">
+                        <widget class="TDEListView">
                             <property name="name">
                                 <cstring>FunctionListView</cstring>
                             </property>
diff --git a/kstars/kstars/tools/wutdialogui.ui b/kstars/kstars/tools/wutdialogui.ui
index b80697da..7117eb8a 100644
--- a/kstars/kstars/tools/wutdialogui.ui
+++ b/kstars/kstars/tools/wutdialogui.ui
@@ -398,7 +398,7 @@
                         <string>Choose a category:</string>
                     </property>
                 </widget>
-                <widget class="KListBox" row="1" column="1">
+                <widget class="TDEListBox" row="1" column="1">
                     <property name="name">
                         <cstring>ObjectListBox</cstring>
                     </property>
@@ -515,7 +515,7 @@
                         </widget>
                     </vbox>
                 </widget>
-                <widget class="KListBox" row="1" column="0">
+                <widget class="TDEListBox" row="1" column="0">
                     <property name="name">
                         <cstring>CategoryListBox</cstring>
                     </property>